diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000000..26b750dff4
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,30 @@
+## Core team
+modules/openapi-generator/src/main/java/org/openapitools/codegen/*.java @OpenAPITools/generator-core-team
+modules/openapi-generator/src/main/java/org/openapitools/codegen/auth/*.java @OpenAPITools/generator-core-team
+modules/openapi-generator/src/main/java/org/openapitools/codegen/config/*.java @OpenAPITools/generator-core-team
+modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/*.java @OpenAPITools/generator-core-team
+modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/**/*.java @OpenAPITools/generator-core-team
+modules/openapi-generator/src/main/java/org/openapitools/codegen/serializer/*.java @OpenAPITools/generator-core-team
+modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/**/*.java @OpenAPITools/generator-core-team
+modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/**/*.java @OpenAPITools/generator-core-team
+modules/openapi-generator-core/**/* @OpenAPITools/generator-core-team
+
+# No need for auto-generated subdirectories (reduces noise)
+docs/ @OpenAPITools/generator-core-team
+
+## Individual interests
+.github/**/* @jimschubert
+scripts/**/* @jimschubert
+website/**/* @jimschubert
+bin/ci/**/* @jimschubert
+
+## Bulid related
+CI/**/* @OpenAPITools/build
+.mvn/**/* @OpenAPITools/build
+bin/utils/**/* @OpenAPITools/build
+
+## Module-specific
+modules/openapi-generator-cli/**/* @jimschubert
+modules/openapi-generator-gradle-plugin/**/* @jimschubert
+modules/openapi-generator-maven-plugin/**/* @jimschubert
+
diff --git a/.github/auto-labeler.yml b/.github/auto-labeler.yml
index f623319907..5bff51d5ce 100644
--- a/.github/auto-labeler.yml
+++ b/.github/auto-labeler.yml
@@ -247,7 +247,7 @@ labels:
'Server: Java':
- '\s*?\[java-.*?\]\s*?'
- '\s*?-[gl] java-.*?\s*?'
- - '\s*?-[gl] jaxrx-.*?\s*?'
+ - '\s*?-[gl] jaxrs-.*?\s*?'
'Server: Kotlin':
- '\s*?\[ktor]\s*?'
- '\s*?\[kotlin-spring]\s*?'
diff --git a/CI/bitrise.yml b/CI/bitrise.yml
index 8a572ab864..cfdb8601ec 100644
--- a/CI/bitrise.yml
+++ b/CI/bitrise.yml
@@ -49,6 +49,25 @@ workflows:
./samples/client/petstore/swift4/swift4_test_all.sh
./samples/client/test/swift4/swift4_test_all.sh
+ - script@1.1.5:
+ title: Update Swift5 samples
+ inputs:
+ - content: |
+ #!/usr/bin/env bash
+
+ set -e
+
+ sh bin/swift5-all.sh
+ - script@1.1.5:
+ title: Run Swift5 tests
+ inputs:
+ - content: |
+ #!/usr/bin/env bash
+
+ set -e
+
+ ./samples/client/petstore/swift5/swift5_test_all.sh
+ ./samples/client/test/swift5/swift5_test_all.sh
- script@1.1.5:
title: Run all bin scripts
inputs:
diff --git a/CI/samples.ci/client/petstore/java/jersey2-java6/build.gradle b/CI/samples.ci/client/petstore/java/jersey2-java6/build.gradle
index 37f1ab526d..d540a137bd 100644
--- a/CI/samples.ci/client/petstore/java/jersey2-java6/build.gradle
+++ b/CI/samples.ci/client/petstore/java/jersey2-java6/build.gradle
@@ -102,7 +102,7 @@ ext {
jersey_version = "2.6"
commons_io_version=2.5
commons_lang3_version=3.6
- junit_version = "4.12"
+ junit_version = "4.13"
threetenbp_version = "2.6.4"
}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3566369348..8c4bd40f4f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -101,5 +101,5 @@ To start the CI tests, you can run `mvn verify -Psamples` (assuming you've all t
- Make sure test cases passed after the change (one way is to leverage https://travis-ci.org/ to run the CI tests)
- File a PR with meaningful title, description and commit messages.
- Recommended git settings
- - `git config --global core.autocrlf input` to tell Git convert CRLF to LF on commit but not the other way around
+ - `git config core.autocrlf input` to tell Git convert CRLF to LF on commit but not the other way around
- To close an issue (e.g. issue 1542) automatically after a PR is merged, use keywords "fix", "close", "resolve" in the PR description, e.g. `fix #1542`. (Ref: [closing issues using keywords](https://help.github.com/articles/closing-issues-using-keywords/))
diff --git a/LICENSE b/LICENSE
index c806b7a847..310853b896 100644
--- a/LICENSE
+++ b/LICENSE
@@ -193,7 +193,7 @@
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
+ 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,
diff --git a/README.md b/README.md
index 228b189e01..2804326fba 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@
[](https://join.slack.com/t/openapi-generator/shared_invite/enQtNzAyNDMyOTU0OTE1LTY5ZDBiNDI5NzI5ZjQ1Y2E5OWVjMjZkYzY1ZGM2MWQ4YWFjMzcyNDY5MGI4NjQxNDBiMTlmZTc5NjY2ZTQ5MGM)
-[](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.openapitools%22%20AND%20a%3A%22openapi-generator%22)
+[](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.openapitools%22%20AND%20a%3A%22openapi-generator%22)
[](https://twitter.com/oas_generator)
@@ -70,7 +70,7 @@ OpenAPI Generator allows generation of API client libraries (SDK generation), se
| | Languages/Frameworks |
|-|-|
-**API clients** | **ActionScript**, **Ada**, **Apex**, **Bash**, **C**, **C#** (.net 2.0, 3.5 or later, .NET Standard 1.3 - 2.0, .NET Core 2.0), **C++** (cpp-restsdk, Qt5, Tizen), **Clojure**, **Dart (1.x, 2.x)**, **Elixir**, **Elm**, **Eiffel**, **Erlang**, **Go**, **Groovy**, **Haskell** (http-client, Servant), **Java** (Jersey1.x, Jersey2.x, OkHttp, Retrofit1.x, Retrofit2.x, Feign, RestTemplate, RESTEasy, Vertx, Google API Client Library for Java, Rest-assured, Spring 5 Web Client, MicroProfile Rest Client), **Kotlin**, **Lua**, **Nim**, **Node.js/JavaScript** (ES5, ES6, AngularJS with Google Closure Compiler annotations, Flow types), **Objective-C**, **OCaml**, **Perl**, **PHP**, **PowerShell**, **Python**, **R**, **Ruby**, **Rust** (rust, rust-server), **Scala** (akka, http4s, scalaz, swagger-async-httpclient), **Swift** (2.x, 3.x, 4.x), **Typescript** (AngularJS, Angular (2.x - 8.x), Aurelia, Axios, Fetch, Inversify, jQuery, Node, Rxjs)
+**API clients** | **ActionScript**, **Ada**, **Apex**, **Bash**, **C**, **C#** (.net 2.0, 3.5 or later, .NET Standard 1.3 - 2.0, .NET Core 2.0), **C++** (cpp-restsdk, Qt5, Tizen), **Clojure**, **Dart (1.x, 2.x)**, **Elixir**, **Elm**, **Eiffel**, **Erlang**, **Go**, **Groovy**, **Haskell** (http-client, Servant), **Java** (Jersey1.x, Jersey2.x, OkHttp, Retrofit1.x, Retrofit2.x, Feign, RestTemplate, RESTEasy, Vertx, Google API Client Library for Java, Rest-assured, Spring 5 Web Client, MicroProfile Rest Client), **Kotlin**, **Lua**, **Nim**, **Node.js/JavaScript** (ES5, ES6, AngularJS with Google Closure Compiler annotations, Flow types), **Objective-C**, **OCaml**, **Perl**, **PHP**, **PowerShell**, **Python**, **R**, **Ruby**, **Rust** (rust, rust-server), **Scala** (akka, http4s, scalaz, swagger-async-httpclient), **Swift** (2.x, 3.x, 4.x, 5.x), **Typescript** (AngularJS, Angular (2.x - 8.x), Aurelia, Axios, Fetch, Inversify, jQuery, Node, Rxjs)
**Server stubs** | **Ada**, **C#** (ASP.NET Core, NancyFx), **C++** (Pistache, Restbed, Qt5 QHTTPEngine), **Erlang**, **F#** (Giraffe), **Go** (net/http, Gin), **Haskell** (Servant), **Java** (MSF4J, Spring, Undertow, JAX-RS: CDI, CXF, Inflector, Jersey, RestEasy, Play Framework, [PKMST](https://github.com/ProKarma-Inc/pkmst-getting-started-examples), [Vert.x](https://vertx.io/)), **Kotlin** (Spring Boot, Ktor, Vertx), **PHP** (Laravel, Lumen, Slim, Silex, [Symfony](https://symfony.com/), [Zend Expressive](https://github.com/zendframework/zend-expressive)), **Python** (Flask), **NodeJS**, **Ruby** (Sinatra, Rails5), **Rust** (rust-server), **Scala** ([Finch](https://github.com/finagle/finch), [Lagom](https://github.com/lagom/lagom), [Play](https://www.playframework.com/), Scalatra)
**API documentation generators** | **HTML**, **Confluence Wiki**, **Asciidoc**
**Configuration files** | [**Apache2**](https://httpd.apache.org/)
@@ -171,16 +171,16 @@ See the different versions of the [openapi-generator-cli](https://mvnrepository.
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: `http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/4.2.2/openapi-generator-cli-4.2.2.jar`
+JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/4.2.2/openapi-generator-cli-4.2.2.jar`
For **Mac/Linux** users:
```sh
-wget http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/4.2.2/openapi-generator-cli-4.2.2.jar -O openapi-generator-cli.jar
+wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/4.2.2/openapi-generator-cli-4.2.2.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 http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/4.2.2/openapi-generator-cli-4.2.2.jar
+Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/4.2.2/openapi-generator-cli-4.2.2.jar
```
After downloading the JAR, run `java -jar openapi-generator-cli.jar help` to show the usage.
@@ -395,10 +395,10 @@ openapi-generator version
```
-Or install a particular OpenAPI Generator version (e.g. v4.1.2):
+Or install a particular OpenAPI Generator version (e.g. v4.2.2):
```sh
-npm install @openapitools/openapi-generator-cli@cli-4.1.2 -g
+npm install @openapitools/openapi-generator-cli@cli-4.2.2 -g
```
Or install it as dev-dependency:
@@ -422,7 +422,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`)
-You can also download the JAR (latest release) directly from [maven.org](http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/4.2.2/openapi-generator-cli-4.2.2.jar)
+You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/4.2.2/openapi-generator-cli-4.2.2.jar)
To get a list of **general** options available, please run `java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar help generate`
@@ -580,6 +580,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
- [California State University, Northridge](https://www.csun.edu)
- [CAM](https://www.cam-inc.co.jp/)
- [Camptocamp](https://www.camptocamp.com/en)
+- [Cisco](https://www.cisco.com/)
- [codecentric AG](https://www.codecentric.de/)
- [Commencis](https://www.commencis.com/)
- [Crossover Health](https://crossoverhealth.com/)
@@ -603,6 +604,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
- [JustStar](https://www.juststarinfo.com)
- [Klarna](https://www.klarna.com/)
- [Kronsoft Development](https://www.kronsoft.ro/home/)
+- [Kubernetes](https://kubernetes.io)
- [Linode](https://www.linode.com/)
- [Médiavision](https://www.mediavision.fr/)
- [Metaswitch](https://www.metaswitch.com/)
@@ -643,6 +645,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
- 2018/05/15 - [REST API仕様からAPIクライアントやスタブサーバを自動生成する「OpenAPI Generator」オープンソースで公開。Swagger Codegenからのフォーク](https://www.publickey1.jp/blog/18/rest_apiapiopenapi_generatorswagger_generator.html) by [Publickey](https://www.publickey1.jp)
- 2018/06/08 - [Swagger Codegen is now OpenAPI Generator](https://angular.schule/blog/2018-06-swagger-codegen-is-now-openapi-generator) by [JohannesHoppe](https://github.com/JohannesHoppe)
- 2018/06/21 - [Connect your JHipster apps to the world of APIs with OpenAPI and gRPC](https://fr.slideshare.net/chbornet/jhipster-conf-2018-connect-your-jhipster-apps-to-the-world-of-apis-with-openapi-and-grpc) by [Christophe Bornet](https://github.com/cbornet) at [JHipster Conf 2018](https://jhipster-conf.github.io/)
+- 2018/06/22 - [OpenAPI Generator で Gatling Client を生成してみた](https://rohki.hatenablog.com/entry/2018/06/22/073000) at [ソモサン](https://rohki.hatenablog.com/)
- 2018/06/27 - [Lessons Learned from Leading an Open-Source Project Supporting 30+ Programming Languages](https://speakerdeck.com/wing328/lessons-learned-from-leading-an-open-source-project-supporting-30-plus-programming-languages) - [William Cheng](https://github.com/wing328) at [LinuxCon + ContainerCon + CloudOpen China 2018](http://bit.ly/2waDKKX)
- 2018/07/19 - [OpenAPI Generator Contribution Quickstart - RingCentral Go SDK](https://medium.com/ringcentral-developers/openapi-generator-for-go-contribution-quickstart-8cc72bf37b53) by [John Wang](https://github.com/grokify)
- 2018/08/22 - [OpenAPI Generatorのプロジェクト構成などのメモ](https://yinm.info/20180822/) by [Yusuke Iinuma](https://github.com/yinm)
@@ -714,7 +717,10 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
- 2019-11-24 - [Accelerate Flutter development with OpenAPI and Dart code generation](https://medium.com/@irinasouthwell_220/accelerate-flutter-development-with-openapi-and-dart-code-generation-1f16f8329a6a) by [Irina Southwell](https://medium.com/@irinasouthwell_220)
- 2019-11-25 - [openapi-generatorで手軽にスタブサーバとクライアントの生成](https://qiita.com/pochopocho13/items/8db662e1934fb2b408b8) by [@pochopocho13](https://twitter.com/pochopocho13)
- 2019-11-26 - [CordaCon 2019 Highlights: Braid Server and OpenAPI Generator for Corda Client API’s](https://blog.b9lab.com/cordacon-2019-highlights-braid-server-and-openapi-generator-for-corda-flows-api-s-d24179ccb27c) by [Adel Rustum](https://blog.b9lab.com/@adelrestom) at [B9lab](https://blog.b9lab.com/)
-- 2020-12-04 - [Angular+NestJS+OpenAPI(Swagger)でマイクロサービスを視野に入れた環境を考える](https://qiita.com/teracy55/items/0327c7a170ec772970c6) by [てらしー](https://twitter.com/teracy55)
+- 2019-12-04 - [Angular+NestJS+OpenAPI(Swagger)でマイクロサービスを視野に入れた環境を考える](https://qiita.com/teracy55/items/0327c7a170ec772970c6) by [てらしー](https://twitter.com/teracy55)
+- 2019-12-17 - [OpenAPI Generator で OAuth2 アクセストークン発行のコードまで生成してみる](https://www.techscore.com/blog/2019/12/17/openapi-generator-oauth2-accesstoken/) by [TECHSCORE](https://www.techscore.com/blog/)
+- 2019-12-23 - [Use Ada for Your Web Development](https://www.electronicdesign.com/technologies/embedded-revolution/article/21119177/use-ada-for-your-web-development) by [Stephane Carrez](https://github.com/stcarrez)
+- 2019-01-17 - [OpenAPI demo for Pulp 3.0 GA](https://www.youtube.com/watch?v=mFBP-M0ZPfw&t=178s) by [Pulp](https://www.youtube.com/channel/UCI43Ffs4VPDv7awXvvBJfRQ) at [Youtube](https://www.youtube.com/)
## [6 - About Us](#table-of-contents)
@@ -795,6 +801,7 @@ Here is a list of template creators:
* Swift: @tkqubo
* Swift 3: @hexelon
* Swift 4: @ehyche
+ * Swift 5: @4brunu
* TypeScript (Angular1): @mhardorf
* TypeScript (Angular2): @roni-frantchi
* TypeScript (Angular6): @akehir
diff --git a/appveyor.yml b/appveyor.yml
index afafbd2e70..b029aa6944 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,5 @@
# for CI with appveyor.yml
-# Ref: http://www.yegor256.com/2015/01/10/windows-appveyor-maven.html
+# Ref: https://www.yegor256.com/2015/01/10/windows-appveyor-maven.html
version: '{branch}-{build}'
image: Visual Studio 2017
hosts:
diff --git a/bin/ci/kotlin-client-string.json b/bin/ci/kotlin-client-string.json
index 52f68e53b4..cceb366c2c 100644
--- a/bin/ci/kotlin-client-string.json
+++ b/bin/ci/kotlin-client-string.json
@@ -6,6 +6,8 @@
"templateDir": "modules/openapi-generator/src/main/resources/kotlin-client",
"additionalProperties": {
"dateLibrary": "string",
- "serializableModel": "true"
+ "serializableModel": "true",
+ "sortParamsByRequiredFlag": "false",
+ "sortModelPropertiesByRequiredFlag": "false"
}
}
\ No newline at end of file
diff --git a/bin/kotlin-client-all.sh b/bin/kotlin-client-all.sh
index 9fa9ee7de0..8663752ab5 100755
--- a/bin/kotlin-client-all.sh
+++ b/bin/kotlin-client-all.sh
@@ -10,4 +10,4 @@
./bin/kotlin-client-threetenbp.sh
./bin/kotlin-client-nullable.sh
./bin/kotlin-client-retrofit2.sh
-./bin/kotlin-client-json-request-date.sh
+./bin/kotlin-client-json-request-string.sh
diff --git a/bin/kotlin-client-json-request-date.sh b/bin/kotlin-client-json-request-string.sh
similarity index 86%
rename from bin/kotlin-client-json-request-date.sh
rename to bin/kotlin-client-json-request-string.sh
index 84ee2b7485..2e32eed675 100755
--- a/bin/kotlin-client-json-request-date.sh
+++ b/bin/kotlin-client-json-request-string.sh
@@ -27,6 +27,6 @@ fi
# if you've executed sbt assembly previously it will use that instead.
export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -t modules/openapi-generator/src/main/resources/kotlin-client -i modules/openapi-generator/src/test/resources/2_0/petstore-with-date-field.yaml -g kotlin --artifact-id kotlin-petstore-json-request-date --additional-properties requestDateConverter=toJson -o samples/client/petstore/kotlin-json-request-date $@"
+ags="generate -t modules/openapi-generator/src/main/resources/kotlin-client -i modules/openapi-generator/src/test/resources/2_0/petstore-with-date-field.yaml -g kotlin --artifact-id kotlin-petstore-json-request-string --additional-properties requestDateConverter=toString -o samples/client/petstore/kotlin-json-request-string $@"
java ${JAVA_OPTS} -jar ${executable} ${ags}
diff --git a/bin/swift5-all.sh b/bin/swift5-all.sh
new file mode 100755
index 0000000000..0fabcabab4
--- /dev/null
+++ b/bin/swift5-all.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+./bin/swift5-petstore-all.sh
+./bin/swift5-test.sh
diff --git a/bin/swift5-petstore-alamofire.json b/bin/swift5-petstore-alamofire.json
new file mode 100644
index 0000000000..f6cc7270be
--- /dev/null
+++ b/bin/swift5-petstore-alamofire.json
@@ -0,0 +1,7 @@
+{
+ "podSummary": "PetstoreClient",
+ "podHomepage": "https://github.com/openapitools/openapi-generator",
+ "podAuthors": "",
+ "projectName": "PetstoreClient",
+ "library": "alamofire"
+}
diff --git a/bin/swift5-petstore-alamofire.sh b/bin/swift5-petstore-alamofire.sh
new file mode 100755
index 0000000000..6c8ef2c5f8
--- /dev/null
+++ b/bin/swift5-petstore-alamofire.sh
@@ -0,0 +1,42 @@
+#!/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"
+
+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} -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="generate -t modules/openapi-generator/src/main/resources/swift5 -i modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml -g swift5 -c ./bin/swift5-petstore-alamofire.json -o samples/client/petstore/swift5/alamofireLibrary --generate-alias-as-model $@"
+
+java $JAVA_OPTS -jar $executable $ags
+
+if type "xcodegen" > /dev/null 2>&1; then
+ cd samples/client/petstore/swift5/alamofireLibrary
+ xcodegen generate
+fi
+
+if type "swiftlint" > /dev/null 2>&1; then
+ cd samples/client/petstore/swift5/alamofireLibrary
+ swiftlint autocorrect
+fi
\ No newline at end of file
diff --git a/bin/swift5-petstore-all.sh b/bin/swift5-petstore-all.sh
new file mode 100755
index 0000000000..bce216fcb4
--- /dev/null
+++ b/bin/swift5-petstore-all.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+./bin/swift5-petstore.sh
+./bin/swift5-petstore-promisekit.sh
+./bin/swift5-petstore-result.sh
+./bin/swift5-petstore-rxswift.sh
+./bin/swift5-petstore-objcCompatible.sh
+./bin/swift5-petstore-nonPublicApi.sh
+./bin/swift5-petstore-urlsession.sh
+./bin/swift5-petstore-alamofire.sh
+./bin/swift5-petstore-combine.sh
+
\ No newline at end of file
diff --git a/bin/swift5-petstore-combine.json b/bin/swift5-petstore-combine.json
new file mode 100644
index 0000000000..ef420f56e2
--- /dev/null
+++ b/bin/swift5-petstore-combine.json
@@ -0,0 +1,7 @@
+{
+ "podSummary": "PetstoreClient",
+ "podHomepage": "https://github.com/openapitools/openapi-generator",
+ "podAuthors": "",
+ "projectName": "PetstoreClient",
+ "responseAs": "Combine"
+}
diff --git a/bin/swift5-petstore-combine.sh b/bin/swift5-petstore-combine.sh
new file mode 100755
index 0000000000..71ca667a9a
--- /dev/null
+++ b/bin/swift5-petstore-combine.sh
@@ -0,0 +1,42 @@
+#!/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"
+
+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} -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="generate -t modules/openapi-generator/src/main/resources/swift5 -i modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml -g swift5 -c ./bin/swift5-petstore-combine.json -o samples/client/petstore/swift5/combineLibrary --generate-alias-as-model $@"
+
+java $JAVA_OPTS -jar $executable $ags
+
+if type "xcodegen" > /dev/null 2>&1; then
+ cd samples/client/petstore/swift5/combineLibrary
+ xcodegen generate
+fi
+
+if type "swiftlint" > /dev/null 2>&1; then
+ cd samples/client/petstore/swift5/combineLibrary
+ swiftlint autocorrect
+fi
\ No newline at end of file
diff --git a/bin/swift5-petstore-nonPublicApi.json b/bin/swift5-petstore-nonPublicApi.json
new file mode 100644
index 0000000000..f20305dec0
--- /dev/null
+++ b/bin/swift5-petstore-nonPublicApi.json
@@ -0,0 +1,8 @@
+{
+ "podSummary": "PetstoreClient",
+ "podHomepage": "https://github.com/openapitools/openapi-generator",
+ "podAuthors": "",
+ "projectName": "PetstoreClient",
+ "nonPublicApi": true,
+ "sortParamsByRequiredFlag": false
+}
diff --git a/bin/openapi3/nodejs-petstore-google-cloud-functions.sh b/bin/swift5-petstore-nonPublicApi.sh
similarity index 54%
rename from bin/openapi3/nodejs-petstore-google-cloud-functions.sh
rename to bin/swift5-petstore-nonPublicApi.sh
index 00ab32fb9a..fc4035bfca 100755
--- a/bin/openapi3/nodejs-petstore-google-cloud-functions.sh
+++ b/bin/swift5-petstore-nonPublicApi.sh
@@ -22,11 +22,21 @@ executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
if [ ! -f "$executable" ]
then
- mvn clean package
+ mvn -B clean package
fi
# if you've executed sbt assembly previously it will use that instead.
export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g nodejs-server-deprecated --additional-properties=googleCloudFunctions=true -o samples/server/petstore/nodejs-google-cloud-functions -Dservice $@"
+ags="generate -t modules/openapi-generator/src/main/resources/swift5 -i modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml -g swift5 -c ./bin/swift5-petstore-nonPublicApi.json -o samples/client/petstore/swift5/nonPublicApi --generate-alias-as-model $@"
java $JAVA_OPTS -jar $executable $ags
+
+if type "xcodegen" > /dev/null 2>&1; then
+ cd samples/client/petstore/swift5/nonPublicApi
+ xcodegen generate
+fi
+
+if type "swiftlint" > /dev/null 2>&1; then
+ cd samples/client/petstore/swift5/nonPublicApi
+ swiftlint autocorrect
+fi
\ No newline at end of file
diff --git a/bin/swift5-petstore-objcCompatible.json b/bin/swift5-petstore-objcCompatible.json
new file mode 100644
index 0000000000..c24c7abf69
--- /dev/null
+++ b/bin/swift5-petstore-objcCompatible.json
@@ -0,0 +1,7 @@
+{
+ "podSummary": "PetstoreClient",
+ "podHomepage": "https://github.com/openapitools/openapi-generator",
+ "podAuthors": "",
+ "projectName": "PetstoreClient",
+ "objcCompatible": true
+}
diff --git a/bin/swift5-petstore-objcCompatible.sh b/bin/swift5-petstore-objcCompatible.sh
new file mode 100755
index 0000000000..39d53ff8e6
--- /dev/null
+++ b/bin/swift5-petstore-objcCompatible.sh
@@ -0,0 +1,42 @@
+#!/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"
+
+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} -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="generate -t modules/openapi-generator/src/main/resources/swift5 -i modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml -g swift5 -c ./bin/swift5-petstore-objcCompatible.json -o samples/client/petstore/swift5/objcCompatible --generate-alias-as-model $@"
+
+java $JAVA_OPTS -jar $executable $ags
+
+if type "xcodegen" > /dev/null 2>&1; then
+ cd samples/client/petstore/swift5/objcCompatible
+ xcodegen generate
+fi
+
+if type "swiftlint" > /dev/null 2>&1; then
+ cd samples/client/petstore/swift5/objcCompatible
+ swiftlint autocorrect
+fi
\ No newline at end of file
diff --git a/bin/swift5-petstore-promisekit.json b/bin/swift5-petstore-promisekit.json
new file mode 100644
index 0000000000..48137f1f28
--- /dev/null
+++ b/bin/swift5-petstore-promisekit.json
@@ -0,0 +1,7 @@
+{
+ "podSummary": "PetstoreClient",
+ "podHomepage": "https://github.com/openapitools/openapi-generator",
+ "podAuthors": "",
+ "projectName": "PetstoreClient",
+ "responseAs": "PromiseKit"
+}
diff --git a/bin/swift5-petstore-promisekit.sh b/bin/swift5-petstore-promisekit.sh
new file mode 100755
index 0000000000..f864088e9b
--- /dev/null
+++ b/bin/swift5-petstore-promisekit.sh
@@ -0,0 +1,42 @@
+#!/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"
+
+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} -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="generate -t modules/openapi-generator/src/main/resources/swift5 -i modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml -g swift5 -c ./bin/swift5-petstore-promisekit.json -o samples/client/petstore/swift5/promisekitLibrary --generate-alias-as-model $@"
+
+java $JAVA_OPTS -jar $executable $ags
+
+if type "xcodegen" > /dev/null 2>&1; then
+ cd samples/client/petstore/swift5/promisekitLibrary
+ xcodegen generate
+fi
+
+if type "swiftlint" > /dev/null 2>&1; then
+ cd samples/client/petstore/swift5/promisekitLibrary
+ swiftlint autocorrect
+fi
\ No newline at end of file
diff --git a/bin/swift5-petstore-result.json b/bin/swift5-petstore-result.json
new file mode 100644
index 0000000000..3154338678
--- /dev/null
+++ b/bin/swift5-petstore-result.json
@@ -0,0 +1,7 @@
+{
+ "podSummary": "PetstoreClient",
+ "podHomepage": "https://github.com/openapitools/openapi-generator",
+ "podAuthors": "",
+ "projectName": "PetstoreClient",
+ "responseAs": "Result"
+}
diff --git a/bin/openapi3/nodejs-petstore-server.sh b/bin/swift5-petstore-result.sh
similarity index 54%
rename from bin/openapi3/nodejs-petstore-server.sh
rename to bin/swift5-petstore-result.sh
index a987aced35..803c79a4f7 100755
--- a/bin/openapi3/nodejs-petstore-server.sh
+++ b/bin/swift5-petstore-result.sh
@@ -22,11 +22,21 @@ executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
if [ ! -f "$executable" ]
then
- mvn clean package
+ mvn -B clean package
fi
# if you've executed sbt assembly previously it will use that instead.
export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -t modules/openapi-generator/src/main/resources/nodejs -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g nodejs-server-deprecated -o samples/server/petstore/nodejs -Dservice $@"
+ags="generate -t modules/openapi-generator/src/main/resources/swift5 -i modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml -g swift5 -c ./bin/swift5-petstore-result.json -o samples/client/petstore/swift5/resultLibrary --generate-alias-as-model $@"
java $JAVA_OPTS -jar $executable $ags
+
+if type "xcodegen" > /dev/null 2>&1; then
+ cd samples/client/petstore/swift5/resultLibrary
+ xcodegen generate
+fi
+
+if type "swiftlint" > /dev/null 2>&1; then
+ cd samples/client/petstore/swift5/resultLibrary
+ swiftlint autocorrect
+fi
\ No newline at end of file
diff --git a/bin/swift5-petstore-rxswift.json b/bin/swift5-petstore-rxswift.json
new file mode 100644
index 0000000000..eb8b11dde5
--- /dev/null
+++ b/bin/swift5-petstore-rxswift.json
@@ -0,0 +1,7 @@
+{
+ "podSummary": "PetstoreClient",
+ "podHomepage": "https://github.com/openapitools/openapi-generator",
+ "podAuthors": "",
+ "projectName": "PetstoreClient",
+ "responseAs": "RxSwift"
+}
diff --git a/bin/swift5-petstore-rxswift.sh b/bin/swift5-petstore-rxswift.sh
new file mode 100755
index 0000000000..9c8398248e
--- /dev/null
+++ b/bin/swift5-petstore-rxswift.sh
@@ -0,0 +1,42 @@
+#!/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"
+
+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} -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="generate -t modules/openapi-generator/src/main/resources/swift5 -i modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml -g swift5 -c ./bin/swift5-petstore-rxswift.json -o samples/client/petstore/swift5/rxswiftLibrary --generate-alias-as-model $@"
+
+java $JAVA_OPTS -jar $executable $ags
+
+if type "xcodegen" > /dev/null 2>&1; then
+ cd samples/client/petstore/swift5/rxswiftLibrary
+ xcodegen generate
+fi
+
+if type "swiftlint" > /dev/null 2>&1; then
+ cd samples/client/petstore/swift5/rxswiftLibrary
+ swiftlint autocorrect
+fi
\ No newline at end of file
diff --git a/bin/swift5-petstore-urlsession.json b/bin/swift5-petstore-urlsession.json
new file mode 100644
index 0000000000..db0f6c9fbf
--- /dev/null
+++ b/bin/swift5-petstore-urlsession.json
@@ -0,0 +1,7 @@
+{
+ "podSummary": "PetstoreClient",
+ "podHomepage": "https://github.com/openapitools/openapi-generator",
+ "podAuthors": "",
+ "projectName": "PetstoreClient",
+ "library": "urlsession"
+}
diff --git a/bin/swift5-petstore-urlsession.sh b/bin/swift5-petstore-urlsession.sh
new file mode 100755
index 0000000000..76a674d431
--- /dev/null
+++ b/bin/swift5-petstore-urlsession.sh
@@ -0,0 +1,42 @@
+#!/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"
+
+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} -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="generate -t modules/openapi-generator/src/main/resources/swift5 -i modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml -g swift5 -c ./bin/swift5-petstore-urlsession.json -o samples/client/petstore/swift5/urlsessionLibrary --generate-alias-as-model $@"
+
+java $JAVA_OPTS -jar $executable $ags
+
+if type "xcodegen" > /dev/null 2>&1; then
+ cd samples/client/petstore/swift5/urlsessionLibrary
+ xcodegen generate
+fi
+
+if type "swiftlint" > /dev/null 2>&1; then
+ cd samples/client/petstore/swift5/urlsessionLibrary
+ swiftlint autocorrect
+fi
\ No newline at end of file
diff --git a/bin/swift5-petstore.json b/bin/swift5-petstore.json
new file mode 100644
index 0000000000..59bd94f43e
--- /dev/null
+++ b/bin/swift5-petstore.json
@@ -0,0 +1,6 @@
+{
+ "podSummary": "PetstoreClient",
+ "podHomepage": "https://github.com/openapitools/openapi-generator",
+ "podAuthors": "",
+ "projectName": "PetstoreClient"
+}
diff --git a/bin/nodejs-petstore-server.sh b/bin/swift5-petstore.sh
similarity index 57%
rename from bin/nodejs-petstore-server.sh
rename to bin/swift5-petstore.sh
index fbbed3e46f..f2752acc1a 100755
--- a/bin/nodejs-petstore-server.sh
+++ b/bin/swift5-petstore.sh
@@ -27,6 +27,16 @@ fi
# if you've executed sbt assembly previously it will use that instead.
export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -t modules/openapi-generator/src/main/resources/nodejs -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g nodejs-server-deprecated -o samples/server/petstore/nodejs -Dservice $@"
+ags="generate -t modules/openapi-generator/src/main/resources/swift5 -i modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml -g swift5 -c ./bin/swift5-petstore.json -o samples/client/petstore/swift5/default --generate-alias-as-model $@"
java $JAVA_OPTS -jar $executable $ags
+
+if type "xcodegen" > /dev/null 2>&1; then
+ cd samples/client/petstore/swift5/default
+ xcodegen generate
+fi
+
+if type "swiftlint" > /dev/null 2>&1; then
+ cd samples/client/petstore/swift5/default
+ swiftlint autocorrect
+fi
diff --git a/bin/swift5-test.json b/bin/swift5-test.json
new file mode 100644
index 0000000000..9341b740a2
--- /dev/null
+++ b/bin/swift5-test.json
@@ -0,0 +1,6 @@
+{
+ "podSummary": "TestClient",
+ "podHomepage": "https://github.com/openapitools/openapi-generator",
+ "podAuthors": "",
+ "projectName": "TestClient"
+}
diff --git a/bin/nodejs-petstore-google-cloud-functions.sh b/bin/swift5-test.sh
similarity index 60%
rename from bin/nodejs-petstore-google-cloud-functions.sh
rename to bin/swift5-test.sh
index bfb02d960d..1620ea6e27 100755
--- a/bin/nodejs-petstore-google-cloud-functions.sh
+++ b/bin/swift5-test.sh
@@ -27,6 +27,16 @@ fi
# if you've executed sbt assembly previously it will use that instead.
export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g nodejs-server-deprecated --additional-properties=googleCloudFunctions=true -o samples/server/petstore/nodejs-google-cloud-functions -Dservice $@"
+ags="generate -t modules/openapi-generator/src/main/resources/swift5 -i modules/openapi-generator/src/test/resources/2_0/swift5Test.json -g swift5 -c ./bin/swift5-test.json -o samples/client/test/swift5/default --generate-alias-as-model $@"
java $JAVA_OPTS -jar $executable $ags
+
+if type "xcodegen" > /dev/null 2>&1; then
+ cd samples/client/test/swift5/default
+ xcodegen generate
+fi
+
+if type "swiftlint" > /dev/null 2>&1; then
+ cd samples/client/test/swift5/default
+ swiftlint autocorrect
+fi
diff --git a/bin/utils/ensure-up-to-date b/bin/utils/ensure-up-to-date
index f7d7172d47..80ca209e27 100755
--- a/bin/utils/ensure-up-to-date
+++ b/bin/utils/ensure-up-to-date
@@ -39,13 +39,14 @@ declare -a samples=(
"${root}/bin/mysql-schema-petstore.sh"
"${root}/bin/nim-client-petstore.sh"
"${root}/bin/python-petstore-all.sh"
+"${root}/bin/python-server-all.sh"
"${root}/bin/openapi3/python-petstore.sh"
"${root}/bin/php-petstore.sh"
"${root}/bin/php-silex-petstore-server.sh"
"${root}/bin/php-symfony-petstore.sh"
"${root}/bin/php-lumen-petstore-server.sh"
"${root}/bin/php-slim-server-petstore.sh"
-"${root}/bin/php-slim4-server-petstore.sh"
+#"${root}/bin/php-slim4-server-petstore.sh"
"${root}/bin/php-ze-ph-petstore-server.sh"
"${root}/bin/openapi3/php-petstore.sh"
"${root}/bin/typescript-angularjs-petstore.sh"
diff --git a/bin/utils/export_generator.sh b/bin/utils/export_generator.sh
index 6ec536aa28..a566522a90 100755
--- a/bin/utils/export_generator.sh
+++ b/bin/utils/export_generator.sh
@@ -14,4 +14,4 @@ fi
executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
-java -jar ${executable} config-help -g "${NAME}" --named-header --format markdown --markdown-header -o "docs/generators/${NAME}.md"
+java -jar ${executable} config-help -g "${NAME}" --full-details --named-header --format markdown --markdown-header -o "docs/generators/${NAME}.md"
diff --git a/bin/utils/release/bump.sh b/bin/utils/release/bump.sh
index 1afeffde16..1de9df213d 100755
--- a/bin/utils/release/bump.sh
+++ b/bin/utils/release/bump.sh
@@ -8,7 +8,7 @@
# 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
+# 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,
diff --git a/bin/utils/release/release_version_update.sh b/bin/utils/release/release_version_update.sh
index abc227a202..95d41712c5 100755
--- a/bin/utils/release/release_version_update.sh
+++ b/bin/utils/release/release_version_update.sh
@@ -11,7 +11,7 @@
# 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
+# 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,
diff --git a/bin/utils/release/release_version_update_docs.sh b/bin/utils/release/release_version_update_docs.sh
index 287b9a3e7d..cfd66070e9 100755
--- a/bin/utils/release/release_version_update_docs.sh
+++ b/bin/utils/release/release_version_update_docs.sh
@@ -11,7 +11,7 @@
# 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
+# 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,
@@ -105,6 +105,8 @@ declare -a xml_files=(
"${root}/modules/openapi-generator-maven-plugin/README.md"
"${root}/modules/openapi-generator-gradle-plugin/samples/local-spec/README.md"
"${root}/README.md"
+ "${root}/docs/installation.md"
+ "${root}/website/pages/en/index.js"
)
declare -a commented_files=(
diff --git a/bin/utils/release_checkout.rb b/bin/utils/release_checkout.rb
index 8f82bf4bdc..2ceabba344 100755
--- a/bin/utils/release_checkout.rb
+++ b/bin/utils/release_checkout.rb
@@ -75,9 +75,9 @@ def check_readme
url = "https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/README.md"
matches = ["[#{$version}](https://github.com/OpenAPITools/openapi-generator/releases/tag/v#{$version})",
- "JAR location: `http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/#{$version}/openapi-generator-cli-#{$version}.jar`",
- "wget http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/#{$version}/openapi-generator-cli-#{$version}.jar -O openapi-generator-cli.jar",
- "Invoke-WebRequest -OutFile openapi-generator-cli.jar http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/#{$version}/openapi-generator-cli-#{$version}.jar"]
+ "JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/#{$version}/openapi-generator-cli-#{$version}.jar`",
+ "wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/#{$version}/openapi-generator-cli-#{$version}.jar -O openapi-generator-cli.jar",
+ "Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/#{$version}/openapi-generator-cli-#{$version}.jar"]
open(url) do |f|
content = f.read
has_outdated = false
@@ -104,7 +104,7 @@ end
def check_openapi_generator_jar
print "Checking openapi-generator JAR ... "
- url = "http://central.maven.org/maven2/org/openapitools/openapi-generator/#{$version}/openapi-generator-#{$version}.jar"
+ url = "https://repo1.maven.org/maven2/org/openapitools/openapi-generator/#{$version}/openapi-generator-#{$version}.jar"
if check_url(url)
puts "[OK]"
@@ -118,7 +118,7 @@ end
def check_openapi_generator_cli_jar
print "Checking openapi-generator-cli JAR ... "
- url = "http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/#{$version}/openapi-generator-cli-#{$version}.jar"
+ url = "https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/#{$version}/openapi-generator-cli-#{$version}.jar"
if check_url(url)
puts "[OK]"
@@ -130,7 +130,7 @@ end
def check_openapi_generator_maven_plugin_jar
print "Checking openapi-generator-maven-plugin JAR ... "
- url = "http://central.maven.org/maven2/org/openapitools/openapi-generator-maven-plugin/#{$version}/openapi-generator-maven-plugin-#{$version}.jar"
+ url = "https://repo1.maven.org/maven2/org/openapitools/openapi-generator-maven-plugin/#{$version}/openapi-generator-maven-plugin-#{$version}.jar"
if check_url(url)
puts "[OK]"
@@ -142,7 +142,7 @@ end
def check_openapi_generator_gradle_plugin_jar
print "Checking openapi-generator-gradle-plugin JAR ... "
- url = "http://central.maven.org/maven2/org/openapitools/openapi-generator-gradle-plugin/#{$version}/openapi-generator-gradle-plugin-#{$version}.jar"
+ url = "https://repo1.maven.org/maven2/org/openapitools/openapi-generator-gradle-plugin/#{$version}/openapi-generator-gradle-plugin-#{$version}.jar"
if check_url(url)
puts "[OK]"
@@ -154,7 +154,7 @@ end
def check_openapi_generator_online_jar
print "Checking openapi-generator-online JAR ... "
- url = "http://central.maven.org/maven2/org/openapitools/openapi-generator-online/#{$version}/openapi-generator-online-#{$version}.jar"
+ url = "https://repo1.maven.org/maven2/org/openapitools/openapi-generator-online/#{$version}/openapi-generator-online-#{$version}.jar"
if check_url(url)
puts "[OK]"
@@ -166,7 +166,7 @@ end
def check_openapi_generator_project_pom
print "Checking openapi-generator-project pom.xml ... "
- url = "http://central.maven.org/maven2/org/openapitools/openapi-generator-project/#{$version}/openapi-generator-project-#{$version}.pom"
+ url = "https://repo1.maven.org/maven2/org/openapitools/openapi-generator-project/#{$version}/openapi-generator-project-#{$version}.pom"
if check_url(url)
puts "[OK]"
diff --git a/bin/utils/release_version_update_docs.sh b/bin/utils/release_version_update_docs.sh
index df743e8e47..c6b8f12921 100755
--- a/bin/utils/release_version_update_docs.sh
+++ b/bin/utils/release_version_update_docs.sh
@@ -8,7 +8,7 @@
# 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
+# 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,
diff --git a/bin/windows/kotlin-client-all.bat b/bin/windows/kotlin-client-all.bat
index 3833a95c7d..d4dd27a9f6 100644
--- a/bin/windows/kotlin-client-all.bat
+++ b/bin/windows/kotlin-client-all.bat
@@ -7,5 +7,5 @@ call powershell -command "& '%~dp0\kotlin-client-petstore.bat'"
call powershell -command "& '%~dp0\kotlin-client-string.bat'"
call powershell -command "& '%~dp0\kotlin-client-threetenbp.bat'"
call powershell -command "& '%~dp0\kotlin-client-nullable.bat'"
-call powershell -command "& '%~dp0\kotlin-client-json-request-date.bat'"
+call powershell -command "& '%~dp0\kotlin-client-json-request-string.bat'"
call powershell -command "& '%~dp0\kotlin-client-retrofit2.bat'"
\ No newline at end of file
diff --git a/bin/windows/kotlin-client-json-request-date.bat b/bin/windows/kotlin-client-json-request-date.bat
deleted file mode 100644
index 47fd16af7a..0000000000
--- a/bin/windows/kotlin-client-json-request-date.bat
+++ /dev/null
@@ -1,10 +0,0 @@
-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 -DloggerPath=conf/log4j.properties
-set ags=generate --artifact-id "kotlin-petstore-json-request-date" -i modules\openapi-generator\src\test\resources\2_0\petstore-with-date-field.yaml -g kotlin --additional-properties requestDateConverter=toJson -o samples\client\petstore\kotlin-json-request-date
-
-java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/kotlin-client-json-request-string.bat b/bin/windows/kotlin-client-json-request-string.bat
new file mode 100644
index 0000000000..1b257af020
--- /dev/null
+++ b/bin/windows/kotlin-client-json-request-string.bat
@@ -0,0 +1,10 @@
+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 -DloggerPath=conf/log4j.properties
+set ags=generate --artifact-id "kotlin-petstore-json-request-string" -i modules\openapi-generator\src\test\resources\2_0\petstore-with-date-field.yaml -g kotlin --additional-properties requestDateConverter=toString -o samples\client\petstore\kotlin-json-request-string
+
+java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/swift5-all.bat b/bin/windows/swift5-all.bat
new file mode 100755
index 0000000000..663df4e22d
--- /dev/null
+++ b/bin/windows/swift5-all.bat
@@ -0,0 +1,2 @@
+call .\bin\windows\swift5-petstore-all.bat
+call .\bin\windows\swift5-test.bat
diff --git a/bin/windows/swift5-petstore-alamofire.bat b/bin/windows/swift5-petstore-alamofire.bat
new file mode 100755
index 0000000000..b982ea061e
--- /dev/null
+++ b/bin/windows/swift5-petstore-alamofire.bat
@@ -0,0 +1,10 @@
+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 ags=generate -i modules\openapi-generator\src\test\resources\2_0\swift\petstore-with-fake-endpoints-models-for-testing.yaml -g swift5 -c bin\swift5-petstore-alamofire.json -o samples\client\petstore\swift5\alamofireLibrary
+
+java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/swift5-petstore-all.bat b/bin/windows/swift5-petstore-all.bat
new file mode 100755
index 0000000000..1daaa1fee7
--- /dev/null
+++ b/bin/windows/swift5-petstore-all.bat
@@ -0,0 +1,9 @@
+call .\bin\windows\swift5-petstore.bat
+call .\bin\windows\swift5-petstore-promisekit.bat
+call .\bin\windows\swift5-petstore-result.bat
+call .\bin\windows\swift5-petstore-rxswift.bat
+call .\bin\windows\swift5-petstore-objcCompatible.bat
+call .\bin\windows\swift5-petstore-nonPublicApi.bat
+call .\bin\windows\swift5-petstore-urlsession.bat
+call .\bin\windows\swift5-petstore-alamofire.bat
+call .\bin\windows\swift5-petstore-combine.bat
diff --git a/bin/windows/swift5-petstore-combine.bat b/bin/windows/swift5-petstore-combine.bat
new file mode 100755
index 0000000000..5ea7cc88db
--- /dev/null
+++ b/bin/windows/swift5-petstore-combine.bat
@@ -0,0 +1,10 @@
+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 ags=generate -i modules\openapi-generator\src\test\resources\2_0\swift\petstore-with-fake-endpoints-models-for-testing.yaml -g swift5 -c bin\swift5-petstore-combine.json -o samples\client\petstore\swift5\combineLibrary
+
+java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/swift5-petstore-nonPublicApi.bat b/bin/windows/swift5-petstore-nonPublicApi.bat
new file mode 100755
index 0000000000..6853336901
--- /dev/null
+++ b/bin/windows/swift5-petstore-nonPublicApi.bat
@@ -0,0 +1,10 @@
+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 ags=generate -i modules\openapi-generator\src\test\resources\2_0\swift\petstore-with-fake-endpoints-models-for-testing.yaml -g swift5 -c bin\swift5-petstore-nonPublicApi.json -o samples\client\petstore\swift5\nonPublicApi
+
+java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/swift5-petstore-objcCompatible.bat b/bin/windows/swift5-petstore-objcCompatible.bat
new file mode 100755
index 0000000000..7d9b7047b4
--- /dev/null
+++ b/bin/windows/swift5-petstore-objcCompatible.bat
@@ -0,0 +1,10 @@
+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 ags=generate -i modules\openapi-generator\src\test\resources\2_0\swift\petstore-with-fake-endpoints-models-for-testing.yaml -g swift5 -c bin\swift5-petstore-objcCompatible.json -o samples\client\petstore\swift5\objcCompatible
+
+java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/swift5-petstore-promisekit.bat b/bin/windows/swift5-petstore-promisekit.bat
new file mode 100755
index 0000000000..cfd9ff41ef
--- /dev/null
+++ b/bin/windows/swift5-petstore-promisekit.bat
@@ -0,0 +1,10 @@
+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 ags=generate -i modules\openapi-generator\src\test\resources\2_0\swift\petstore-with-fake-endpoints-models-for-testing.yaml -g swift5 -c bin\swift5-petstore-promisekit.json -o samples\client\petstore\swift5\promisekitLibrary
+
+java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/swift5-petstore-result.bat b/bin/windows/swift5-petstore-result.bat
new file mode 100755
index 0000000000..4aabf28d50
--- /dev/null
+++ b/bin/windows/swift5-petstore-result.bat
@@ -0,0 +1,10 @@
+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 ags=generate -i modules\openapi-generator\src\test\resources\2_0\swift\petstore-with-fake-endpoints-models-for-testing.yaml -g swift5 -c bin\swift5-petstore-result.json -o samples\client\petstore\swift5\resultLibrary
+
+java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/swift5-petstore-rxswift.bat b/bin/windows/swift5-petstore-rxswift.bat
new file mode 100755
index 0000000000..862c182067
--- /dev/null
+++ b/bin/windows/swift5-petstore-rxswift.bat
@@ -0,0 +1,10 @@
+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 ags=generate -i modules\openapi-generator\src\test\resources\2_0\swift\petstore-with-fake-endpoints-models-for-testing.yaml -g swift5 -c bin\swift5-petstore-rxswift.json -o samples\client\petstore\swift5\rxswiftLibrary
+
+java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/swift5-petstore-urlSession.bat b/bin/windows/swift5-petstore-urlSession.bat
new file mode 100755
index 0000000000..594317a3fa
--- /dev/null
+++ b/bin/windows/swift5-petstore-urlSession.bat
@@ -0,0 +1,10 @@
+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 ags=generate -i modules\openapi-generator\src\test\resources\2_0\swift\petstore-with-fake-endpoints-models-for-testing.yaml -g swift5 -c bin\swift5-petstore-urlsession.json -o samples\client\petstore\swift5\urlsessionLibrary
+
+java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/swift5-petstore.bat b/bin/windows/swift5-petstore.bat
new file mode 100755
index 0000000000..26cee2940f
--- /dev/null
+++ b/bin/windows/swift5-petstore.bat
@@ -0,0 +1,10 @@
+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 ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g swift5 -o samples\client\petstore\swift5\default
+
+java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/swift5-test.bat b/bin/windows/swift5-test.bat
new file mode 100755
index 0000000000..60d74aabcf
--- /dev/null
+++ b/bin/windows/swift5-test.bat
@@ -0,0 +1,10 @@
+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 ags=generate -i modules\openapi-generator\src\test\resources\2_0\swift5Test.json -g swift5 -c bin\swift5-test.json -o samples\client\test\swift5\default
+
+java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/docs/building.md b/docs/building.md
index aa029b4cb6..257721f418 100644
--- a/docs/building.md
+++ b/docs/building.md
@@ -7,9 +7,9 @@ title: Building the code
To build from source, you need the following installed and available in your `$PATH:`
-* [Java 8](http://java.oracle.com)
+* [Java 8](https://java.oracle.com)
-* [Apache maven 3.3.4 or greater](http://maven.apache.org/)
+* [Apache maven 3.3.4 or greater](https://maven.apache.org/)
After cloning the project, you can build it from source with this command:
@@ -53,7 +53,7 @@ Once built, `run-in-docker.sh` will act as an executable for openapi-generator-c
Prerequisite: install [Vagrant](https://www.vagrantup.com/downloads.html) and [VirtualBox](https://www.virtualbox.org/wiki/Downloads).
```bash
-git clone http://github.com/openapitools/openapi-generator.git
+git clone https://github.com/openapitools/openapi-generator.git
cd openapi-generator
vagrant up
vagrant ssh
diff --git a/docs/contributing.md b/docs/contributing.md
index aa0e6f4ff8..8038fa512e 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -105,5 +105,5 @@ To start the CI tests, you can run `mvn verify -Psamples` (assuming you've all t
- Make sure test cases passed after the change (one way is to leverage https://travis-ci.org/ to run the CI tests)
- File a PR with meaningful title, description and commit messages.
- Recommended git settings
- - `git config --global core.autocrlf input` to tell Git convert CRLF to LF on commit but not the other way around
+ - `git config core.autocrlf input` to tell Git convert CRLF to LF on commit but not the other way around
- To close an issue (e.g. issue 1542) automatically after a PR is merged, use keywords "fix", "close", "resolve" in the PR description, e.g. `fix #1542`. (Ref: [closing issues using keywords](https://help.github.com/articles/closing-issues-using-keywords/))
diff --git a/docs/generators.md b/docs/generators.md
index 59935cc3a6..8be760e7cc 100644
--- a/docs/generators.md
+++ b/docs/generators.md
@@ -57,6 +57,7 @@ The following generators are available:
* [swift2-deprecated (deprecated)](generators/swift2-deprecated.md)
* [swift3-deprecated (deprecated)](generators/swift3-deprecated.md)
* [swift4](generators/swift4.md)
+* [swift5 (beta)](generators/swift5.md)
* [typescript-angular](generators/typescript-angular.md)
* [typescript-angularjs](generators/typescript-angularjs.md)
* [typescript-aurelia](generators/typescript-aurelia.md)
diff --git a/docs/generators/README.md b/docs/generators/README.md
index 070ef96c15..cd9e5f551c 100644
--- a/docs/generators/README.md
+++ b/docs/generators/README.md
@@ -1,123 +1,138 @@
+
The following generators are available:
-* CLIENT generators:
- - [ada](ada.md)
- - [android](android.md)
- - [apex](apex.md)
- - [bash](bash.md)
- - [c](c.md)
- - [clojure](clojure.md)
- - [cpp-qt5-client](cpp-qt5-client.md)
- - [cpp-restsdk](cpp-restsdk.md)
- - [cpp-tizen](cpp-tizen.md)
- - [csharp](csharp.md)
- - [csharp-dotnet2](csharp-dotnet2.md)
- - [csharp-refactor](csharp-refactor.md)
- - [dart](dart.md)
- - [dart-dio](dart-dio.md)
- - [dart-jaguar](dart-jaguar.md)
- - [eiffel](eiffel.md)
- - [elixir](elixir.md)
- - [elm](elm.md)
- - [erlang-client](erlang-client.md)
- - [erlang-proper](erlang-proper.md)
- - [flash](flash.md)
- - [go](go.md)
- - [groovy](groovy.md)
- - [haskell-http-client](haskell-http-client.md)
- - [java](java.md)
- - [javascript](javascript.md)
- - [javascript-closure-angular](javascript-closure-angular.md)
- - [javascript-flowtyped](javascript-flowtyped.md)
- - [jaxrs-cxf-client](jaxrs-cxf-client.md)
- - [jmeter](jmeter.md)
- - [kotlin](kotlin.md)
- - [lua](lua.md)
- - [objc](objc.md)
- - [perl](perl.md)
- - [php](php.md)
- - [powershell](powershell.md)
- - [python](python.md)
- - [r](r.md)
- - [ruby](ruby.md)
- - [rust](rust.md)
- - [scala-akka](scala-akka.md)
- - [scala-gatling](scala-gatling.md)
- - [scala-httpclient](scala-httpclient.md)
- - [scalaz](scalaz.md)
- - [swift2-deprecated](swift2-deprecated.md)
- - [swift3-deprecated](swift3-deprecated.md)
- - [swift4](swift4.md)
- - [typescript-angular](typescript-angular.md)
- - [typescript-angularjs](typescript-angularjs.md)
- - [typescript-aurelia](typescript-aurelia.md)
- - [typescript-axios](typescript-axios.md)
- - [typescript-fetch](typescript-fetch.md)
- - [typescript-inversify](typescript-inversify.md)
- - [typescript-jquery](typescript-jquery.md)
- - [typescript-node](typescript-node.md)
- - [typescript-rxjs](typescript-rxjs.md)
+## CLIENT generators
+* [ada](ada.md)
+* [android](android.md)
+* [apex](apex.md)
+* [bash](bash.md)
+* [c](c.md)
+* [clojure](clojure.md)
+* [cpp-qt5-client](cpp-qt5-client.md)
+* [cpp-restsdk](cpp-restsdk.md)
+* [cpp-tizen](cpp-tizen.md)
+* [csharp](csharp.md)
+* [csharp-netcore](csharp-netcore.md)
+* [dart](dart.md)
+* [dart-dio](dart-dio.md)
+* [dart-jaguar](dart-jaguar.md)
+* [eiffel](eiffel.md)
+* [elixir](elixir.md)
+* [elm](elm.md)
+* [erlang-client](erlang-client.md)
+* [erlang-proper](erlang-proper.md)
+* [flash](flash.md)
+* [go](go.md)
+* [go-experimental (experimental)](go-experimental.md)
+* [groovy](groovy.md)
+* [haskell-http-client](haskell-http-client.md)
+* [java](java.md)
+* [javascript](javascript.md)
+* [javascript-closure-angular](javascript-closure-angular.md)
+* [javascript-flowtyped](javascript-flowtyped.md)
+* [jaxrs-cxf-client](jaxrs-cxf-client.md)
+* [jmeter](jmeter.md)
+* [kotlin](kotlin.md)
+* [lua](lua.md)
+* [nim (beta)](nim.md)
+* [objc](objc.md)
+* [ocaml](ocaml.md)
+* [perl](perl.md)
+* [php](php.md)
+* [powershell](powershell.md)
+* [python](python.md)
+* [python-experimental (experimental)](python-experimental.md)
+* [r](r.md)
+* [ruby](ruby.md)
+* [rust](rust.md)
+* [scala-akka](scala-akka.md)
+* [scala-gatling](scala-gatling.md)
+* [scalaz](scalaz.md)
+* [swift4](swift4.md)
+* [swift5 (beta)](swift5.md)
+* [typescript-angular](typescript-angular.md)
+* [typescript-angularjs](typescript-angularjs.md)
+* [typescript-aurelia](typescript-aurelia.md)
+* [typescript-axios](typescript-axios.md)
+* [typescript-fetch](typescript-fetch.md)
+* [typescript-inversify](typescript-inversify.md)
+* [typescript-jquery](typescript-jquery.md)
+* [typescript-node](typescript-node.md)
+* [typescript-redux-query](typescript-redux-query.md)
+* [typescript-rxjs](typescript-rxjs.md)
-* SERVER generators:
- - [ada-server](ada-server.md)
- - [aspnetcore](aspnetcore.md)
- - [cpp-pistache-server](cpp-pistache-server.md)
- - [cpp-qt5-qhttpengine-server](cpp-qt5-qhttpengine-server.md)
- - [cpp-restbed-server](cpp-restbed-server.md)
- - [csharp-nancyfx](csharp-nancyfx.md)
- - [erlang-server](erlang-server.md)
- - [go-gin-server](go-gin-server.md)
- - [go-server](go-server.md)
- - [graphql-server](graphql-server.md)
- - [haskell](haskell.md)
- - [java-inflector](java-inflector.md)
- - [java-msf4j](java-msf4j.md)
- - [java-pkmst](java-pkmst.md)
- - [java-play-framework](java-play-framework.md)
- - [java-undertow-server](java-undertow-server.md)
- - [java-vertx](java-vertx.md)
- - [jaxrs-cxf](jaxrs-cxf.md)
- - [jaxrs-cxf-cdi](jaxrs-cxf-cdi.md)
- - [jaxrs-jersey](jaxrs-jersey.md)
- - [jaxrs-resteasy](jaxrs-resteasy.md)
- - [jaxrs-resteasy-eap](jaxrs-resteasy-eap.md)
- - [jaxrs-spec](jaxrs-spec.md)
- - [kotlin-server](kotlin-server.md)
- - [kotlin-spring](kotlin-spring.md)
- - [nodejs-server](nodejs-server.md)
- - [php-laravel](php-laravel.md)
- - [php-lumen](php-lumen.md)
- - [php-silex](php-silex.md)
- - [php-slim](php-slim.md)
- - [php-symfony](php-symfony.md)
- - [php-ze-ph](php-ze-ph.md)
- - [python-flask](python-flask.md)
- - [ruby-on-rails](ruby-on-rails.md)
- - [ruby-sinatra](ruby-sinatra.md)
- - [rust-server](rust-server.md)
- - [scala-finch](scala-finch.md)
- - [scala-lagom-server](scala-lagom-server.md)
- - [scalatra](scalatra.md)
- - [spring](spring.md)
+## SERVER generators
+* [ada-server](ada-server.md)
+* [aspnetcore](aspnetcore.md)
+* [cpp-pistache-server](cpp-pistache-server.md)
+* [cpp-qt5-qhttpengine-server](cpp-qt5-qhttpengine-server.md)
+* [cpp-restbed-server](cpp-restbed-server.md)
+* [csharp-nancyfx](csharp-nancyfx.md)
+* [erlang-server](erlang-server.md)
+* [fsharp-functions (beta)](fsharp-functions.md)
+* [fsharp-giraffe-server (beta)](fsharp-giraffe-server.md)
+* [go-gin-server](go-gin-server.md)
+* [go-server](go-server.md)
+* [graphql-nodejs-express-server](graphql-nodejs-express-server.md)
+* [haskell](haskell.md)
+* [java-inflector](java-inflector.md)
+* [java-msf4j](java-msf4j.md)
+* [java-pkmst](java-pkmst.md)
+* [java-play-framework](java-play-framework.md)
+* [java-undertow-server](java-undertow-server.md)
+* [java-vertx](java-vertx.md)
+* [java-vertx-web (beta)](java-vertx-web.md)
+* [jaxrs-cxf](jaxrs-cxf.md)
+* [jaxrs-cxf-cdi](jaxrs-cxf-cdi.md)
+* [jaxrs-cxf-extended](jaxrs-cxf-extended.md)
+* [jaxrs-jersey](jaxrs-jersey.md)
+* [jaxrs-resteasy](jaxrs-resteasy.md)
+* [jaxrs-resteasy-eap](jaxrs-resteasy-eap.md)
+* [jaxrs-spec](jaxrs-spec.md)
+* [kotlin-server](kotlin-server.md)
+* [kotlin-spring](kotlin-spring.md)
+* [kotlin-vertx (beta)](kotlin-vertx.md)
+* [nodejs-express-server (beta)](nodejs-express-server.md)
+* [php-laravel](php-laravel.md)
+* [php-lumen](php-lumen.md)
+* [php-silex](php-silex.md)
+* [php-slim4](php-slim4.md)
+* [php-symfony](php-symfony.md)
+* [php-ze-ph](php-ze-ph.md)
+* [python-aiohttp](python-aiohttp.md)
+* [python-blueplanet](python-blueplanet.md)
+* [python-flask](python-flask.md)
+* [ruby-on-rails](ruby-on-rails.md)
+* [ruby-sinatra](ruby-sinatra.md)
+* [rust-server](rust-server.md)
+* [scala-finch](scala-finch.md)
+* [scala-lagom-server](scala-lagom-server.md)
+* [scala-play-server](scala-play-server.md)
+* [scalatra](scalatra.md)
+* [spring](spring.md)
-* DOCUMENTATION generators:
- - [cwiki](cwiki.md)
- - [dynamic-html](dynamic-html.md)
- - [html](html.md)
- - [html2](html2.md)
- - [openapi](openapi.md)
- - [openapi-yaml](openapi-yaml.md)
+## DOCUMENTATION generators
+* [asciidoc](asciidoc.md)
+* [cwiki](cwiki.md)
+* [dynamic-html](dynamic-html.md)
+* [html](html.md)
+* [html2](html2.md)
+* [markdown (beta)](markdown.md)
+* [openapi](openapi.md)
+* [openapi-yaml](openapi-yaml.md)
-* SCHEMA generators:
- - [mysql-schema](mysql-schema.md)
+## SCHEMA generators
+* [avro-schema (beta)](avro-schema.md)
+* [mysql-schema](mysql-schema.md)
-* CONFIG generators:
- - [apache2](apache2.md)
- - [graphql-schema](graphql-schema.md)
+## CONFIG generators
+* [apache2](apache2.md)
+* [graphql-schema](graphql-schema.md)
+* [protobuf-schema (beta)](protobuf-schema.md)
diff --git a/docs/generators/ada-server.md b/docs/generators/ada-server.md
index 479a9a54bc..61f5b1c53e 100644
--- a/docs/generators/ada-server.md
+++ b/docs/generators/ada-server.md
@@ -5,9 +5,109 @@ sidebar_label: ada-server
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
|projectName|GNAT project name| |defaultProject|
+|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- Boolean
+- Character
+- Integer
+- boolean
+- double
+- float
+- integer
+- long
+
+
+## RESERVED WORDS
+
+- abort
+- abs
+- abstract
+- accept
+- access
+- aliased
+- all
+- and
+- array
+- at
+- begin
+- body
+- case
+- constant
+- declare
+- delay
+- digits
+- do
+- else
+- elsif
+- end
+- entry
+- exception
+- exit
+- for
+- function
+- generic
+- goto
+- if
+- in
+- interface
+- is
+- limited
+- loop
+- mod
+- new
+- not
+- null
+- of
+- or
+- others
+- out
+- overriding
+- package
+- pragma
+- private
+- procedure
+- protected
+- raise
+- range
+- record
+- rem
+- renames
+- requeue
+- return
+- reverse
+- select
+- separate
+- some
+- subtype
+- synchronized
+- tagged
+- task
+- terminate
+- then
+- type
+- until
+- use
+- when
+- while
+- with
+- xor
+
diff --git a/docs/generators/ada.md b/docs/generators/ada.md
index 3341e16373..60d6a74739 100644
--- a/docs/generators/ada.md
+++ b/docs/generators/ada.md
@@ -5,9 +5,109 @@ sidebar_label: ada
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
|projectName|GNAT project name| |defaultProject|
+|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- Boolean
+- Character
+- Integer
+- boolean
+- double
+- float
+- integer
+- long
+
+
+## RESERVED WORDS
+
+- abort
+- abs
+- abstract
+- accept
+- access
+- aliased
+- all
+- and
+- array
+- at
+- begin
+- body
+- case
+- constant
+- declare
+- delay
+- digits
+- do
+- else
+- elsif
+- end
+- entry
+- exception
+- exit
+- for
+- function
+- generic
+- goto
+- if
+- in
+- interface
+- is
+- limited
+- loop
+- mod
+- new
+- not
+- null
+- of
+- or
+- others
+- out
+- overriding
+- package
+- pragma
+- private
+- procedure
+- protected
+- raise
+- range
+- record
+- rem
+- renames
+- requeue
+- return
+- reverse
+- select
+- separate
+- some
+- subtype
+- synchronized
+- tagged
+- task
+- terminate
+- then
+- type
+- until
+- use
+- when
+- while
+- with
+- xor
+
diff --git a/docs/generators/android.md b/docs/generators/android.md
index 96c4695f43..8bcc419aa7 100644
--- a/docs/generators/android.md
+++ b/docs/generators/android.md
@@ -5,21 +5,132 @@ sidebar_label: android
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |null|
-|apiPackage|package for generated api classes| |null|
-|invokerPackage|root package for generated code| |null|
-|groupId|groupId for use in the generated build.gradle and pom.xml| |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|
-|sourceFolder|source folder for generated code| |null|
-|useAndroidMavenGradlePlugin|A flag to toggle android-maven gradle plugin.| |true|
+|androidBuildToolsVersion|buildToolsVersion version for use in the generated build.gradle| |null|
|androidGradleVersion|gradleVersion version for use in the generated build.gradle| |null|
|androidSdkVersion|compileSdkVersion version for use in the generated build.gradle| |null|
-|androidBuildToolsVersion|buildToolsVersion version for use in the generated build.gradle| |null|
-|serializableModel|boolean - toggle "implements Serializable" for generated models| |false|
+|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|
+|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|
|library|library template (sub-template) to use|- **volley**
- HTTP client: Volley 1.0.19 (default)
- **httpclient**
- HTTP client: Apache HttpClient 4.3.6. JSON processing: Gson 2.3.1. IMPORTANT: Android client using HttpClient is not actively maintained and will be depecreated in the next major release.
|null|
+|modelPackage|package for generated models| |null|
+|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
+|serializableModel|boolean - toggle "implements Serializable" for generated models| |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|
+|sourceFolder|source folder for generated code| |null|
+|useAndroidMavenGradlePlugin|A flag to toggle android-maven gradle plugin.| |true|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|ArrayList|
+|map|HashMap|
+
+
+## LANGUAGE PRIMITIVES
+
+- Boolean
+- Double
+- Float
+- Integer
+- Long
+- Object
+- String
+- boolean
+- byte[]
+
+
+## RESERVED WORDS
+
+- abstract
+- apiinvoker
+- assert
+- authnames
+- basepath
+- boolean
+- break
+- byte
+- case
+- catch
+- char
+- class
+- const
+- continue
+- default
+- do
+- double
+- else
+- enum
+- extends
+- final
+- finally
+- float
+- for
+- goto
+- if
+- implements
+- import
+- instanceof
+- int
+- interface
+- localvarbuilder
+- localvarcontenttype
+- localvarcontenttypes
+- localvarformparams
+- localvarheaderparams
+- localvarpath
+- localvarpostbody
+- localvarqueryparams
+- localvarresponse
+- long
+- native
+- new
+- null
+- object
+- package
+- private
+- protected
+- public
+- return
+- short
+- static
+- strictfp
+- super
+- switch
+- synchronized
+- this
+- throw
+- throws
+- transient
+- try
+- void
+- volatile
+- while
+
diff --git a/docs/generators/apache2.md b/docs/generators/apache2.md
index bb7e852bfd..80dbcb60ff 100644
--- a/docs/generators/apache2.md
+++ b/docs/generators/apache2.md
@@ -5,9 +5,45 @@ sidebar_label: apache2
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|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|
|userInfoPath|Path to the user and group files| |null|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+
+
+## RESERVED WORDS
+
+
diff --git a/docs/generators/apex.md b/docs/generators/apex.md
index bf9606d33a..d80fb0f3fe 100644
--- a/docs/generators/apex.md
+++ b/docs/generators/apex.md
@@ -5,12 +5,182 @@ sidebar_label: apex
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|classPrefix|Prefix for generated classes. Set this to avoid overwriting existing classes in your org.| |null|
|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|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|namedCredential|The named credential name for the HTTP callouts| |null|
+|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|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|List|
+|map|Map|
+
+
+## LANGUAGE PRIMITIVES
+
+- Blob
+- Boolean
+- Date
+- Datetime
+- Decimal
+- Double
+- ID
+- Integer
+- Long
+- Object
+- String
+- Time
+
+
+## RESERVED WORDS
+
+- abstract
+- activate
+- and
+- any
+- array
+- as
+- asc
+- autonomous
+- begin
+- bigdecimal
+- blob
+- break
+- bulk
+- by
+- byte
+- case
+- cast
+- catch
+- char
+- class
+- collect
+- commit
+- const
+- continue
+- convertcurrency
+- currency
+- date
+- datetime
+- decimal
+- default
+- delete
+- desc
+- do
+- else
+- end
+- enum
+- exception
+- exit
+- export
+- extends
+- false
+- final
+- finally
+- float
+- for
+- from
+- future
+- global
+- goto
+- group
+- having
+- hint
+- if
+- implements
+- import
+- in
+- inner
+- insert
+- instanceof
+- int
+- interface
+- into
+- join
+- last_90_days
+- last_month
+- last_n_days
+- last_week
+- like
+- limit
+- list
+- long
+- loop
+- map
+- merge
+- new
+- next_90_days
+- next_month
+- next_n_days
+- next_week
+- not
+- null
+- nulls
+- number
+- object
+- of
+- on
+- or
+- outer
+- override
+- package
+- parallel
+- pragma
+- private
+- protected
+- public
+- retrieve
+- return
+- returning
+- rollback
+- savepoint
+- search
+- select
+- set
+- short
+- sort
+- stat
+- static
+- super
+- switch
+- synchronized
+- system
+- testmethod
+- then
+- this
+- this_month
+- this_week
+- throw
+- time
+- today
+- tolabel
+- tomorrow
+- transaction
+- trigger
+- true
+- try
+- type
+- undelete
+- update
+- upsert
+- using
+- virtual
+- webservice
+- when
+- where
+- while
+- yesterday
+
diff --git a/docs/generators/asciidoc.md b/docs/generators/asciidoc.md
index d69dbacdb7..9243aaface 100644
--- a/docs/generators/asciidoc.md
+++ b/docs/generators/asciidoc.md
@@ -5,21 +5,41 @@ sidebar_label: asciidoc
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|appName|short name of the application| |null|
|appDescription|description of the application| |null|
-|infoUrl|a URL where users can get more information about the application| |null|
-|infoEmail|an email address to contact for inquiries about the application| |null|
-|licenseInfo|a short description of the license| |null|
-|licenseUrl|a URL pointing to the full license| |null|
-|invokerPackage|root package for generated code| |null|
-|groupId|groupId in generated pom.xml| |null|
+|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|
-|snippetDir|path with includable markup snippets (e.g. test output generated by restdoc, default: .)| |.|
-|specDir|path with includable markup spec files (e.g. handwritten additional docs, default: ..)| |..|
+|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|
+|infoEmail|an email address to contact for inquiries about the application| |null|
+|infoUrl|a URL where users can get more information about the application| |null|
+|invokerPackage|root package for generated code| |null|
+|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|
+|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: ..)| |..|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+
+
+## RESERVED WORDS
+
+
diff --git a/docs/generators/aspnetcore.md b/docs/generators/aspnetcore.md
index 761ba0f0c4..eda0e8a9f2 100644
--- a/docs/generators/aspnetcore.md
+++ b/docs/generators/aspnetcore.md
@@ -5,32 +5,187 @@ sidebar_label: aspnetcore
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|licenseUrl|The URL of the license| |http://localhost|
-|licenseName|The name of the license| |NoLicense|
-|packageCopyright|Specifies an AssemblyCopyright for the .NET Framework global assembly attributes stored in the AssemblyInfo file.| |No Copyright|
-|packageAuthors|Specifies Authors property in the .NET Core project file.| |OpenAPI|
-|packageTitle|Specifies an AssemblyTitle for the .NET Framework global assembly attributes stored in the AssemblyInfo file.| |OpenAPI Library|
-|packageName|C# package name (convention: Title.Case).| |Org.OpenAPITools|
-|packageVersion|C# package version.| |1.0.0|
-|packageGuid|The GUID that will be associated with the C# project| |null|
-|sourceFolder|source folder for generated code| |src|
-|compatibilityVersion|ASP.Net Core CompatibilityVersion| |Version_2_2|
|aspnetCoreVersion|ASP.NET Core version: 3.0 (preview4 only), 2.2, 2.1, 2.0 (deprecated)| |2.2|
-|swashbuckleVersion|Swashbucke version: 3.0.0, 4.0.0| |3.0.0|
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|useDateTimeOffset|Use DateTimeOffset to model date-time properties| |false|
-|useCollection|Deserialize array types to Collection<T> instead of List<T>.| |false|
-|returnICollection|Return ICollection<T> instead of the concrete type.| |false|
-|useSwashbuckle|Uses the Swashbuckle.AspNetCore NuGet package for documentation.| |true|
+|buildTarget|Target to build an application or library| |program|
+|classModifier|Class Modifier can be empty, abstract| ||
+|compatibilityVersion|ASP.Net Core CompatibilityVersion| |Version_2_2|
+|enumNameSuffix|Suffix that will be appended to all enum names.| |Enum|
+|enumValueSuffix|Suffix that will be appended to all enum values.| |Enum|
+|generateBody|Generates method body.| |true|
|isLibrary|Is the build a library| |false|
+|licenseName|The name of the license| |NoLicense|
+|licenseUrl|The URL of the license| |http://localhost|
+|modelClassModifier|Model Class Modifier can be nothing or partial| |partial|
+|newtonsoftVersion|Version for Microsoft.AspNetCore.Mvc.NewtonsoftJson for ASP.NET Core 3.0+| |3.0.0-preview5-19227-01|
+|operationIsAsync|Set methods to async or sync (default).| |false|
+|operationModifier|Operation Modifier can be virtual, abstract or partial| |virtual|
+|operationResultTask|Set methods result to Task<>.| |false|
+|packageAuthors|Specifies Authors property in the .NET Core project file.| |OpenAPI|
+|packageCopyright|Specifies an AssemblyCopyright for the .NET Framework global assembly attributes stored in the AssemblyInfo file.| |No Copyright|
+|packageGuid|The GUID that will be associated with the C# project| |null|
+|packageName|C# package name (convention: Title.Case).| |Org.OpenAPITools|
+|packageTitle|Specifies an AssemblyTitle for the .NET Framework global assembly attributes stored in the AssemblyInfo file.| |OpenAPI Library|
+|packageVersion|C# package version.| |1.0.0|
+|returnICollection|Return ICollection<T> instead of the concrete type.| |false|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+|sourceFolder|source folder for generated code| |src|
+|swashbuckleVersion|Swashbucke version: 3.0.0, 4.0.0| |3.0.0|
+|useCollection|Deserialize array types to Collection<T> instead of List<T>.| |false|
+|useDateTimeOffset|Use DateTimeOffset to model date-time properties| |false|
+|useDefaultRouting|Use default routing for the ASP.NET Core version. For 3.0 turn off default because it is not yet supported.| |true|
|useFrameworkReference|Use frameworkReference for ASP.NET Core 3.0+ and PackageReference ASP.NET Core 2.2 or earlier.| |false|
|useNewtonsoft|Uses the Newtonsoft JSON library.| |true|
-|newtonsoftVersion|Version for Microsoft.AspNetCore.Mvc.NewtonsoftJson for ASP.NET Core 3.0+| |3.0.0-preview5-19227-01|
-|useDefaultRouting|Use default routing for the ASP.NET Core version. For 3.0 turn off default because it is not yet supported.| |true|
-|classModifier|Class Modifier can be empty, abstract| ||
-|operationModifier|Operation Modifier can be virtual, abstract or partial| |virtual|
-|buildTarget|Target to build an application or library| |program|
-|generateBody|Generates method body.| |true|
-|operationIsAsync|Set methods to async or sync (default).| |false|
-|operationResultTask|Set methods result to Task<>.| |false|
-|modelClassModifier|Model Class Modifier can be nothing or partial| |partial|
+|useSwashbuckle|Uses the Swashbuckle.AspNetCore NuGet package for documentation.| |true|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|List|
+|list|List|
+|map|Dictionary|
+
+
+## LANGUAGE PRIMITIVES
+
+- Boolean
+- Collection
+- DateTime
+- DateTime?
+- DateTimeOffset
+- DateTimeOffset?
+- Dictionary
+- Double
+- Float
+- Guid
+- Guid?
+- ICollection
+- Int32
+- Int64
+- List
+- Object
+- String
+- System.IO.Stream
+- bool
+- bool?
+- byte[]
+- decimal
+- decimal?
+- double
+- double?
+- float
+- float?
+- int
+- int?
+- long
+- long?
+- string
+
+
+## RESERVED WORDS
+
+- Client
+- abstract
+- as
+- async
+- await
+- base
+- bool
+- break
+- byte
+- case
+- catch
+- char
+- checked
+- class
+- client
+- const
+- continue
+- decimal
+- default
+- delegate
+- do
+- double
+- dynamic
+- else
+- enum
+- event
+- explicit
+- extern
+- false
+- finally
+- fixed
+- float
+- for
+- foreach
+- goto
+- if
+- implicit
+- in
+- int
+- interface
+- internal
+- is
+- localVarFileParams
+- localVarFormParams
+- localVarHeaderParams
+- localVarHttpContentType
+- localVarHttpContentTypes
+- localVarHttpHeaderAccept
+- localVarHttpHeaderAccepts
+- localVarPath
+- localVarPathParams
+- localVarPostBody
+- localVarQueryParams
+- localVarResponse
+- localVarStatusCode
+- lock
+- long
+- namespace
+- new
+- null
+- object
+- operator
+- out
+- override
+- parameter
+- params
+- private
+- protected
+- public
+- readonly
+- ref
+- return
+- sbyte
+- sealed
+- short
+- sizeof
+- stackalloc
+- static
+- string
+- struct
+- switch
+- this
+- throw
+- true
+- try
+- typeof
+- uint
+- ulong
+- unchecked
+- unsafe
+- ushort
+- using
+- var
+- virtual
+- void
+- volatile
+- while
+- yield
+
diff --git a/docs/generators/avro-schema.md b/docs/generators/avro-schema.md
index 97e3c9ec50..45256f4895 100644
--- a/docs/generators/avro-schema.md
+++ b/docs/generators/avro-schema.md
@@ -5,9 +5,46 @@ sidebar_label: avro-schema
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|packageName|package for generated classes (where supported)| |null|
+|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|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|Array|
+|list|Array|
+|map|Object|
+
+
+## LANGUAGE PRIMITIVES
+
+- BigDecimal
+- DateTime
+- UUID
+- boolean
+- bytes
+- date
+- double
+- float
+- int
+- integer
+- long
+- null
+- number
+- string
+
+
+## RESERVED WORDS
+
+
diff --git a/docs/generators/bash.md b/docs/generators/bash.md
index d35e805585..c56cbd4047 100644
--- a/docs/generators/bash.md
+++ b/docs/generators/bash.md
@@ -5,16 +5,75 @@ sidebar_label: bash
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
+|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|
-|processMarkdown|Convert all Markdown Markup into terminal formatting| |false|
-|scriptName|The name of the script that will be generated (e.g. petstore-cli)| |null|
+|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|
|hostEnvironmentVariable|Name of environment variable where host can be defined (e.g. PETSTORE_HOST='http://api.openapitools.org:8080')| |null|
-|basicAuthEnvironmentVariable|Name of environment variable where username and password can be defined (e.g. PETSTORE_CREDS='username:password')| |null|
-|apiKeyAuthEnvironmentVariable|Name of environment variable where API key can be defined (e.g. PETSTORE_APIKEY='kjhasdGASDa5asdASD')| |false|
+|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
+|processMarkdown|Convert all Markdown Markup into terminal formatting| |false|
+|scriptName|The name of the script that will be generated (e.g. petstore-cli)| |null|
+|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- array
+- binary
+- boolean
+- float
+- integer
+- map
+- string
+
+
+## RESERVED WORDS
+
+- case
+- do
+- done
+- elif
+- else
+- esac
+- fi
+- for
+- function
+- if
+- in
+- select
+- then
+- time
+- until
+- while
+
diff --git a/docs/generators/c.md b/docs/generators/c.md
index b60a7fbd49..400db5b79a 100644
--- a/docs/generators/c.md
+++ b/docs/generators/c.md
@@ -5,9 +5,84 @@ sidebar_label: c
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
+|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|
+|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|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- Object
+- binary_t*
+- char
+- double
+- float
+- int
+- list
+- list_t*
+- long
+- short
+
+
+## RESERVED WORDS
+
+- _alignas
+- _alignof
+- _atomic
+- _bool
+- _complex
+- _generic
+- _imaginary
+- _noreturn
+- _static_assert
+- _thread_local
+- auto
+- break
+- case
+- char
+- const
+- continue
+- default
+- do
+- double
+- else
+- enum
+- extern
+- float
+- for
+- goto
+- if
+- inline
+- int
+- long
+- register
+- remove
+- restrict
+- return
+- short
+- signed
+- sizeof
+- static
+- struct
+- switch
+- typedef
+- union
+- unsigned
+- void
+- volatile
+- while
+
diff --git a/docs/generators/clojure.md b/docs/generators/clojure.md
index 2c49f189b2..ce49769404 100644
--- a/docs/generators/clojure.md
+++ b/docs/generators/clojure.md
@@ -5,15 +5,51 @@ sidebar_label: clojure
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|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|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|projectName|name of the project (Default: generated from info.title or "openapi-clj-client")| |null|
|projectDescription|description of the project (Default: using info.description or "Client library of <projectName>")| |null|
-|projectVersion|version of the project (Default: using info.version or "1.0.0")| |null|
-|projectUrl|URL of the project (Default: using info.contact.url or not included in project.clj)| |null|
|projectLicenseName|name of the license the project uses (Default: using info.license.name or not included in project.clj)| |null|
|projectLicenseUrl|URL of the license the project uses (Default: using info.license.url or not included in project.clj)| |null|
-|baseNamespace|the base/top namespace (Default: generated from projectName)| |null|
+|projectName|name of the project (Default: generated from info.title or "openapi-clj-client")| |null|
+|projectUrl|URL of the project (Default: using info.contact.url or not included in project.clj)| |null|
+|projectVersion|version of the project (Default: using info.version or "1.0.0")| |null|
+|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+
+
+## RESERVED WORDS
+
+
diff --git a/docs/generators/cpp-pistache-server.md b/docs/generators/cpp-pistache-server.md
index b925ffc175..fde4459144 100644
--- a/docs/generators/cpp-pistache-server.md
+++ b/docs/generators/cpp-pistache-server.md
@@ -8,3 +8,35 @@ sidebar_label: cpp-pistache-server
|addExternalLibs|Add the Possibility to fetch and compile external Libraries needed by this Framework.| |true|
|helpersPackage|Specify the package name to be used for the helpers (e.g. org.openapitools.server.helpers).| |org.openapitools.server.helpers|
|useStructModel|Use struct-based model template instead of get/set-based model template| |false|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Object|#include "Object.h"|
+|std::map|#include <map>|
+|std::string|#include <string>|
+|std::vector|#include <vector>|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- bool
+- char
+- double
+- float
+- int
+- int32_t
+- int64_t
+- long
+
+
+## RESERVED WORDS
+
+
diff --git a/docs/generators/cpp-qt5-client.md b/docs/generators/cpp-qt5-client.md
index 582f762740..5a5ec0f789 100644
--- a/docs/generators/cpp-qt5-client.md
+++ b/docs/generators/cpp-qt5-client.md
@@ -5,11 +5,128 @@ sidebar_label: cpp-qt5-client
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
|cppNamespace|C++ namespace (convention: name::space::for::api).| |OpenAPI|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|modelNamePrefix|Prefix that will be prepended to all model names.| |OAI|
|optionalProjectFile|Generate client.pri.| |true|
+|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|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|OAIHttpFileElement|#include "OAIHttpFileElement.h"|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- QByteArray
+- QDate
+- QDateTime
+- QString
+- bool
+- double
+- float
+- qint32
+- qint64
+
+
+## RESERVED WORDS
+
+- alignas
+- alignof
+- and
+- and_eq
+- asm
+- auto
+- bitand
+- bitor
+- bool
+- break
+- case
+- catch
+- char
+- char16_t
+- char32_t
+- class
+- compl
+- concept
+- const
+- const_cast
+- constexpr
+- continue
+- decltype
+- default
+- delete
+- do
+- double
+- dynamic_cast
+- else
+- enum
+- explicit
+- export
+- extern
+- false
+- float
+- for
+- friend
+- goto
+- if
+- inline
+- int
+- linux
+- long
+- mutable
+- namespace
+- new
+- noexcept
+- not
+- not_eq
+- nullptr
+- operator
+- or
+- or_eq
+- private
+- protected
+- public
+- register
+- reinterpret_cast
+- requires
+- return
+- short
+- signed
+- sizeof
+- static
+- static_assert
+- static_cast
+- struct
+- switch
+- template
+- this
+- thread_local
+- throw
+- true
+- try
+- typedef
+- typeid
+- typename
+- union
+- unsigned
+- using
+- virtual
+- void
+- volatile
+- wchar_t
+- while
+- xor
+- xor_eq
+
diff --git a/docs/generators/cpp-qt5-qhttpengine-server.md b/docs/generators/cpp-qt5-qhttpengine-server.md
index 2531287fac..fd32082fad 100644
--- a/docs/generators/cpp-qt5-qhttpengine-server.md
+++ b/docs/generators/cpp-qt5-qhttpengine-server.md
@@ -5,10 +5,127 @@ sidebar_label: cpp-qt5-qhttpengine-server
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
|cppNamespace|C++ namespace (convention: name::space::for::api).| |OpenAPI|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|modelNamePrefix|Prefix that will be prepended to all model names.| |OAI|
+|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|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|OAIHttpFileElement|#include "OAIHttpFileElement.h"|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- QByteArray
+- QDate
+- QDateTime
+- QString
+- bool
+- double
+- float
+- qint32
+- qint64
+
+
+## RESERVED WORDS
+
+- alignas
+- alignof
+- and
+- and_eq
+- asm
+- auto
+- bitand
+- bitor
+- bool
+- break
+- case
+- catch
+- char
+- char16_t
+- char32_t
+- class
+- compl
+- concept
+- const
+- const_cast
+- constexpr
+- continue
+- decltype
+- default
+- delete
+- do
+- double
+- dynamic_cast
+- else
+- enum
+- explicit
+- export
+- extern
+- false
+- float
+- for
+- friend
+- goto
+- if
+- inline
+- int
+- linux
+- long
+- mutable
+- namespace
+- new
+- noexcept
+- not
+- not_eq
+- nullptr
+- operator
+- or
+- or_eq
+- private
+- protected
+- public
+- register
+- reinterpret_cast
+- requires
+- return
+- short
+- signed
+- sizeof
+- static
+- static_assert
+- static_cast
+- struct
+- switch
+- template
+- this
+- thread_local
+- throw
+- true
+- try
+- typedef
+- typeid
+- typename
+- union
+- unsigned
+- using
+- virtual
+- void
+- volatile
+- wchar_t
+- while
+- xor
+- xor_eq
+
diff --git a/docs/generators/cpp-restbed-server.md b/docs/generators/cpp-restbed-server.md
index 1dde370533..4c59be6e67 100644
--- a/docs/generators/cpp-restbed-server.md
+++ b/docs/generators/cpp-restbed-server.md
@@ -5,8 +5,128 @@ sidebar_label: cpp-restbed-server
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|modelPackage|C++ namespace for models (convention: name.space.model).| |org.openapitools.server.model|
|apiPackage|C++ namespace for apis (convention: name.space.api).| |org.openapitools.server.api|
-|packageVersion|C++ package version.| |1.0.0|
|declspec|C++ preprocessor to place before the class name for handling dllexport/dllimport.| ||
|defaultInclude|The default include statement that should be placed in all headers for including things like the declspec (convention: #include "Commons.h" | ||
+|modelPackage|C++ namespace for models (convention: name.space.model).| |org.openapitools.server.model|
+|packageVersion|C++ package version.| |1.0.0|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Object|#include "Object.h"|
+|restbed::Bytes|#include <corvusoft/restbed/byte.hpp>|
+|std::map|#include <map>|
+|std::string|#include <string>|
+|std::vector|#include <vector>|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- bool
+- char
+- double
+- float
+- int
+- int32_t
+- int64_t
+- long
+
+
+## RESERVED WORDS
+
+- alignas
+- alignof
+- and
+- and_eq
+- asm
+- auto
+- bitand
+- bitor
+- bool
+- break
+- case
+- catch
+- char
+- char16_t
+- char32_t
+- class
+- compl
+- concept
+- const
+- const_cast
+- constexpr
+- continue
+- decltype
+- default
+- delete
+- do
+- double
+- dynamic_cast
+- else
+- enum
+- explicit
+- export
+- extern
+- false
+- float
+- for
+- friend
+- goto
+- if
+- inline
+- int
+- linux
+- long
+- mutable
+- namespace
+- new
+- noexcept
+- not
+- not_eq
+- nullptr
+- operator
+- or
+- or_eq
+- private
+- protected
+- public
+- register
+- reinterpret_cast
+- requires
+- return
+- short
+- signed
+- sizeof
+- static
+- static_assert
+- static_cast
+- struct
+- switch
+- template
+- this
+- thread_local
+- throw
+- true
+- try
+- typedef
+- typeid
+- typename
+- union
+- unsigned
+- using
+- virtual
+- void
+- volatile
+- wchar_t
+- while
+- xor
+- xor_eq
+
diff --git a/docs/generators/cpp-restsdk.md b/docs/generators/cpp-restsdk.md
index 0518392adf..6bf209af79 100644
--- a/docs/generators/cpp-restsdk.md
+++ b/docs/generators/cpp-restsdk.md
@@ -5,9 +5,131 @@ sidebar_label: cpp-restsdk
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|modelPackage|C++ namespace for models (convention: name.space.model).| |org.openapitools.client.model|
|apiPackage|C++ namespace for apis (convention: name.space.api).| |org.openapitools.client.api|
-|packageVersion|C++ package version.| |1.0.0|
|declspec|C++ preprocessor to place before the class name for handling dllexport/dllimport.| ||
|defaultInclude|The default include statement that should be placed in all headers for including things like the declspec (convention: #include "Commons.h" | ||
|generateGMocksForApis|Generate Google Mock classes for APIs.| |null|
+|modelPackage|C++ namespace for models (convention: name.space.model).| |org.openapitools.client.model|
+|packageVersion|C++ package version.| |1.0.0|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|HttpContent|#include "HttpContent.h"|
+|Object|#include "Object.h"|
+|std::map|#include <map>|
+|std::string|#include <string>|
+|std::vector|#include <vector>|
+|utility::datetime|#include <cpprest/details/basic_types.h>|
+|utility::string_t|#include <cpprest/details/basic_types.h>|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- bool
+- char
+- double
+- float
+- int
+- int32_t
+- int64_t
+- long
+
+
+## RESERVED WORDS
+
+- alignas
+- alignof
+- and
+- and_eq
+- asm
+- auto
+- bitand
+- bitor
+- bool
+- break
+- case
+- catch
+- char
+- char16_t
+- char32_t
+- class
+- compl
+- concept
+- const
+- const_cast
+- constexpr
+- continue
+- decltype
+- default
+- delete
+- do
+- double
+- dynamic_cast
+- else
+- enum
+- explicit
+- export
+- extern
+- false
+- float
+- for
+- friend
+- goto
+- if
+- inline
+- int
+- linux
+- long
+- mutable
+- namespace
+- new
+- noexcept
+- not
+- not_eq
+- nullptr
+- operator
+- or
+- or_eq
+- private
+- protected
+- public
+- register
+- reinterpret_cast
+- requires
+- return
+- short
+- signed
+- sizeof
+- static
+- static_assert
+- static_cast
+- struct
+- switch
+- template
+- this
+- thread_local
+- throw
+- true
+- try
+- typedef
+- typeid
+- typename
+- union
+- unsigned
+- using
+- virtual
+- void
+- volatile
+- wchar_t
+- while
+- xor
+- xor_eq
+
diff --git a/docs/generators/cpp-tizen.md b/docs/generators/cpp-tizen.md
index babc5bd014..4cabf3db44 100644
--- a/docs/generators/cpp-tizen.md
+++ b/docs/generators/cpp-tizen.md
@@ -5,8 +5,126 @@ sidebar_label: cpp-tizen
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|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|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- bool
+- double
+- float
+- int
+- long long
+- std::string
+
+
+## RESERVED WORDS
+
+- alignas
+- alignof
+- and
+- and_eq
+- asm
+- atomic_cancel
+- atomic_commit
+- atomic_noexcept
+- auto
+- bitand
+- bitor
+- bool
+- break
+- case
+- catch
+- char
+- char16_t
+- char32_t
+- class
+- compl
+- concept
+- const
+- const_cast
+- constexpr
+- continue
+- decltype
+- default
+- delete
+- do
+- double
+- dynamic_cast
+- else
+- enum
+- explicit
+- export
+- extern
+- false
+- float
+- for
+- friend
+- goto
+- if
+- import
+- inline
+- int
+- long
+- module
+- mutable
+- namespace
+- new
+- noexcept
+- not
+- not_eq
+- nullptr
+- operator
+- or
+- or_eq
+- private
+- protected
+- public
+- register
+- reinterpret_cast
+- requires
+- return
+- short
+- signed
+- sizeof
+- static
+- static_assert
+- static_cast
+- struct
+- switch
+- synchronized
+- template
+- this
+- thread_local
+- throw
+- true
+- try
+- typedef
+- typeid
+- typename
+- union
+- unsigned
+- using
+- virtual
+- void
+- volatile
+- wchar_t
+- while
+- xor
+- xor_eq
+
diff --git a/docs/generators/csharp-dotnet2.md b/docs/generators/csharp-dotnet2.md
index b4d4ffccf9..adf5841d42 100644
--- a/docs/generators/csharp-dotnet2.md
+++ b/docs/generators/csharp-dotnet2.md
@@ -5,6 +5,154 @@ sidebar_label: csharp-dotnet2
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
+|clientPackage|C# client package name (convention: Camel.Case).| |Org.OpenAPITools.Client|
|packageName|C# package name (convention: Camel.Case).| |Org.OpenAPITools|
|packageVersion|C# package version.| |1.0.0|
-|clientPackage|C# client package name (convention: Camel.Case).| |Org.OpenAPITools.Client|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|List|
+|list|List|
+|map|Dictionary|
+
+
+## LANGUAGE PRIMITIVES
+
+- Boolean
+- Collection
+- DateTime
+- DateTime?
+- DateTimeOffset
+- DateTimeOffset?
+- Dictionary
+- Double
+- Float
+- Guid
+- Guid?
+- ICollection
+- Int32
+- Int64
+- List
+- Object
+- String
+- System.IO.Stream
+- bool
+- bool?
+- byte[]
+- decimal
+- decimal?
+- double
+- double?
+- float
+- float?
+- int
+- int?
+- long
+- long?
+- string
+
+
+## RESERVED WORDS
+
+- Client
+- abstract
+- as
+- base
+- bool
+- break
+- byte
+- case
+- catch
+- char
+- checked
+- class
+- client
+- const
+- continue
+- decimal
+- default
+- delegate
+- do
+- double
+- else
+- enum
+- event
+- explicit
+- extern
+- false
+- finally
+- fixed
+- float
+- for
+- foreach
+- goto
+- if
+- implicit
+- in
+- int
+- interface
+- internal
+- is
+- localVarFileParams
+- localVarFormParams
+- localVarHeaderParams
+- localVarHttpContentType
+- localVarHttpContentTypes
+- localVarHttpHeaderAccept
+- localVarHttpHeaderAccepts
+- localVarPath
+- localVarPathParams
+- localVarPostBody
+- localVarQueryParams
+- localVarResponse
+- localVarStatusCode
+- lock
+- long
+- namespace
+- new
+- null
+- object
+- operator
+- out
+- override
+- parameter
+- params
+- private
+- protected
+- public
+- readonly
+- ref
+- return
+- sbyte
+- sealed
+- short
+- sizeof
+- stackalloc
+- static
+- string
+- struct
+- switch
+- this
+- throw
+- true
+- try
+- typeof
+- uint
+- ulong
+- unchecked
+- unsafe
+- ushort
+- using
+- virtual
+- void
+- volatile
+- while
+
diff --git a/docs/generators/csharp-nancyfx.md b/docs/generators/csharp-nancyfx.md
index b436a6b4b2..48913347f5 100644
--- a/docs/generators/csharp-nancyfx.md
+++ b/docs/generators/csharp-nancyfx.md
@@ -5,17 +5,80 @@ sidebar_label: csharp-nancyfx
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
+|asyncServer|Set to true to enable the generation of async routes/endpoints.| |false|
+|immutable|Enabled by default. If disabled generates model classes with setters| |true|
+|interfacePrefix|Prefix interfaces with a community standard or widely accepted prefix.| ||
+|optionalProjectFile|Generate {PackageName}.csproj.| |true|
+|packageContext|Optionally overrides the PackageContext which determines the namespace (namespace=packageName.packageContext). If not set, packageContext will default to basePath.| |null|
+|packageGuid|The GUID that will be associated with the C# project| |null|
|packageName|C# package name (convention: Title.Case).| |Org.OpenAPITools|
|packageVersion|C# package version.| |1.0.0|
-|sourceFolder|source folder for generated code| |src|
-|interfacePrefix|Prefix interfaces with a community standard or widely accepted prefix.| ||
-|packageGuid|The GUID that will be associated with the C# project| |null|
-|packageContext|Optionally overrides the PackageContext which determines the namespace (namespace=packageName.packageContext). If not set, packageContext will default to basePath.| |null|
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|optionalProjectFile|Generate {PackageName}.csproj.| |true|
-|useDateTimeOffset|Use DateTimeOffset to model date-time properties| |false|
-|useCollection|Deserialize array types to Collection<T> instead of List<T>.| |false|
|returnICollection|Return ICollection<T> instead of the concrete type.| |false|
-|immutable|Enabled by default. If disabled generates model classes with setters| |true|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+|sourceFolder|source folder for generated code| |src|
+|useCollection|Deserialize array types to Collection<T> instead of List<T>.| |false|
+|useDateTimeOffset|Use DateTimeOffset to model date-time properties| |false|
|writeModulePath|Enabled by default. If disabled, module paths will not mirror api base path| |true|
-|asyncServer|Set to true to enable the generation of async routes/endpoints.| |false|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|List|
+|list|List|
+|map|Dictionary|
+
+
+## LANGUAGE PRIMITIVES
+
+- Boolean
+- Collection
+- DateTime
+- DateTime?
+- DateTimeOffset
+- DateTimeOffset?
+- Dictionary
+- Double
+- Float
+- Guid
+- Guid?
+- ICollection
+- Int32
+- Int64
+- List
+- LocalDate?
+- LocalTime?
+- Object
+- String
+- System.IO.Stream
+- ZonedDateTime?
+- bool
+- bool?
+- byte[]
+- decimal
+- decimal?
+- double
+- double?
+- float
+- float?
+- int
+- int?
+- long
+- long?
+- string
+
+
+## RESERVED WORDS
+
+- async
+- await
+- dynamic
+- var
+- yield
+
diff --git a/docs/generators/csharp-netcore.md b/docs/generators/csharp-netcore.md
index 346932bc6e..fb09d3a1ff 100644
--- a/docs/generators/csharp-netcore.md
+++ b/docs/generators/csharp-netcore.md
@@ -5,24 +5,172 @@ sidebar_label: csharp-netcore
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|packageName|C# package name (convention: Title.Case).| |Org.OpenAPITools|
-|packageVersion|C# package version.| |1.0.0|
-|sourceFolder|source folder for generated code| |src|
-|packageGuid|The GUID that will be associated with the C# project| |null|
-|interfacePrefix|Prefix interfaces with a community standard or widely accepted prefix.| |I|
-|targetFramework|The target .NET framework version.|- **netstandard1.3**
- .NET Standard 1.3 compatible
- **netstandard1.4**
- .NET Standard 1.4 compatible
- **netstandard1.5**
- .NET Standard 1.5 compatible
- **netstandard1.6**
- .NET Standard 1.6 compatible
- **netstandard2.0**
- .NET Standard 2.0 compatible
- **netcoreapp2.0**
- .NET Core 2.0 compatible
|netstandard2.0|
-|modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |PascalCase|
+|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
+|caseInsensitiveResponseHeaders|Make API response's headers case-insensitive| |false|
|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|useDateTimeOffset|Use DateTimeOffset to model date-time properties| |false|
-|useCollection|Deserialize array types to Collection<T> instead of List<T>.| |false|
-|returnICollection|Return ICollection<T> instead of the concrete type.| |false|
-|optionalMethodArgument|C# Optional method argument, e.g. void square(int x=10) (.net 4.0+ only).| |true|
+|interfacePrefix|Prefix interfaces with a community standard or widely accepted prefix.| |I|
+|modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |PascalCase|
+|netCoreProjectFile|Use the new format (.NET Core) for .NET project files (.csproj).| |false|
+|nonPublicApi|Generates code with reduced access modifiers; allows embedding elsewhere without exposing non-public API calls to consumers.| |false|
|optionalAssemblyInfo|Generate AssemblyInfo.cs.| |true|
|optionalEmitDefaultValues|Set DataMember's EmitDefaultValue.| |false|
+|optionalMethodArgument|C# Optional method argument, e.g. void square(int x=10) (.net 4.0+ only).| |true|
|optionalProjectFile|Generate {PackageName}.csproj.| |true|
-|nonPublicApi|Generates code with reduced access modifiers; allows embedding elsewhere without exposing non-public API calls to consumers.| |false|
-|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|netCoreProjectFile|Use the new format (.NET Core) for .NET project files (.csproj).| |false|
+|packageGuid|The GUID that will be associated with the C# project| |null|
+|packageName|C# package name (convention: Title.Case).| |Org.OpenAPITools|
+|packageVersion|C# package version.| |1.0.0|
+|returnICollection|Return ICollection<T> instead of the concrete type.| |false|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+|sourceFolder|source folder for generated code| |src|
+|targetFramework|The target .NET framework version.|- **netstandard1.3**
- .NET Standard 1.3 compatible
- **netstandard1.4**
- .NET Standard 1.4 compatible
- **netstandard1.5**
- .NET Standard 1.5 compatible
- **netstandard1.6**
- .NET Standard 1.6 compatible
- **netstandard2.0**
- .NET Standard 2.0 compatible
- **netcoreapp2.0**
- .NET Core 2.0 compatible
|netstandard2.0|
+|useCollection|Deserialize array types to Collection<T> instead of List<T>.| |false|
+|useDateTimeOffset|Use DateTimeOffset to model date-time properties| |false|
|validatable|Generates self-validatable models.| |true|
-|caseInsensitiveResponseHeaders|Make API response's headers case-insensitive| |false|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|List|
+|list|List|
+|map|Dictionary|
+
+
+## LANGUAGE PRIMITIVES
+
+- Boolean
+- Collection
+- DateTime
+- DateTime?
+- DateTimeOffset
+- DateTimeOffset?
+- Dictionary
+- Double
+- Float
+- Guid
+- Guid?
+- ICollection
+- Int32
+- Int64
+- List
+- Object
+- String
+- System.IO.Stream
+- bool
+- bool?
+- byte[]
+- decimal
+- decimal?
+- double
+- double?
+- float
+- float?
+- int
+- int?
+- long
+- long?
+- string
+
+
+## RESERVED WORDS
+
+- Client
+- abstract
+- as
+- base
+- bool
+- break
+- byte
+- case
+- catch
+- char
+- checked
+- class
+- client
+- const
+- continue
+- decimal
+- default
+- delegate
+- do
+- double
+- else
+- enum
+- event
+- explicit
+- extern
+- false
+- finally
+- fixed
+- float
+- for
+- foreach
+- goto
+- if
+- implicit
+- in
+- int
+- interface
+- internal
+- is
+- localVarFileParams
+- localVarFormParams
+- localVarHeaderParams
+- localVarHttpContentType
+- localVarHttpContentTypes
+- localVarHttpHeaderAccept
+- localVarHttpHeaderAccepts
+- localVarPath
+- localVarPathParams
+- localVarPostBody
+- localVarQueryParams
+- localVarResponse
+- localVarStatusCode
+- lock
+- long
+- namespace
+- new
+- null
+- object
+- operator
+- out
+- override
+- parameter
+- params
+- private
+- protected
+- public
+- readonly
+- ref
+- return
+- sbyte
+- sealed
+- short
+- sizeof
+- stackalloc
+- static
+- string
+- struct
+- switch
+- this
+- throw
+- true
+- try
+- typeof
+- uint
+- ulong
+- unchecked
+- unsafe
+- ushort
+- using
+- virtual
+- void
+- volatile
+- while
+
diff --git a/docs/generators/csharp-refactor.md b/docs/generators/csharp-refactor.md
deleted file mode 100644
index d9f5714900..0000000000
--- a/docs/generators/csharp-refactor.md
+++ /dev/null
@@ -1,29 +0,0 @@
-
----
-id: generator-opts-client-csharp-refactor
-title: Config Options for csharp-refactor
-sidebar_label: csharp-refactor
----
-
-| Option | Description | Values | Default |
-| ------ | ----------- | ------ | ------- |
-|packageName|C# package name (convention: Title.Case).| |Org.OpenAPITools|
-|packageVersion|C# package version.| |1.0.0|
-|sourceFolder|source folder for generated code| |src|
-|packageGuid|The GUID that will be associated with the C# project| |null|
-|interfacePrefix|Prefix interfaces with a community standard or widely accepted prefix.| |I|
-|targetFramework|The target .NET framework version.|- **netstandard1.3**
- .NET Standard 1.3 compatible
- **netstandard1.4**
- .NET Standard 1.4 compatible
- **netstandard1.5**
- .NET Standard 1.5 compatible
- **netstandard1.6**
- .NET Standard 1.6 compatible
- **netstandard2.0**
- .NET Standard 2.0 compatible
- **netcoreapp2.0**
- .NET Core 2.0 compatible
|v4.6.1|
-|modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |PascalCase|
-|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|useDateTimeOffset|Use DateTimeOffset to model date-time properties| |false|
-|useCollection|Deserialize array types to Collection<T> instead of List<T>.| |false|
-|returnICollection|Return ICollection<T> instead of the concrete type.| |false|
-|optionalMethodArgument|C# Optional method argument, e.g. void square(int x=10) (.net 4.0+ only).| |true|
-|optionalAssemblyInfo|Generate AssemblyInfo.cs.| |true|
-|optionalProjectFile|Generate {PackageName}.csproj.| |true|
-|optionalEmitDefaultValues|Set DataMember's EmitDefaultValue.| |false|
-|nonPublicApi|Generates code with reduced access modifiers; allows embedding elsewhere without exposing non-public API calls to consumers.| |false|
-|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|netCoreProjectFile|Use the new format (.NET Core) for .NET project files (.csproj).| |false|
-|validatable|Generates self-validatable models.| |true|
diff --git a/docs/generators/csharp.md b/docs/generators/csharp.md
index 802eaae3ee..4ec890a4e8 100644
--- a/docs/generators/csharp.md
+++ b/docs/generators/csharp.md
@@ -5,26 +5,174 @@ sidebar_label: csharp
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|packageName|C# package name (convention: Title.Case).| |Org.OpenAPITools|
-|packageVersion|C# package version.| |1.0.0|
-|sourceFolder|source folder for generated code| |src|
-|packageGuid|The GUID that will be associated with the C# project| |null|
-|interfacePrefix|Prefix interfaces with a community standard or widely accepted prefix.| |I|
-|targetFramework|The target .NET framework version.|- **v3.5**
- .NET Framework 3.5 compatible
- **v4.0**
- .NET Framework 4.0 compatible
- **v4.5**
- .NET Framework 4.5+ compatible
- **v5.0**
- .NET Standard 1.3 compatible (DEPRECATED. Please use `csharp-netcore` generator instead)
- **uwp**
- Universal Windows Platform (DEPRECATED. Please use `csharp-netcore` generator instead)
|v4.5|
-|modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |PascalCase|
+|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
+|caseInsensitiveResponseHeaders|Make API response's headers case-insensitive| |false|
+|generatePropertyChanged|Specifies a AssemblyDescription for the .NET Framework global assembly attributes stored in the AssemblyInfo file.| |false|
|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|useDateTimeOffset|Use DateTimeOffset to model date-time properties| |false|
-|useCollection|Deserialize array types to Collection<T> instead of List<T>.| |false|
-|returnICollection|Return ICollection<T> instead of the concrete type.| |false|
-|optionalMethodArgument|C# Optional method argument, e.g. void square(int x=10) (.net 4.0+ only).| |true|
+|interfacePrefix|Prefix interfaces with a community standard or widely accepted prefix.| |I|
+|modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |PascalCase|
+|netCoreProjectFile|Use the new format (.NET Core) for .NET project files (.csproj).| |false|
+|nonPublicApi|Generates code with reduced access modifiers; allows embedding elsewhere without exposing non-public API calls to consumers.| |false|
|optionalAssemblyInfo|Generate AssemblyInfo.cs.| |true|
|optionalEmitDefaultValues|Set DataMember's EmitDefaultValue.| |false|
+|optionalMethodArgument|C# Optional method argument, e.g. void square(int x=10) (.net 4.0+ only).| |true|
|optionalProjectFile|Generate {PackageName}.csproj.| |true|
-|generatePropertyChanged|Specifies a AssemblyDescription for the .NET Framework global assembly attributes stored in the AssemblyInfo file.| |false|
-|nonPublicApi|Generates code with reduced access modifiers; allows embedding elsewhere without exposing non-public API calls to consumers.| |false|
-|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|netCoreProjectFile|Use the new format (.NET Core) for .NET project files (.csproj).| |false|
-|validatable|Generates self-validatable models.| |true|
+|packageGuid|The GUID that will be associated with the C# project| |null|
+|packageName|C# package name (convention: Title.Case).| |Org.OpenAPITools|
+|packageVersion|C# package version.| |1.0.0|
+|returnICollection|Return ICollection<T> instead of the concrete type.| |false|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+|sourceFolder|source folder for generated code| |src|
+|targetFramework|The target .NET framework version.|- **v3.5**
- .NET Framework 3.5 compatible
- **v4.0**
- .NET Framework 4.0 compatible
- **v4.5**
- .NET Framework 4.5+ compatible
- **v5.0**
- .NET Standard 1.3 compatible (DEPRECATED. Please use `csharp-netcore` generator instead)
- **uwp**
- Universal Windows Platform (DEPRECATED. Please use `csharp-netcore` generator instead)
|v4.5|
+|useCollection|Deserialize array types to Collection<T> instead of List<T>.| |false|
|useCompareNetObjects|Use KellermanSoftware.CompareNetObjects for deep recursive object comparison. WARNING: this option incurs potential performance impact.| |false|
-|caseInsensitiveResponseHeaders|Make API response's headers case-insensitive| |false|
+|useDateTimeOffset|Use DateTimeOffset to model date-time properties| |false|
+|validatable|Generates self-validatable models.| |true|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|List|
+|list|List|
+|map|Dictionary|
+
+
+## LANGUAGE PRIMITIVES
+
+- Boolean
+- Collection
+- DateTime
+- DateTime?
+- DateTimeOffset
+- DateTimeOffset?
+- Dictionary
+- Double
+- Float
+- Guid
+- Guid?
+- ICollection
+- Int32
+- Int64
+- List
+- Object
+- String
+- System.IO.Stream
+- bool
+- bool?
+- byte[]
+- decimal
+- decimal?
+- double
+- double?
+- float
+- float?
+- int
+- int?
+- long
+- long?
+- string
+
+
+## RESERVED WORDS
+
+- Client
+- abstract
+- as
+- base
+- bool
+- break
+- byte
+- case
+- catch
+- char
+- checked
+- class
+- client
+- const
+- continue
+- decimal
+- default
+- delegate
+- do
+- double
+- else
+- enum
+- event
+- explicit
+- extern
+- false
+- finally
+- fixed
+- float
+- for
+- foreach
+- goto
+- if
+- implicit
+- in
+- int
+- interface
+- internal
+- is
+- localVarFileParams
+- localVarFormParams
+- localVarHeaderParams
+- localVarHttpContentType
+- localVarHttpContentTypes
+- localVarHttpHeaderAccept
+- localVarHttpHeaderAccepts
+- localVarPath
+- localVarPathParams
+- localVarPostBody
+- localVarQueryParams
+- localVarResponse
+- localVarStatusCode
+- lock
+- long
+- namespace
+- new
+- null
+- object
+- operator
+- out
+- override
+- parameter
+- params
+- private
+- protected
+- public
+- readonly
+- ref
+- return
+- sbyte
+- sealed
+- short
+- sizeof
+- stackalloc
+- static
+- string
+- struct
+- switch
+- this
+- throw
+- true
+- try
+- typeof
+- uint
+- ulong
+- unchecked
+- unsafe
+- ushort
+- using
+- virtual
+- void
+- volatile
+- while
+
diff --git a/docs/generators/cwiki.md b/docs/generators/cwiki.md
index 767d30b1b2..9765e1cc58 100644
--- a/docs/generators/cwiki.md
+++ b/docs/generators/cwiki.md
@@ -5,18 +5,38 @@ sidebar_label: cwiki
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|appName|short name of the application| |null|
|appDescription|description of the application| |null|
-|infoUrl|a URL where users can get more information about the application| |null|
-|infoEmail|an email address to contact for inquiries about the application| |null|
-|licenseInfo|a short description of the license| |null|
-|licenseUrl|a URL pointing to the full license| |null|
-|invokerPackage|root package for generated code| |null|
-|groupId|groupId in generated pom.xml| |null|
+|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|
+|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|
+|infoUrl|a URL where users can get more information about the application| |null|
+|invokerPackage|root package for generated code| |null|
+|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|
+|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+
+
+## RESERVED WORDS
+
+
diff --git a/docs/generators/dart-dio.md b/docs/generators/dart-dio.md
index 045175c038..3445c7e165 100644
--- a/docs/generators/dart-dio.md
+++ b/docs/generators/dart-dio.md
@@ -5,20 +5,120 @@ sidebar_label: dart-dio
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
|browserClient|Is the client browser based (for Dart 1.x only)| |null|
-|pubName|Name in generated pubspec| |null|
-|pubVersion|Version in generated pubspec| |null|
-|pubDescription|Description in generated pubspec| |null|
+|dateLibrary|Option. Date library to use|- **core**
- Dart core library (DateTime)
- **timemachine**
- Time Machine is date and time library for Flutter, Web, and Server with support for timezones, calendars, cultures, formatting and parsing.
|core|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|nullableFields|Is the null fields should be in the JSON payload| |null|
+|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
|pubAuthor|Author name in generated pubspec| |null|
|pubAuthorEmail|Email address of the author in generated pubspec| |null|
+|pubDescription|Description in generated pubspec| |null|
|pubHomepage|Homepage in generated pubspec| |null|
-|useEnumExtension|Allow the 'x-enum-values' extension for enums| |null|
+|pubName|Name in generated pubspec| |null|
+|pubVersion|Version in generated pubspec| |null|
+|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|
|supportDart2|Support Dart 2.x (Dart 1.x support has been deprecated)| |true|
-|nullableFields|Is the null fields should be in the JSON payload| |null|
-|dateLibrary|Option. Date library to use|- **core**
- Dart core library (DateTime)
- **timemachine**
- Time Machine is date and time library for Flutter, Web, and Server with support for timezones, calendars, cultures, formatting and parsing.
|core|
+|useEnumExtension|Allow the 'x-enum-values' extension for enums| |null|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|BuiltList|package:built_collection/built_collection.dart|
+|BuiltMap|package:built_collection/built_collection.dart|
+|JsonObject|package:built_value/json_object.dart|
+|Uint8List|dart:typed_data|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|List|
+|map|Map|
+
+
+## LANGUAGE PRIMITIVES
+
+- String
+- bool
+- double
+- int
+- num
+
+
+## RESERVED WORDS
+
+- abstract
+- as
+- assert
+- async
+- await
+- break
+- case
+- catch
+- class
+- const
+- continue
+- covariant
+- default
+- deferred
+- do
+- dynamic
+- else
+- enum
+- export
+- extends
+- extension
+- external
+- factory
+- false
+- final
+- finally
+- for
+- function
+- get
+- hide
+- if
+- implements
+- import
+- in
+- inout
+- interface
+- is
+- late
+- library
+- mixin
+- native
+- new
+- null
+- of
+- on
+- operator
+- out
+- part
+- patch
+- required
+- rethrow
+- return
+- set
+- show
+- source
+- static
+- super
+- switch
+- sync
+- this
+- throw
+- true
+- try
+- typedef
+- var
+- void
+- while
+- with
+- yield
+
diff --git a/docs/generators/dart-jaguar.md b/docs/generators/dart-jaguar.md
index 5a06755bf2..78f1eac7d5 100644
--- a/docs/generators/dart-jaguar.md
+++ b/docs/generators/dart-jaguar.md
@@ -5,20 +5,116 @@ sidebar_label: dart-jaguar
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
|browserClient|Is the client browser based (for Dart 1.x only)| |null|
-|pubName|Name in generated pubspec| |null|
-|pubVersion|Version in generated pubspec| |null|
-|pubDescription|Description in generated pubspec| |null|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|nullableFields|Is the null fields should be in the JSON payload| |null|
+|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
|pubAuthor|Author name in generated pubspec| |null|
|pubAuthorEmail|Email address of the author in generated pubspec| |null|
+|pubDescription|Description in generated pubspec| |null|
|pubHomepage|Homepage in generated pubspec| |null|
-|useEnumExtension|Allow the 'x-enum-values' extension for enums| |null|
+|pubName|Name in generated pubspec| |null|
+|pubVersion|Version in generated pubspec| |null|
+|serialization|Choose serialization format JSON or PROTO is supported| |null|
+|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|
|supportDart2|Support Dart 2.x (Dart 1.x support has been deprecated)| |true|
-|nullableFields|Is the null fields should be in the JSON payload| |null|
-|serialization|Choose serialization format JSON or PROTO is supported| |null|
+|useEnumExtension|Allow the 'x-enum-values' extension for enums| |null|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|List|
+|map|Map|
+
+
+## LANGUAGE PRIMITIVES
+
+- String
+- bool
+- double
+- int
+- num
+
+
+## RESERVED WORDS
+
+- abstract
+- as
+- assert
+- async
+- await
+- break
+- case
+- catch
+- class
+- const
+- continue
+- covariant
+- default
+- deferred
+- do
+- dynamic
+- else
+- enum
+- export
+- extends
+- extension
+- external
+- factory
+- false
+- final
+- finally
+- for
+- function
+- get
+- hide
+- if
+- implements
+- import
+- in
+- inout
+- interface
+- is
+- late
+- library
+- mixin
+- native
+- new
+- null
+- of
+- on
+- operator
+- out
+- part
+- patch
+- required
+- rethrow
+- return
+- set
+- show
+- source
+- static
+- super
+- switch
+- sync
+- this
+- throw
+- true
+- try
+- typedef
+- var
+- void
+- while
+- with
+- yield
+
diff --git a/docs/generators/dart.md b/docs/generators/dart.md
index 12c6550b1c..8b1bd158c3 100644
--- a/docs/generators/dart.md
+++ b/docs/generators/dart.md
@@ -5,18 +5,114 @@ sidebar_label: dart
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
|browserClient|Is the client browser based (for Dart 1.x only)| |null|
-|pubName|Name in generated pubspec| |null|
-|pubVersion|Version in generated pubspec| |null|
-|pubDescription|Description in generated pubspec| |null|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
|pubAuthor|Author name in generated pubspec| |null|
|pubAuthorEmail|Email address of the author in generated pubspec| |null|
+|pubDescription|Description in generated pubspec| |null|
|pubHomepage|Homepage in generated pubspec| |null|
-|useEnumExtension|Allow the 'x-enum-values' extension for enums| |null|
+|pubName|Name in generated pubspec| |null|
+|pubVersion|Version in generated pubspec| |null|
+|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|
|supportDart2|Support Dart 2.x (Dart 1.x support has been deprecated)| |true|
+|useEnumExtension|Allow the 'x-enum-values' extension for enums| |null|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|List|
+|map|Map|
+
+
+## LANGUAGE PRIMITIVES
+
+- String
+- bool
+- double
+- int
+- num
+
+
+## RESERVED WORDS
+
+- abstract
+- as
+- assert
+- async
+- await
+- break
+- case
+- catch
+- class
+- const
+- continue
+- covariant
+- default
+- deferred
+- do
+- dynamic
+- else
+- enum
+- export
+- extends
+- extension
+- external
+- factory
+- false
+- final
+- finally
+- for
+- function
+- get
+- hide
+- if
+- implements
+- import
+- in
+- inout
+- interface
+- is
+- late
+- library
+- mixin
+- native
+- new
+- null
+- of
+- on
+- operator
+- out
+- part
+- patch
+- required
+- rethrow
+- return
+- set
+- show
+- source
+- static
+- super
+- switch
+- sync
+- this
+- throw
+- true
+- try
+- typedef
+- var
+- void
+- while
+- with
+- yield
+
diff --git a/docs/generators/dynamic-html.md b/docs/generators/dynamic-html.md
index 50752f564c..1fa63d3434 100644
--- a/docs/generators/dynamic-html.md
+++ b/docs/generators/dynamic-html.md
@@ -5,12 +5,34 @@ sidebar_label: dynamic-html
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|invokerPackage|root package for generated code| |null|
-|groupId|groupId in generated pom.xml| |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|
+|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|
+|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|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|ArrayList|
+|map|HashMap|
+
+
+## LANGUAGE PRIMITIVES
+
+
+
+## RESERVED WORDS
+
+
diff --git a/docs/generators/eiffel.md b/docs/generators/eiffel.md
index fb6b8d9cb9..2f239b7c40 100644
--- a/docs/generators/eiffel.md
+++ b/docs/generators/eiffel.md
@@ -5,6 +5,116 @@ sidebar_label: eiffel
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
+|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
|packageName|Eiffel Cluster name (convention: lowercase).| |openapi|
|packageVersion|Eiffel package version.| |1.0.0|
-|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|ARRAYED_LIST|
+|list|ARRAYED_LIST|
+|map|STRING_TABLE|
+
+
+## LANGUAGE PRIMITIVES
+
+- BOOLEAN
+- INTEGER_16
+- INTEGER_32
+- INTEGER_64
+- INTEGER_8
+- NATURAL_16
+- NATURAL_32
+- NATURAL_64
+- NATURAL_8
+- REAL_32
+- REAL_64
+
+
+## RESERVED WORDS
+
+- across
+- agent
+- alias
+- all
+- and
+- as
+- assign
+- attribute
+- check
+- class
+- convert
+- create
+- current
+- debug
+- deferred
+- do
+- else
+- elseif
+- end
+- ensure
+- expanded
+- export
+- external
+- false
+- feature
+- from
+- frozen
+- if
+- implies
+- inherit
+- inspect
+- invariant
+- like
+- local
+- loop
+- not
+- note
+- obsolete
+- old
+- once
+- only
+- or
+- precursor
+- redefine
+- rename
+- require
+- rescue
+- result
+- retry
+- select
+- separate
+- then
+- true
+- tuple
+- undefine
+- until
+- variant
+- void
+- when
+- xor
+
diff --git a/docs/generators/elixir.md b/docs/generators/elixir.md
index 2fb1cf776b..fae1d80bd3 100644
--- a/docs/generators/elixir.md
+++ b/docs/generators/elixir.md
@@ -5,11 +5,65 @@ sidebar_label: elixir
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
+|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|
|licenseHeader|The license header to prepend to the top of all source files.| |null|
|packageName|Elixir package name (convention: lowercase).| |null|
+|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|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- Atom
+- Boolean
+- DateTime
+- Float
+- Integer
+- List
+- Map
+- PID
+- String
+- Tuple
+
+
+## RESERVED WORDS
+
+- __CALLER__
+- __DIR__
+- __ENV__
+- __FILE__
+- __MODULE__
+- false
+- nil
+- true
+
diff --git a/docs/generators/elm.md b/docs/generators/elm.md
index b9df3d2422..0fefd01e78 100644
--- a/docs/generators/elm.md
+++ b/docs/generators/elm.md
@@ -5,3 +5,45 @@ sidebar_label: elm
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|List|
+|map|Dict|
+
+
+## LANGUAGE PRIMITIVES
+
+- Bool
+- Dict
+- Float
+- Int
+- List
+- String
+
+
+## RESERVED WORDS
+
+- as
+- case
+- else
+- exposing
+- if
+- import
+- in
+- let
+- module
+- of
+- port
+- then
+- type
+- where
+
diff --git a/docs/generators/erlang-client.md b/docs/generators/erlang-client.md
index 675e15f80f..72e4df6061 100644
--- a/docs/generators/erlang-client.md
+++ b/docs/generators/erlang-client.md
@@ -6,4 +6,67 @@ sidebar_label: erlang-client
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
|packageName|Erlang application name (convention: lowercase).| |openapi|
-|packageName|Erlang application version| |1.0.0|
+|packageVersion|Erlang application version| |1.0.0|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+
+
+## RESERVED WORDS
+
+- after
+- and
+- andalso
+- band
+- begin
+- bnot
+- bor
+- bsl
+- bsr
+- bxor
+- case
+- catch
+- cond
+- div
+- end
+- fun
+- if
+- let
+- not
+- of
+- or
+- orelse
+- receive
+- rem
+- try
+- when
+- xor
+
diff --git a/docs/generators/erlang-proper.md b/docs/generators/erlang-proper.md
index 57187fdf49..6d48712bdc 100644
--- a/docs/generators/erlang-proper.md
+++ b/docs/generators/erlang-proper.md
@@ -6,4 +6,67 @@ sidebar_label: erlang-proper
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
|packageName|Erlang application name (convention: lowercase).| |openapi|
-|packageName|Erlang application version| |1.0.0|
+|packageVersion|Erlang application version| |1.0.0|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+
+
+## RESERVED WORDS
+
+- after
+- and
+- andalso
+- band
+- begin
+- bnot
+- bor
+- bsl
+- bsr
+- bxor
+- case
+- catch
+- cond
+- div
+- end
+- fun
+- if
+- let
+- not
+- of
+- or
+- orelse
+- receive
+- rem
+- try
+- when
+- xor
+
diff --git a/docs/generators/erlang-server.md b/docs/generators/erlang-server.md
index 8e109cd37d..8db2184f0d 100644
--- a/docs/generators/erlang-server.md
+++ b/docs/generators/erlang-server.md
@@ -5,5 +5,68 @@ sidebar_label: erlang-server
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|packageName|Erlang package name (convention: lowercase).| |openapi|
|openAPISpecName|Openapi Spec Name.| |openapi|
+|packageName|Erlang package name (convention: lowercase).| |openapi|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+
+
+## RESERVED WORDS
+
+- after
+- and
+- andalso
+- band
+- begin
+- bnot
+- bor
+- bsl
+- bsr
+- bxor
+- case
+- catch
+- cond
+- div
+- end
+- fun
+- if
+- let
+- not
+- of
+- or
+- orelse
+- receive
+- rem
+- try
+- when
+- xor
+
diff --git a/docs/generators/flash.md b/docs/generators/flash.md
index 53312f0fb4..5d6fd829b1 100644
--- a/docs/generators/flash.md
+++ b/docs/generators/flash.md
@@ -5,7 +5,65 @@ sidebar_label: flash
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
+|invokerPackage|root package for generated code| |null|
|packageName|flash package name (convention: package.name)| |org.openapitools|
|packageVersion|flash package version| |1.0.0|
-|invokerPackage|root package for generated code| |null|
|sourceFolder|source folder for generated code. e.g. flash| |null|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|File|flash.filesystem.File|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- Array
+- Boolean
+- Date
+- Dictionary
+- Number
+- String
+
+
+## RESERVED WORDS
+
+- add
+- and
+- break
+- continue
+- delete
+- do
+- else
+- eq
+- for
+- function
+- ge
+- gt
+- if
+- ifframeloaded
+- in
+- le
+- lt
+- ne
+- new
+- not
+- on
+- onclipevent
+- or
+- return
+- telltarget
+- this
+- typeof
+- var
+- void
+- while
+- with
+
diff --git a/docs/generators/fsharp-functions.md b/docs/generators/fsharp-functions.md
index 145573d67d..389c94b133 100644
--- a/docs/generators/fsharp-functions.md
+++ b/docs/generators/fsharp-functions.md
@@ -5,17 +5,183 @@ sidebar_label: fsharp-functions
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|licenseUrl|The URL of the license| |http://localhost|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|licenseName|The name of the license| |NoLicense|
-|packageCopyright|Specifies an AssemblyCopyright for the .NET Framework global assembly attributes stored in the AssemblyInfo file.| |No Copyright|
+|licenseUrl|The URL of the license| |http://localhost|
|packageAuthors|Specifies Authors property in the .NET Core project file.| |OpenAPI|
-|packageTitle|Specifies an AssemblyTitle for the .NET Framework global assembly attributes stored in the AssemblyInfo file.| |OpenAPI Library|
-|packageName|F# module name (convention: Title.Case).| |OpenAPI|
-|packageVersion|F# package version.| |1.0.0|
+|packageCopyright|Specifies an AssemblyCopyright for the .NET Framework global assembly attributes stored in the AssemblyInfo file.| |No Copyright|
|packageGuid|The GUID that will be associated with the C# project| |null|
+|packageName|F# module name (convention: Title.Case).| |OpenAPI|
+|packageTitle|Specifies an AssemblyTitle for the .NET Framework global assembly attributes stored in the AssemblyInfo file.| |OpenAPI Library|
+|packageVersion|F# package version.| |1.0.0|
+|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|
|sourceFolder|source folder for generated code| |OpenAPI/src|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|IDictionary|System.Collections.Generic|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|list|
+|list|list|
+|map|IDictionary|
+
+
+## LANGUAGE PRIMITIVES
+
+- Collection
+- DataTimeOffset
+- DateTime
+- Dictionary
+- Double
+- ICollection
+- Int32
+- Int64
+- List
+- String
+- System.IO.Stream
+- bool
+- byte[]
+- char
+- decimal
+- dict
+- double
+- float
+- float32
+- int
+- int16
+- int64
+- list
+- nativeint
+- obj
+- seq
+- single
+- string
+- uint16
+- uint32
+- uint64
+- unativeint
+
+
+## RESERVED WORDS
+
+- abstract
+- and
+- as
+- assert
+- async
+- await
+- base
+- begin
+- bool
+- break
+- byte
+- case
+- catch
+- char
+- checked
+- class
+- const
+- continue
+- decimal
+- default
+- delegate
+- do
+- done
+- double
+- downcast
+- downto
+- dynamic
+- elif
+- else
+- end
+- enum
+- event
+- exception
+- explicit
+- extern
+- false
+- finally
+- fixed
+- float
+- for
+- foreach
+- fun
+- function
+- if
+- in
+- inherit
+- inline
+- int
+- interface
+- internal
+- is
+- lazy
+- let
+- let!
+- localVarFileParams
+- localVarFormParams
+- localVarHeaderParams
+- localVarHttpContentType
+- localVarHttpContentTypes
+- localVarHttpHeaderAccept
+- localVarHttpHeaderAccepts
+- localVarPath
+- localVarPathParams
+- localVarPostBody
+- localVarQueryParams
+- localVarResponse
+- localVarStatusCode
+- lock
+- match
+- match!
+- member
+- module
+- mutable
+- namespace
+- new
+- not
+- null
+- of
+- open
+- option
+- or
+- override
+- params
+- private
+- public
+- raise
+- rec
+- return
+- return!
+- sealed
+- select
+- static
+- string
+- struct
+- then
+- to
+- true
+- try
+- type
+- upcast
+- use
+- use!
+- val
+- void
+- volatile
+- when
+- while
+- with
+- yield
+- yield!
+
diff --git a/docs/generators/fsharp-giraffe-server.md b/docs/generators/fsharp-giraffe-server.md
index bec1994334..d05383c75d 100644
--- a/docs/generators/fsharp-giraffe-server.md
+++ b/docs/generators/fsharp-giraffe-server.md
@@ -5,19 +5,185 @@ sidebar_label: fsharp-giraffe-server
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|licenseUrl|The URL of the license| |http://localhost|
-|licenseName|The name of the license| |NoLicense|
-|packageCopyright|Specifies an AssemblyCopyright for the .NET Framework global assembly attributes stored in the AssemblyInfo file.| |No Copyright|
-|packageAuthors|Specifies Authors property in the .NET Core project file.| |OpenAPI|
-|packageTitle|Specifies an AssemblyTitle for the .NET Framework global assembly attributes stored in the AssemblyInfo file.| |OpenAPI Library|
-|packageName|F# module name (convention: Title.Case).| |OpenAPI|
-|packageVersion|F# package version.| |1.0.0|
-|packageGuid|The GUID that will be associated with the C# project| |null|
-|sourceFolder|source folder for generated code| |OpenAPI/src|
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|useDateTimeOffset|Use DateTimeOffset to model date-time properties| |false|
-|useCollection|Deserialize array types to Collection<T> instead of List<T>.| |false|
-|returnICollection|Return ICollection<T> instead of the concrete type.| |false|
-|useSwashbuckle|Uses the Swashbuckle.AspNetCore NuGet package for documentation.| |false|
-|generateBody|Generates method body.| |true|
|buildTarget|Target the build for a program or library.| |program|
+|generateBody|Generates method body.| |true|
+|licenseName|The name of the license| |NoLicense|
+|licenseUrl|The URL of the license| |http://localhost|
+|packageAuthors|Specifies Authors property in the .NET Core project file.| |OpenAPI|
+|packageCopyright|Specifies an AssemblyCopyright for the .NET Framework global assembly attributes stored in the AssemblyInfo file.| |No Copyright|
+|packageGuid|The GUID that will be associated with the C# project| |null|
+|packageName|F# module name (convention: Title.Case).| |OpenAPI|
+|packageTitle|Specifies an AssemblyTitle for the .NET Framework global assembly attributes stored in the AssemblyInfo file.| |OpenAPI Library|
+|packageVersion|F# package version.| |1.0.0|
+|returnICollection|Return ICollection<T> instead of the concrete type.| |false|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+|sourceFolder|source folder for generated code| |OpenAPI/src|
+|useCollection|Deserialize array types to Collection<T> instead of List<T>.| |false|
+|useDateTimeOffset|Use DateTimeOffset to model date-time properties| |false|
+|useSwashbuckle|Uses the Swashbuckle.AspNetCore NuGet package for documentation.| |false|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|IDictionary|System.Collections.Generic|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|list|
+|list|list|
+|map|IDictionary|
+
+
+## LANGUAGE PRIMITIVES
+
+- Collection
+- DataTimeOffset
+- DateTime
+- Dictionary
+- Double
+- ICollection
+- Int32
+- Int64
+- List
+- String
+- System.IO.Stream
+- bool
+- byte[]
+- char
+- decimal
+- dict
+- double
+- float
+- float32
+- int
+- int16
+- int64
+- list
+- nativeint
+- obj
+- seq
+- single
+- string
+- uint16
+- uint32
+- uint64
+- unativeint
+
+
+## RESERVED WORDS
+
+- abstract
+- and
+- as
+- assert
+- async
+- await
+- base
+- begin
+- bool
+- break
+- byte
+- case
+- catch
+- char
+- checked
+- class
+- const
+- continue
+- decimal
+- default
+- delegate
+- do
+- done
+- double
+- downcast
+- downto
+- dynamic
+- elif
+- else
+- end
+- enum
+- event
+- exception
+- explicit
+- extern
+- false
+- finally
+- fixed
+- float
+- for
+- foreach
+- fun
+- function
+- if
+- in
+- inherit
+- inline
+- int
+- interface
+- internal
+- is
+- lazy
+- let
+- let!
+- localVarFileParams
+- localVarFormParams
+- localVarHeaderParams
+- localVarHttpContentType
+- localVarHttpContentTypes
+- localVarHttpHeaderAccept
+- localVarHttpHeaderAccepts
+- localVarPath
+- localVarPathParams
+- localVarPostBody
+- localVarQueryParams
+- localVarResponse
+- localVarStatusCode
+- lock
+- match
+- match!
+- member
+- module
+- mutable
+- namespace
+- new
+- not
+- null
+- of
+- open
+- option
+- or
+- override
+- params
+- private
+- public
+- raise
+- rec
+- return
+- return!
+- sealed
+- select
+- static
+- string
+- struct
+- then
+- to
+- true
+- try
+- type
+- upcast
+- use
+- use!
+- val
+- void
+- volatile
+- when
+- while
+- with
+- yield
+- yield!
+
diff --git a/docs/generators/fsharp-giraffe.md b/docs/generators/fsharp-giraffe.md
deleted file mode 100644
index 473781b7c5..0000000000
--- a/docs/generators/fsharp-giraffe.md
+++ /dev/null
@@ -1,25 +0,0 @@
-
----
-id: generator-opts-server-fsharp-giraffe
-title: Config Options for fsharp-giraffe
-sidebar_label: fsharp-giraffe
----
-
-| Option | Description | Values | Default |
-| ------ | ----------- | ------ | ------- |
-|licenseUrl|The URL of the license| |http://localhost|
-|licenseName|The name of the license| |NoLicense|
-|packageCopyright|Specifies an AssemblyCopyright for the .NET Framework global assembly attributes stored in the AssemblyInfo file.| |No Copyright|
-|packageAuthors|Specifies Authors property in the .NET Core project file.| |OpenAPI|
-|packageTitle|Specifies an AssemblyTitle for the .NET Framework global assembly attributes stored in the AssemblyInfo file.| |OpenAPI Library|
-|packageName|F# module name (convention: Title.Case).| |OpenAPI|
-|packageVersion|F# package version.| |1.0.0|
-|packageGuid|The GUID that will be associated with the C# project| |null|
-|sourceFolder|source folder for generated code| |OpenAPI/src|
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|useDateTimeOffset|Use DateTimeOffset to model date-time properties| |false|
-|useCollection|Deserialize array types to Collection<T> instead of List<T>.| |false|
-|returnICollection|Return ICollection<T> instead of the concrete type.| |false|
-|useSwashbuckle|Uses the Swashbuckle.AspNetCore NuGet package for documentation.| |false|
-|generateBody|Generates method body.| |true|
-|buildTarget|Target the build for a program or library.| |program|
diff --git a/docs/generators/go-experimental.md b/docs/generators/go-experimental.md
index 00cec6310b..6099220d65 100644
--- a/docs/generators/go-experimental.md
+++ b/docs/generators/go-experimental.md
@@ -5,13 +5,93 @@ sidebar_label: go-experimental
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|packageName|Go package name (convention: lowercase).| |openapi|
-|packageVersion|Go package version.| |1.0.0|
+|enumClassPrefix|Prefix enum with class name| |false|
|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
|isGoSubmodule|whether the generated Go module is a submodule| |false|
-|withGoCodegenComment|whether to include Go codegen comment to disable Go Lint and collapse by default GitHub in PRs and diffs| |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|
-|enumClassPrefix|Prefix enum with class name| |false|
+|packageName|Go package name (convention: lowercase).| |openapi|
+|packageVersion|Go package version.| |1.0.0|
+|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
|structPrefix|whether to prefix struct with the class name. e.g. DeletePetOpts => PetApiDeletePetOpts| |false|
|withAWSV4Signature|whether to include AWS v4 signature support| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
+|withGoCodegenComment|whether to include Go codegen comment to disable Go Lint and collapse by default GitHub in PRs and diffs| |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
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- bool
+- byte
+- complex128
+- complex64
+- float32
+- float64
+- int
+- int32
+- int64
+- rune
+- string
+- uint
+- uint32
+- uint64
+
+
+## RESERVED WORDS
+
+- bool
+- break
+- byte
+- case
+- chan
+- complex128
+- complex64
+- const
+- continue
+- default
+- defer
+- else
+- error
+- fallthrough
+- float32
+- float64
+- for
+- func
+- go
+- goto
+- if
+- import
+- int
+- int16
+- int32
+- int64
+- int8
+- interface
+- map
+- nil
+- package
+- range
+- return
+- rune
+- select
+- string
+- struct
+- switch
+- type
+- uint
+- uint16
+- uint32
+- uint64
+- uint8
+- uintptr
+- var
+
diff --git a/docs/generators/go-gin-server.md b/docs/generators/go-gin-server.md
index 445f3c2d16..189705f092 100644
--- a/docs/generators/go-gin-server.md
+++ b/docs/generators/go-gin-server.md
@@ -5,6 +5,86 @@ sidebar_label: go-gin-server
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
+|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
|packageName|Go package name (convention: lowercase).| |openapi|
|packageVersion|Go package version.| |1.0.0|
-|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- bool
+- byte
+- complex128
+- complex64
+- float32
+- float64
+- int
+- int32
+- int64
+- rune
+- string
+- uint
+- uint32
+- uint64
+
+
+## RESERVED WORDS
+
+- bool
+- break
+- byte
+- case
+- chan
+- complex128
+- complex64
+- const
+- continue
+- default
+- defer
+- else
+- error
+- fallthrough
+- float32
+- float64
+- for
+- func
+- go
+- goto
+- if
+- import
+- int
+- int16
+- int32
+- int64
+- int8
+- interface
+- map
+- nil
+- package
+- range
+- return
+- rune
+- select
+- string
+- struct
+- switch
+- type
+- uint
+- uint16
+- uint32
+- uint64
+- uint8
+- uintptr
+- var
+
diff --git a/docs/generators/go-server.md b/docs/generators/go-server.md
index a602a39c42..0125db11e9 100644
--- a/docs/generators/go-server.md
+++ b/docs/generators/go-server.md
@@ -5,9 +5,89 @@ sidebar_label: go-server
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
+|featureCORS|Enable Cross-Origin Resource Sharing middleware| |false|
+|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
|packageName|Go package name (convention: lowercase).| |openapi|
|packageVersion|Go package version.| |1.0.0|
-|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
-|sourceFolder|source folder for generated code| |go|
|serverPort|The network port the generated server binds to| |8080|
-|featureCORS|Enable Cross-Origin Resource Sharing middleware| |false|
+|sourceFolder|source folder for generated code| |go|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- bool
+- byte
+- complex128
+- complex64
+- float32
+- float64
+- int
+- int32
+- int64
+- rune
+- string
+- uint
+- uint32
+- uint64
+
+
+## RESERVED WORDS
+
+- bool
+- break
+- byte
+- case
+- chan
+- complex128
+- complex64
+- const
+- continue
+- default
+- defer
+- else
+- error
+- fallthrough
+- float32
+- float64
+- for
+- func
+- go
+- goto
+- if
+- import
+- int
+- int16
+- int32
+- int64
+- int8
+- interface
+- map
+- nil
+- package
+- range
+- return
+- rune
+- select
+- string
+- struct
+- switch
+- type
+- uint
+- uint16
+- uint32
+- uint64
+- uint8
+- uintptr
+- var
+
diff --git a/docs/generators/go.md b/docs/generators/go.md
index 0801d2108f..1d8909bbfc 100644
--- a/docs/generators/go.md
+++ b/docs/generators/go.md
@@ -5,13 +5,93 @@ sidebar_label: go
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|packageName|Go package name (convention: lowercase).| |openapi|
-|packageVersion|Go package version.| |1.0.0|
+|enumClassPrefix|Prefix enum with class name| |false|
|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
|isGoSubmodule|whether the generated Go module is a submodule| |false|
-|withGoCodegenComment|whether to include Go codegen comment to disable Go Lint and collapse by default GitHub in PRs and diffs| |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|
-|enumClassPrefix|Prefix enum with class name| |false|
+|packageName|Go package name (convention: lowercase).| |openapi|
+|packageVersion|Go package version.| |1.0.0|
+|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
|structPrefix|whether to prefix struct with the class name. e.g. DeletePetOpts => PetApiDeletePetOpts| |false|
|withAWSV4Signature|whether to include AWS v4 signature support| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
+|withGoCodegenComment|whether to include Go codegen comment to disable Go Lint and collapse by default GitHub in PRs and diffs| |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
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- bool
+- byte
+- complex128
+- complex64
+- float32
+- float64
+- int
+- int32
+- int64
+- rune
+- string
+- uint
+- uint32
+- uint64
+
+
+## RESERVED WORDS
+
+- bool
+- break
+- byte
+- case
+- chan
+- complex128
+- complex64
+- const
+- continue
+- default
+- defer
+- else
+- error
+- fallthrough
+- float32
+- float64
+- for
+- func
+- go
+- goto
+- if
+- import
+- int
+- int16
+- int32
+- int64
+- int8
+- interface
+- map
+- nil
+- package
+- range
+- return
+- rune
+- select
+- string
+- struct
+- switch
+- type
+- uint
+- uint16
+- uint32
+- uint64
+- uint8
+- uintptr
+- var
+
diff --git a/docs/generators/graphql-nodejs-express-server.md b/docs/generators/graphql-nodejs-express-server.md
index 3ab10107cf..8200c47531 100644
--- a/docs/generators/graphql-nodejs-express-server.md
+++ b/docs/generators/graphql-nodejs-express-server.md
@@ -5,6 +5,59 @@ sidebar_label: graphql-nodejs-express-server
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
+|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
|packageName|GraphQL Node.js Express server package name (convention: lowercase).| |openapi3graphql-server|
|packageVersion|GraphQL Node.js Express server package version.| |1.0.0|
-|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- Boolean
+- Float
+- ID
+- Int
+- String
+- null
+
+
+## RESERVED WORDS
+
+- boolean
+- float
+- id
+- implements
+- int
+- interface
+- null
+- query
+- string
+- type
+- union
+
diff --git a/docs/generators/graphql-schema.md b/docs/generators/graphql-schema.md
index 83b90af0be..5cc481fa24 100644
--- a/docs/generators/graphql-schema.md
+++ b/docs/generators/graphql-schema.md
@@ -5,6 +5,59 @@ sidebar_label: graphql-schema
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
+|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
|packageName|GraphQL package name (convention: lowercase).| |openapi2graphql|
|packageVersion|GraphQL package version.| |1.0.0|
-|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- Boolean
+- Float
+- ID
+- Int
+- String
+- null
+
+
+## RESERVED WORDS
+
+- boolean
+- float
+- id
+- implements
+- int
+- interface
+- null
+- query
+- string
+- type
+- union
+
diff --git a/docs/generators/graphql-server.md b/docs/generators/graphql-server.md
deleted file mode 100644
index 97fb578008..0000000000
--- a/docs/generators/graphql-server.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
----
-id: generator-opts-server-graphql-server
-title: Config Options for graphql-server
-sidebar_label: graphql-server
----
-
-| Option | Description | Values | Default |
-| ------ | ----------- | ------ | ------- |
-|packageName|GraphQL express server package name (convention: lowercase).| |openapi3graphql-server|
-|packageVersion|GraphQL express server package version.| |1.0.0|
-|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
diff --git a/docs/generators/groovy.md b/docs/generators/groovy.md
index a3a5463a3b..13e9a1a619 100644
--- a/docs/generators/groovy.md
+++ b/docs/generators/groovy.md
@@ -5,38 +5,159 @@ sidebar_label: groovy
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |org.openapitools.model|
|apiPackage|package for generated api classes| |org.openapitools.api|
-|invokerPackage|root package for generated code| |org.openapitools.api|
-|groupId|groupId in generated pom.xml| |org.openapitools|
|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-groovy|
|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
+|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
+|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|legacy|
+|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
+|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
+|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|
+|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|
+|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.api|
+|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
+|licenseName|The name of the license| |Unlicense|
+|licenseUrl|The URL of the license| |http://unlicense.org|
+|modelPackage|package for generated models| |org.openapitools.model|
+|parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
+|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|
+|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|
|scmUrl|SCM URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
-|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
-|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
-|developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
-|developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
-|licenseName|The name of the license| |Unlicense|
-|licenseUrl|The URL of the license| |http://unlicense.org|
-|sourceFolder|source folder for generated code| |src/main/groovy|
|serializableModel|boolean - toggle "implements Serializable" for generated models| |false|
-|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
-|fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
-|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |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|
-|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|legacy|
-|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
-|disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|booleanGetterPrefix|Set booleanGetterPrefix| |get|
-|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
-|parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
-|parentArtifactId|parent artifactId 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|
|snapshotVersion|Uses a SNAPSHOT version.|- **true**
- Use a SnapShot Version
- **false**
- Use a Release Version
|null|
+|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+|sourceFolder|source folder for generated code| |src/main/groovy|
+|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
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|ArrayList|
+|map|HashMap|
+
+
+## LANGUAGE PRIMITIVES
+
+- ArrayList
+- Boolean
+- Date
+- Double
+- File
+- Float
+- Integer
+- Long
+- Map
+- Object
+- String
+- boolean
+- byte[]
+
+
+## RESERVED WORDS
+
+- abstract
+- apiclient
+- apiexception
+- apiresponse
+- assert
+- boolean
+- break
+- byte
+- case
+- catch
+- char
+- class
+- configuration
+- const
+- continue
+- default
+- do
+- double
+- else
+- enum
+- extends
+- final
+- finally
+- float
+- for
+- goto
+- if
+- implements
+- import
+- instanceof
+- int
+- interface
+- localreturntype
+- localvaraccept
+- localvaraccepts
+- localvarauthnames
+- localvarcollectionqueryparams
+- localvarcontenttype
+- localvarcontenttypes
+- localvarcookieparams
+- localvarformparams
+- localvarheaderparams
+- localvarpath
+- localvarpostbody
+- localvarqueryparams
+- long
+- native
+- new
+- null
+- object
+- package
+- private
+- protected
+- public
+- return
+- short
+- static
+- strictfp
+- stringutil
+- super
+- switch
+- synchronized
+- this
+- throw
+- throws
+- transient
+- try
+- void
+- volatile
+- while
+
diff --git a/docs/generators/grpc-schema.md b/docs/generators/grpc-schema.md
deleted file mode 100644
index 17a765fbbc..0000000000
--- a/docs/generators/grpc-schema.md
+++ /dev/null
@@ -1,9 +0,0 @@
-
----
-id: generator-opts-config-grpc-schema
-title: Config Options for grpc-schema
-sidebar_label: grpc-schema
----
-
-| Option | Description | Values | Default |
-| ------ | ----------- | ------ | ------- |
diff --git a/docs/generators/haskell-http-client.md b/docs/generators/haskell-http-client.md
index f79606c6db..3a68e2276a 100644
--- a/docs/generators/haskell-http-client.md
+++ b/docs/generators/haskell-http-client.md
@@ -5,29 +5,93 @@ sidebar_label: haskell-http-client
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|allowFromJsonNulls|allow JSON Null during model decoding from JSON| |true|
+|allowNonUniqueOperationIds|allow different API modules to contain the same operationId. Each API must be imported qualified| |false|
+|allowToJsonNulls|allow emitting JSON Null during model encoding to JSON| |false|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
+|baseModule|Set the base module namespace| |null|
|cabalPackage|Set the cabal package name, which consists of one or more alphanumeric words separated by hyphens| |null|
|cabalVersion|Set the cabal version number, consisting of a sequence of one or more integers separated by dots| |null|
-|baseModule|Set the base module namespace| |null|
-|requestType|Set the name of the type used to generate requests| |null|
|configType|Set the name of the type used for configuration| |null|
-|allowFromJsonNulls|allow JSON Null during model decoding from JSON| |true|
-|allowToJsonNulls|allow emitting JSON Null during model encoding to JSON| |false|
-|allowNonUniqueOperationIds|allow different API modules to contain the same operationId. Each API must be imported qualified| |false|
-|generateLenses|Generate Lens optics for Models| |true|
-|generateModelConstructors|Generate smart constructors (only supply required fields) for models| |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|
-|inlineMimeTypes|Inline (hardcode) the content-type and accept parameters on operations, when there is only 1 option| |true|
-|modelDeriving|Additional classes to include in the deriving() clause of Models| |null|
-|strictFields|Add strictness annotations to all model fields| |true|
-|useKatip|Sets the default value for the UseKatip cabal flag. If true, the katip package provides logging instead of monad-logger| |true|
+|customTestInstanceModule|test module used to provide typeclass instances for types not known by the generator| |null|
+|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|
-|dateFormat|format string used to parse/render a date| |%Y-%m-%d|
-|customTestInstanceModule|test module used to provide typeclass instances for types not known by the generator| |null|
+|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|
+|generateLenses|Generate Lens optics for Models| |true|
+|generateModelConstructors|Generate smart constructors (only supply required fields) for models| |true|
|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
+|inlineMimeTypes|Inline (hardcode) the content-type and accept parameters on operations, when there is only 1 option| |true|
+|modelDeriving|Additional classes to include in the deriving() clause of Models| |null|
+|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
+|requestType|Set the name of the type used to generate requests| |null|
+|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+|strictFields|Add strictness annotations to all model fields| |true|
+|useKatip|Sets the default value for the UseKatip cabal flag. If true, the katip package provides logging instead of monad-logger| |true|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- Bool
+- Char
+- Double
+- FilePath
+- Float
+- Int
+- Integer
+- List
+- String
+- Text
+
+
+## RESERVED WORDS
+
+- accept
+- as
+- case
+- class
+- contenttype
+- data
+- default
+- deriving
+- do
+- else
+- family
+- forall
+- foreign
+- hiding
+- if
+- import
+- in
+- infix
+- infixl
+- infixr
+- instance
+- let
+- mdo
+- module
+- newtype
+- of
+- proc
+- pure
+- qualified
+- rec
+- return
+- then
+- type
+- where
+
diff --git a/docs/generators/haskell.md b/docs/generators/haskell.md
index 89cd90586d..3e0cb77314 100644
--- a/docs/generators/haskell.md
+++ b/docs/generators/haskell.md
@@ -5,11 +5,71 @@ sidebar_label: haskell
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |null|
|apiPackage|package for generated api classes| |null|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|modelPackage|package for generated models| |null|
+|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
|serveStatic|serve will serve files from the directory 'static'.| |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|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Map|qualified Data.Map as Map|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- Bool
+- Char
+- Double
+- FilePath
+- Float
+- Int
+- Integer
+- List
+- String
+
+
+## RESERVED WORDS
+
+- as
+- case
+- class
+- data
+- default
+- deriving
+- do
+- else
+- family
+- forall
+- foreign
+- hiding
+- if
+- import
+- in
+- infix
+- infixl
+- infixr
+- instance
+- let
+- mdo
+- module
+- newtype
+- of
+- proc
+- qualified
+- rec
+- then
+- type
+- where
+
diff --git a/docs/generators/html.md b/docs/generators/html.md
index 0c75b44dd0..d538d0f91d 100644
--- a/docs/generators/html.md
+++ b/docs/generators/html.md
@@ -5,18 +5,38 @@ sidebar_label: html
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|appName|short name of the application| |null|
|appDescription|description of the application| |null|
-|infoUrl|a URL where users can get more information about the application| |null|
-|infoEmail|an email address to contact for inquiries about the application| |null|
-|licenseInfo|a short description of the license| |null|
-|licenseUrl|a URL pointing to the full license| |null|
-|invokerPackage|root package for generated code| |null|
-|groupId|groupId in generated pom.xml| |null|
+|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|
+|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|
+|infoUrl|a URL where users can get more information about the application| |null|
+|invokerPackage|root package for generated code| |null|
+|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|
+|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+
+
+## RESERVED WORDS
+
+
diff --git a/docs/generators/html2.md b/docs/generators/html2.md
index 3b7775d5fc..82374353c4 100644
--- a/docs/generators/html2.md
+++ b/docs/generators/html2.md
@@ -5,22 +5,42 @@ sidebar_label: html2
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|appName|short name of the application| |null|
|appDescription|description of the application| |null|
-|infoUrl|a URL where users can get more information about the application| |null|
-|infoEmail|an email address to contact for inquiries about the application| |null|
-|licenseInfo|a short description of the license| |null|
-|licenseUrl|a URL pointing to the full license| |null|
-|invokerPackage|root package for generated code| |null|
-|phpInvokerPackage|root package for generated php code| |null|
-|perlModuleName|root module name for generated perl code| |null|
-|pythonPackageName|package name for generated python code| |null|
-|packageName|C# package name| |null|
-|groupId|groupId in generated pom.xml| |null|
+|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|
+|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|
+|infoUrl|a URL where users can get more information about the application| |null|
+|invokerPackage|root package for generated code| |null|
+|licenseInfo|a short description of the license| |null|
+|licenseUrl|a URL pointing to the full license| |null|
+|packageName|C# package name| |null|
+|perlModuleName|root module name for generated perl code| |null|
+|phpInvokerPackage|root package for generated php code| |null|
+|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
+|pythonPackageName|package name for generated python code| |null|
+|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+
+
+## RESERVED WORDS
+
+
diff --git a/docs/generators/java-inflector.md b/docs/generators/java-inflector.md
index f50718a448..9a0da4b39a 100644
--- a/docs/generators/java-inflector.md
+++ b/docs/generators/java-inflector.md
@@ -5,40 +5,157 @@ sidebar_label: java-inflector
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |org.openapitools.model|
|apiPackage|package for generated api classes| |org.openapitools.controllers|
-|invokerPackage|root package for generated code| |org.openapitools.controllers|
-|groupId|groupId in generated pom.xml| |org.openapitools|
-|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-inflector-server|
-|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
-|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
|artifactDescription|artifact description in generated pom.xml| |OpenAPI Java|
+|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-inflector-server|
+|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
+|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
+|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
+|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|legacy|
+|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
+|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
+|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|
+|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|
+|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.controllers|
+|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
+|licenseName|The name of the license| |Unlicense|
+|licenseUrl|The URL of the license| |http://unlicense.org|
+|modelPackage|package for generated models| |org.openapitools.model|
+|parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
+|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|
+|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|
|scmUrl|SCM URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
-|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
-|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
-|developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
-|developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
-|licenseName|The name of the license| |Unlicense|
-|licenseUrl|The URL of the license| |http://unlicense.org|
-|sourceFolder|source folder for generated code| |src/gen/java|
|serializableModel|boolean - toggle "implements Serializable" for generated models| |false|
-|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
-|fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
-|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |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|
-|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|legacy|
-|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
-|disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|booleanGetterPrefix|Set booleanGetterPrefix| |get|
-|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
-|parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
-|parentArtifactId|parent artifactId 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|
|snapshotVersion|Uses a SNAPSHOT version.|- **true**
- Use a SnapShot Version
- **false**
- Use a Release Version
|null|
+|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+|sourceFolder|source folder for generated code| |src/gen/java|
+|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
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|ArrayList|
+|map|HashMap|
+
+
+## LANGUAGE PRIMITIVES
+
+- Boolean
+- Double
+- Float
+- Integer
+- Long
+- Object
+- String
+- boolean
+- byte[]
+
+
+## RESERVED WORDS
+
+- abstract
+- apiclient
+- apiexception
+- apiresponse
+- assert
+- boolean
+- break
+- byte
+- case
+- catch
+- char
+- class
+- configuration
+- const
+- continue
+- default
+- do
+- double
+- else
+- enum
+- extends
+- final
+- finally
+- float
+- for
+- goto
+- if
+- implements
+- import
+- instanceof
+- int
+- interface
+- localreturntype
+- localvaraccept
+- localvaraccepts
+- localvarauthnames
+- localvarcollectionqueryparams
+- localvarcontenttype
+- localvarcontenttypes
+- localvarcookieparams
+- localvarformparams
+- localvarheaderparams
+- localvarpath
+- localvarpostbody
+- localvarqueryparams
+- long
+- native
+- new
+- null
+- object
+- package
+- private
+- protected
+- public
+- return
+- short
+- static
+- strictfp
+- stringutil
+- super
+- switch
+- synchronized
+- this
+- throw
+- throws
+- transient
+- try
+- void
+- volatile
+- while
+
diff --git a/docs/generators/java-msf4j.md b/docs/generators/java-msf4j.md
index d6f8235503..d0ecb290ff 100644
--- a/docs/generators/java-msf4j.md
+++ b/docs/generators/java-msf4j.md
@@ -5,45 +5,162 @@ sidebar_label: java-msf4j
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |org.openapitools.model|
|apiPackage|package for generated api classes| |org.openapitools.api|
-|invokerPackage|root package for generated code| |org.openapitools.api|
-|groupId|groupId in generated pom.xml| |org.openapitools|
-|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-jaxrs-server|
-|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
-|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
|artifactDescription|artifact description in generated pom.xml| |OpenAPI Java|
+|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-jaxrs-server|
+|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
+|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
+|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
+|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|legacy|
+|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
+|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
+|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|
+|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|
+|groupId|groupId in generated pom.xml| |org.openapitools|
+|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
+|implFolder|folder for generated implementation code| |src/main/java|
+|invokerPackage|root package for generated code| |org.openapitools.api|
+|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
+|library|library template (sub-template)|- **jersey1**
- Jersey core 1.x
- **jersey2**
- Jersey core 2.x
|jersey2|
+|licenseName|The name of the license| |Unlicense|
+|licenseUrl|The URL of the license| |http://unlicense.org|
+|modelPackage|package for generated models| |org.openapitools.model|
+|parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
+|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|
+|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|
|scmUrl|SCM URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
-|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
-|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
-|developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
-|developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
-|licenseName|The name of the license| |Unlicense|
-|licenseUrl|The URL of the license| |http://unlicense.org|
-|sourceFolder|source folder for generated code| |src/main/java|
|serializableModel|boolean - toggle "implements Serializable" for generated models| |false|
-|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
-|fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
-|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |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|
-|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|legacy|
-|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
-|disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|booleanGetterPrefix|Set booleanGetterPrefix| |get|
-|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
-|parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
-|parentArtifactId|parent artifactId 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|
+|serverPort|The port on which the server should be started| |8080|
|snapshotVersion|Uses a SNAPSHOT version.|- **true**
- Use a SnapShot Version
- **false**
- Use a Release Version
|null|
-|implFolder|folder for generated implementation code| |src/main/java|
+|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+|sourceFolder|source folder for generated code| |src/main/java|
|title|a title describing the application| |OpenAPI Server|
|useBeanValidation|Use BeanValidation API annotations| |true|
-|serverPort|The port on which the server should be started| |8080|
-|library|library template (sub-template)|- **jersey1**
- Jersey core 1.x
- **jersey2**
- Jersey core 2.x
|jersey2|
+|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
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|ArrayList|
+|map|HashMap|
+
+
+## LANGUAGE PRIMITIVES
+
+- Boolean
+- Double
+- Float
+- Integer
+- Long
+- Object
+- String
+- boolean
+- byte[]
+
+
+## RESERVED WORDS
+
+- abstract
+- apiclient
+- apiexception
+- apiresponse
+- assert
+- boolean
+- break
+- byte
+- case
+- catch
+- char
+- class
+- configuration
+- const
+- continue
+- default
+- do
+- double
+- else
+- enum
+- extends
+- final
+- finally
+- float
+- for
+- goto
+- if
+- implements
+- import
+- instanceof
+- int
+- interface
+- localreturntype
+- localvaraccept
+- localvaraccepts
+- localvarauthnames
+- localvarcollectionqueryparams
+- localvarcontenttype
+- localvarcontenttypes
+- localvarcookieparams
+- localvarformparams
+- localvarheaderparams
+- localvarpath
+- localvarpostbody
+- localvarqueryparams
+- long
+- native
+- new
+- null
+- object
+- package
+- private
+- protected
+- public
+- return
+- short
+- static
+- strictfp
+- stringutil
+- super
+- switch
+- synchronized
+- this
+- throw
+- throws
+- transient
+- try
+- void
+- volatile
+- while
+
diff --git a/docs/generators/java-pkmst.md b/docs/generators/java-pkmst.md
index a9ef34390f..8ab96c097d 100644
--- a/docs/generators/java-pkmst.md
+++ b/docs/generators/java-pkmst.md
@@ -5,47 +5,164 @@ sidebar_label: java-pkmst
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |com.prokarma.pkmst.model|
|apiPackage|package for generated api classes| |com.prokarma.pkmst.controller|
-|invokerPackage|root package for generated code| |com.prokarma.pkmst.controller|
-|groupId|groupId in generated pom.xml| |com.prokarma|
-|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |pkmst-microservice|
-|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
-|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
|artifactDescription|artifact description in generated pom.xml| |OpenAPI Java|
+|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |pkmst-microservice|
+|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
+|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
+|basePackage|base package for java source code| |null|
+|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
+|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|threetenbp|
+|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
+|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
+|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|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|eurekaUri|Eureka URI| |null|
+|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| |com.prokarma|
+|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
+|invokerPackage|root package for generated code| |com.prokarma.pkmst.controller|
+|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
+|licenseName|The name of the license| |Unlicense|
+|licenseUrl|The URL of the license| |http://unlicense.org|
+|modelPackage|package for generated models| |com.prokarma.pkmst.model|
+|parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
+|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|
+|pkmstInterceptor|PKMST Interceptor| |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|
|scmUrl|SCM URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
-|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
-|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
-|developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
-|developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
-|licenseName|The name of the license| |Unlicense|
-|licenseUrl|The URL of the license| |http://unlicense.org|
-|sourceFolder|source folder for generated code| |src/main/java|
|serializableModel|boolean - toggle "implements Serializable" for generated models| |false|
-|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
-|fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
-|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |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|
-|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|threetenbp|
-|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
-|disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|booleanGetterPrefix|Set booleanGetterPrefix| |get|
-|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
-|parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
-|parentArtifactId|parent artifactId 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|
-|snapshotVersion|Uses a SNAPSHOT version.|- **true**
- Use a SnapShot Version
- **false**
- Use a Release Version
|null|
-|basePackage|base package for java source code| |null|
|serviceName|Service Name| |null|
-|title|server title name or client service name| |null|
-|eurekaUri|Eureka URI| |null|
-|zipkinUri|Zipkin URI| |null|
+|snapshotVersion|Uses a SNAPSHOT version.|- **true**
- Use a SnapShot Version
- **false**
- Use a Release Version
|null|
+|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+|sourceFolder|source folder for generated code| |src/main/java|
|springBootAdminUri|Spring-Boot URI| |null|
-|pkmstInterceptor|PKMST Interceptor| |null|
+|title|server title name or client service name| |null|
+|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|
+|zipkinUri|Zipkin URI| |null|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|ArrayList|
+|map|HashMap|
+
+
+## LANGUAGE PRIMITIVES
+
+- Boolean
+- Double
+- Float
+- Integer
+- Long
+- Object
+- String
+- boolean
+- byte[]
+
+
+## RESERVED WORDS
+
+- abstract
+- apiclient
+- apiexception
+- apiresponse
+- assert
+- boolean
+- break
+- byte
+- case
+- catch
+- char
+- class
+- configuration
+- const
+- continue
+- default
+- do
+- double
+- else
+- enum
+- extends
+- final
+- finally
+- float
+- for
+- goto
+- if
+- implements
+- import
+- instanceof
+- int
+- interface
+- localreturntype
+- localvaraccept
+- localvaraccepts
+- localvarauthnames
+- localvarcollectionqueryparams
+- localvarcontenttype
+- localvarcontenttypes
+- localvarcookieparams
+- localvarformparams
+- localvarheaderparams
+- localvarpath
+- localvarpostbody
+- localvarqueryparams
+- long
+- native
+- new
+- null
+- object
+- package
+- private
+- protected
+- public
+- return
+- short
+- static
+- strictfp
+- stringutil
+- super
+- switch
+- synchronized
+- this
+- throw
+- throws
+- transient
+- try
+- void
+- volatile
+- while
+
diff --git a/docs/generators/java-play-framework.md b/docs/generators/java-play-framework.md
index bb4fb690a2..c087518409 100644
--- a/docs/generators/java-play-framework.md
+++ b/docs/generators/java-play-framework.md
@@ -5,49 +5,166 @@ sidebar_label: java-play-framework
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |apimodels|
|apiPackage|package for generated api classes| |controllers|
-|invokerPackage|root package for generated code| |org.openapitools.api|
-|groupId|groupId in generated pom.xml| |org.openapitools|
-|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-java-playframework|
-|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
-|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
|artifactDescription|artifact description in generated pom.xml| |OpenAPI Java|
+|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-java-playframework|
+|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
+|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
+|basePackage|base package for generated code| |org.openapitools|
+|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
+|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|configPackage|configuration package for generated code| |org.openapitools.configuration|
+|controllerOnly|Whether to generate only API interface stubs without the server files.| |false|
+|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|threetenbp|
+|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
+|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
+|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|
+|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|
+|groupId|groupId in generated pom.xml| |org.openapitools|
+|handleExceptions|Add a 'throw exception' to each controller function. Add also a custom error handler where you can put your custom logic| |true|
+|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
+|invokerPackage|root package for generated code| |org.openapitools.api|
+|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
+|licenseName|The name of the license| |Unlicense|
+|licenseUrl|The URL of the license| |http://unlicense.org|
+|modelPackage|package for generated models| |apimodels|
+|parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
+|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|
+|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|
|scmUrl|SCM URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
-|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
-|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
-|developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
-|developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
-|licenseName|The name of the license| |Unlicense|
-|licenseUrl|The URL of the license| |http://unlicense.org|
-|sourceFolder|source folder for generated code| |/app|
|serializableModel|boolean - toggle "implements Serializable" for generated models| |false|
-|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
-|fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
-|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |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|
-|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|threetenbp|
-|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
-|disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|booleanGetterPrefix|Set booleanGetterPrefix| |get|
-|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
-|parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
-|parentArtifactId|parent artifactId 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|
|snapshotVersion|Uses a SNAPSHOT version.|- **true**
- Use a SnapShot Version
- **false**
- Use a Release Version
|null|
+|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| |/app|
|title|server title name or client service name| |openapi-java-playframework|
-|configPackage|configuration package for generated code| |org.openapitools.configuration|
-|basePackage|base package for generated code| |org.openapitools|
-|controllerOnly|Whether to generate only API interface stubs without the server files.| |false|
|useBeanValidation|Use BeanValidation API annotations| |true|
|useInterfaces|Makes the controllerImp implements an interface to facilitate automatic completion when updating from version x to y of your spec| |true|
-|handleExceptions|Add a 'throw exception' to each controller function. Add also a custom error handler where you can put your custom logic| |true|
-|wrapCalls|Add a wrapper to each controller function to handle things like metrics, response modification, etc..| |true|
|useSwaggerUI|Add a route to /api which show your documentation in swagger-ui. Will also import needed dependencies| |true|
+|withXml|whether to include support for application/xml content type and include XML annotations in the model (works with libraries that provide support for JSON and XML)| |false|
+|wrapCalls|Add a wrapper to each controller function to handle things like metrics, response modification, etc..| |true|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|ArrayList|
+|map|HashMap|
+
+
+## LANGUAGE PRIMITIVES
+
+- Boolean
+- Double
+- Float
+- Integer
+- Long
+- Object
+- String
+- boolean
+- byte[]
+
+
+## RESERVED WORDS
+
+- abstract
+- apiclient
+- apiexception
+- apiresponse
+- assert
+- boolean
+- break
+- byte
+- case
+- catch
+- char
+- class
+- configuration
+- const
+- continue
+- default
+- do
+- double
+- else
+- enum
+- extends
+- final
+- finally
+- float
+- for
+- goto
+- if
+- implements
+- import
+- instanceof
+- int
+- interface
+- localreturntype
+- localvaraccept
+- localvaraccepts
+- localvarauthnames
+- localvarcollectionqueryparams
+- localvarcontenttype
+- localvarcontenttypes
+- localvarcookieparams
+- localvarformparams
+- localvarheaderparams
+- localvarpath
+- localvarpostbody
+- localvarqueryparams
+- long
+- native
+- new
+- null
+- object
+- package
+- private
+- protected
+- public
+- return
+- short
+- static
+- strictfp
+- stringutil
+- super
+- switch
+- synchronized
+- this
+- throw
+- throws
+- transient
+- try
+- void
+- volatile
+- while
+
diff --git a/docs/generators/java-undertow-server.md b/docs/generators/java-undertow-server.md
index dd4bac2ca0..3e13225d8d 100644
--- a/docs/generators/java-undertow-server.md
+++ b/docs/generators/java-undertow-server.md
@@ -5,40 +5,157 @@ sidebar_label: java-undertow-server
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |null|
|apiPackage|package for generated api classes| |null|
-|invokerPackage|root package for generated code| |org.openapitools.handler|
-|groupId|groupId in generated pom.xml| |org.openapitools|
-|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-undertow-server|
-|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
-|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
|artifactDescription|artifact description in generated pom.xml| |OpenAPI Java|
+|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-undertow-server|
+|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
+|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
+|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
+|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|legacy|
+|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
+|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
+|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|
+|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|
+|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.handler|
+|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
+|licenseName|The name of the license| |Unlicense|
+|licenseUrl|The URL of the license| |http://unlicense.org|
+|modelPackage|package for generated models| |null|
+|parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
+|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|
+|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|
|scmUrl|SCM URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
-|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
-|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
-|developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
-|developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
-|licenseName|The name of the license| |Unlicense|
-|licenseUrl|The URL of the license| |http://unlicense.org|
-|sourceFolder|source folder for generated code| |src/main/java|
|serializableModel|boolean - toggle "implements Serializable" for generated models| |false|
-|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
-|fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
-|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |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|
-|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|legacy|
-|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
-|disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|booleanGetterPrefix|Set booleanGetterPrefix| |get|
-|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
-|parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
-|parentArtifactId|parent artifactId 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|
|snapshotVersion|Uses a SNAPSHOT version.|- **true**
- Use a SnapShot Version
- **false**
- Use a Release Version
|null|
+|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+|sourceFolder|source folder for generated code| |src/main/java|
+|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
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|ArrayList|
+|map|HashMap|
+
+
+## LANGUAGE PRIMITIVES
+
+- Boolean
+- Double
+- Float
+- Integer
+- Long
+- Object
+- String
+- boolean
+- byte[]
+
+
+## RESERVED WORDS
+
+- abstract
+- apiclient
+- apiexception
+- apiresponse
+- assert
+- boolean
+- break
+- byte
+- case
+- catch
+- char
+- class
+- configuration
+- const
+- continue
+- default
+- do
+- double
+- else
+- enum
+- extends
+- final
+- finally
+- float
+- for
+- goto
+- if
+- implements
+- import
+- instanceof
+- int
+- interface
+- localreturntype
+- localvaraccept
+- localvaraccepts
+- localvarauthnames
+- localvarcollectionqueryparams
+- localvarcontenttype
+- localvarcontenttypes
+- localvarcookieparams
+- localvarformparams
+- localvarheaderparams
+- localvarpath
+- localvarpostbody
+- localvarqueryparams
+- long
+- native
+- new
+- null
+- object
+- package
+- private
+- protected
+- public
+- return
+- short
+- static
+- strictfp
+- stringutil
+- super
+- switch
+- synchronized
+- this
+- throw
+- throws
+- transient
+- try
+- void
+- volatile
+- while
+
diff --git a/docs/generators/java-vertx-web.md b/docs/generators/java-vertx-web.md
index 2cc47cad07..584fae2dc2 100644
--- a/docs/generators/java-vertx-web.md
+++ b/docs/generators/java-vertx-web.md
@@ -5,40 +5,157 @@ sidebar_label: java-vertx-web
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |org.openapitools.vertxweb.server.model|
|apiPackage|package for generated api classes| |org.openapitools.vertxweb.server.api|
-|invokerPackage|root package for generated code| |org.openapitools.vertxweb.server|
-|groupId|groupId in generated pom.xml| |org.openapitools|
-|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-java-vertx-web-server|
-|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0-SNAPSHOT|
-|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
|artifactDescription|artifact description in generated pom.xml| |OpenAPI Java|
+|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-java-vertx-web-server|
+|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
+|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0-SNAPSHOT|
+|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
+|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|java8|
+|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
+|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
+|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|
+|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|
+|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.vertxweb.server|
+|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
+|licenseName|The name of the license| |Unlicense|
+|licenseUrl|The URL of the license| |http://unlicense.org|
+|modelPackage|package for generated models| |org.openapitools.vertxweb.server.model|
+|parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
+|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|
+|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|
|scmUrl|SCM URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
-|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
-|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
-|developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
-|developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
-|licenseName|The name of the license| |Unlicense|
-|licenseUrl|The URL of the license| |http://unlicense.org|
-|sourceFolder|source folder for generated code| |src/main/java|
|serializableModel|boolean - toggle "implements Serializable" for generated models| |false|
-|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
-|fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
-|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |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|
-|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|java8|
-|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
-|disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|booleanGetterPrefix|Set booleanGetterPrefix| |get|
-|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
-|parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
-|parentArtifactId|parent artifactId 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|
|snapshotVersion|Uses a SNAPSHOT version.|- **true**
- Use a SnapShot Version
- **false**
- Use a Release Version
|null|
+|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+|sourceFolder|source folder for generated code| |src/main/java|
+|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
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|ArrayList|
+|map|HashMap|
+
+
+## LANGUAGE PRIMITIVES
+
+- Boolean
+- Double
+- Float
+- Integer
+- Long
+- Object
+- String
+- boolean
+- byte[]
+
+
+## RESERVED WORDS
+
+- abstract
+- apiclient
+- apiexception
+- apiresponse
+- assert
+- boolean
+- break
+- byte
+- case
+- catch
+- char
+- class
+- configuration
+- const
+- continue
+- default
+- do
+- double
+- else
+- enum
+- extends
+- final
+- finally
+- float
+- for
+- goto
+- if
+- implements
+- import
+- instanceof
+- int
+- interface
+- localreturntype
+- localvaraccept
+- localvaraccepts
+- localvarauthnames
+- localvarcollectionqueryparams
+- localvarcontenttype
+- localvarcontenttypes
+- localvarcookieparams
+- localvarformparams
+- localvarheaderparams
+- localvarpath
+- localvarpostbody
+- localvarqueryparams
+- long
+- native
+- new
+- null
+- object
+- package
+- private
+- protected
+- public
+- return
+- short
+- static
+- strictfp
+- stringutil
+- super
+- switch
+- synchronized
+- this
+- throw
+- throws
+- transient
+- try
+- void
+- volatile
+- while
+
diff --git a/docs/generators/java-vertx.md b/docs/generators/java-vertx.md
index 1ad7527103..ea93520b0b 100644
--- a/docs/generators/java-vertx.md
+++ b/docs/generators/java-vertx.md
@@ -5,43 +5,160 @@ sidebar_label: java-vertx
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |org.openapitools.server.api.model|
|apiPackage|package for generated api classes| |org.openapitools.server.api.verticle|
-|invokerPackage|root package for generated code| |org.openapitools|
-|groupId|groupId in generated pom.xml| |org.openapitools|
-|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-java-vertx-server|
-|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0-SNAPSHOT|
-|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
|artifactDescription|artifact description in generated pom.xml| |OpenAPI Java|
+|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-java-vertx-server|
+|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
+|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0-SNAPSHOT|
+|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
+|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|java8|
+|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
+|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
+|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|
+|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|
+|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|
+|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
+|licenseName|The name of the license| |Unlicense|
+|licenseUrl|The URL of the license| |http://unlicense.org|
+|modelPackage|package for generated models| |org.openapitools.server.api.model|
+|parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
+|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|
+|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
+|rxInterface|When specified, API interfaces are generated with RX and methods return Single<> and Comparable.| |false|
+|rxVersion2|When specified in combination with rxInterface, API interfaces are generated with RxJava2.| |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|
|scmUrl|SCM URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
-|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
-|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
-|developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
-|developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
-|licenseName|The name of the license| |Unlicense|
-|licenseUrl|The URL of the license| |http://unlicense.org|
-|sourceFolder|source folder for generated code| |src/main/java|
|serializableModel|boolean - toggle "implements Serializable" for generated models| |false|
-|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
-|fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
-|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |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|
-|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|java8|
-|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
-|disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|booleanGetterPrefix|Set booleanGetterPrefix| |get|
-|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
-|parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
-|parentArtifactId|parent artifactId 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|
|snapshotVersion|Uses a SNAPSHOT version.|- **true**
- Use a SnapShot Version
- **false**
- Use a Release Version
|null|
-|rxInterface|When specified, API interfaces are generated with RX and methods return Single<> and Comparable.| |false|
-|rxVersion2|When specified in combination with rxInterface, API interfaces are generated with RxJava2.| |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|
+|sourceFolder|source folder for generated code| |src/main/java|
|vertxSwaggerRouterVersion|Specify the version of the swagger router library| |null|
+|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
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|ArrayList|
+|map|HashMap|
+
+
+## LANGUAGE PRIMITIVES
+
+- Boolean
+- Double
+- Float
+- Integer
+- Long
+- Object
+- String
+- boolean
+- byte[]
+
+
+## RESERVED WORDS
+
+- abstract
+- apiclient
+- apiexception
+- apiresponse
+- assert
+- boolean
+- break
+- byte
+- case
+- catch
+- char
+- class
+- configuration
+- const
+- continue
+- default
+- do
+- double
+- else
+- enum
+- extends
+- final
+- finally
+- float
+- for
+- goto
+- if
+- implements
+- import
+- instanceof
+- int
+- interface
+- localreturntype
+- localvaraccept
+- localvaraccepts
+- localvarauthnames
+- localvarcollectionqueryparams
+- localvarcontenttype
+- localvarcontenttypes
+- localvarcookieparams
+- localvarformparams
+- localvarheaderparams
+- localvarpath
+- localvarpostbody
+- localvarqueryparams
+- long
+- native
+- new
+- null
+- object
+- package
+- private
+- protected
+- public
+- return
+- short
+- static
+- strictfp
+- stringutil
+- super
+- switch
+- synchronized
+- this
+- throw
+- throws
+- transient
+- try
+- void
+- volatile
+- while
+
diff --git a/docs/generators/java.md b/docs/generators/java.md
index 9c267d17fb..fddd7ba9ff 100644
--- a/docs/generators/java.md
+++ b/docs/generators/java.md
@@ -5,55 +5,172 @@ sidebar_label: java
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |org.openapitools.client.model|
|apiPackage|package for generated api classes| |org.openapitools.client.api|
-|invokerPackage|root package for generated code| |org.openapitools.client|
-|groupId|groupId in generated pom.xml| |org.openapitools|
-|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-java-client|
-|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
-|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
|artifactDescription|artifact description in generated pom.xml| |OpenAPI Java|
+|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-java-client|
+|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
+|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
+|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
+|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|caseInsensitiveResponseHeaders|Make API response's headers case-insensitive. Available on okhttp-gson, jersey2 libraries| |false|
+|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|threetenbp|
+|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
+|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
+|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|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|feignVersion|Version of OpenFeign: '10.x', '9.x' (default)| |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|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
+|library|library template (sub-template) to use|- **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.
- **jersey2**
- HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.9.x
- **feign**
- HTTP client: OpenFeign 9.x or 10.x. JSON processing: Jackson 2.9.x. To enable OpenFeign 10.x, set the 'feignVersion' option to '10.x'
- **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'.
- **retrofit**
- HTTP client: OkHttp 2.x. JSON processing: Gson 2.x (Retrofit 1.9.0). IMPORTANT NOTE: retrofit1.x is no longer actively maintained so please upgrade to 'retrofit2' instead.
- **retrofit2**
- 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)
- **resttemplate**
- HTTP client: Spring RestTemplate 4.x. JSON processing: Jackson 2.9.x
- **webclient**
- HTTP client: Spring WebClient 5.x. JSON processing: Jackson 2.9.x
- **resteasy**
- HTTP client: Resteasy client 3.x. JSON processing: Jackson 2.9.x
- **vertx**
- HTTP client: VertX client 3.x. JSON processing: Jackson 2.9.x
- **google-api-client**
- HTTP client: Google API client 1.x. JSON processing: Jackson 2.9.x
- **rest-assured**
- HTTP client: rest-assured : 4.x. JSON processing: Gson 2.x or Jackson 2.9.x. Only for Java8
- **native**
- HTTP client: Java native HttpClient. JSON processing: Jackson 2.9.x. Only for Java11+
- **microprofile**
- HTTP client: Microprofile client X.x. JSON processing: Jackson 2.9.x
|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|
+|parcelableModel|Whether to generate models for Android that implement Parcelable with the okhttp-gson library.| |false|
+|parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
+|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 "play24", "play25" (default), "play26")| |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|
|scmUrl|SCM URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
-|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
-|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
-|developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
-|developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
-|licenseName|The name of the license| |Unlicense|
-|licenseUrl|The URL of the license| |http://unlicense.org|
-|sourceFolder|source folder for generated code| |src/main/java|
|serializableModel|boolean - toggle "implements Serializable" for generated models| |false|
-|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
-|fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
-|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |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|
-|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|threetenbp|
-|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
-|disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|booleanGetterPrefix|Set booleanGetterPrefix| |get|
-|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
-|parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
-|parentArtifactId|parent artifactId 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|
+|serializationLibrary|Serialization library, default depends from the library|- **jackson**
- Use Jackson as serialization library
- **gson**
- Use Gson as serialization library
|null|
|snapshotVersion|Uses a SNAPSHOT version.|- **true**
- Use a SnapShot Version
- **false**
- Use a Release Version
|null|
-|useRxJava|Whether to use the RxJava adapter with the retrofit2 library.| |false|
-|useRxJava2|Whether to use the RxJava2 adapter with the retrofit2 library.| |false|
-|parcelableModel|Whether to generate models for Android that implement Parcelable with the okhttp-gson library.| |false|
-|usePlayWS|Use Play! Async HTTP client (Play WS API)| |false|
-|playVersion|Version of Play! Framework (possible values "play24", "play25" (default), "play26")| |null|
+|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+|sourceFolder|source folder for generated code| |src/main/java|
|supportJava6|Whether to support Java6 with the Jersey1 library.| |false|
|useBeanValidation|Use BeanValidation API annotations| |false|
-|performBeanValidation|Perform BeanValidation| |false|
|useGzipFeature|Send gzip-encoded requests| |false|
-|useRuntimeException|Use RuntimeException instead of Exception| |false|
-|feignVersion|Version of OpenFeign: '10.x', '9.x' (default)| |false|
+|usePlayWS|Use Play! Async HTTP client (Play WS API)| |false|
|useReflectionEqualsHashCode|Use org.apache.commons.lang3.builder for equals and hashCode in the models. WARNING: This will fail under a security manager, unless the appropriate permissions are set up correctly and also there's potential performance impact.| |false|
-|caseInsensitiveResponseHeaders|Make API response's headers case-insensitive. Available on okhttp-gson, jersey2 libraries| |false|
-|library|library template (sub-template) to use|- **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.
- **jersey2**
- HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.9.x
- **feign**
- HTTP client: OpenFeign 9.x or 10.x. JSON processing: Jackson 2.9.x. To enable OpenFeign 10.x, set the 'feignVersion' option to '10.x'
- **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'.
- **retrofit**
- HTTP client: OkHttp 2.x. JSON processing: Gson 2.x (Retrofit 1.9.0). IMPORTANT NOTE: retrofit1.x is no longer actively maintained so please upgrade to 'retrofit2' instead.
- **retrofit2**
- 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)
- **resttemplate**
- HTTP client: Spring RestTemplate 4.x. JSON processing: Jackson 2.9.x
- **webclient**
- HTTP client: Spring WebClient 5.x. JSON processing: Jackson 2.9.x
- **resteasy**
- HTTP client: Resteasy client 3.x. JSON processing: Jackson 2.9.x
- **vertx**
- HTTP client: VertX client 3.x. JSON processing: Jackson 2.9.x
- **google-api-client**
- HTTP client: Google API client 1.x. JSON processing: Jackson 2.9.x
- **rest-assured**
- HTTP client: rest-assured : 4.x. JSON processing: Gson 2.x or Jackson 2.9.x. Only for Java8
- **native**
- HTTP client: Java native HttpClient. JSON processing: Jackson 2.9.x. Only for Java11+
- **microprofile**
- HTTP client: Microprofile client X.x. JSON processing: Jackson 2.9.x
|okhttp-gson|
-|serializationLibrary|Serialization library, default depends from the library|- **jackson**
- Use Jackson as serialization library
- **gson**
- Use Gson as serialization library
|null|
+|useRuntimeException|Use RuntimeException instead of Exception| |false|
+|useRxJava|Whether to use the RxJava adapter with the retrofit2 library.| |false|
+|useRxJava2|Whether to use the RxJava2 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
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|ArrayList|
+|map|HashMap|
+
+
+## LANGUAGE PRIMITIVES
+
+- Boolean
+- Double
+- Float
+- Integer
+- Long
+- Object
+- String
+- boolean
+- byte[]
+
+
+## RESERVED WORDS
+
+- abstract
+- apiclient
+- apiexception
+- apiresponse
+- assert
+- boolean
+- break
+- byte
+- case
+- catch
+- char
+- class
+- configuration
+- const
+- continue
+- default
+- do
+- double
+- else
+- enum
+- extends
+- final
+- finally
+- float
+- for
+- goto
+- if
+- implements
+- import
+- instanceof
+- int
+- interface
+- localreturntype
+- localvaraccept
+- localvaraccepts
+- localvarauthnames
+- localvarcollectionqueryparams
+- localvarcontenttype
+- localvarcontenttypes
+- localvarcookieparams
+- localvarformparams
+- localvarheaderparams
+- localvarpath
+- localvarpostbody
+- localvarqueryparams
+- long
+- native
+- new
+- null
+- object
+- package
+- private
+- protected
+- public
+- return
+- short
+- static
+- strictfp
+- stringutil
+- super
+- switch
+- synchronized
+- this
+- throw
+- throws
+- transient
+- try
+- void
+- volatile
+- while
+
diff --git a/docs/generators/javascript-closure-angular.md b/docs/generators/javascript-closure-angular.md
index 20c4048fec..0308a0a824 100644
--- a/docs/generators/javascript-closure-angular.md
+++ b/docs/generators/javascript-closure-angular.md
@@ -5,10 +5,81 @@ sidebar_label: javascript-closure-angular
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
+|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|
+|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|
|useEs6|use ES6 templates| |false|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|Array|
+
+
+## LANGUAGE PRIMITIVES
+
+- Blob
+- Date
+- Object
+- boolean
+- number
+- string
+
+
+## RESERVED WORDS
+
+- abstract
+- assert
+- break
+- byte
+- case
+- catch
+- char
+- class
+- const
+- continue
+- default
+- do
+- double
+- else
+- enum
+- extends
+- final
+- finally
+- for
+- goto
+- if
+- implements
+- import
+- instanceof
+- int
+- interface
+- new
+- package
+- private
+- protected
+- public
+- return
+- short
+- static
+- super
+- switch
+- synchronized
+- this
+- throw
+- throws
+- transient
+- try
+- void
+- while
+
diff --git a/docs/generators/javascript-flowtyped.md b/docs/generators/javascript-flowtyped.md
index f5fb5207f4..0946f51912 100644
--- a/docs/generators/javascript-flowtyped.md
+++ b/docs/generators/javascript-flowtyped.md
@@ -5,14 +5,131 @@ sidebar_label: javascript-flowtyped
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase|
-|supportsES6|Generate code that conforms to ES6.| |false|
|npmName|The name under which you want to publish generated npm package. Required to generate a full package| |null|
-|npmVersion|The version of your npm package. If not provided, using the version from the OpenAPI specification file.| |1.0.0|
-|snapshot|When setting this property to true, the version will be suffixed with -SNAPSHOT.yyyyMMddHHmm| |false|
|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|
+|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|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|Array|
+|list|Array|
+|map|Object|
+
+
+## LANGUAGE PRIMITIVES
+
+- Array
+- Blob
+- Date
+- File
+- Object
+- boolean
+- number
+- string
+
+
+## RESERVED WORDS
+
+- abstract
+- arguments
+- array
+- boolean
+- break
+- byte
+- case
+- catch
+- char
+- class
+- const
+- continue
+- date
+- debugger
+- default
+- delete
+- do
+- double
+- else
+- enum
+- eval
+- export
+- extends
+- false
+- final
+- finally
+- float
+- for
+- formparams
+- function
+- goto
+- hasownproperty
+- headerparams
+- if
+- implements
+- import
+- in
+- infinity
+- instanceof
+- int
+- interface
+- isfinite
+- isnan
+- isprototypeof
+- let
+- long
+- math
+- nan
+- native
+- new
+- null
+- number
+- object
+- package
+- private
+- protected
+- prototype
+- public
+- queryparameters
+- requestoptions
+- return
+- short
+- static
+- string
+- super
+- switch
+- synchronized
+- this
+- throw
+- throws
+- tostring
+- transient
+- true
+- try
+- typeof
+- undefined
+- useformdata
+- valueof
+- var
+- varlocaldeferred
+- varlocalpath
+- void
+- volatile
+- while
+- with
+- yield
+
diff --git a/docs/generators/javascript.md b/docs/generators/javascript.md
index 23aa54a57b..7064b4a287 100644
--- a/docs/generators/javascript.md
+++ b/docs/generators/javascript.md
@@ -5,24 +5,135 @@ sidebar_label: javascript
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|sourceFolder|source folder for generated code| |src|
-|invokerPackage|root package for generated code| |null|
|apiPackage|package for generated api classes| |null|
-|modelPackage|package for generated models| |null|
-|projectName|name of the project (Default: generated from info.title or "openapi-js-client")| |null|
-|moduleName|module name for AMD, Node or globals (Default: generated from <projectName>)| |null|
-|projectDescription|description of the project (Default: using info.description or "Client library of <projectName>")| |null|
-|projectVersion|version of the project (Default: using info.version or "1.0.0")| |null|
-|licenseName|name of the license the project uses (Default: using info.license.name)| |null|
-|usePromises|use Promises as return values from the client API, instead of superagent callbacks| |false|
-|emitModelMethods|generate getters and setters for model properties| |false|
|emitJSDoc|generate JSDoc comments| |true|
-|useInheritance|use JavaScript prototype chains & delegation for inheritance| |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|
|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
-|useES6|use JavaScript ES6 (ECMAScript 6) (beta). Default is ES6.| |true|
+|invokerPackage|root package for generated code| |null|
+|licenseName|name of the license the project uses (Default: using info.license.name)| |null|
+|modelPackage|package for generated models| |null|
|modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase|
+|moduleName|module name for AMD, Node or globals (Default: generated from <projectName>)| |null|
+|npmRepository|Use this property to set an url your private npmRepo in the package.json| |null|
+|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
+|projectDescription|description of the project (Default: using info.description or "Client library of <projectName>")| |null|
+|projectName|name of the project (Default: generated from info.title or "openapi-js-client")| |null|
+|projectVersion|version of the project (Default: using info.version or "1.0.0")| |null|
+|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+|sourceFolder|source folder for generated code| |src|
+|useES6|use JavaScript ES6 (ECMAScript 6) (beta). Default is ES6.| |true|
+|useInheritance|use JavaScript prototype chains & delegation for inheritance| |true|
+|usePromises|use Promises as return values from the client API, instead of superagent callbacks| |false|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|Array|
+|list|Array|
+|map|Object|
+
+
+## LANGUAGE PRIMITIVES
+
+- Array
+- Blob
+- Boolean
+- Date
+- File
+- Number
+- Object
+- String
+
+
+## RESERVED WORDS
+
+- abstract
+- arguments
+- array
+- boolean
+- break
+- byte
+- case
+- catch
+- char
+- class
+- const
+- continue
+- date
+- debugger
+- default
+- delete
+- do
+- double
+- else
+- enum
+- eval
+- export
+- extends
+- false
+- final
+- finally
+- float
+- for
+- function
+- goto
+- hasownproperty
+- if
+- implements
+- import
+- in
+- infinity
+- instanceof
+- int
+- interface
+- isfinite
+- isnan
+- isprototypeof
+- let
+- long
+- math
+- nan
+- native
+- new
+- null
+- number
+- object
+- package
+- private
+- protected
+- prototype
+- public
+- return
+- short
+- static
+- string
+- super
+- switch
+- synchronized
+- this
+- throw
+- throws
+- tostring
+- transient
+- true
+- try
+- typeof
+- undefined
+- valueof
+- var
+- void
+- volatile
+- while
+- with
+- yield
+
diff --git a/docs/generators/jaxrs-cxf-cdi.md b/docs/generators/jaxrs-cxf-cdi.md
index ff8be78361..0842a00cce 100644
--- a/docs/generators/jaxrs-cxf-cdi.md
+++ b/docs/generators/jaxrs-cxf-cdi.md
@@ -5,51 +5,167 @@ sidebar_label: jaxrs-cxf-cdi
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |org.openapitools.model|
|apiPackage|package for generated api classes| |org.openapitools.api|
-|invokerPackage|root package for generated code| |org.openapitools.api|
-|groupId|groupId in generated pom.xml| |org.openapitools|
-|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-jaxrs-cxf-cdi-server|
-|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
-|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
|artifactDescription|artifact description in generated pom.xml| |OpenAPI Java|
+|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-jaxrs-cxf-cdi-server|
+|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
+|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
+|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
+|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|legacy|
+|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
+|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
+|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|
+|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|
+|generatePom|Whether to generate pom.xml if the file does not already exist.| |true|
+|groupId|groupId in generated pom.xml| |org.openapitools|
+|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
+|implFolder|folder for generated implementation code| |src/main/java|
+|interfaceOnly|Whether to generate only API interface stubs without the server files.| |false|
+|invokerPackage|root package for generated code| |org.openapitools.api|
+|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
+|library|library template (sub-template)|- **<default>**
- JAXRS spec only, to be deployed in an app server (TomEE, JBoss, WLS, ...)
- **quarkus**
- Server using Quarkus
- **thorntail**
- Server using Thorntail
- **openliberty**
- Server using Open Liberty
- **helidon**
- Server using Helidon
|<default>|
+|licenseName|The name of the license| |Unlicense|
+|licenseUrl|The URL of the license| |http://unlicense.org|
+|modelPackage|package for generated models| |org.openapitools.model|
+|openApiSpecFileLocation|Location where the file containing the spec will be generated in the output folder. No file generated when set to null or empty string.| |null|
+|parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
+|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|
+|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
+|returnResponse|Whether generate API interface should return javax.ws.rs.core.Response instead of a deserialized entity. Only useful if interfaceOnly is true.| |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|
|scmUrl|SCM URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
-|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
-|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
-|developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
-|developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
-|licenseName|The name of the license| |Unlicense|
-|licenseUrl|The URL of the license| |http://unlicense.org|
-|sourceFolder|source folder for generated code| |src/gen/java|
|serializableModel|boolean - toggle "implements Serializable" for generated models| |false|
-|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
-|fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
-|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |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|
-|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|legacy|
-|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
-|disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|booleanGetterPrefix|Set booleanGetterPrefix| |get|
-|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
-|parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
-|parentArtifactId|parent artifactId 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|
+|serverPort|The port on which the server should be started| |8080|
|snapshotVersion|Uses a SNAPSHOT version.|- **true**
- Use a SnapShot Version
- **false**
- Use a Release Version
|null|
-|implFolder|folder for generated implementation code| |src/main/java|
+|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+|sourceFolder|source folder for generated code| |src/gen/java|
|title|a title describing the application| |OpenAPI Server|
|useBeanValidation|Use BeanValidation API annotations| |true|
-|serverPort|The port on which the server should be started| |8080|
-|library|library template (sub-template)|- **<default>**
- JAXRS spec only, to be deployed in an app server (TomEE, JBoss, WLS, ...)
- **quarkus**
- Server using Quarkus
- **thorntail**
- Server using Thorntail
- **openliberty**
- Server using Open Liberty
- **helidon**
- Server using Helidon
|<default>|
-|generatePom|Whether to generate pom.xml if the file does not already exist.| |true|
-|interfaceOnly|Whether to generate only API interface stubs without the server files.| |false|
-|returnResponse|Whether generate API interface should return javax.ws.rs.core.Response instead of a deserialized entity. Only useful if interfaceOnly is true.| |false|
|useSwaggerAnnotations|Whether to generate Swagger annotations.| |true|
-|openApiSpecFileLocation|Location where the file containing the spec will be generated in the output folder. No file generated when set to null or empty string.| |null|
-|useBeanValidation|Use BeanValidation API annotations| |true|
+|withXml|whether to include support for application/xml content type and include XML annotations in the model (works with libraries that provide support for JSON and XML)| |false|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.LocalDate|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|ArrayList|
+|map|HashMap|
+
+
+## LANGUAGE PRIMITIVES
+
+- Boolean
+- Double
+- Float
+- Integer
+- Long
+- Object
+- String
+- boolean
+- byte[]
+
+
+## RESERVED WORDS
+
+- abstract
+- apiclient
+- apiexception
+- apiresponse
+- assert
+- boolean
+- break
+- byte
+- case
+- catch
+- char
+- class
+- configuration
+- const
+- continue
+- default
+- do
+- double
+- else
+- enum
+- extends
+- final
+- finally
+- float
+- for
+- goto
+- if
+- implements
+- import
+- instanceof
+- int
+- interface
+- localreturntype
+- localvaraccept
+- localvaraccepts
+- localvarauthnames
+- localvarcollectionqueryparams
+- localvarcontenttype
+- localvarcontenttypes
+- localvarcookieparams
+- localvarformparams
+- localvarheaderparams
+- localvarpath
+- localvarpostbody
+- localvarqueryparams
+- long
+- native
+- new
+- null
+- object
+- package
+- private
+- protected
+- public
+- return
+- short
+- static
+- strictfp
+- stringutil
+- super
+- switch
+- synchronized
+- this
+- throw
+- throws
+- transient
+- try
+- void
+- volatile
+- while
+
diff --git a/docs/generators/jaxrs-cxf-client.md b/docs/generators/jaxrs-cxf-client.md
index 401b13a22c..713ef85478 100644
--- a/docs/generators/jaxrs-cxf-client.md
+++ b/docs/generators/jaxrs-cxf-client.md
@@ -5,44 +5,161 @@ sidebar_label: jaxrs-cxf-client
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |org.openapitools.model|
|apiPackage|package for generated api classes| |org.openapitools.api|
-|invokerPackage|root package for generated code| |org.openapitools.api|
-|groupId|groupId in generated pom.xml| |org.openapitools|
-|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-jaxrs-client|
-|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
-|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
|artifactDescription|artifact description in generated pom.xml| |OpenAPI Java|
+|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-jaxrs-client|
+|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
+|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
+|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
+|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|legacy|
+|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
+|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
+|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|
+|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|
+|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.api|
+|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
+|licenseName|The name of the license| |Unlicense|
+|licenseUrl|The URL of the license| |http://unlicense.org|
+|modelPackage|package for generated models| |org.openapitools.model|
+|parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
+|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|
+|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|
|scmUrl|SCM URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
-|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
-|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
-|developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
-|developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
-|licenseName|The name of the license| |Unlicense|
-|licenseUrl|The URL of the license| |http://unlicense.org|
-|sourceFolder|source folder for generated code| |src/gen/java|
|serializableModel|boolean - toggle "implements Serializable" for generated models| |false|
-|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
-|fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
-|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |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|
-|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|legacy|
-|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
-|disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|booleanGetterPrefix|Set booleanGetterPrefix| |get|
-|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
-|parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
-|parentArtifactId|parent artifactId 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|
|snapshotVersion|Uses a SNAPSHOT version.|- **true**
- Use a SnapShot Version
- **false**
- Use a Release Version
|null|
+|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+|sourceFolder|source folder for generated code| |src/gen/java|
|useBeanValidation|Use BeanValidation API annotations| |false|
+|useGenericResponse|Use generic response| |false|
|useGzipFeatureForTests|Use Gzip Feature for tests| |false|
|useLoggingFeatureForTests|Use Logging Feature for tests| |false|
-|useGenericResponse|Use generic response| |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
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.LocalDate|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|ArrayList|
+|map|HashMap|
+
+
+## LANGUAGE PRIMITIVES
+
+- Boolean
+- Double
+- Float
+- Integer
+- Long
+- Object
+- String
+- boolean
+- byte[]
+
+
+## RESERVED WORDS
+
+- abstract
+- apiclient
+- apiexception
+- apiresponse
+- assert
+- boolean
+- break
+- byte
+- case
+- catch
+- char
+- class
+- configuration
+- const
+- continue
+- default
+- do
+- double
+- else
+- enum
+- extends
+- final
+- finally
+- float
+- for
+- goto
+- if
+- implements
+- import
+- instanceof
+- int
+- interface
+- localreturntype
+- localvaraccept
+- localvaraccepts
+- localvarauthnames
+- localvarcollectionqueryparams
+- localvarcontenttype
+- localvarcontenttypes
+- localvarcookieparams
+- localvarformparams
+- localvarheaderparams
+- localvarpath
+- localvarpostbody
+- localvarqueryparams
+- long
+- native
+- new
+- null
+- object
+- package
+- private
+- protected
+- public
+- return
+- short
+- static
+- strictfp
+- stringutil
+- super
+- switch
+- synchronized
+- this
+- throw
+- throws
+- transient
+- try
+- void
+- volatile
+- while
+
diff --git a/docs/generators/jaxrs-cxf-extended.md b/docs/generators/jaxrs-cxf-extended.md
index 03dcf52b07..14e8995141 100644
--- a/docs/generators/jaxrs-cxf-extended.md
+++ b/docs/generators/jaxrs-cxf-extended.md
@@ -5,66 +5,183 @@ sidebar_label: jaxrs-cxf-extended
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|addConsumesProducesJson|Add @Consumes/@Produces Json to API interface| |false|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |org.openapitools.model|
|apiPackage|package for generated api classes| |org.openapitools.api|
-|invokerPackage|root package for generated code| |org.openapitools.api|
-|groupId|groupId in generated pom.xml| |org.openapitools|
-|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-cxf-server|
-|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
-|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
|artifactDescription|artifact description in generated pom.xml| |OpenAPI Java|
+|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-cxf-server|
+|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
+|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
+|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
+|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|legacy|
+|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
+|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
+|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|
+|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|
+|generateJbossDeploymentDescriptor|Generate Jboss Deployment Descriptor| |false|
+|generateNonSpringApplication|Generate non-Spring application| |false|
+|generateOperationBody|Generate fully functional operation bodies| |false|
+|generateSpringApplication|Generate Spring application| |false|
+|generateSpringBootApplication|Generate Spring Boot application| |false|
+|groupId|groupId in generated pom.xml| |org.openapitools|
+|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
+|implFolder|folder for generated implementation code| |src/main/java|
+|invokerPackage|root package for generated code| |org.openapitools.api|
+|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
+|licenseName|The name of the license| |Unlicense|
+|licenseUrl|The URL of the license| |http://unlicense.org|
+|loadTestDataFromFile|Load test data from a generated JSON file| |false|
+|modelPackage|package for generated models| |org.openapitools.model|
+|parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
+|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|
+|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|
|scmUrl|SCM URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
-|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
-|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
-|developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
-|developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
-|licenseName|The name of the license| |Unlicense|
-|licenseUrl|The URL of the license| |http://unlicense.org|
-|sourceFolder|source folder for generated code| |src/main/java|
|serializableModel|boolean - toggle "implements Serializable" for generated models| |false|
-|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
-|fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
-|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |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|
-|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|legacy|
-|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
-|disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|booleanGetterPrefix|Set booleanGetterPrefix| |get|
-|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
-|parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
-|parentArtifactId|parent artifactId 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|
-|snapshotVersion|Uses a SNAPSHOT version.|- **true**
- Use a SnapShot Version
- **false**
- Use a Release Version
|null|
-|implFolder|folder for generated implementation code| |src/main/java|
-|title|a title describing the application| |OpenAPI Server|
-|useBeanValidation|Use BeanValidation API annotations| |true|
|serverPort|The port on which the server should be started| |8080|
-|generateSpringApplication|Generate Spring application| |false|
+|snapshotVersion|Uses a SNAPSHOT version.|- **true**
- Use a SnapShot Version
- **false**
- Use a Release Version
|null|
+|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+|sourceFolder|source folder for generated code| |src/main/java|
+|supportMultipleSpringServices|Support generation of Spring services from multiple specifications| |false|
+|testDataControlFile|JSON file to control test data generation| |null|
+|testDataFile|JSON file to contain generated test data| |null|
+|title|a title describing the application| |OpenAPI Server|
+|useAnnotatedBasePath|Use @Path annotations for basePath| |false|
+|useBeanValidation|Use BeanValidation API annotations| |true|
+|useBeanValidationFeature|Use BeanValidation Feature| |false|
+|useGenericResponse|Use generic response| |false|
+|useGzipFeature|Use Gzip Feature| |false|
+|useGzipFeatureForTests|Use Gzip Feature for tests| |false|
+|useLoggingFeature|Use Logging Feature| |false|
+|useLoggingFeatureForTests|Use Logging Feature for tests| |false|
+|useMultipartFeature|Use Multipart Feature| |false|
|useSpringAnnotationConfig|Use Spring Annotation Config| |false|
|useSwaggerFeature|Use Swagger Feature| |false|
|useSwaggerUI|Use Swagger UI| |false|
|useWadlFeature|Use WADL Feature| |false|
-|useMultipartFeature|Use Multipart Feature| |false|
-|useGzipFeature|Use Gzip Feature| |false|
-|useGzipFeatureForTests|Use Gzip Feature for tests| |false|
-|useBeanValidationFeature|Use BeanValidation Feature| |false|
-|useLoggingFeature|Use Logging Feature| |false|
-|useLoggingFeatureForTests|Use Logging Feature for tests| |false|
-|generateSpringBootApplication|Generate Spring Boot application| |false|
-|generateJbossDeploymentDescriptor|Generate Jboss Deployment Descriptor| |false|
-|addConsumesProducesJson|Add @Consumes/@Produces Json to API interface| |false|
-|useAnnotatedBasePath|Use @Path annotations for basePath| |false|
-|generateNonSpringApplication|Generate non-Spring application| |false|
-|useGenericResponse|Use generic response| |false|
-|supportMultipleSpringServices|Support generation of Spring services from multiple specifications| |false|
-|generateOperationBody|Generate fully functional operation bodies| |false|
-|loadTestDataFromFile|Load test data from a generated JSON file| |false|
-|testDataFile|JSON file to contain generated test data| |null|
-|testDataControlFile|JSON file to control test data generation| |null|
+|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
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.LocalDate|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|ArrayList|
+|map|HashMap|
+
+
+## LANGUAGE PRIMITIVES
+
+- Boolean
+- Double
+- Float
+- Integer
+- Long
+- Object
+- String
+- boolean
+- byte[]
+
+
+## RESERVED WORDS
+
+- abstract
+- apiclient
+- apiexception
+- apiresponse
+- assert
+- boolean
+- break
+- byte
+- case
+- catch
+- char
+- class
+- configuration
+- const
+- continue
+- default
+- do
+- double
+- else
+- enum
+- extends
+- final
+- finally
+- float
+- for
+- goto
+- if
+- implements
+- import
+- instanceof
+- int
+- interface
+- localreturntype
+- localvaraccept
+- localvaraccepts
+- localvarauthnames
+- localvarcollectionqueryparams
+- localvarcontenttype
+- localvarcontenttypes
+- localvarcookieparams
+- localvarformparams
+- localvarheaderparams
+- localvarpath
+- localvarpostbody
+- localvarqueryparams
+- long
+- native
+- new
+- null
+- object
+- package
+- private
+- protected
+- public
+- return
+- short
+- static
+- strictfp
+- stringutil
+- super
+- switch
+- synchronized
+- this
+- throw
+- throws
+- transient
+- try
+- void
+- volatile
+- while
+
diff --git a/docs/generators/jaxrs-cxf.md b/docs/generators/jaxrs-cxf.md
index 5bb65f09b1..1fc41f7b17 100644
--- a/docs/generators/jaxrs-cxf.md
+++ b/docs/generators/jaxrs-cxf.md
@@ -5,61 +5,178 @@ sidebar_label: jaxrs-cxf
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|addConsumesProducesJson|Add @Consumes/@Produces Json to API interface| |false|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |org.openapitools.model|
|apiPackage|package for generated api classes| |org.openapitools.api|
-|invokerPackage|root package for generated code| |org.openapitools.api|
-|groupId|groupId in generated pom.xml| |org.openapitools|
-|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-cxf-server|
-|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
-|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
|artifactDescription|artifact description in generated pom.xml| |OpenAPI Java|
+|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-cxf-server|
+|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
+|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
+|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
+|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|legacy|
+|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
+|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
+|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|
+|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|
+|generateJbossDeploymentDescriptor|Generate Jboss Deployment Descriptor| |false|
+|generateNonSpringApplication|Generate non-Spring application| |false|
+|generateSpringApplication|Generate Spring application| |false|
+|generateSpringBootApplication|Generate Spring Boot application| |false|
+|groupId|groupId in generated pom.xml| |org.openapitools|
+|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
+|implFolder|folder for generated implementation code| |src/main/java|
+|invokerPackage|root package for generated code| |org.openapitools.api|
+|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
+|licenseName|The name of the license| |Unlicense|
+|licenseUrl|The URL of the license| |http://unlicense.org|
+|modelPackage|package for generated models| |org.openapitools.model|
+|parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
+|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|
+|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|
|scmUrl|SCM URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
-|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
-|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
-|developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
-|developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
-|licenseName|The name of the license| |Unlicense|
-|licenseUrl|The URL of the license| |http://unlicense.org|
-|sourceFolder|source folder for generated code| |src/main/java|
|serializableModel|boolean - toggle "implements Serializable" for generated models| |false|
-|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
-|fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
-|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |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|
-|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|legacy|
-|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
-|disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|booleanGetterPrefix|Set booleanGetterPrefix| |get|
-|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
-|parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
-|parentArtifactId|parent artifactId 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|
-|snapshotVersion|Uses a SNAPSHOT version.|- **true**
- Use a SnapShot Version
- **false**
- Use a Release Version
|null|
-|implFolder|folder for generated implementation code| |src/main/java|
-|title|a title describing the application| |OpenAPI Server|
-|useBeanValidation|Use BeanValidation API annotations| |true|
|serverPort|The port on which the server should be started| |8080|
-|generateSpringApplication|Generate Spring application| |false|
+|snapshotVersion|Uses a SNAPSHOT version.|- **true**
- Use a SnapShot Version
- **false**
- Use a Release Version
|null|
+|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+|sourceFolder|source folder for generated code| |src/main/java|
+|title|a title describing the application| |OpenAPI Server|
+|useAnnotatedBasePath|Use @Path annotations for basePath| |false|
+|useBeanValidation|Use BeanValidation API annotations| |true|
+|useBeanValidationFeature|Use BeanValidation Feature| |false|
+|useGenericResponse|Use generic response| |false|
+|useGzipFeature|Use Gzip Feature| |false|
+|useGzipFeatureForTests|Use Gzip Feature for tests| |false|
+|useLoggingFeature|Use Logging Feature| |false|
+|useLoggingFeatureForTests|Use Logging Feature for tests| |false|
+|useMultipartFeature|Use Multipart Feature| |false|
|useSpringAnnotationConfig|Use Spring Annotation Config| |false|
|useSwaggerFeature|Use Swagger Feature| |false|
|useSwaggerUI|Use Swagger UI| |false|
|useWadlFeature|Use WADL Feature| |false|
-|useMultipartFeature|Use Multipart Feature| |false|
-|useGzipFeature|Use Gzip Feature| |false|
-|useGzipFeatureForTests|Use Gzip Feature for tests| |false|
-|useBeanValidationFeature|Use BeanValidation Feature| |false|
-|useLoggingFeature|Use Logging Feature| |false|
-|useLoggingFeatureForTests|Use Logging Feature for tests| |false|
-|generateSpringBootApplication|Generate Spring Boot application| |false|
-|generateJbossDeploymentDescriptor|Generate Jboss Deployment Descriptor| |false|
-|addConsumesProducesJson|Add @Consumes/@Produces Json to API interface| |false|
-|useAnnotatedBasePath|Use @Path annotations for basePath| |false|
-|generateNonSpringApplication|Generate non-Spring application| |false|
-|useGenericResponse|Use generic response| |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
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.LocalDate|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|ArrayList|
+|map|HashMap|
+
+
+## LANGUAGE PRIMITIVES
+
+- Boolean
+- Double
+- Float
+- Integer
+- Long
+- Object
+- String
+- boolean
+- byte[]
+
+
+## RESERVED WORDS
+
+- abstract
+- apiclient
+- apiexception
+- apiresponse
+- assert
+- boolean
+- break
+- byte
+- case
+- catch
+- char
+- class
+- configuration
+- const
+- continue
+- default
+- do
+- double
+- else
+- enum
+- extends
+- final
+- finally
+- float
+- for
+- goto
+- if
+- implements
+- import
+- instanceof
+- int
+- interface
+- localreturntype
+- localvaraccept
+- localvaraccepts
+- localvarauthnames
+- localvarcollectionqueryparams
+- localvarcontenttype
+- localvarcontenttypes
+- localvarcookieparams
+- localvarformparams
+- localvarheaderparams
+- localvarpath
+- localvarpostbody
+- localvarqueryparams
+- long
+- native
+- new
+- null
+- object
+- package
+- private
+- protected
+- public
+- return
+- short
+- static
+- strictfp
+- stringutil
+- super
+- switch
+- synchronized
+- this
+- throw
+- throws
+- transient
+- try
+- void
+- volatile
+- while
+
diff --git a/docs/generators/jaxrs-jersey.md b/docs/generators/jaxrs-jersey.md
index 489987ffc0..d1851341f6 100644
--- a/docs/generators/jaxrs-jersey.md
+++ b/docs/generators/jaxrs-jersey.md
@@ -5,47 +5,164 @@ sidebar_label: jaxrs-jersey
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |org.openapitools.model|
|apiPackage|package for generated api classes| |org.openapitools.api|
-|invokerPackage|root package for generated code| |org.openapitools.api|
-|groupId|groupId in generated pom.xml| |org.openapitools|
-|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-jaxrs-server|
-|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
-|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
|artifactDescription|artifact description in generated pom.xml| |OpenAPI Java|
+|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-jaxrs-server|
+|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
+|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
+|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
+|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|legacy|
+|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
+|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
+|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|
+|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|
+|groupId|groupId in generated pom.xml| |org.openapitools|
+|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
+|implFolder|folder for generated implementation code| |src/main/java|
+|invokerPackage|root package for generated code| |org.openapitools.api|
+|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
+|library|library template (sub-template)|- **jersey1**
- Jersey core 1.x
- **jersey2**
- Jersey core 2.x
|jersey2|
+|licenseName|The name of the license| |Unlicense|
+|licenseUrl|The URL of the license| |http://unlicense.org|
+|modelPackage|package for generated models| |org.openapitools.model|
+|parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
+|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|
+|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|
|scmUrl|SCM URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
-|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
-|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
-|developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
-|developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
-|licenseName|The name of the license| |Unlicense|
-|licenseUrl|The URL of the license| |http://unlicense.org|
-|sourceFolder|source folder for generated code| |src/main/java|
|serializableModel|boolean - toggle "implements Serializable" for generated models| |false|
-|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
-|fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
-|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |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|
-|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|legacy|
-|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
-|disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|booleanGetterPrefix|Set booleanGetterPrefix| |get|
-|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
-|parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
-|parentArtifactId|parent artifactId 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|
+|serverPort|The port on which the server should be started| |8080|
|snapshotVersion|Uses a SNAPSHOT version.|- **true**
- Use a SnapShot Version
- **false**
- Use a Release Version
|null|
-|implFolder|folder for generated implementation code| |src/main/java|
+|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+|sourceFolder|source folder for generated code| |src/main/java|
+|supportJava6|Whether to support Java6 with the Jersey1/2 library.| |false|
|title|a title describing the application| |OpenAPI Server|
|useBeanValidation|Use BeanValidation API annotations| |true|
-|serverPort|The port on which the server should be started| |8080|
-|library|library template (sub-template)|- **jersey1**
- Jersey core 1.x
- **jersey2**
- Jersey core 2.x
|jersey2|
-|supportJava6|Whether to support Java6 with the Jersey1/2 library.| |false|
|useTags|use tags for creating interface and controller classnames| |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
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|ArrayList|
+|map|HashMap|
+
+
+## LANGUAGE PRIMITIVES
+
+- Boolean
+- Double
+- Float
+- Integer
+- Long
+- Object
+- String
+- boolean
+- byte[]
+
+
+## RESERVED WORDS
+
+- abstract
+- apiclient
+- apiexception
+- apiresponse
+- assert
+- boolean
+- break
+- byte
+- case
+- catch
+- char
+- class
+- configuration
+- const
+- continue
+- default
+- do
+- double
+- else
+- enum
+- extends
+- final
+- finally
+- float
+- for
+- goto
+- if
+- implements
+- import
+- instanceof
+- int
+- interface
+- localreturntype
+- localvaraccept
+- localvaraccepts
+- localvarauthnames
+- localvarcollectionqueryparams
+- localvarcontenttype
+- localvarcontenttypes
+- localvarcookieparams
+- localvarformparams
+- localvarheaderparams
+- localvarpath
+- localvarpostbody
+- localvarqueryparams
+- long
+- native
+- new
+- null
+- object
+- package
+- private
+- protected
+- public
+- return
+- short
+- static
+- strictfp
+- stringutil
+- super
+- switch
+- synchronized
+- this
+- throw
+- throws
+- transient
+- try
+- void
+- volatile
+- while
+
diff --git a/docs/generators/jaxrs-resteasy-eap.md b/docs/generators/jaxrs-resteasy-eap.md
index 3dce1089ae..378769bd75 100644
--- a/docs/generators/jaxrs-resteasy-eap.md
+++ b/docs/generators/jaxrs-resteasy-eap.md
@@ -5,47 +5,163 @@ sidebar_label: jaxrs-resteasy-eap
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |org.openapitools.model|
|apiPackage|package for generated api classes| |org.openapitools.api|
-|invokerPackage|root package for generated code| |org.openapitools.api|
-|groupId|groupId in generated pom.xml| |org.openapitools|
-|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-jaxrs-resteasy-eap-server|
-|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
-|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
|artifactDescription|artifact description in generated pom.xml| |OpenAPI Java|
+|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-jaxrs-resteasy-eap-server|
+|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
+|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
+|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
+|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|legacy|
+|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
+|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
+|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|
+|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|
+|generateJbossDeploymentDescriptor|Generate Jboss Deployment Descriptor| |true|
+|groupId|groupId in generated pom.xml| |org.openapitools|
+|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
+|implFolder|folder for generated implementation code| |src/main/java|
+|invokerPackage|root package for generated code| |org.openapitools.api|
+|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
+|licenseName|The name of the license| |Unlicense|
+|licenseUrl|The URL of the license| |http://unlicense.org|
+|modelPackage|package for generated models| |org.openapitools.model|
+|parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
+|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|
+|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|
|scmUrl|SCM URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
-|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
-|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
-|developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
-|developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
-|licenseName|The name of the license| |Unlicense|
-|licenseUrl|The URL of the license| |http://unlicense.org|
-|sourceFolder|source folder for generated code| |src/main/java|
|serializableModel|boolean - toggle "implements Serializable" for generated models| |false|
-|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
-|fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
-|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |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|
-|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|legacy|
-|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
-|disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|booleanGetterPrefix|Set booleanGetterPrefix| |get|
-|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
-|parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
-|parentArtifactId|parent artifactId 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|
+|serverPort|The port on which the server should be started| |8080|
|snapshotVersion|Uses a SNAPSHOT version.|- **true**
- Use a SnapShot Version
- **false**
- Use a Release Version
|null|
-|implFolder|folder for generated implementation code| |src/main/java|
+|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+|sourceFolder|source folder for generated code| |src/main/java|
|title|a title describing the application| |OpenAPI Server|
|useBeanValidation|Use BeanValidation API annotations| |true|
-|serverPort|The port on which the server should be started| |8080|
-|useBeanValidation|Use BeanValidation API annotations| |true|
-|generateJbossDeploymentDescriptor|Generate Jboss Deployment Descriptor| |true|
|useSwaggerFeature|Use dynamic Swagger generator| |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
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|ArrayList|
+|map|HashMap|
+
+
+## LANGUAGE PRIMITIVES
+
+- Boolean
+- Double
+- Float
+- Integer
+- Long
+- Object
+- String
+- boolean
+- byte[]
+
+
+## RESERVED WORDS
+
+- abstract
+- apiclient
+- apiexception
+- apiresponse
+- assert
+- boolean
+- break
+- byte
+- case
+- catch
+- char
+- class
+- configuration
+- const
+- continue
+- default
+- do
+- double
+- else
+- enum
+- extends
+- final
+- finally
+- float
+- for
+- goto
+- if
+- implements
+- import
+- instanceof
+- int
+- interface
+- localreturntype
+- localvaraccept
+- localvaraccepts
+- localvarauthnames
+- localvarcollectionqueryparams
+- localvarcontenttype
+- localvarcontenttypes
+- localvarcookieparams
+- localvarformparams
+- localvarheaderparams
+- localvarpath
+- localvarpostbody
+- localvarqueryparams
+- long
+- native
+- new
+- null
+- object
+- package
+- private
+- protected
+- public
+- return
+- short
+- static
+- strictfp
+- stringutil
+- super
+- switch
+- synchronized
+- this
+- throw
+- throws
+- transient
+- try
+- void
+- volatile
+- while
+
diff --git a/docs/generators/jaxrs-resteasy.md b/docs/generators/jaxrs-resteasy.md
index 4712a95cdc..9b85ad5e17 100644
--- a/docs/generators/jaxrs-resteasy.md
+++ b/docs/generators/jaxrs-resteasy.md
@@ -5,45 +5,162 @@ sidebar_label: jaxrs-resteasy
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |org.openapitools.model|
|apiPackage|package for generated api classes| |org.openapitools.api|
-|invokerPackage|root package for generated code| |org.openapitools.api|
-|groupId|groupId in generated pom.xml| |org.openapitools|
-|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-jaxrs-resteasy-server|
-|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
-|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
|artifactDescription|artifact description in generated pom.xml| |OpenAPI Java|
+|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-jaxrs-resteasy-server|
+|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
+|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
+|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
+|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|legacy|
+|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
+|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
+|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|
+|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|
+|generateJbossDeploymentDescriptor|Generate Jboss Deployment Descriptor| |false|
+|groupId|groupId in generated pom.xml| |org.openapitools|
+|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
+|implFolder|folder for generated implementation code| |src/main/java|
+|invokerPackage|root package for generated code| |org.openapitools.api|
+|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
+|licenseName|The name of the license| |Unlicense|
+|licenseUrl|The URL of the license| |http://unlicense.org|
+|modelPackage|package for generated models| |org.openapitools.model|
+|parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
+|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|
+|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|
|scmUrl|SCM URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
-|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
-|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
-|developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
-|developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
-|licenseName|The name of the license| |Unlicense|
-|licenseUrl|The URL of the license| |http://unlicense.org|
-|sourceFolder|source folder for generated code| |src/main/java|
|serializableModel|boolean - toggle "implements Serializable" for generated models| |false|
-|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
-|fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
-|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |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|
-|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|legacy|
-|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
-|disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|booleanGetterPrefix|Set booleanGetterPrefix| |get|
-|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
-|parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
-|parentArtifactId|parent artifactId 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|
+|serverPort|The port on which the server should be started| |8080|
|snapshotVersion|Uses a SNAPSHOT version.|- **true**
- Use a SnapShot Version
- **false**
- Use a Release Version
|null|
-|implFolder|folder for generated implementation code| |src/main/java|
+|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+|sourceFolder|source folder for generated code| |src/main/java|
|title|a title describing the application| |OpenAPI Server|
|useBeanValidation|Use BeanValidation API annotations| |true|
-|serverPort|The port on which the server should be started| |8080|
-|generateJbossDeploymentDescriptor|Generate Jboss Deployment Descriptor| |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
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|ArrayList|
+|map|HashMap|
+
+
+## LANGUAGE PRIMITIVES
+
+- Boolean
+- Double
+- Float
+- Integer
+- Long
+- Object
+- String
+- boolean
+- byte[]
+
+
+## RESERVED WORDS
+
+- abstract
+- apiclient
+- apiexception
+- apiresponse
+- assert
+- boolean
+- break
+- byte
+- case
+- catch
+- char
+- class
+- configuration
+- const
+- continue
+- default
+- do
+- double
+- else
+- enum
+- extends
+- final
+- finally
+- float
+- for
+- goto
+- if
+- implements
+- import
+- instanceof
+- int
+- interface
+- localreturntype
+- localvaraccept
+- localvaraccepts
+- localvarauthnames
+- localvarcollectionqueryparams
+- localvarcontenttype
+- localvarcontenttypes
+- localvarcookieparams
+- localvarformparams
+- localvarheaderparams
+- localvarpath
+- localvarpostbody
+- localvarqueryparams
+- long
+- native
+- new
+- null
+- object
+- package
+- private
+- protected
+- public
+- return
+- short
+- static
+- strictfp
+- stringutil
+- super
+- switch
+- synchronized
+- this
+- throw
+- throws
+- transient
+- try
+- void
+- volatile
+- while
+
diff --git a/docs/generators/jaxrs-spec.md b/docs/generators/jaxrs-spec.md
index eac2f0d61b..d9c32ce88a 100644
--- a/docs/generators/jaxrs-spec.md
+++ b/docs/generators/jaxrs-spec.md
@@ -5,50 +5,167 @@ sidebar_label: jaxrs-spec
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |org.openapitools.model|
|apiPackage|package for generated api classes| |org.openapitools.api|
-|invokerPackage|root package for generated code| |org.openapitools.api|
-|groupId|groupId in generated pom.xml| |org.openapitools|
-|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-jaxrs-server|
-|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
-|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
|artifactDescription|artifact description in generated pom.xml| |OpenAPI Java|
+|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-jaxrs-server|
+|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
+|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
+|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
+|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|legacy|
+|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
+|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
+|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|
+|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|
+|generatePom|Whether to generate pom.xml if the file does not already exist.| |true|
+|groupId|groupId in generated pom.xml| |org.openapitools|
+|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
+|implFolder|folder for generated implementation code| |src/main/java|
+|interfaceOnly|Whether to generate only API interface stubs without the server files.| |false|
+|invokerPackage|root package for generated code| |org.openapitools.api|
+|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
+|library|library template (sub-template)|- **<default>**
- JAXRS spec only, to be deployed in an app server (TomEE, JBoss, WLS, ...)
- **quarkus**
- Server using Quarkus
- **thorntail**
- Server using Thorntail
- **openliberty**
- Server using Open Liberty
- **helidon**
- Server using Helidon
|<default>|
+|licenseName|The name of the license| |Unlicense|
+|licenseUrl|The URL of the license| |http://unlicense.org|
+|modelPackage|package for generated models| |org.openapitools.model|
+|openApiSpecFileLocation|Location where the file containing the spec will be generated in the output folder. No file generated when set to null or empty string.| |null|
+|parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
+|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|
+|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
+|returnResponse|Whether generate API interface should return javax.ws.rs.core.Response instead of a deserialized entity. Only useful if interfaceOnly is true.| |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|
|scmUrl|SCM URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
-|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
-|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
-|developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
-|developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
-|licenseName|The name of the license| |Unlicense|
-|licenseUrl|The URL of the license| |http://unlicense.org|
-|sourceFolder|source folder for generated code| |src/main/java|
|serializableModel|boolean - toggle "implements Serializable" for generated models| |false|
-|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
-|fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
-|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |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|
-|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|legacy|
-|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64
- **false**
- Various third party libraries as needed
|false|
-|disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|booleanGetterPrefix|Set booleanGetterPrefix| |get|
-|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
-|parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
-|parentArtifactId|parent artifactId 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|
+|serverPort|The port on which the server should be started| |8080|
|snapshotVersion|Uses a SNAPSHOT version.|- **true**
- Use a SnapShot Version
- **false**
- Use a Release Version
|null|
-|implFolder|folder for generated implementation code| |src/main/java|
+|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+|sourceFolder|source folder for generated code| |src/main/java|
|title|a title describing the application| |OpenAPI Server|
|useBeanValidation|Use BeanValidation API annotations| |true|
-|serverPort|The port on which the server should be started| |8080|
-|library|library template (sub-template)|- **<default>**
- JAXRS spec only, to be deployed in an app server (TomEE, JBoss, WLS, ...)
- **quarkus**
- Server using Quarkus
- **thorntail**
- Server using Thorntail
- **openliberty**
- Server using Open Liberty
- **helidon**
- Server using Helidon
|<default>|
-|generatePom|Whether to generate pom.xml if the file does not already exist.| |true|
-|interfaceOnly|Whether to generate only API interface stubs without the server files.| |false|
-|returnResponse|Whether generate API interface should return javax.ws.rs.core.Response instead of a deserialized entity. Only useful if interfaceOnly is true.| |false|
|useSwaggerAnnotations|Whether to generate Swagger annotations.| |true|
-|openApiSpecFileLocation|Location where the file containing the spec will be generated in the output folder. No file generated when set to null or empty string.| |null|
+|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
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.LocalDate|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|ArrayList|
+|map|HashMap|
+
+
+## LANGUAGE PRIMITIVES
+
+- Boolean
+- Double
+- Float
+- Integer
+- Long
+- Object
+- String
+- boolean
+- byte[]
+
+
+## RESERVED WORDS
+
+- abstract
+- apiclient
+- apiexception
+- apiresponse
+- assert
+- boolean
+- break
+- byte
+- case
+- catch
+- char
+- class
+- configuration
+- const
+- continue
+- default
+- do
+- double
+- else
+- enum
+- extends
+- final
+- finally
+- float
+- for
+- goto
+- if
+- implements
+- import
+- instanceof
+- int
+- interface
+- localreturntype
+- localvaraccept
+- localvaraccepts
+- localvarauthnames
+- localvarcollectionqueryparams
+- localvarcontenttype
+- localvarcontenttypes
+- localvarcookieparams
+- localvarformparams
+- localvarheaderparams
+- localvarpath
+- localvarpostbody
+- localvarqueryparams
+- long
+- native
+- new
+- null
+- object
+- package
+- private
+- protected
+- public
+- return
+- short
+- static
+- strictfp
+- stringutil
+- super
+- switch
+- synchronized
+- this
+- throw
+- throws
+- transient
+- try
+- void
+- volatile
+- while
+
diff --git a/docs/generators/jmeter.md b/docs/generators/jmeter.md
index 20f3183420..2aff0efbb2 100644
--- a/docs/generators/jmeter.md
+++ b/docs/generators/jmeter.md
@@ -5,8 +5,46 @@ sidebar_label: jmeter
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|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|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+
+
+## RESERVED WORDS
+
+
diff --git a/docs/generators/kotlin-server.md b/docs/generators/kotlin-server.md
index 135c570669..cffcda881f 100644
--- a/docs/generators/kotlin-server.md
+++ b/docs/generators/kotlin-server.md
@@ -5,22 +5,97 @@ sidebar_label: kotlin-server
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sourceFolder|source folder for generated code| |src/main/kotlin|
-|packageName|Generated artifact package name.| |org.openapitools.server|
|apiSuffix|suffix for api classes| |Api|
-|groupId|Generated artifact package's organization (i.e. maven groupId).| |org.openapitools|
|artifactId|Generated artifact id (name of jar).| |kotlin-server|
|artifactVersion|Generated artifact's package version.| |1.0.0|
|enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |camelCase|
-|serializationLibrary|What serialization library to use: 'moshi' (default), or 'gson'| |moshi|
-|parcelizeModels|toggle "@Parcelize" for generated models| |null|
-|serializableModel|boolean - toggle "implements Serializable" for generated models| |null|
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |null|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |null|
-|modelMutable|Create mutable models| |false|
-|library|library template (sub-template)|- **ktor**
- ktor framework
|ktor|
|featureAutoHead|Automatically provide responses to HEAD requests for existing routes that have the GET verb defined.| |true|
-|featureConditionalHeaders|Avoid sending content if client already has same content, by checking ETag or LastModified properties.| |false|
-|featureHSTS|Avoid sending content if client already has same content, by checking ETag or LastModified properties.| |true|
|featureCORS|Ktor by default provides an interceptor for implementing proper support for Cross-Origin Resource Sharing (CORS). See enable-cors.org.| |false|
|featureCompression|Adds ability to compress outgoing content using gzip, deflate or custom encoder and thus reduce size of the response.| |true|
+|featureConditionalHeaders|Avoid sending content if client already has same content, by checking ETag or LastModified properties.| |false|
+|featureHSTS|Avoid sending content if client already has same content, by checking ETag or LastModified properties.| |true|
+|groupId|Generated artifact package's organization (i.e. maven groupId).| |org.openapitools|
+|library|library template (sub-template)|- **ktor**
- ktor framework
|ktor|
+|modelMutable|Create mutable models| |false|
+|packageName|Generated artifact package name.| |org.openapitools.server|
+|parcelizeModels|toggle "@Parcelize" for generated models| |null|
+|serializableModel|boolean - toggle "implements Serializable" for generated models| |null|
+|serializationLibrary|What serialization library to use: 'moshi' (default), or 'gson'| |moshi|
+|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |null|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |null|
+|sourceFolder|source folder for generated code| |src/main/kotlin|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|java.time.LocalDateTime|
+|File|java.io.File|
+|LocalDate|java.time.LocalDate|
+|LocalDateTime|java.time.LocalDateTime|
+|LocalTime|java.time.LocalTime|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|kotlin.arrayOf|
+|list|kotlin.arrayOf|
+|map|kotlin.mapOf|
+
+
+## LANGUAGE PRIMITIVES
+
+- kotlin.Array
+- kotlin.Boolean
+- kotlin.Byte
+- kotlin.ByteArray
+- kotlin.Char
+- kotlin.Double
+- kotlin.Float
+- kotlin.Int
+- kotlin.Long
+- kotlin.Short
+- kotlin.String
+- kotlin.collections.List
+- kotlin.collections.Map
+- kotlin.collections.Set
+
+
+## RESERVED WORDS
+
+- as
+- break
+- class
+- continue
+- do
+- else
+- false
+- for
+- fun
+- if
+- in
+- interface
+- is
+- null
+- object
+- package
+- return
+- super
+- this
+- throw
+- true
+- try
+- typealias
+- typeof
+- val
+- var
+- when
+- while
+
diff --git a/docs/generators/kotlin-spring.md b/docs/generators/kotlin-spring.md
index 2ad78b7b90..11d7a924b2 100644
--- a/docs/generators/kotlin-spring.md
+++ b/docs/generators/kotlin-spring.md
@@ -5,31 +5,109 @@ sidebar_label: kotlin-spring
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sourceFolder|source folder for generated code| |src/main/kotlin|
-|packageName|Generated artifact package name.| |org.openapitools|
+|apiPackage|api package for generated code| |org.openapitools.api|
|apiSuffix|suffix for api classes| |Api|
-|groupId|Generated artifact package's organization (i.e. maven groupId).| |org.openapitools|
|artifactId|Generated artifact id (name of jar).| |openapi-spring|
|artifactVersion|Generated artifact's package version.| |1.0.0|
-|enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |camelCase|
-|serializationLibrary|What serialization library to use: 'moshi' (default), or 'gson'| |moshi|
-|parcelizeModels|toggle "@Parcelize" for generated models| |null|
-|serializableModel|boolean - toggle "implements Serializable" for generated models| |null|
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |null|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |null|
-|modelMutable|Create mutable models| |false|
-|title|server title name or client service name| |OpenAPI Kotlin Spring|
|basePackage|base package (invokerPackage) for generated code| |org.openapitools|
-|serverPort|configuration the port in which the sever is to run on| |8080|
-|modelPackage|model package for generated code| |org.openapitools.model|
-|apiPackage|api package for generated code| |org.openapitools.api|
+|delegatePattern|Whether to generate the server files using the delegate pattern| |false|
+|enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |camelCase|
|exceptionHandler|generate default global exception handlers (not compatible with reactive. enabling reactive will disable exceptionHandler )| |true|
|gradleBuildFile|generate a gradle build file using the Kotlin DSL| |true|
-|swaggerAnnotations|generate swagger annotations to go alongside controllers and models| |false|
-|serviceInterface|generate service interfaces to go alongside controllers. In most cases this option would be used to update an existing project, so not to override implementations. Useful to help facilitate the generation gap pattern| |false|
-|serviceImplementation|generate stub service implementations that extends service interfaces. If this is set to true service interfaces will also be generated| |false|
-|useBeanValidation|Use BeanValidation API annotations to validate data types| |true|
-|reactive|use coroutines for reactive behavior| |false|
+|groupId|Generated artifact package's organization (i.e. maven groupId).| |org.openapitools|
|interfaceOnly|Whether to generate only API interface stubs without the server files.| |false|
-|delegatePattern|Whether to generate the server files using the delegate pattern| |false|
|library|library template (sub-template)|- **spring-boot**
- Spring-boot Server application.
|spring-boot|
+|modelMutable|Create mutable models| |false|
+|modelPackage|model package for generated code| |org.openapitools.model|
+|packageName|Generated artifact package name.| |org.openapitools|
+|parcelizeModels|toggle "@Parcelize" for generated models| |null|
+|reactive|use coroutines for reactive behavior| |false|
+|serializableModel|boolean - toggle "implements Serializable" for generated models| |null|
+|serializationLibrary|What serialization library to use: 'moshi' (default), or 'gson'| |moshi|
+|serverPort|configuration the port in which the sever is to run on| |8080|
+|serviceImplementation|generate stub service implementations that extends service interfaces. If this is set to true service interfaces will also be generated| |false|
+|serviceInterface|generate service interfaces to go alongside controllers. In most cases this option would be used to update an existing project, so not to override implementations. Useful to help facilitate the generation gap pattern| |false|
+|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |null|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |null|
+|sourceFolder|source folder for generated code| |src/main/kotlin|
+|swaggerAnnotations|generate swagger annotations to go alongside controllers and models| |false|
+|title|server title name or client service name| |OpenAPI Kotlin Spring|
+|useBeanValidation|Use BeanValidation API annotations to validate data types| |true|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|BigDecimal|java.math.BigDecimal|
+|Date|java.time.LocalDate|
+|DateTime|java.time.OffsetDateTime|
+|File|java.io.File|
+|LocalDate|java.time.LocalDate|
+|LocalDateTime|java.time.LocalDateTime|
+|LocalTime|java.time.LocalTime|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|kotlin.arrayOf|
+|list|kotlin.arrayOf|
+|map|kotlin.mapOf|
+
+
+## LANGUAGE PRIMITIVES
+
+- kotlin.Array
+- kotlin.Boolean
+- kotlin.Byte
+- kotlin.ByteArray
+- kotlin.Char
+- kotlin.Double
+- kotlin.Float
+- kotlin.Int
+- kotlin.Long
+- kotlin.Short
+- kotlin.String
+- kotlin.collections.List
+- kotlin.collections.Map
+- kotlin.collections.Set
+
+
+## RESERVED WORDS
+
+- ApiClient
+- ApiException
+- ApiResponse
+- as
+- break
+- class
+- continue
+- do
+- else
+- false
+- for
+- fun
+- if
+- in
+- interface
+- is
+- null
+- object
+- package
+- return
+- super
+- this
+- throw
+- true
+- try
+- typealias
+- typeof
+- val
+- var
+- when
+- while
+
diff --git a/docs/generators/kotlin-vertx.md b/docs/generators/kotlin-vertx.md
index fd37a2cc8d..20a85045d0 100644
--- a/docs/generators/kotlin-vertx.md
+++ b/docs/generators/kotlin-vertx.md
@@ -5,16 +5,91 @@ sidebar_label: kotlin-vertx
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sourceFolder|source folder for generated code| |src/main/kotlin|
-|packageName|Generated artifact package name.| |org.openapitools|
|apiSuffix|suffix for api classes| |Api|
-|groupId|Generated artifact package's organization (i.e. maven groupId).| |org.openapitools|
|artifactId|Generated artifact id (name of jar).| |null|
|artifactVersion|Generated artifact's package version.| |1.0.0|
|enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |camelCase|
-|serializationLibrary|What serialization library to use: 'moshi' (default), or 'gson'| |moshi|
+|groupId|Generated artifact package's organization (i.e. maven groupId).| |org.openapitools|
+|modelMutable|Create mutable models| |false|
+|packageName|Generated artifact package name.| |org.openapitools|
|parcelizeModels|toggle "@Parcelize" for generated models| |null|
|serializableModel|boolean - toggle "implements Serializable" for generated models| |null|
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |null|
+|serializationLibrary|What serialization library to use: 'moshi' (default), or 'gson'| |moshi|
|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |null|
-|modelMutable|Create mutable models| |false|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |null|
+|sourceFolder|source folder for generated code| |src/main/kotlin|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|java.time.LocalDateTime|
+|File|java.io.File|
+|LocalDate|java.time.LocalDate|
+|LocalDateTime|java.time.LocalDateTime|
+|LocalTime|java.time.LocalTime|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|kotlin.arrayOf|
+|list|kotlin.arrayOf|
+|map|kotlin.mapOf|
+
+
+## LANGUAGE PRIMITIVES
+
+- kotlin.Array
+- kotlin.Boolean
+- kotlin.Byte
+- kotlin.ByteArray
+- kotlin.Char
+- kotlin.Double
+- kotlin.Float
+- kotlin.Int
+- kotlin.Long
+- kotlin.Short
+- kotlin.String
+- kotlin.collections.List
+- kotlin.collections.Map
+- kotlin.collections.Set
+
+
+## RESERVED WORDS
+
+- as
+- break
+- class
+- continue
+- do
+- else
+- false
+- for
+- fun
+- if
+- in
+- interface
+- is
+- null
+- object
+- package
+- return
+- super
+- this
+- throw
+- true
+- try
+- typealias
+- typeof
+- val
+- var
+- when
+- while
+
diff --git a/docs/generators/kotlin.md b/docs/generators/kotlin.md
index 5c8f71e679..cdd75b8927 100644
--- a/docs/generators/kotlin.md
+++ b/docs/generators/kotlin.md
@@ -5,20 +5,95 @@ sidebar_label: kotlin
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sourceFolder|source folder for generated code| |src/main/kotlin|
-|packageName|Generated artifact package name.| |org.openapitools.client|
|apiSuffix|suffix for api classes| |Api|
-|groupId|Generated artifact package's organization (i.e. maven groupId).| |org.openapitools|
|artifactId|Generated artifact id (name of jar).| |kotlin-client|
|artifactVersion|Generated artifact's package version.| |1.0.0|
-|enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |camelCase|
-|serializationLibrary|What serialization library to use: 'moshi' (default), or 'gson'| |moshi|
-|parcelizeModels|toggle "@Parcelize" for generated models| |null|
-|serializableModel|boolean - toggle "implements Serializable" for generated models| |null|
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |null|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |null|
-|modelMutable|Create mutable models| |false|
-|dateLibrary|Option. Date library to use|- **threetenbp-localdatetime**
- Threetenbp - Backport of JSR310 (jvm only, for legacy app only)
- **string**
- String
- **java8-localdatetime**
- Java 8 native JSR310 (jvm only, for legacy app only)
- **java8**
- Java 8 native JSR310 (jvm only, preferred for jdk 1.8+)
- **threetenbp**
- Threetenbp - Backport of JSR310 (jvm only, preferred for jdk < 1.8)
|java8|
|collectionType|Option. Collection type to use|- **array**
- kotlin.Array
- **list**
- kotlin.collections.List
|array|
+|dateLibrary|Option. Date library to use|- **threetenbp-localdatetime**
- Threetenbp - Backport of JSR310 (jvm only, for legacy app only)
- **string**
- String
- **java8-localdatetime**
- Java 8 native JSR310 (jvm only, for legacy app only)
- **java8**
- Java 8 native JSR310 (jvm only, preferred for jdk 1.8+)
- **threetenbp**
- Threetenbp - Backport of JSR310 (jvm only, preferred for jdk < 1.8)
|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|
|library|Library template (sub-template) to use|- **jvm-okhttp4**
- [DEFAULT] Platform: Java Virtual Machine. HTTP client: OkHttp 4.2.0 (Android 5.0+ and Java 8+). JSON processing: Moshi 1.8.0.
- **jvm-okhttp3**
- Platform: Java Virtual Machine. HTTP client: OkHttp 3.12.4 (Android 2.3+ and Java 7+). JSON processing: Moshi 1.8.0.
- **jvm-retrofit2**
- Platform: Java Virtual Machine. HTTP client: Retrofit 2.6.2.
- **multiplatform**
- Platform: Kotlin multiplatform. HTTP client: Ktor 1.2.4. JSON processing: Kotlinx Serialization: 0.12.0.
|jvm-okhttp4|
-|requestDateConverter|JVM-Option. Defines in how to handle date-time objects that are used for a request (as query or parameter)|- **toJson**
- Date formater option using a json converter.
- **toString**
- [DEFAULT] Use the 'toString'-method of the date-time object to retrieve the related string representation.
|toString|
+|modelMutable|Create mutable models| |false|
+|packageName|Generated artifact package name.| |org.openapitools.client|
+|parcelizeModels|toggle "@Parcelize" for generated models| |null|
+|requestDateConverter|JVM-Option. Defines in how to handle date-time objects that are used for a request (as query or parameter)|- **toJson**
- [DEFAULT] Date formater option using a json converter.
- **toString**
- Use the 'toString'-method of the date-time object to retrieve the related string representation.
|toJson|
+|serializableModel|boolean - toggle "implements Serializable" for generated models| |null|
+|serializationLibrary|What serialization library to use: 'moshi' (default), or 'gson'| |moshi|
+|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |null|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |null|
+|sourceFolder|source folder for generated code| |src/main/kotlin|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|java.time.LocalDateTime|
+|File|java.io.File|
+|LocalDate|java.time.LocalDate|
+|LocalDateTime|java.time.LocalDateTime|
+|LocalTime|java.time.LocalTime|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|kotlin.arrayOf|
+|list|kotlin.arrayOf|
+|map|kotlin.mapOf|
+
+
+## LANGUAGE PRIMITIVES
+
+- kotlin.Array
+- kotlin.Boolean
+- kotlin.Byte
+- kotlin.ByteArray
+- kotlin.Char
+- kotlin.Double
+- kotlin.Float
+- kotlin.Int
+- kotlin.Long
+- kotlin.Short
+- kotlin.String
+- kotlin.collections.List
+- kotlin.collections.Map
+- kotlin.collections.Set
+
+
+## RESERVED WORDS
+
+- as
+- break
+- class
+- continue
+- do
+- else
+- false
+- for
+- fun
+- if
+- in
+- interface
+- is
+- null
+- object
+- package
+- return
+- super
+- this
+- throw
+- true
+- try
+- typealias
+- typeof
+- val
+- var
+- when
+- while
+
diff --git a/docs/generators/lua.md b/docs/generators/lua.md
index b466a5a70f..4062270334 100644
--- a/docs/generators/lua.md
+++ b/docs/generators/lua.md
@@ -5,6 +5,60 @@ sidebar_label: lua
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
+|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
|packageName|Lua package name (convention: single word).| |openapiclient|
|packageVersion|Lua package version.| |1.0.0-1|
-|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|*os.File|os|
+|os|io/ioutil|
+|time.Time|time|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- boolean
+- nil
+- number
+- string
+
+
+## RESERVED WORDS
+
+- and
+- boolean
+- break
+- do
+- else
+- elseif
+- end
+- false
+- for
+- function
+- if
+- in
+- local
+- nil
+- not
+- number
+- or
+- repeat
+- return
+- string
+- table
+- then
+- thread
+- true
+- until
+- userdata
+- while
+
diff --git a/docs/generators/markdown.md b/docs/generators/markdown.md
index 5fe5f9d699..3c7777b2a9 100644
--- a/docs/generators/markdown.md
+++ b/docs/generators/markdown.md
@@ -5,8 +5,44 @@ sidebar_label: markdown
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|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|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+
+
+## RESERVED WORDS
+
+
diff --git a/docs/generators/mysql-schema.md b/docs/generators/mysql-schema.md
index 6b48a721cb..67e235168b 100644
--- a/docs/generators/mysql-schema.md
+++ b/docs/generators/mysql-schema.md
@@ -6,5 +6,311 @@ sidebar_label: mysql-schema
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
|defaultDatabaseName|Default database name for all MySQL queries| ||
-|jsonDataTypeEnabled|Use special JSON MySQL data type for complex model properties. Requires MySQL version 5.7.8. Generates TEXT data type when disabled| |true|
|identifierNamingConvention|Naming convention of MySQL identifiers(table names and column names). This is not related to database name which is defined by defaultDatabaseName option|- **original**
- Do not transform original names
- **snake_case**
- Use snake_case names
|original|
+|jsonDataTypeEnabled|Use special JSON MySQL data type for complex model properties. Requires MySQL version 5.7.8. Generates TEXT data type when disabled| |true|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- BigDecimal
+- ByteArray
+- Date
+- DateTime
+- URI
+- UUID
+- binary
+- bool
+- boolean
+- byte
+- char
+- date
+- double
+- file
+- float
+- int
+- integer
+- long
+- mixed
+- number
+- short
+- string
+- void
+
+
+## RESERVED WORDS
+
+- accessible
+- add
+- all
+- alter
+- analyze
+- and
+- as
+- asc
+- asensitive
+- before
+- between
+- bigint
+- binary
+- blob
+- both
+- by
+- call
+- cascade
+- case
+- change
+- char
+- character
+- check
+- collate
+- column
+- condition
+- constraint
+- continue
+- convert
+- create
+- cross
+- cube
+- cume_dist
+- current_date
+- current_time
+- current_timestamp
+- current_user
+- cursor
+- database
+- databases
+- day_hour
+- day_microsecond
+- day_minute
+- day_second
+- dec
+- decimal
+- declare
+- default
+- delayed
+- delete
+- dense_rank
+- desc
+- describe
+- deterministic
+- distinct
+- distinctrow
+- div
+- double
+- drop
+- dual
+- each
+- else
+- elseif
+- empty
+- enclosed
+- escaped
+- except
+- exists
+- exit
+- explain
+- false
+- fetch
+- first_value
+- float
+- float4
+- float8
+- for
+- force
+- foreign
+- from
+- fulltext
+- function
+- generated
+- get
+- grant
+- group
+- grouping
+- groups
+- having
+- high_priority
+- hour_microsecond
+- hour_minute
+- hour_second
+- if
+- ignore
+- in
+- index
+- infile
+- inner
+- inout
+- insensitive
+- insert
+- int
+- int1
+- int2
+- int3
+- int4
+- int8
+- integer
+- interval
+- into
+- io_after_gtids
+- io_before_gtids
+- is
+- iterate
+- join
+- json_table
+- key
+- keys
+- kill
+- lag
+- last_value
+- lead
+- leading
+- leave
+- left
+- like
+- limit
+- linear
+- lines
+- load
+- localtime
+- localtimestamp
+- lock
+- long
+- longblob
+- longtext
+- loop
+- low_priority
+- master_bind
+- master_ssl_verify_server_cert
+- match
+- maxvalue
+- mediumblob
+- mediumint
+- mediumtext
+- middleint
+- minute_microsecond
+- minute_second
+- mod
+- modifies
+- natural
+- no_write_to_binlog
+- not
+- nth_value
+- ntile
+- null
+- numeric
+- of
+- on
+- optimize
+- optimizer_costs
+- option
+- optionally
+- or
+- order
+- out
+- outer
+- outfile
+- over
+- partition
+- percent_rank
+- persist
+- persist_only
+- precision
+- primary
+- procedure
+- purge
+- range
+- rank
+- read
+- read_write
+- reads
+- real
+- recursive
+- references
+- regexp
+- release
+- rename
+- repeat
+- replace
+- require
+- resignal
+- restrict
+- return
+- revoke
+- right
+- rlike
+- role
+- row
+- row_number
+- rows
+- schema
+- schemas
+- second_microsecond
+- select
+- sensitive
+- separator
+- set
+- show
+- signal
+- smallint
+- spatial
+- specific
+- sql
+- sql_big_result
+- sql_calc_found_rows
+- sql_small_result
+- sqlexception
+- sqlstate
+- sqlwarning
+- ssl
+- starting
+- stored
+- straight_join
+- system
+- table
+- terminated
+- then
+- tinyblob
+- tinyint
+- tinytext
+- to
+- trailing
+- trigger
+- true
+- undo
+- union
+- unique
+- unlock
+- unsigned
+- update
+- usage
+- use
+- using
+- utc_date
+- utc_time
+- utc_timestamp
+- values
+- varbinary
+- varchar
+- varcharacter
+- varying
+- virtual
+- when
+- where
+- while
+- window
+- with
+- write
+- xor
+- year_month
+- zerofill
+
diff --git a/docs/generators/nim.md b/docs/generators/nim.md
index 7368aa1e8b..946669ccbe 100644
--- a/docs/generators/nim.md
+++ b/docs/generators/nim.md
@@ -5,8 +5,128 @@ sidebar_label: nim
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|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|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- bool
+- char
+- cstring
+- float
+- float32
+- float64
+- int
+- int16
+- int32
+- int64
+- int8
+- pointer
+- string
+- uint
+- uint16
+- uint32
+- uint64
+- uint8
+
+
+## RESERVED WORDS
+
+- addr
+- and
+- as
+- asm
+- bind
+- block
+- break
+- case
+- cast
+- concept
+- const
+- continue
+- converter
+- defer
+- discard
+- distinct
+- div
+- do
+- elif
+- else
+- end
+- enum
+- except
+- export
+- finally
+- for
+- from
+- func
+- if
+- import
+- in
+- include
+- interface
+- is
+- isnot
+- iterator
+- let
+- macro
+- method
+- mixin
+- mod
+- nil
+- not
+- notin
+- object
+- of
+- or
+- out
+- proc
+- ptr
+- raise
+- ref
+- return
+- shl
+- shr
+- static
+- template
+- try
+- tuple
+- type
+- using
+- var
+- when
+- while
+- xor
+- yield
+
diff --git a/docs/generators/nodejs-express-server.md b/docs/generators/nodejs-express-server.md
index 0f00358644..b0a8db1c49 100644
--- a/docs/generators/nodejs-express-server.md
+++ b/docs/generators/nodejs-express-server.md
@@ -5,9 +5,79 @@ sidebar_label: nodejs-express-server
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
|serverPort|TCP port to listen on.| |null|
+|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+
+
+## RESERVED WORDS
+
+- break
+- case
+- catch
+- class
+- const
+- continue
+- debugger
+- default
+- delete
+- do
+- else
+- export
+- extends
+- finally
+- for
+- function
+- if
+- import
+- in
+- instanceof
+- let
+- new
+- return
+- super
+- switch
+- this
+- throw
+- try
+- typeof
+- var
+- void
+- while
+- with
+- yield
+
diff --git a/docs/generators/nodejs-server-deprecated.md b/docs/generators/nodejs-server-deprecated.md
index 113637d89a..0967505e68 100644
--- a/docs/generators/nodejs-server-deprecated.md
+++ b/docs/generators/nodejs-server-deprecated.md
@@ -5,11 +5,81 @@ sidebar_label: nodejs-server-deprecated
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|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|
+|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|
+|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
|serverPort|TCP port to listen on.| |null|
+|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+
+
+## RESERVED WORDS
+
+- break
+- case
+- catch
+- class
+- const
+- continue
+- debugger
+- default
+- delete
+- do
+- else
+- export
+- extends
+- finally
+- for
+- function
+- if
+- import
+- in
+- instanceof
+- let
+- new
+- return
+- super
+- switch
+- this
+- throw
+- try
+- typeof
+- var
+- void
+- while
+- with
+- yield
+
diff --git a/docs/generators/nodejs-server.md b/docs/generators/nodejs-server.md
deleted file mode 100644
index d66e4e4f01..0000000000
--- a/docs/generators/nodejs-server.md
+++ /dev/null
@@ -1,16 +0,0 @@
-
----
-id: generator-opts-server-nodejs-server
-title: Config Options for nodejs-server
-sidebar_label: nodejs-server
----
-
-| Option | Description | Values | Default |
-| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|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|
-|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|
-|serverPort|TCP port to listen on.| |null|
diff --git a/docs/generators/objc.md b/docs/generators/objc.md
index dff34b94fa..49148761b6 100644
--- a/docs/generators/objc.md
+++ b/docs/generators/objc.md
@@ -5,11 +5,102 @@ sidebar_label: objc
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|coreData|Should generate core data models| |false|
-|classPrefix|prefix for generated classes (convention: Abbreviation of pod name e.g. `HN` for `HackerNews`).`| |OAI|
-|podName|cocoapods package name (convention: CameCase).| |OpenAPIClient|
-|podVersion|cocoapods package version.| |1.0.0|
-|authorName|Name to use in the podspec file.| |OpenAPI|
|authorEmail|Email to use in the podspec file.| |team@openapitools.org|
+|authorName|Name to use in the podspec file.| |OpenAPI|
+|classPrefix|prefix for generated classes (convention: Abbreviation of pod name e.g. `HN` for `HackerNews`).`| |OAI|
+|coreData|Should generate core data models| |false|
|gitRepoURL|URL for the git repo where this podspec should point to.| |https://github.com/openapitools/openapi-generator|
|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
+|podName|cocoapods package name (convention: CameCase).| |OpenAPIClient|
+|podVersion|cocoapods package version.| |1.0.0|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|NSMutableArray|
+|map|NSMutableDictionary|
+
+
+## LANGUAGE PRIMITIVES
+
+- BOOL
+- NSData
+- NSDate
+- NSNumber
+- NSObject
+- NSString
+- NSURL
+- bool
+
+
+## RESERVED WORDS
+
+- _packed
+- authsettings
+- auto
+- bodyparam
+- break
+- case
+- cgfloat
+- char
+- class
+- const
+- continue
+- default
+- description
+- do
+- double
+- else
+- enum
+- extern
+- float
+- for
+- formparams
+- goto
+- headerparams
+- id
+- if
+- implementation
+- int
+- interface
+- localvarfiles
+- long
+- nonatomic
+- nsinteger
+- nsnumber
+- nsobject
+- pathparams
+- property
+- protocol
+- queryparams
+- readonly
+- readwrite
+- register
+- requestcontenttype
+- resourcepath
+- responsecontenttype
+- retain
+- return
+- short
+- signed
+- sizeof
+- static
+- strong
+- struct
+- switch
+- typedef
+- union
+- unsafe_unretained
+- unsigned
+- void
+- volatile
+- weak
+- while
+
diff --git a/docs/generators/ocaml-client.md b/docs/generators/ocaml-client.md
deleted file mode 100644
index 52874232c1..0000000000
--- a/docs/generators/ocaml-client.md
+++ /dev/null
@@ -1,13 +0,0 @@
-
----
-id: generator-opts-client-ocaml-client
-title: Config Options for ocaml-client
-sidebar_label: ocaml-client
----
-
-| Option | Description | Values | Default |
-| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/ocaml.md b/docs/generators/ocaml.md
index 2e9278e513..87721f5984 100644
--- a/docs/generators/ocaml.md
+++ b/docs/generators/ocaml.md
@@ -5,8 +5,110 @@ sidebar_label: ocaml
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|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|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- Yojson.Safe.t
+- bool
+- bytes
+- char
+- float
+- int
+- int32
+- int64
+- list
+- string
+
+
+## RESERVED WORDS
+
+- and
+- as
+- asr
+- assert
+- begin
+- class
+- constraint
+- do
+- done
+- downto
+- else
+- end
+- exception
+- external
+- false
+- for
+- fun
+- function
+- functor
+- if
+- in
+- include
+- inherit
+- initializer
+- land
+- lazy
+- let
+- lor
+- lsl
+- lsr
+- lxor
+- match
+- method
+- mod
+- module
+- mutable
+- new
+- nonrec
+- object
+- of
+- open
+- or
+- private
+- rec
+- result
+- sig
+- struct
+- then
+- to
+- true
+- try
+- type
+- val
+- virtual
+- when
+- while
+- with
+
diff --git a/docs/generators/openapi-yaml.md b/docs/generators/openapi-yaml.md
index 6c31814c58..96021a3a3e 100644
--- a/docs/generators/openapi-yaml.md
+++ b/docs/generators/openapi-yaml.md
@@ -5,9 +5,45 @@ sidebar_label: openapi-yaml
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|outputFile|Output filename| |openapi/openapi.yaml|
+|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|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+
+
+## RESERVED WORDS
+
+
diff --git a/docs/generators/openapi.md b/docs/generators/openapi.md
index b4fe221913..95b8fd6ace 100644
--- a/docs/generators/openapi.md
+++ b/docs/generators/openapi.md
@@ -5,8 +5,44 @@ sidebar_label: openapi
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|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|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+
+
+## RESERVED WORDS
+
+
diff --git a/docs/generators/perl.md b/docs/generators/perl.md
index 2cac430a58..3a65f291a4 100644
--- a/docs/generators/perl.md
+++ b/docs/generators/perl.md
@@ -5,9 +5,77 @@ sidebar_label: perl
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|moduleName|Perl module name (convention: CamelCase or Long::Module).| |OpenAPIClient|
-|moduleVersion|Perl module version.| |1.0.0|
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |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|
+|moduleName|Perl module name (convention: CamelCase or Long::Module).| |OpenAPIClient|
+|moduleVersion|Perl module version.| |1.0.0|
|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- ARRAY
+- DateTime
+- HASH
+- boolean
+- double
+- int
+- object
+- string
+
+
+## RESERVED WORDS
+
+- __end__
+- __file__
+- __line__
+- __package__
+- and
+- cmp
+- continue
+- core
+- do
+- else
+- elsif
+- eq
+- exp
+- for
+- foreach
+- ge
+- gt
+- if
+- le
+- lock
+- lt
+- m
+- ne
+- no
+- or
+- package
+- q
+- qq
+- qr
+- qw
+- qx
+- return
+- s
+- sub
+- tr
+- unless
+- until
+- while
+- xor
+- y
+
diff --git a/docs/generators/php-laravel.md b/docs/generators/php-laravel.md
index dee3787142..a0b7443d87 100644
--- a/docs/generators/php-laravel.md
+++ b/docs/generators/php-laravel.md
@@ -5,15 +5,138 @@ sidebar_label: php-laravel
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |null|
|apiPackage|package for generated api classes| |null|
-|variableNamingConvention|naming convention of variable name, e.g. camelCase.| |snake_case|
-|invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null|
-|packageName|The main package name for classes. e.g. GeneratedPetstore| |null|
-|srcBasePath|The directory to serve as source root.| |null|
|artifactVersion|The version to use in the composer package version field. e.g. 1.2.3| |null|
+|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|
+|modelPackage|package for generated models| |null|
+|packageName|The main package name for classes. e.g. GeneratedPetstore| |null|
+|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|
+|srcBasePath|The directory to serve as source root.| |null|
+|variableNamingConvention|naming convention of variable name, e.g. camelCase.| |snake_case|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|array|
+|map|map|
+
+
+## LANGUAGE PRIMITIVES
+
+- DateTime
+- bool
+- boolean
+- byte
+- double
+- float
+- int
+- integer
+- mixed
+- number
+- object
+- string
+- void
+
+
+## RESERVED WORDS
+
+- __halt_compiler
+- _header_accept
+- _tempbody
+- 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
+- formparams
+- function
+- global
+- goto
+- headerparams
+- httpbody
+- if
+- implements
+- include
+- include_once
+- instanceof
+- insteadof
+- interface
+- isset
+- list
+- namespace
+- new
+- or
+- print
+- private
+- protected
+- public
+- queryparams
+- require
+- require_once
+- resourcepath
+- return
+- static
+- switch
+- throw
+- trait
+- try
+- unset
+- use
+- var
+- while
+- xor
+
diff --git a/docs/generators/php-lumen.md b/docs/generators/php-lumen.md
index 96af22e02a..4a33196eca 100644
--- a/docs/generators/php-lumen.md
+++ b/docs/generators/php-lumen.md
@@ -5,15 +5,138 @@ sidebar_label: php-lumen
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |null|
|apiPackage|package for generated api classes| |null|
-|variableNamingConvention|naming convention of variable name, e.g. camelCase.| |snake_case|
-|invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null|
-|packageName|The main package name for classes. e.g. GeneratedPetstore| |null|
-|srcBasePath|The directory to serve as source root.| |null|
|artifactVersion|The version to use in the composer package version field. e.g. 1.2.3| |null|
+|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|
+|modelPackage|package for generated models| |null|
+|packageName|The main package name for classes. e.g. GeneratedPetstore| |null|
+|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|
+|srcBasePath|The directory to serve as source root.| |null|
+|variableNamingConvention|naming convention of variable name, e.g. camelCase.| |snake_case|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|array|
+|map|map|
+
+
+## LANGUAGE PRIMITIVES
+
+- DateTime
+- bool
+- boolean
+- byte
+- double
+- float
+- int
+- integer
+- mixed
+- number
+- object
+- string
+- void
+
+
+## RESERVED WORDS
+
+- __halt_compiler
+- _header_accept
+- _tempbody
+- 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
+- formparams
+- function
+- global
+- goto
+- headerparams
+- httpbody
+- if
+- implements
+- include
+- include_once
+- instanceof
+- insteadof
+- interface
+- isset
+- list
+- namespace
+- new
+- or
+- print
+- private
+- protected
+- public
+- queryparams
+- require
+- require_once
+- resourcepath
+- return
+- static
+- switch
+- throw
+- trait
+- try
+- unset
+- use
+- var
+- while
+- xor
+
diff --git a/docs/generators/php-silex.md b/docs/generators/php-silex.md
index 67000a6a3b..7c515f135e 100644
--- a/docs/generators/php-silex.md
+++ b/docs/generators/php-silex.md
@@ -5,8 +5,121 @@ sidebar_label: php-silex
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|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|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|array|
+|map|map|
+
+
+## LANGUAGE PRIMITIVES
+
+- DateTime
+- boolean
+- double
+- float
+- int
+- integer
+- mixed
+- number
+- object
+- string
+
+
+## RESERVED WORDS
+
+- __halt_compiler
+- 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/docs/generators/php-slim-deprecated.md b/docs/generators/php-slim-deprecated.md
index b15405df2b..7e6cd21fdb 100644
--- a/docs/generators/php-slim-deprecated.md
+++ b/docs/generators/php-slim-deprecated.md
@@ -5,15 +5,122 @@ sidebar_label: php-slim-deprecated
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |null|
|apiPackage|package for generated api classes| |null|
-|variableNamingConvention|naming convention of variable name, e.g. camelCase.| |camelCase|
-|invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null|
-|packageName|The main package name for classes. e.g. GeneratedPetstore| |null|
-|srcBasePath|The directory to serve as source root.| |null|
|artifactVersion|The version to use in the composer package version field. e.g. 1.2.3| |null|
+|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|
+|modelPackage|package for generated models| |null|
+|packageName|The main package name for classes. e.g. GeneratedPetstore| |null|
+|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|
+|srcBasePath|The directory to serve as source root.| |null|
+|variableNamingConvention|naming convention of variable name, e.g. camelCase.| |camelCase|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|array|
+|map|map|
+
+
+## LANGUAGE PRIMITIVES
+
+- DateTime
+- bool
+- boolean
+- byte
+- double
+- float
+- int
+- integer
+- mixed
+- number
+- object
+- string
+- void
+
+
+## RESERVED WORDS
+
+- __halt_compiler
+- _header_accept
+- _tempbody
+- 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
+- formparams
+- function
+- global
+- goto
+- headerparams
+- httpbody
+- if
+- implements
+- include
+- include_once
+- instanceof
+- insteadof
+- interface
+- isset
+- list
+- namespace
+- new
+- or
+- print
+- private
+- protected
+- public
+- queryparams
+- require
+- require_once
+- resourcepath
+- return
+- static
+- switch
+- throw
+- trait
+- try
+- unset
+- use
+- var
+- while
+- xor
+
diff --git a/docs/generators/php-slim.md b/docs/generators/php-slim.md
deleted file mode 100644
index d9e188a425..0000000000
--- a/docs/generators/php-slim.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-title: Config Options for php-slim
-sidebar_label: php-slim
----
-
-| Option | Description | Values | Default |
-| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |null|
-|apiPackage|package for generated api classes| |null|
-|variableNamingConvention|naming convention of variable name, e.g. camelCase.| |camelCase|
-|invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null|
-|packageName|The main package name for classes. e.g. GeneratedPetstore| |null|
-|srcBasePath|The directory to serve as source root.| |null|
-|artifactVersion|The version to use in the composer package version field. e.g. 1.2.3| |null|
diff --git a/docs/generators/php-slim4.md b/docs/generators/php-slim4.md
index 6ca37b8adc..1e96ca09b3 100644
--- a/docs/generators/php-slim4.md
+++ b/docs/generators/php-slim4.md
@@ -5,16 +5,123 @@ sidebar_label: php-slim4
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |null|
|apiPackage|package for generated api classes| |null|
-|variableNamingConvention|naming convention of variable name, e.g. camelCase.| |camelCase|
-|invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null|
-|packageName|The main package name for classes. e.g. GeneratedPetstore| |null|
-|srcBasePath|The directory to serve as source root.| |null|
|artifactVersion|The version to use in the composer package version field. e.g. 1.2.3| |null|
+|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|
+|modelPackage|package for generated models| |null|
+|packageName|The main package name for classes. e.g. GeneratedPetstore| |null|
+|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
|psr7Implementation|Slim 4 provides its own PSR-7 implementation so that it works out of the box. However, you are free to replace Slim’s default PSR-7 objects with a third-party implementation. Ref: https://www.slimframework.com/docs/v4/concepts/value-objects.html|- **slim-psr7**
- Slim PSR-7 Message implementation
- **nyholm-psr7**
- Nyholm PSR-7 Message implementation
- **guzzle-psr7**
- Guzzle PSR-7 Message implementation
- **zend-diactoros**
- Zend Diactoros PSR-7 Message implementation
|slim-psr7|
+|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+|srcBasePath|The directory to serve as source root.| |null|
+|variableNamingConvention|naming convention of variable name, e.g. camelCase.| |camelCase|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|array|
+|map|map|
+
+
+## LANGUAGE PRIMITIVES
+
+- DateTime
+- bool
+- boolean
+- byte
+- double
+- float
+- int
+- integer
+- mixed
+- number
+- object
+- string
+- void
+
+
+## RESERVED WORDS
+
+- __halt_compiler
+- _header_accept
+- _tempbody
+- 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
+- formparams
+- function
+- global
+- goto
+- headerparams
+- httpbody
+- if
+- implements
+- include
+- include_once
+- instanceof
+- insteadof
+- interface
+- isset
+- list
+- namespace
+- new
+- or
+- print
+- private
+- protected
+- public
+- queryparams
+- require
+- require_once
+- resourcepath
+- return
+- static
+- switch
+- throw
+- trait
+- try
+- unset
+- use
+- var
+- while
+- xor
+
diff --git a/docs/generators/php-symfony.md b/docs/generators/php-symfony.md
index 913c5be6a5..a6fbd33e45 100644
--- a/docs/generators/php-symfony.md
+++ b/docs/generators/php-symfony.md
@@ -5,21 +5,126 @@ sidebar_label: php-symfony
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |null|
|apiPackage|package for generated api classes| |null|
-|variableNamingConvention|naming convention of variable name, e.g. camelCase.| |snake_case|
-|invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null|
-|packageName|The main package name for classes. e.g. GeneratedPetstore| |null|
-|srcBasePath|The directory to serve as source root.| |null|
|artifactVersion|The version to use in the composer package version field. e.g. 1.2.3| |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|
-|bundleName|The name of the Symfony bundle. The template uses {{bundleName}}| |null|
|bundleAlias|The alias of the Symfony bundle. The template uses {{aliasName}}| |null|
+|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|
+|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|
+|modelPackage|package for generated models| |null|
+|packageName|The main package name for classes. e.g. GeneratedPetstore| |null|
|phpLegacySupport|Should the generated code be compatible with PHP 5.x?| |true|
+|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|
+|srcBasePath|The directory to serve as source root.| |null|
+|variableNamingConvention|naming convention of variable name, e.g. camelCase.| |snake_case|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|array|
+|map|map|
+
+
+## LANGUAGE PRIMITIVES
+
+- array
+- bool
+- byte
+- double
+- float
+- int
+- mixed
+- number
+- object
+- string
+- void
+
+
+## RESERVED WORDS
+
+- __halt_compiler
+- _header_accept
+- _tempbody
+- 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
+- formparams
+- function
+- global
+- goto
+- headerparams
+- httpbody
+- if
+- implements
+- include
+- include_once
+- instanceof
+- insteadof
+- interface
+- isset
+- list
+- namespace
+- new
+- or
+- print
+- private
+- protected
+- public
+- queryparams
+- require
+- require_once
+- resourcepath
+- return
+- static
+- switch
+- throw
+- trait
+- try
+- unset
+- use
+- var
+- while
+- xor
+
diff --git a/docs/generators/php-ze-ph.md b/docs/generators/php-ze-ph.md
index a1066f34dc..99bf251414 100644
--- a/docs/generators/php-ze-ph.md
+++ b/docs/generators/php-ze-ph.md
@@ -5,15 +5,138 @@ sidebar_label: php-ze-ph
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |null|
|apiPackage|package for generated api classes| |null|
-|variableNamingConvention|naming convention of variable name, e.g. camelCase.| |snake_case|
-|invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null|
-|packageName|The main package name for classes. e.g. GeneratedPetstore| |null|
-|srcBasePath|The directory to serve as source root.| |null|
|artifactVersion|The version to use in the composer package version field. e.g. 1.2.3| |null|
+|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|
+|modelPackage|package for generated models| |null|
+|packageName|The main package name for classes. e.g. GeneratedPetstore| |null|
+|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|
+|srcBasePath|The directory to serve as source root.| |null|
+|variableNamingConvention|naming convention of variable name, e.g. camelCase.| |snake_case|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|array|
+|map|map|
+
+
+## LANGUAGE PRIMITIVES
+
+- DateTime
+- bool
+- boolean
+- byte
+- double
+- float
+- int
+- integer
+- mixed
+- number
+- object
+- string
+- void
+
+
+## RESERVED WORDS
+
+- __halt_compiler
+- _header_accept
+- _tempbody
+- 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
+- formparams
+- function
+- global
+- goto
+- headerparams
+- httpbody
+- if
+- implements
+- include
+- include_once
+- instanceof
+- insteadof
+- interface
+- isset
+- list
+- namespace
+- new
+- or
+- print
+- private
+- protected
+- public
+- queryparams
+- require
+- require_once
+- resourcepath
+- return
+- static
+- switch
+- throw
+- trait
+- try
+- unset
+- use
+- var
+- while
+- xor
+
diff --git a/docs/generators/php.md b/docs/generators/php.md
index c7d1766f24..b8de32ff81 100644
--- a/docs/generators/php.md
+++ b/docs/generators/php.md
@@ -5,16 +5,123 @@ sidebar_label: php
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |null|
|apiPackage|package for generated api classes| |null|
-|variableNamingConvention|naming convention of variable name, e.g. camelCase.| |snake_case|
-|invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null|
-|packageName|The main package name for classes. e.g. GeneratedPetstore| |null|
-|srcBasePath|The directory to serve as source root.| |null|
|artifactVersion|The version to use in the composer package version field. e.g. 1.2.3| |null|
+|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|
+|modelPackage|package for generated models| |null|
+|packageName|The main package name for classes. e.g. GeneratedPetstore| |null|
+|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|
+|srcBasePath|The directory to serve as source root.| |null|
+|variableNamingConvention|naming convention of variable name, e.g. camelCase.| |snake_case|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|array|
+|map|map|
+
+
+## LANGUAGE PRIMITIVES
+
+- DateTime
+- bool
+- boolean
+- byte
+- double
+- float
+- int
+- integer
+- mixed
+- number
+- object
+- string
+- void
+
+
+## RESERVED WORDS
+
+- __halt_compiler
+- _header_accept
+- _tempbody
+- 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
+- formparams
+- function
+- global
+- goto
+- headerparams
+- httpbody
+- if
+- implements
+- include
+- include_once
+- instanceof
+- insteadof
+- interface
+- isset
+- list
+- namespace
+- new
+- or
+- print
+- private
+- protected
+- public
+- queryparams
+- require
+- require_once
+- resourcepath
+- return
+- static
+- switch
+- throw
+- trait
+- try
+- unset
+- use
+- var
+- while
+- xor
+
diff --git a/docs/generators/powershell.md b/docs/generators/powershell.md
index bef12a7aaf..e8fcfaf8af 100644
--- a/docs/generators/powershell.md
+++ b/docs/generators/powershell.md
@@ -5,6 +5,96 @@ sidebar_label: powershell
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|packageName|Client package name (e.g. org.openapitools.client).| |Org.OpenAPITools|
-|packageGuid|GUID for PowerShell module (e.g. a27b908d-2a20-467f-bc32-af6f3a654ac5). A random GUID will be generated by default.| |null|
|csharpClientPath|Path to the C# API client generated by OpenAPI Generator, e.g. $ScriptDir\..\csharp\OpenAPIClient where $ScriptDir is the current directory. NOTE: you will need to generate the C# API client separately.| |$ScriptDir\csharp\OpenAPIClient|
+|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. org.openapitools.client).| |Org.OpenAPITools|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- Boolean
+- Byte
+- Byte[]
+- Char
+- Decimal
+- Double
+- Guid
+- Int16
+- Int32
+- Int64
+- ProgressRecord
+- SByte
+- SecureString
+- Single
+- String
+- System.DateTime
+- TimeSpan
+- UInt16
+- UInt32
+- UInt64
+- Uri
+- Version
+- XmlDocument
+
+
+## RESERVED WORDS
+
+- Begin
+- Break
+- Catch
+- Continue
+- Data
+- Do
+- Dynamicparam
+- Else
+- Elseif
+- End
+- Exit
+- Filter
+- Finally
+- For
+- Foreach
+- From
+- Function
+- If
+- In
+- Local
+- Param
+- Private
+- Process
+- Return
+- Switch
+- Throw
+- Trap
+- Try
+- Until
+- Where
+- While
+
diff --git a/docs/generators/protobuf-schema.md b/docs/generators/protobuf-schema.md
index 68edd8d6e2..71b97282c3 100644
--- a/docs/generators/protobuf-schema.md
+++ b/docs/generators/protobuf-schema.md
@@ -5,3 +5,41 @@ sidebar_label: protobuf-schema
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|repeat|
+
+
+## LANGUAGE PRIMITIVES
+
+- array
+- bool
+- bytes
+- double
+- fixed32
+- fixed64
+- float
+- int32
+- int64
+- map
+- sfixed32
+- sfixed64
+- sint32
+- sint64
+- string
+- uint32
+- uint64
+
+
+## RESERVED WORDS
+
+
diff --git a/docs/generators/python-aiohttp.md b/docs/generators/python-aiohttp.md
index a116fc6e96..3fa24defa3 100644
--- a/docs/generators/python-aiohttp.md
+++ b/docs/generators/python-aiohttp.md
@@ -5,15 +5,100 @@ sidebar_label: python-aiohttp
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|packageName|python package name (convention: snake_case).| |openapi_server|
-|packageVersion|python package version.| |1.0.0|
|controllerPackage|controller package| |controllers|
|defaultController|default controller| |default_controller|
-|supportPython2|support python2| |false|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|packageName|python package name (convention: snake_case).| |openapi_server|
+|packageVersion|python package version.| |1.0.0|
+|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
|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|
|useNose|use the nose test framework| |false|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- Dict
+- List
+- bool
+- byte
+- bytearray
+- date
+- datetime
+- file
+- float
+- int
+- object
+- str
+
+
+## RESERVED WORDS
+
+- and
+- as
+- assert
+- break
+- class
+- continue
+- def
+- del
+- elif
+- else
+- except
+- exec
+- false
+- finally
+- for
+- from
+- global
+- if
+- import
+- in
+- is
+- lambda
+- none
+- nonlocal
+- not
+- or
+- pass
+- print
+- property
+- raise
+- return
+- self
+- true
+- try
+- while
+- with
+- yield
+
diff --git a/docs/generators/python-blueplanet.md b/docs/generators/python-blueplanet.md
index 7114953628..6acfe09100 100644
--- a/docs/generators/python-blueplanet.md
+++ b/docs/generators/python-blueplanet.md
@@ -5,15 +5,100 @@ sidebar_label: python-blueplanet
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|packageName|python package name (convention: snake_case).| |openapi_server|
-|packageVersion|python package version.| |1.0.0|
|controllerPackage|controller package| |controllers|
|defaultController|default controller| |default_controller|
-|supportPython2|support python2| |false|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|packageName|python package name (convention: snake_case).| |openapi_server|
+|packageVersion|python package version.| |1.0.0|
+|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
|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|
|useNose|use the nose test framework| |false|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- Dict
+- List
+- bool
+- byte
+- bytearray
+- date
+- datetime
+- file
+- float
+- int
+- object
+- str
+
+
+## RESERVED WORDS
+
+- and
+- as
+- assert
+- break
+- class
+- continue
+- def
+- del
+- elif
+- else
+- except
+- exec
+- false
+- finally
+- for
+- from
+- global
+- if
+- import
+- in
+- is
+- lambda
+- none
+- nonlocal
+- not
+- or
+- pass
+- print
+- property
+- raise
+- return
+- self
+- true
+- try
+- while
+- with
+- yield
+
diff --git a/docs/generators/python-experimental.md b/docs/generators/python-experimental.md
index 8ba2d699ed..1c42e76919 100644
--- a/docs/generators/python-experimental.md
+++ b/docs/generators/python-experimental.md
@@ -5,12 +5,93 @@ sidebar_label: python-experimental
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|packageName|python package name (convention: snake_case).| |openapi_client|
-|projectName|python project name in setup.py (e.g. petstore-api).| |null|
-|packageVersion|python package version.| |1.0.0|
-|packageUrl|python package URL.| |null|
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
|generateSourceCodeOnly|Specifies that only a library source code is to be generated.| |false|
-|useNose|use the nose test framework| |false|
+|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
|library|library template (sub-template) to use: asyncio, tornado, urllib3| |urllib3|
+|packageName|python package name (convention: snake_case).| |openapi_client|
+|packageUrl|python package URL.| |null|
+|packageVersion|python package version.| |1.0.0|
+|projectName|python project name in setup.py (e.g. petstore-api).| |null|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+|useNose|use the nose test framework| |false|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|map|dict|
+
+
+## LANGUAGE PRIMITIVES
+
+- bool
+- date
+- datetime
+- dict
+- file
+- file_type
+- float
+- int
+- list
+- none_type
+- object
+- str
+
+
+## RESERVED WORDS
+
+- all_params
+- and
+- as
+- assert
+- async
+- auth_settings
+- await
+- body_params
+- break
+- class
+- continue
+- def
+- del
+- elif
+- else
+- except
+- exec
+- false
+- finally
+- for
+- form_params
+- from
+- global
+- header_params
+- if
+- import
+- in
+- is
+- lambda
+- local_var_files
+- none
+- nonlocal
+- not
+- or
+- pass
+- path_params
+- print
+- property
+- query_params
+- raise
+- resource_path
+- return
+- self
+- true
+- try
+- while
+- with
+- yield
+
diff --git a/docs/generators/python-flask.md b/docs/generators/python-flask.md
index 1b68530a86..1f76e43466 100644
--- a/docs/generators/python-flask.md
+++ b/docs/generators/python-flask.md
@@ -5,15 +5,100 @@ sidebar_label: python-flask
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|packageName|python package name (convention: snake_case).| |openapi_server|
-|packageVersion|python package version.| |1.0.0|
|controllerPackage|controller package| |controllers|
|defaultController|default controller| |default_controller|
-|supportPython2|support python2| |false|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|packageName|python package name (convention: snake_case).| |openapi_server|
+|packageVersion|python package version.| |1.0.0|
+|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
|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|
|useNose|use the nose test framework| |false|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- Dict
+- List
+- bool
+- byte
+- bytearray
+- date
+- datetime
+- file
+- float
+- int
+- object
+- str
+
+
+## RESERVED WORDS
+
+- and
+- as
+- assert
+- break
+- class
+- continue
+- def
+- del
+- elif
+- else
+- except
+- exec
+- false
+- finally
+- for
+- from
+- global
+- if
+- import
+- in
+- is
+- lambda
+- none
+- nonlocal
+- not
+- or
+- pass
+- print
+- property
+- raise
+- return
+- self
+- true
+- try
+- while
+- with
+- yield
+
diff --git a/docs/generators/python.md b/docs/generators/python.md
index ee581848b0..19e268b90d 100644
--- a/docs/generators/python.md
+++ b/docs/generators/python.md
@@ -5,12 +5,90 @@ sidebar_label: python
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|packageName|python package name (convention: snake_case).| |openapi_client|
-|projectName|python project name in setup.py (e.g. petstore-api).| |null|
-|packageVersion|python package version.| |1.0.0|
-|packageUrl|python package URL.| |null|
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
|generateSourceCodeOnly|Specifies that only a library source code is to be generated.| |false|
-|useNose|use the nose test framework| |false|
+|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
|library|library template (sub-template) to use: asyncio, tornado, urllib3| |urllib3|
+|packageName|python package name (convention: snake_case).| |openapi_client|
+|packageUrl|python package URL.| |null|
+|packageVersion|python package version.| |1.0.0|
+|projectName|python project name in setup.py (e.g. petstore-api).| |null|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+|useNose|use the nose test framework| |false|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- bool
+- date
+- datetime
+- dict
+- file
+- float
+- int
+- list
+- object
+- str
+
+
+## RESERVED WORDS
+
+- all_params
+- and
+- as
+- assert
+- async
+- auth_settings
+- await
+- body_params
+- break
+- class
+- continue
+- def
+- del
+- elif
+- else
+- except
+- exec
+- false
+- finally
+- for
+- form_params
+- from
+- global
+- header_params
+- if
+- import
+- in
+- is
+- lambda
+- local_var_files
+- none
+- nonlocal
+- not
+- or
+- pass
+- path_params
+- print
+- property
+- query_params
+- raise
+- resource_path
+- return
+- self
+- true
+- try
+- while
+- with
+- yield
+
diff --git a/docs/generators/r.md b/docs/generators/r.md
index fa257ae0ed..8d71a39a69 100644
--- a/docs/generators/r.md
+++ b/docs/generators/r.md
@@ -5,8 +5,53 @@ sidebar_label: r
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
+|exceptionPackage|Specify the exception handling package|- **default**
- Use stop() for raising exceptions.
- **rlang**
- Use rlang package for exceptions.
|default|
+|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
|packageName|R package name (convention: lowercase).| |openapi|
|packageVersion|R package version.| |1.0.0|
-|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
|returnExceptionOnFailure|Throw an exception on non success response codes| |false|
-|exceptionPackage|Specify the exception handling package|- **default**
- Use stop() for raising exceptions.
- **rlang**
- Use rlang package for exceptions.
|default|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- character
+- data.frame
+- integer
+- numeric
+- object
+
+
+## RESERVED WORDS
+
+- apiresponse
+- break
+- else
+- false
+- for
+- function
+- if
+- in
+- inf
+- na
+- na_character_
+- na_complex_
+- na_integer_
+- na_real_
+- nan
+- next
+- null
+- repeat
+- true
+- while
+
diff --git a/docs/generators/ruby-on-rails.md b/docs/generators/ruby-on-rails.md
index d55421f8d6..82d9f33bb3 100644
--- a/docs/generators/ruby-on-rails.md
+++ b/docs/generators/ruby-on-rails.md
@@ -6,3 +6,87 @@ sidebar_label: ruby-on-rails
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
|databaseAdapter|The adapter for database (e.g. mysql, sqlite). Default: sqlite| |sqlite|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- Array
+- Boolean
+- Date
+- DateTime
+- File
+- Float
+- Hash
+- Integer
+- Object
+- String
+
+
+## RESERVED WORDS
+
+- __file__
+- __line__
+- alias
+- and
+- begin
+- break
+- case
+- class
+- def
+- defined?
+- do
+- else
+- elsif
+- end
+- ensure
+- false
+- for
+- if
+- in
+- module
+- next
+- nil
+- not
+- or
+- redo
+- rescue
+- retry
+- return
+- self
+- super
+- then
+- true
+- undef
+- unless
+- until
+- when
+- while
+- yield
+
diff --git a/docs/generators/ruby-sinatra.md b/docs/generators/ruby-sinatra.md
index f46767a209..b759489632 100644
--- a/docs/generators/ruby-sinatra.md
+++ b/docs/generators/ruby-sinatra.md
@@ -5,3 +5,87 @@ sidebar_label: ruby-sinatra
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- Array
+- Boolean
+- Date
+- DateTime
+- File
+- Float
+- Hash
+- Integer
+- Object
+- String
+
+
+## RESERVED WORDS
+
+- __file__
+- __line__
+- alias
+- and
+- begin
+- break
+- case
+- class
+- def
+- defined?
+- do
+- else
+- elsif
+- end
+- ensure
+- false
+- for
+- if
+- in
+- module
+- next
+- nil
+- not
+- or
+- redo
+- rescue
+- retry
+- return
+- self
+- super
+- then
+- true
+- undef
+- unless
+- until
+- when
+- while
+- yield
+
diff --git a/docs/generators/ruby.md b/docs/generators/ruby.md
index 17eab9c029..f749fa9667 100644
--- a/docs/generators/ruby.md
+++ b/docs/generators/ruby.md
@@ -5,20 +5,102 @@ sidebar_label: ruby
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|gemName|gem name (convention: underscore_case).| |openapi_client|
-|moduleName|top module name (convention: CamelCase, usually corresponding to gem name).| |OpenAPIClient|
-|gemVersion|gem version.| |1.0.0|
-|gemLicense|gem license. | |unlicense|
-|gemRequiredRubyVersion|gem required Ruby version. | |>= 1.9|
-|gemHomepage|gem homepage. | |http://org.openapitools|
-|gemSummary|gem summary. | |A ruby wrapper for the REST APIs|
-|gemDescription|gem description. | |This gem maps to a REST API|
+|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|
+|gemDescription|gem description. | |This gem maps to a REST API|
+|gemHomepage|gem homepage. | |http://org.openapitools|
+|gemLicense|gem license. | |unlicense|
+|gemName|gem name (convention: underscore_case).| |openapi_client|
+|gemRequiredRubyVersion|gem required Ruby version. | |>= 1.9|
+|gemSummary|gem summary. | |A ruby wrapper for the REST APIs|
+|gemVersion|gem version.| |1.0.0|
|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
|library|HTTP library template (sub-template) to use|- **faraday**
- Faraday (https://github.com/lostisland/faraday) (Beta support)
- **typhoeus**
- Typhoeus >= 1.0.1 (https://github.com/typhoeus/typhoeus)
|typhoeus|
+|moduleName|top module name (convention: CamelCase, usually corresponding to gem name).| |OpenAPIClient|
+|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|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- Array
+- Boolean
+- Date
+- DateTime
+- File
+- Float
+- Hash
+- Integer
+- Object
+- String
+- array
+- int
+- map
+- string
+
+
+## RESERVED WORDS
+
+- __file__
+- __line__
+- _header_accept
+- _header_accept_result
+- _header_content_type
+- alias
+- and
+- auth_names
+- begin
+- break
+- case
+- class
+- def
+- defined?
+- do
+- else
+- elsif
+- end
+- ensure
+- false
+- for
+- form_params
+- header_params
+- if
+- in
+- local_var_path
+- module
+- next
+- nil
+- not
+- or
+- post_body
+- query_params
+- redo
+- rescue
+- retry
+- return
+- self
+- send
+- super
+- then
+- true
+- undef
+- unless
+- until
+- when
+- while
+- yield
+
diff --git a/docs/generators/rust-server.md b/docs/generators/rust-server.md
index 9671d82b9f..50551fa841 100644
--- a/docs/generators/rust-server.md
+++ b/docs/generators/rust-server.md
@@ -7,3 +7,92 @@ sidebar_label: rust-server
| ------ | ----------- | ------ | ------- |
|packageName|Rust crate name (convention: snake_case).| |openapi_client|
|packageVersion|Rust crate version.| |null|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|Vec|
+|map|Map|
+
+
+## LANGUAGE PRIMITIVES
+
+- String
+- bool
+- char
+- f32
+- f64
+- i16
+- i32
+- i64
+- i8
+- isize
+- str
+- u16
+- u32
+- u64
+- u8
+- usize
+
+
+## RESERVED WORDS
+
+- abstract
+- alignof
+- as
+- become
+- box
+- break
+- const
+- continue
+- crate
+- do
+- else
+- enum
+- extern
+- false
+- final
+- fn
+- for
+- if
+- impl
+- in
+- let
+- loop
+- macro
+- match
+- mod
+- move
+- mut
+- offsetof
+- override
+- priv
+- proc
+- pub
+- pure
+- ref
+- return
+- self
+- sizeof
+- static
+- struct
+- super
+- trait
+- true
+- type
+- typeof
+- unsafe
+- unsized
+- use
+- virtual
+- where
+- while
+- yield
+
diff --git a/docs/generators/rust.md b/docs/generators/rust.md
index 2f1aa5d747..9dfff407df 100644
--- a/docs/generators/rust.md
+++ b/docs/generators/rust.md
@@ -5,7 +5,109 @@ sidebar_label: rust
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|packageName|Rust package name (convention: lowercase).| |openapi|
-|packageVersion|Rust package version.| |1.0.0|
|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
|library|library template (sub-template) to use.|- **hyper**
- HTTP client: Hyper.
- **reqwest**
- HTTP client: Reqwest.
|hyper|
+|packageName|Rust package name (convention: lowercase).| |openapi|
+|packageVersion|Rust package version.| |1.0.0|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|Set|java.util.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+
+
+## LANGUAGE PRIMITIVES
+
+- File
+- String
+- Vec<u8>
+- bool
+- char
+- f32
+- f64
+- i16
+- i32
+- i64
+- i8
+- u16
+- u32
+- u64
+- u8
+
+
+## RESERVED WORDS
+
+- abstract
+- alignof
+- as
+- become
+- box
+- break
+- const
+- continue
+- crate
+- do
+- else
+- enum
+- extern
+- false
+- final
+- fn
+- for
+- if
+- impl
+- in
+- let
+- loop
+- macro
+- match
+- mod
+- move
+- mut
+- offsetof
+- override
+- priv
+- proc
+- pub
+- pure
+- ref
+- return
+- self
+- sizeof
+- static
+- struct
+- super
+- trait
+- true
+- type
+- typeof
+- unsafe
+- unsized
+- use
+- virtual
+- where
+- while
+- yield
+
diff --git a/docs/generators/scala-akka.md b/docs/generators/scala-akka.md
index ceae6b73ea..3ad7d16a08 100644
--- a/docs/generators/scala-akka.md
+++ b/docs/generators/scala-akka.md
@@ -5,12 +5,102 @@ sidebar_label: scala-akka
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |null|
|apiPackage|package for generated api classes| |null|
-|sourceFolder|source folder for generated code| |null|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|mainPackage|Top-level package name, which defines 'apiPackage', 'modelPackage', 'invokerPackage'| |org.openapitools.client|
+|modelPackage|package for generated models| |null|
+|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|
+|sourceFolder|source folder for generated code| |null|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.DateTime|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|ListBuffer|scala.collection.mutable.ListBuffer|
+|ListSet|scala.collection.immutable.ListSet|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|ListBuffer|
+|map|Map|
+|set|Set|
+
+
+## LANGUAGE PRIMITIVES
+
+- Any
+- Array
+- Boolean
+- Double
+- Float
+- Int
+- List
+- Long
+- Map
+- Object
+- Seq
+- String
+- boolean
+
+
+## RESERVED WORDS
+
+- abstract
+- case
+- catch
+- class
+- def
+- do
+- else
+- extends
+- false
+- final
+- finally
+- for
+- forsome
+- if
+- implicit
+- import
+- lazy
+- match
+- new
+- null
+- object
+- override
+- package
+- private
+- protected
+- return
+- sealed
+- super
+- this
+- throw
+- trait
+- true
+- try
+- type
+- val
+- var
+- while
+- with
+- yield
+
diff --git a/docs/generators/scala-finch.md b/docs/generators/scala-finch.md
index 2a38482084..764ea5fd71 100644
--- a/docs/generators/scala-finch.md
+++ b/docs/generators/scala-finch.md
@@ -5,6 +5,120 @@ sidebar_label: scala-finch
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|packageName|Finch package name (e.g. org.openapitools).| |org.openapitools|
-|modelPackage|package for generated models| |null|
|apiPackage|package for generated api classes| |null|
+|modelPackage|package for generated models| |null|
+|packageName|Finch package name (e.g. org.openapitools).| |org.openapitools|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|ArrayBuffer|scala.collection.mutable.ArrayBuffer|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|java.time.LocalDateTime|
+|File|java.io.File|
+|HashMap|scala.collection.immutable.HashMap|
+|LocalDate|java.time.LocalDate|
+|LocalDateTime|java.time.LocalDateTime|
+|LocalTime|java.time.LocalTime|
+|Map|scala.collection.immutable.Map|
+|Seq|scala.collection.immutable.Seq|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+|ZonedDateTime|java.time.ZonedDateTime|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|ArrayList|
+|map|HashMap|
+
+
+## LANGUAGE PRIMITIVES
+
+- Any
+- AnyRef
+- AnyVal
+- Boolean
+- Double
+- Float
+- Int
+- Integer
+- Long
+- Object
+- String
+
+
+## RESERVED WORDS
+
+- abstract
+- assert
+- break
+- byte
+- case
+- catch
+- char
+- class
+- const
+- continue
+- def
+- default
+- do
+- double
+- else
+- enum
+- extends
+- false
+- final
+- finally
+- float
+- for
+- forsome
+- goto
+- if
+- implements
+- implicit
+- import
+- instanceof
+- int
+- interface
+- lazy
+- long
+- match
+- native
+- new
+- null
+- object
+- override
+- package
+- private
+- protected
+- public
+- return
+- sealed
+- short
+- static
+- strictfp
+- super
+- switch
+- synchronized
+- this
+- throw
+- throws
+- trait
+- transient
+- true
+- try
+- type
+- val
+- var
+- void
+- volatile
+- while
+- with
+- yield
+
diff --git a/docs/generators/scala-gatling.md b/docs/generators/scala-gatling.md
index 8f56ccebbf..3354299227 100644
--- a/docs/generators/scala-gatling.md
+++ b/docs/generators/scala-gatling.md
@@ -5,11 +5,112 @@ sidebar_label: scala-gatling
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |null|
|apiPackage|package for generated api classes| |null|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|modelPackage|package for generated models| |null|
+|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|
|sourceFolder|source folder for generated code| |null|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|ListBuffer|scala.collection.mutable.ListBuffer|
+|ListSet|scala.collection.immutable.ListSet|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Seq|scala.collection.immutable.Seq|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|ListBuffer|
+|map|HashMap|
+|set|Set|
+
+
+## LANGUAGE PRIMITIVES
+
+- Any
+- Array
+- Boolean
+- Double
+- Float
+- Int
+- List
+- Long
+- Map
+- Object
+- Seq
+- String
+- boolean
+
+
+## RESERVED WORDS
+
+- abstract
+- apiinvoker
+- basepath
+- case
+- catch
+- class
+- contenttype
+- contenttypes
+- def
+- do
+- else
+- extends
+- false
+- final
+- finally
+- for
+- formparams
+- forsome
+- headerparams
+- if
+- implicit
+- import
+- lazy
+- match
+- mp
+- new
+- null
+- object
+- override
+- package
+- path
+- postbody
+- private
+- protected
+- queryparams
+- return
+- sealed
+- super
+- this
+- throw
+- trait
+- true
+- try
+- type
+- val
+- var
+- while
+- with
+- yield
+
diff --git a/docs/generators/scala-httpclient-deprecated.md b/docs/generators/scala-httpclient-deprecated.md
index d27b8bf3a0..4fa157bcd7 100644
--- a/docs/generators/scala-httpclient-deprecated.md
+++ b/docs/generators/scala-httpclient-deprecated.md
@@ -5,12 +5,113 @@ sidebar_label: scala-httpclient-deprecated
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |null|
|apiPackage|package for generated api classes| |null|
-|sourceFolder|source folder for generated code| |null|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|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|
+|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|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|ListBuffer|scala.collection.mutable.ListBuffer|
+|ListSet|scala.collection.immutable.ListSet|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Seq|scala.collection.immutable.Seq|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|ListBuffer|
+|map|HashMap|
+|set|Set|
+
+
+## LANGUAGE PRIMITIVES
+
+- Any
+- Array
+- Boolean
+- Double
+- Float
+- Int
+- List
+- Long
+- Map
+- Object
+- Seq
+- String
+- boolean
+
+
+## RESERVED WORDS
+
+- abstract
+- apiinvoker
+- basepath
+- case
+- catch
+- class
+- contenttype
+- contenttypes
+- def
+- do
+- else
+- extends
+- false
+- final
+- finally
+- for
+- formparams
+- forsome
+- headerparams
+- if
+- implicit
+- import
+- lazy
+- match
+- mp
+- new
+- null
+- object
+- override
+- package
+- path
+- postbody
+- private
+- protected
+- queryparams
+- return
+- sealed
+- super
+- this
+- throw
+- trait
+- true
+- try
+- type
+- val
+- var
+- while
+- with
+- yield
+
diff --git a/docs/generators/scala-httpclient.md b/docs/generators/scala-httpclient.md
deleted file mode 100644
index 6b85507bc2..0000000000
--- a/docs/generators/scala-httpclient.md
+++ /dev/null
@@ -1,17 +0,0 @@
-
----
-id: generator-opts-client-scala-httpclient
-title: Config Options for scala-httpclient
-sidebar_label: scala-httpclient
----
-
-| Option | Description | Values | Default |
-| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |null|
-|apiPackage|package for generated api classes| |null|
-|sourceFolder|source folder for generated code| |null|
-|modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase|
diff --git a/docs/generators/scala-lagom-server.md b/docs/generators/scala-lagom-server.md
index c0d040c642..0608d6cfa2 100644
--- a/docs/generators/scala-lagom-server.md
+++ b/docs/generators/scala-lagom-server.md
@@ -5,12 +5,113 @@ sidebar_label: scala-lagom-server
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |null|
|apiPackage|package for generated api classes| |null|
-|sourceFolder|source folder for generated code| |null|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|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|
+|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|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.DateTime|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|ListBuffer|scala.collection.mutable.ListBuffer|
+|ListSet|scala.collection.immutable.ListSet|
+|LocalDate|org.joda.time.*|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Seq|scala.collection.immutable.Seq|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|ListBuffer|
+|map|HashMap|
+|set|Set|
+
+
+## LANGUAGE PRIMITIVES
+
+- Any
+- Array
+- Boolean
+- Double
+- Float
+- Int
+- List
+- Long
+- Map
+- Object
+- Seq
+- String
+- boolean
+
+
+## RESERVED WORDS
+
+- abstract
+- apiinvoker
+- basepath
+- case
+- catch
+- class
+- contenttype
+- contenttypes
+- def
+- do
+- else
+- extends
+- false
+- final
+- finally
+- for
+- formparams
+- forsome
+- headerparams
+- if
+- implicit
+- import
+- lazy
+- match
+- mp
+- new
+- null
+- object
+- override
+- package
+- path
+- postbody
+- private
+- protected
+- queryparams
+- return
+- sealed
+- super
+- this
+- throw
+- trait
+- true
+- try
+- type
+- val
+- var
+- while
+- with
+- yield
+
diff --git a/docs/generators/scala-play-framework.md b/docs/generators/scala-play-framework.md
deleted file mode 100644
index ff1f8243e1..0000000000
--- a/docs/generators/scala-play-framework.md
+++ /dev/null
@@ -1,22 +0,0 @@
-
----
-id: generator-opts-server-scala-play-framework
-title: Config Options for scala-play-framework
-sidebar_label: scala-play-framework
----
-
-| Option | Description | Values | Default |
-| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |null|
-|apiPackage|package for generated api classes| |null|
-|sourceFolder|source folder for generated code| |null|
-|routesFileName|Name of the routes file to generate.| |routes|
-|routesFileName|Base package in which supporting classes are generated.| |org.openapitools|
-|skipStubs|If set, skips generation of stub classes.| |false|
-|supportAsync|If set, wraps API return types with Futures and generates async actions.| |false|
-|generateCustomExceptions|If set, generates custom exception types.| |true|
-|useSwaggerUI|Add a route to /api which show your documentation in swagger-ui. Will also import needed dependencies| |true|
diff --git a/docs/generators/scala-play-server.md b/docs/generators/scala-play-server.md
index 1582e3959f..48d5cc9d55 100644
--- a/docs/generators/scala-play-server.md
+++ b/docs/generators/scala-play-server.md
@@ -5,17 +5,112 @@ sidebar_label: scala-play-server
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |null|
|apiPackage|package for generated api classes| |null|
-|sourceFolder|source folder for generated code| |null|
-|routesFileName|Name of the routes file to generate.| |routes|
|basePackage|Base package in which supporting classes are generated.| |org.openapitools|
-|skipStubs|If set, skips generation of stub classes.| |false|
-|supportAsync|If set, wraps API return types with Futures and generates async actions.| |false|
+|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|
+|modelPackage|package for generated models| |null|
+|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
+|routesFileName|Name of the routes file to generate.| |routes|
+|skipStubs|If set, skips generation of stub classes.| |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|
+|sourceFolder|source folder for generated code| |null|
+|supportAsync|If set, wraps API return types with Futures and generates async actions.| |false|
|useSwaggerUI|Add a route to /api which show your documentation in swagger-ui. Will also import needed dependencies| |true|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|Date|java.util.Date|
+|DateTime|org.joda.time.*|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|List|java.util.*|
+|ListBuffer|scala.collection.mutable.ListBuffer|
+|ListSet|scala.collection.immutable.ListSet|
+|LocalDate|java.time.LocalDate|
+|LocalDateTime|org.joda.time.*|
+|LocalTime|org.joda.time.*|
+|Map|java.util.Map|
+|OffsetDateTime|java.time.OffsetDateTime|
+|Seq|scala.collection.immutable.Seq|
+|Set|scala.collection.immutable.Set|
+|TemporaryFile|play.api.libs.Files.TemporaryFile|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|List|
+|map|Map|
+|set|Set|
+
+
+## LANGUAGE PRIMITIVES
+
+- Any
+- Array
+- Boolean
+- Double
+- Float
+- Int
+- List
+- Long
+- Map
+- Object
+- Seq
+- String
+- boolean
+
+
+## RESERVED WORDS
+
+- abstract
+- case
+- catch
+- class
+- def
+- do
+- else
+- extends
+- false
+- final
+- finally
+- for
+- forSome
+- if
+- implicit
+- import
+- lazy
+- match
+- new
+- null
+- object
+- override
+- package
+- private
+- protected
+- return
+- sealed
+- super
+- this
+- throw
+- trait
+- true
+- try
+- type
+- val
+- var
+- while
+- with
+- yield
+
diff --git a/docs/generators/scalatra.md b/docs/generators/scalatra.md
index c55dc21c74..f420e05199 100644
--- a/docs/generators/scalatra.md
+++ b/docs/generators/scalatra.md
@@ -5,11 +5,114 @@ sidebar_label: scalatra
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |null|
|apiPackage|package for generated api classes| |null|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|modelPackage|package for generated models| |null|
+|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|
|sourceFolder|source folder for generated code| |null|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.DateTime|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|ListBuffer|scala.collection.mutable.ListBuffer|
+|ListSet|scala.collection.immutable.ListSet|
+|LocalDate|org.joda.time.LocalDate|
+|LocalDateTime|org.joda.time.LocalDateTime|
+|LocalTime|org.joda.time.LocalTime|
+|Map|java.util.Map|
+|Set|scala.collection.immutable.Set|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|map|HashMap|
+|set|Set|
+
+
+## LANGUAGE PRIMITIVES
+
+- Any
+- Array
+- Boolean
+- Double
+- Float
+- Int
+- List
+- Long
+- Map
+- Object
+- Seq
+- String
+- boolean
+
+
+## RESERVED WORDS
+
+- abstract
+- assert
+- boolean
+- break
+- byte
+- case
+- catch
+- char
+- class
+- const
+- continue
+- default
+- do
+- double
+- else
+- enum
+- extends
+- final
+- finally
+- float
+- for
+- goto
+- if
+- implements
+- import
+- instanceof
+- int
+- interface
+- long
+- native
+- new
+- package
+- private
+- protected
+- public
+- return
+- short
+- static
+- strictfp
+- super
+- switch
+- synchronized
+- this
+- throw
+- throws
+- transient
+- try
+- type
+- void
+- volatile
+- while
+
diff --git a/docs/generators/scalaz.md b/docs/generators/scalaz.md
index bf097e1ced..e6050ab3f1 100644
--- a/docs/generators/scalaz.md
+++ b/docs/generators/scalaz.md
@@ -5,12 +5,113 @@ sidebar_label: scalaz
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |null|
|apiPackage|package for generated api classes| |null|
-|sourceFolder|source folder for generated code| |null|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|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|
+|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|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+|Array|java.util.List|
+|ArrayList|java.util.ArrayList|
+|BigDecimal|java.math.BigDecimal|
+|Date|java.util.Date|
+|DateTime|org.joda.time.DateTime|
+|File|java.io.File|
+|HashMap|java.util.HashMap|
+|ListBuffer|scala.collection.mutable.ListBuffer|
+|ListSet|scala.collection.immutable.ListSet|
+|LocalDate|org.joda.time.LocalDate|
+|LocalDateTime|org.joda.time.LocalDateTime|
+|LocalTime|org.joda.time.LocalTime|
+|Seq|scala.collection.immutable.Seq|
+|Timestamp|java.sql.Timestamp|
+|URI|java.net.URI|
+|UUID|java.util.UUID|
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|ListBuffer|
+|map|HashMap|
+|set|Set|
+
+
+## LANGUAGE PRIMITIVES
+
+- Any
+- Array
+- Boolean
+- Double
+- Float
+- Int
+- List
+- Long
+- Map
+- Object
+- Seq
+- String
+- boolean
+
+
+## RESERVED WORDS
+
+- abstract
+- apiinvoker
+- basepath
+- case
+- catch
+- class
+- contenttype
+- contenttypes
+- def
+- do
+- else
+- extends
+- false
+- final
+- finally
+- for
+- formparams
+- forsome
+- headerparams
+- if
+- implicit
+- import
+- lazy
+- match
+- mp
+- new
+- null
+- object
+- override
+- package
+- path
+- postbody
+- private
+- protected
+- queryparams
+- return
+- sealed
+- super
+- this
+- throw
+- trait
+- true
+- try
+- type
+- val
+- var
+- while
+- with
+- yield
+
diff --git a/docs/generators/spring.md b/docs/generators/spring.md
index 6d6d462d80..7ba4dca43d 100644
--- a/docs/generators/spring.md
+++ b/docs/generators/spring.md
@@ -5,62 +5,179 @@ sidebar_label: spring
| Option | Description | Values | Default |
| ------ | ----------- | ------ | ------- |
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|modelPackage|package for generated models| |org.openapitools.model|
+|apiFirst|Generate the API from the OAI spec at server compile time (API first approach)| |false|
|apiPackage|package for generated api classes| |org.openapitools.api|
-|invokerPackage|root package for generated code| |org.openapitools.api|
-|groupId|groupId in generated pom.xml| |org.openapitools|
-|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-spring|
-|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
-|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
|artifactDescription|artifact description in generated pom.xml| |OpenAPI Java|
+|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-spring|
+|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
+|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
+|async|use async Callable controllers| |false|
+|basePackage|base package (invokerPackage) for generated code| |org.openapitools|
+|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
+|booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|configPackage|configuration package for generated code| |org.openapitools.configuration|
+|dateLibrary|Option. Date library to use|- **joda**
- Joda (for legacy app only)
- **legacy**
- Legacy java.util.Date (if you really have a good reason not to use threetenbp
- **java8-localdatetime**
- Java 8 using LocalDateTime (for legacy app only)
- **java8**
- Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets "java8" to true
- **threetenbp**
- Backport of JSR310 (preferred for jdk < 1.8)
|threetenbp|
+|delegatePattern|Whether to generate the server files using the delegate pattern| |false|
+|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
+|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
+|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|
+|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|
+|groupId|groupId in generated pom.xml| |org.openapitools|
+|hateoas|Use Spring HATEOAS library to allow adding HATEOAS links| |false|
+|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
+|implicitHeaders|Skip header parameters in the generated API methods using @ApiImplicitParams annotation.| |false|
+|interfaceOnly|Whether to generate only API interface stubs without the server files.| |false|
+|invokerPackage|root package for generated code| |org.openapitools.api|
+|java8|Option. Use Java8 classes instead of third party equivalents|- **true**
- Use Java 8 classes such as Base64. Use java8 default interface when a responseWrapper is used
- **false**
- Various third party libraries as needed
|false|
+|library|library template (sub-template)|- **spring-boot**
- Spring-boot Server application using the SpringFox integration.
- **spring-mvc**
- Spring-MVC Server application using the SpringFox integration.
- **spring-cloud**
- Spring-Cloud-Feign client with Spring-Boot auto-configured settings.
|spring-boot|
+|licenseName|The name of the license| |Unlicense|
+|licenseUrl|The URL of the license| |http://unlicense.org|
+|modelPackage|package for generated models| |org.openapitools.model|
+|parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
+|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|Use Bean Validation Impl. to perform BeanValidation| |false|
+|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
+|reactive|wrap responses in Mono/Flux Reactor types (spring-boot only)| |false|
+|responseWrapper|wrap the responses in given type (Future, Callable, CompletableFuture,ListenableFuture, DeferredResult, HystrixCommand, RxObservable, RxSingle or fully qualified type)| |null|
+|returnSuccessCode|Generated server returns 2xx code| |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|
|scmUrl|SCM URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
-|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
-|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
-|developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
-|developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
-|licenseName|The name of the license| |Unlicense|
-|licenseUrl|The URL of the license| |http://unlicense.org|
-|sourceFolder|source folder for generated code| |src/main/java|
|serializableModel|boolean - toggle "implements Serializable" for generated models| |false|
-|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
-|fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
-|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |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|
-|dateLibrary|Option. Date library to use|