Typescript refactor: Platform select for browser and node (#4500)

* Use string form of filename parameter

This works for the form-data library and is also compatible with the
browser FormData object.

* Add new option to select platform node or browser

When no platform is selected, a default is chosen by the framework
option and likewise the file data type option is implied by the
platform.

* Remove redundant import of node dns module

* Only use form-data library for node platform

* Generate npm package from npmName option

* Use method convertPropertyToBooleanAndWriteBack

* Generate typescript samples with ensure-up-to-date

.github/.test/samples.json

@@ -134,7 +134,7 @@
       ]
     },
     {
-      "input": "csharp-refactor-petstore.sh",
+      "input": "csharp-netcore-petstore.sh",
       "matches": [
         "Client: C-Sharp"
       ]
@@ -146,13 +146,13 @@
       ]
     },
     {
-      "input": "dart-flutter-petstore.sh",
+      "input": "dart-jaguar-petstore.sh",
       "matches": [
         "Client: Dart"
       ]
     },
     {
-      "input": "dart-jaguar-petstore.sh",
+      "input": "dart-dio-petstore.sh",
       "matches": [
         "Client: Dart"
       ]
@@ -218,7 +218,7 @@
       ]
     },
     {
-      "input": "finch-petstore-server.sh",
+      "input": "scala-finch-petstore-server.sh",
       "matches": [
         "Server: Scala"
       ]
@@ -260,7 +260,7 @@
       ]
     },
     {
-      "input": "graphql-server-petstore.sh",
+      "input": "graphql-nodejs-express-server.sh",
       "matches": [
         "Server: GraphQL"
       ]
@@ -825,13 +825,13 @@
       ]
     },
     {
-      "input": "python-flask-petstore-python2.sh",
+      "input": "python-server-flask-petstore-python2.sh",
       "matches": [
         "Server: Python"
       ]
     },
     {
-      "input": "python-flask-petstore.sh",
+      "input": "python-server-flask-petstore.sh",
       "matches": [
         "Server: Python"
       ]
@@ -878,12 +878,6 @@
         "Client: Rust"
       ]
     },
-    {
-      "input": "rust-reqwest-petstore.sh",
-      "matches": [
-        "Client: Rust"
-      ]
-    },
     {
       "input": "rust-server-petstore.sh",
       "matches": [
@@ -1311,6 +1305,76 @@
       "matches": [
         "Announcement"
       ]
+    },
+    {
+      "input": "[typescript] Generic typescript text",
+      "matches": [
+        "Client: TypeScript"
+      ]
+    },
+    {
+      "input": "[typescript] Generic typescript text",
+      "matches": [
+        "Client: TypeScript"
+      ]
+    },
+    {
+      "input": "[typescript-angular] Generic typescript text",
+      "matches": [
+        "Client: TypeScript"
+      ]
+    },
+    {
+      "input": "[typescript-angularjs] Generic typescript text",
+      "matches": [
+        "Client: TypeScript"
+      ]
+    },
+    {
+      "input": "[typescript-aurelia] Generic typescript text",
+      "matches": [
+        "Client: TypeScript"
+      ]
+    },
+    {
+      "input": "[typescript-axios] Generic typescript text",
+      "matches": [
+        "Client: TypeScript"
+      ]
+    },
+    {
+      "input": "[typescript-fetch] Generic typescript text",
+      "matches": [
+        "Client: TypeScript"
+      ]
+    },
+    {
+      "input": "[typescript-inversify] Generic typescript text",
+      "matches": [
+        "Client: TypeScript"
+      ]
+    },
+    {
+      "input": "[typescript-jquery] Generic typescript text",
+      "matches": [
+        "Client: TypeScript"
+      ]
+    },
+    {
+      "input": "[typescript-node] Generic typescript text",
+      "matches": [
+        "Client: TypeScript"
+      ]
+    },
+    {
+      "input": "[typescript-rxjs] Generic typescript text",
+      "matches": [
+        "Client: TypeScript"
+      ]
+    },
+    {
+      "input": "Should not auto-label for typescript outside of brackets.",
+      "matches": []
     }
   ]
 }

.github/FUNDING.yml

@@ -0,0 +1 @@
+open_collective: openapi_generator

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,11 +1,10 @@
+<!-- Enter details of the change here. Include additional tests that have been done, reference to the issue for tracking, etc. -->
+
+<!-- Please check the completed items below -->
 ### PR checklist
 
 - [ ] Read the [contribution guidelines](https://github.com/openapitools/openapi-generator/blob/master/CONTRIBUTING.md).
-- [ ] Ran the shell script under `./bin/` to update Petstore sample so that CIs can verify the change. (For instance, only need to run `./bin/{LANG}-petstore.sh`, `./bin/openapi3/{LANG}-petstore.sh` if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in `.\bin\windows\`.
-- [ ] Filed the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master`~~, `3.4.x`, `4.0.x`~~. Default: `master`.
-- [ ] Copied the [technical committee](https://github.com/openapitools/openapi-generator/#62---openapi-generator-technical-committee) to review the pull request if your PR is targeting a particular programming language.
-
-### Description of the PR
-
-(details of the change, additional tests that have been done, reference to the issue for tracking, etc)
-
+- [ ] If contributing template-only or documentation-only changes which will change sample output, [build the project](https://github.com/OpenAPITools/openapi-generator#14---build-projects) before.
+- [ ] Run the shell script(s) under `./bin/` (or Windows batch scripts under`.\bin\windows`) to update Petstore samples related to your fix. This is important, as CI jobs will verify _all_ generator outputs of your HEAD commit, and these must match the expectations made by your contribution. You only need to run `./bin/{LANG}-petstore.sh`, `./bin/openapi3/{LANG}-petstore.sh` if updating the code or mustache templates for a language (`{LANG}`) (e.g. php, ruby, python, etc).
+- [ ] File the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master`, `4.1.x`, `5.0.x`. Default: `master`.
+- [ ] Copy the [technical committee](https://github.com/openapitools/openapi-generator/#62---openapi-generator-technical-committee) to review the pull request if your PR is targeting a particular programming language.

.github/auto-labeler.yml

@@ -138,6 +138,7 @@ labels:
       - '\s*?-[gl] swift[34]+\s*?'
       - '\s*?-[gl] swift2-deprecated\s*?'
     'Client: TypeScript':
+      - '\s*?\[typescript\]\s*?'
       - '\s*?\[typescript-[\-a-z]+\]\s*?'
       - '\s*?-[gl] typescript-[\-a-z]+\s*?'
     # 'Client: VB/VB.net': # NOTE: Not yet implemented

.gitignore

@@ -7,6 +7,7 @@ out/
 classpath.txt
 version.properties
 modules/openapi-generator-gradle-plugin/bin/
+modules/openapi-generator-cli/bin/
 !modules/openapi-generator-cli/src/main/resources/version.properties
 .project
 .classpath
@@ -39,7 +40,9 @@ packages/
 
 /target
 /generated-files
+test-output/
 nbactions.xml
+test-output/
 
 # website
 website/build/
@@ -86,6 +89,9 @@ samples/client/petstore/java/jersey2/build/
 samples/client/petstore/java/okhttp-gson/.gradle/
 samples/client/petstore/java/okhttp-gson/build/
 samples/client/petstore/java/feign/build/
+samples/client/petstore/java/feign10x/build/
+samples/client/petstore/java/feign/project/
+samples/client/petstore/java/feign10x/project/
 samples/client/petstore/java/retrofit/build/
 samples/client/petstore/java/retrofit2/build/
 samples/client/petstore/java/retrofit2/hello.txt
@@ -169,16 +175,21 @@ samples/client/petstore/python-tornado/.venv/
 samples/client/petstore/typescript-angular2/npm/npm-debug.log
 samples/client/petstore/typescript-node/npm/npm-debug.log
 samples/client/petstore/typescript-angular/tsd-debug.log
+samples/client/petstore/typescript-fetch/tests/**/dist/
 
 # aspnetcore
 samples/server/petstore/aspnetcore/.vs/
 effective.pom
+
 # kotlin
 samples/client/petstore/kotlin/src/main/kotlin/test/
 samples/client/petstore/kotlin-threetenbp/build
 samples/client/petstore/kotlin-string/build
-samples/server/petstore/kotlin-server/ktor/build
 samples/openapi3/client/petstore/kotlin/build
+samples/server/petstore/kotlin-server/ktor/build
+samples/server/petstore/kotlin-springboot/build
+samples/client/petstore/kotlin-multiplatform/build/
+samples/client/petstore/kotlin-okhttp3/build/
 \?
 
 # haskell
@@ -214,6 +225,7 @@ samples/server/petstore/erlang-server/rebar.lock
 samples/client/petstore/dart/petstore/packages
 samples/client/petstore/dart/flutter_petstore/test/packages
 samples/client/petstore/dart/petstore/test/packages
+**/.dart_tool
 
 # JS
 samples/client/petstore/javascript/package-lock.json
@@ -224,3 +236,7 @@ samples/client/petstore/elm/index.html
 # C
 samples/client/petstore/c/build
 samples/client/petstore/c/*.so
+
+# Ruby
+samples/openapi3/client/petstore/ruby/Gemfile.lock
+samples/openapi3/client/petstore/ruby-faraday/Gemfile.lock

.hub.online.dockerfile

@@ -28,7 +28,7 @@ WORKDIR ${TARGET_DIR}
 
 COPY --from=builder ${GEN_DIR}/modules/openapi-generator-online/target/openapi-generator-online.jar ${TARGET_DIR}/openapi-generator-online.jar
 
-ENV GENERATOR_HOST=http://localhost
+ENV GENERATOR_HOST=""
 
 EXPOSE 8080
 

.java-version

@@ -1 +1 @@
-oracle64-1.8.0.152
+1.8

.travis.yml

@@ -3,6 +3,13 @@ language: java
 jdk:
   - openjdk8
 
+# See https://docs.travis-ci.com/user/languages/java/#caching
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+  # Avoid caching our built dependencies between runs.
+  - rm -fr $HOME/.m2/repository/org/openapitools/
+
 cache:
   directories:
   - $HOME/.m2
@@ -13,6 +20,7 @@ cache:
   - $HOME/samples/client/petstore/php/OpenAPIToolsClient-php/vendor
   - $HOME/samples/client/petstore/ruby/vendor/bundle
   - $HOME/samples/client/petstore/python/.venv/
+  - $HOME/samples/client/petstore/typescript/tests/default/node_modules
   - $HOME/samples/client/petstore/typescript-node/npm/node_modules
   - $HOME/samples/client/petstore/typescript-node/npm/typings/
   - $HOME/samples/client/petstore/typescript-fetch/tests/default/node_modules
@@ -64,10 +72,10 @@ before_install:
   - docker run -d -e SWAGGER_HOST=http://petstore.swagger.io -e SWAGGER_BASE_PATH=/v2 -p 80:8080 swaggerapi/petstore
   - docker ps -a
   # Add bats test framework and cURL for Bash script integration tests
-  #- sudo add-apt-repository ppa:duggan/bats --yes
-  #- sudo apt-get update -qq
-  #- sudo apt-get install -qq bats
-  #- sudo apt-get install -qq curl
+  - sudo add-apt-repository ppa:duggan/bats --yes
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq bats
+  - sudo apt-get install -qq curl
   # install dart
   #- sudo apt-get update
   #- sudo apt-get install apt-transport-https
@@ -87,7 +95,11 @@ before_install:
   # - Rely on `kerl` for [pre-compiled versions available](https://docs.travis-ci.com/user/languages/erlang#Choosing-OTP-releases-to-test-against). Rely on installation path chosen by [`travis-erlang-builder`](https://github.com/travis-ci/travis-erlang-builder/blob/e6d016b1a91ca7ecac5a5a46395bde917ea13d36/bin/compile#L18).
   # - . ~/otp/18.2.1/activate && erl -version
   #- curl -f -L -o ./rebar3 https://s3.amazonaws.com/rebar3/rebar3 && chmod +x ./rebar3 && ./rebar3 version && export PATH="${TRAVIS_BUILD_DIR}:$PATH"
-
+  # install C++ tools 
+  - sudo apt install -y --no-install-recommends valgrind cmake build-essential 
+  # install Qt5
+  - sudo apt install -y --no-install-recommends qt5-default 
+  - cmake --version
   # show host table to confirm petstore.swagger.io is mapped to localhost
   - cat /etc/hosts
   # show java version
@@ -121,28 +133,43 @@ script:
   # fail if generators contain tab '\t'
   - /bin/bash ./bin/utils/detect_tab_in_java_class.sh
   # run integration tests defined in maven pom.xml
-  - ./run-in-docker.sh mvn --quiet --batch-mode clean install
-  - mvn --quiet --batch-mode verify -Psamples
+  # WARN: Travis will timeout after 10 minutes of no stdout/stderr activity, which is problematic with mvn --quiet.
+  - mvn --quiet --batch-mode --show-version clean install
+  - mvn --quiet --batch-mode --show-version verify -Psamples
+  # test maven plugin
+  - mvn clean compile -f modules/openapi-generator-maven-plugin/examples/java-client.xml
+  - mvn clean compile -f modules/openapi-generator-maven-plugin/examples/multi-module/pom.xml
+  # test gradle plugin
+  - (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew buildGoSdk)
+  - (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew openApiGenerate)
 after_success:
   # push to maven repo
-  - if [ $SONATYPE_USERNAME ] && [ -z $TRAVIS_TAG ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
-      if [ "$TRAVIS_BRANCH" = "master" ]; then
+  - if [ $SONATYPE_USERNAME ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
+      if [ "$TRAVIS_BRANCH" = "master" ] && [ -z $TRAVIS_TAG ]; then
+        echo "Publishing from branch $TRAVIS_BRANCH";
         mvn clean deploy -DskipTests=true -B -U -P release --settings CI/settings.xml;
         echo "Finished mvn clean deploy for $TRAVIS_BRANCH";
         pushd .;
         cd modules/openapi-generator-gradle-plugin;
-        ./gradlew -Psigning.keyId="$SIGNING_KEY" -Psigning.password="$SIGNING_PASSPHRASE" -Psigning.secretKeyRingFile="${TRAVIS_BUILD_DIR}/sec.gpg" -PossrhUsername="${SONATYPE_USERNAME}" -PossrhPassword="${SONATYPE_PASSWORD}" uploadArchives --no-daemon;
-        echo "Finished ./gradlew uploadArchives";
+        ./gradlew -Psigning.keyId="$SIGNING_KEY" -Psigning.password="$SIGNING_PASSPHRASE" -Psigning.secretKeyRingFile="${TRAVIS_BUILD_DIR}/sec.gpg" -PossrhUsername="${SONATYPE_USERNAME}" -PossrhPassword="${SONATYPE_PASSWORD}" publishMavenJavaPublicationToNexusRepository closeAndReleaseRepository --no-daemon;
+        echo "Finished ./gradlew publishPluginMavenPublicationToNexusRepository closeAndReleaseRepository";
         popd;
-      elif ([[ "$TRAVIS_BRANCH" =~ ^[0-9]+\.[0-9]+\.x$ ]]) ; then
+      elif [ -z $TRAVIS_TAG ] && [[ "$TRAVIS_BRANCH" =~ ^[0-9]+\.[0-9]+\.x$ ]]; then
+        echo "Publishing from branch $TRAVIS_BRANCH";
         mvn clean deploy --settings CI/settings.xml;
         echo "Finished mvn clean deploy for $TRAVIS_BRANCH";
         pushd .;
         cd modules/openapi-generator-gradle-plugin;
+        ./gradlew -PossrhUsername="${SONATYPE_USERNAME}" -PossrhPassword="${SONATYPE_PASSWORD}" publishPluginMavenPublicationToNexusRepository closeAndReleaseRepository --no-daemon;
+        echo "Finished ./gradlew publishPluginMavenPublicationToNexusRepository closeAndReleaseRepository";
+        popd;
+      fi;
+      if [ -n $TRAVIS_TAG ] && [[ "$TRAVIS_TAG" =~ ^[v][0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+        echo "Publishing the gradle plugin to Gradle Portal on tag $TRAVIS_TAG (only)";
+        pushd .;
+        cd modules/openapi-generator-gradle-plugin;
         ./gradlew -Psigning.keyId="$SIGNING_KEY" -Psigning.password="$SIGNING_PASSPHRASE" -Psigning.secretKeyRingFile="${TRAVIS_BUILD_DIR}/sec.gpg" publishPlugins -Dgradle.publish.key=$GRADLE_PUBLISH_KEY -Dgradle.publish.secret=$GRADLE_PUBLISH_SECRET --no-daemon;
         echo "Finished ./gradlew publishPlugins (plugin portal)";
-        ./gradlew -PossrhUsername="${SONATYPE_USERNAME}" -PossrhPassword="${SONATYPE_PASSWORD}" uploadArchives --no-daemon;
-        echo "Finished ./gradlew uploadArchives";
         popd;
       fi;
     fi;
@@ -162,3 +189,4 @@ after_success:
 
 env:
   - DOCKER_GENERATOR_IMAGE_NAME=openapitools/openapi-generator-online DOCKER_CODEGEN_CLI_IMAGE_NAME=openapitools/openapi-generator-cli NODE_ENV=test CC=gcc-5 CXX=g++-5
+

CI/.drone.yml

@@ -0,0 +1,40 @@
+kind: pipeline
+name: default
+
+steps:
+# test haskell client
+- name: haskell-client-test
+  image: haskell:8.6.5
+  commands:
+  - (cd samples/client/petstore/haskell-http-client/ && stack --install-ghc --no-haddock-deps haddock --fast && stack test --fast)
+# test Dart 2.x petstore client
+- name: dart2x-test
+  image: google/dart
+  commands:
+  - (cd samples/client/petstore/dart-jaguar/openapi && pub get && pub run build_runner build --delete-conflicting-outputs)
+  - (cd samples/client/petstore/dart-jaguar/flutter_petstore/openapi && pub get && pub run build_runner build --delete-conflicting-outputs)
+  - (cd samples/client/petstore/dart2/petstore && pub get && pub run test)
+# test Java 11 HTTP client
+- name: java11-test
+  image: openjdk:11.0
+  commands:
+  - ./mvnw clean install
+  - ./mvnw --quiet verify -Psamples.droneio
+  # test all generators with fake petstore spec (2.0, 3.0)
+  - /bin/bash bin/utils/test-fake-petstore-for-all.sh
+  # generate test scripts
+  - /bin/bash bin/tests/run-all-test
+  # generate all petstore samples (client, servers, doc)
+  - /bin/bash bin/run-all-petstore
+  # generate all petstore samples (openapi3)
+  - /bin/bash bin/openapi3/run-all-petstore
+# test ocaml petstore client
+- name: ocaml-test
+  image: ocaml/opam2:4.07
+  commands:
+  - sudo apt-get -y install m4
+  - cd samples/client/petstore/ocaml
+  - opam install ppx_deriving_yojson cohttp ppx_deriving cohttp-lwt-unix
+  - eval $(opam env)
+  - sudo chmod -R 777 .
+  - dune build --build-dir=./_build

CI/circle_parallel.sh

@@ -12,12 +12,22 @@ if [ "$NODE_INDEX" = "1" ]; then
   #cp CI/pom.xml.circleci pom.xml
   java -version
   mvn --quiet verify -Psamples.circleci
+  mvn --quiet javadoc:javadoc -Psamples.circleci
+
 elif [ "$NODE_INDEX" = "2" ]; then
   # run ensure-up-to-date sample script on SNAPSHOT version only
   project_version=`mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout`
   if [[ $project_version == *"-SNAPSHOT" ]]; then
     echo "Running node $NODE_INDEX to test ensure-up-to-date"
     java -version
+
+    # install elm-format
+    npm install -g elm-format
+
+    # clear any changes to the samples
+    git checkout -- .
+
+    # look for outdated samples
     ./bin/utils/ensure-up-to-date
   fi
 #elif [ "$NODE_INDEX" = "3" ]; then

CI/run-in-docker-settings.xml

@@ -0,0 +1,7 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                      https://maven.apache.org/xsd/settings-1.0.0.xsd">
+    <!-- This directory matches what is defined in run-in-docker.sh -->
+    <localRepository>/var/maven/.m2/repository</localRepository>
+</settings>

CI/samples.ci/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj

@@ -47,16 +47,16 @@ OpenAPI spec version: 1.0.0
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml" />
     <Reference Include="Newtonsoft.Json">
-        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-        <HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-        <HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+        <HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+        <HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="JsonSubTypes">
-        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
-        <HintPath Condition="Exists('..\packages')">..\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
-        <HintPath Condition="Exists('..\..\packages')">..\..\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
-        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
+        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\JsonSubTypes.1.5.2\lib\net45\JsonSubTypes.dll</HintPath>
+        <HintPath Condition="Exists('..\packages')">..\packages\JsonSubTypes.1.5.2\lib\net45\JsonSubTypes.dll</HintPath>
+        <HintPath Condition="Exists('..\..\packages')">..\..\packages\JsonSubTypes.1.5.2\lib\net45\JsonSubTypes.dll</HintPath>
+        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\JsonSubTypes.1.5.2\lib\net45\JsonSubTypes.dll</HintPath>
     </Reference>
     <Reference Include="RestSharp">
         <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
@@ -65,10 +65,10 @@ OpenAPI spec version: 1.0.0
         <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework">
-        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-        <HintPath Condition="Exists('..\packages')">..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-        <HintPath Condition="Exists('..\..\packages')">..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('..\packages')">..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('..\..\packages')">..\..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

CI/samples.ci/client/petstore/java/test-manual/jersey1/auth/ApiKeyAuthTest.java

@@ -15,33 +15,57 @@ public class ApiKeyAuthTest {
     public void testApplyToParamsInQuery() {
         List<Pair> queryParams = new ArrayList<Pair>();
         Map<String, String> headerParams = new HashMap<String, String>();
+        Map<String, String> cookieParams = new HashMap<String, String>();
 
         ApiKeyAuth auth = new ApiKeyAuth("query", "api_key");
         auth.setApiKey("my-api-key");
-        auth.applyToParams(queryParams, headerParams);
+        auth.applyToParams(queryParams, headerParams, cookieParams);
 
         assertEquals(1, queryParams.size());
         for (Pair queryParam : queryParams) {
             assertEquals("my-api-key", queryParam.getValue());
         }
 
-        // no changes to header parameters
+        // no changes to header or cookie parameters
         assertEquals(0, headerParams.size());
+        assertEquals(0, cookieParams.size());
     }
 
     @Test
     public void testApplyToParamsInHeaderWithPrefix() {
             List<Pair> queryParams = new ArrayList<Pair>();
         Map<String, String> headerParams = new HashMap<String, String>();
+        Map<String, String> cookieParams = new HashMap<String, String>();
 
         ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN");
         auth.setApiKey("my-api-token");
         auth.setApiKeyPrefix("Token");
-        auth.applyToParams(queryParams, headerParams);
+        auth.applyToParams(queryParams, headerParams, cookieParams);
 
-        // no changes to query parameters
+        // no changes to query or cookie parameters
         assertEquals(0, queryParams.size());
+        assertEquals(0, cookieParams.size());
+
         assertEquals(1, headerParams.size());
         assertEquals("Token my-api-token", headerParams.get("X-API-TOKEN"));
     }
+
+    @Test
+    public void testApplyToParamsInCookieWithPrefix() {
+            List<Pair> queryParams = new ArrayList<Pair>();
+        Map<String, String> headerParams = new HashMap<String, String>();
+        Map<String, String> cookieParams = new HashMap<String, String>();
+
+        ApiKeyAuth auth = new ApiKeyAuth("cookie", "X-API-TOKEN");
+        auth.setApiKey("my-api-token");
+        auth.setApiKeyPrefix("Token");
+        auth.applyToParams(queryParams, headerParams, cookieParams);
+
+        // no changes to query or header parameters
+        assertEquals(0, queryParams.size());
+        assertEquals(0, headerParams.size());
+
+        assertEquals(1, cookieParams.size());
+        assertEquals("Token my-api-token", cookieParams.get("X-API-TOKEN"));
+    }
 }

CI/samples.ci/client/petstore/java/test-manual/jersey1/auth/HttpBasicAuthTest.java

@@ -22,13 +22,15 @@ public class HttpBasicAuthTest {
     public void testApplyToParams() {
         List<Pair> queryParams = new ArrayList<Pair>();
         Map<String, String> headerParams = new HashMap<String, String>();
+        Map<String, String> cookieParams = new HashMap<String, String>();
 
         auth.setUsername("my-username");
         auth.setPassword("my-password");
-        auth.applyToParams(queryParams, headerParams);
+        auth.applyToParams(queryParams, headerParams, cookieParams);
 
-        // no changes to query parameters
+        // no changes to query or cookie parameters
         assertEquals(0, queryParams.size());
+        assertEquals(0, cookieParams.size());
         assertEquals(1, headerParams.size());
         // the string below is base64-encoded result of "my-username:my-password" with the "Basic " prefix
         String expected = "Basic bXktdXNlcm5hbWU6bXktcGFzc3dvcmQ=";
@@ -36,7 +38,7 @@ public class HttpBasicAuthTest {
 
         // null username should be treated as empty string
         auth.setUsername(null);
-        auth.applyToParams(queryParams, headerParams);
+        auth.applyToParams(queryParams, headerParams, cookieParams);
         // the string below is base64-encoded result of ":my-password" with the "Basic " prefix
         expected = "Basic Om15LXBhc3N3b3Jk";
         assertEquals(expected, headerParams.get("Authorization"));
@@ -44,7 +46,7 @@ public class HttpBasicAuthTest {
         // null password should be treated as empty string
         auth.setUsername("my-username");
         auth.setPassword(null);
-        auth.applyToParams(queryParams, headerParams);
+        auth.applyToParams(queryParams, headerParams, cookieParams);
         // the string below is base64-encoded result of "my-username:" with the "Basic " prefix
         expected = "Basic bXktdXNlcm5hbWU6";
         assertEquals(expected, headerParams.get("Authorization"));

CI/samples.ci/client/petstore/java/test-manual/jersey2/auth/ApiKeyAuthTest.java

@@ -15,33 +15,55 @@ public class ApiKeyAuthTest {
     public void testApplyToParamsInQuery() {
         List<Pair> queryParams = new ArrayList<Pair>();
         Map<String, String> headerParams = new HashMap<String, String>();
+        Map<String, String> cookieParams = new HashMap<String, String>();
 
         ApiKeyAuth auth = new ApiKeyAuth("query", "api_key");
         auth.setApiKey("my-api-key");
-        auth.applyToParams(queryParams, headerParams);
+        auth.applyToParams(queryParams, headerParams, cookieParams);
 
         assertEquals(1, queryParams.size());
         for (Pair queryParam : queryParams) {
             assertEquals("my-api-key", queryParam.getValue());
         }
 
-        // no changes to header parameters
+        // no changes to header or cookie parameters
         assertEquals(0, headerParams.size());
+        assertEquals(0, cookieParams.size());
     }
 
     @Test
     public void testApplyToParamsInHeaderWithPrefix() {
             List<Pair> queryParams = new ArrayList<Pair>();
         Map<String, String> headerParams = new HashMap<String, String>();
+        Map<String, String> cookieParams = new HashMap<String, String>();
 
         ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN");
         auth.setApiKey("my-api-token");
         auth.setApiKeyPrefix("Token");
-        auth.applyToParams(queryParams, headerParams);
+        auth.applyToParams(queryParams, headerParams, cookieParams);
 
         // no changes to query parameters
         assertEquals(0, queryParams.size());
+        assertEquals(0, cookieParams.size());
         assertEquals(1, headerParams.size());
         assertEquals("Token my-api-token", headerParams.get("X-API-TOKEN"));
     }
+
+    @Test
+    public void testApplyToParamsInCookieWithPrefix() {
+            List<Pair> queryParams = new ArrayList<Pair>();
+        Map<String, String> headerParams = new HashMap<String, String>();
+        Map<String, String> cookieParams = new HashMap<String, String>();
+
+        ApiKeyAuth auth = new ApiKeyAuth("cookie", "X-API-TOKEN");
+        auth.setApiKey("my-api-token");
+        auth.setApiKeyPrefix("Token");
+        auth.applyToParams(queryParams, headerParams, cookieParams);
+
+        // no changes to query or header parameters
+        assertEquals(0, queryParams.size());
+        assertEquals(0, headerParams.size());
+        assertEquals(1, cookieParams.size());
+        assertEquals("Token my-api-token", cookieParams.get("X-API-TOKEN"));
+    }
 }

CI/samples.ci/client/petstore/java/test-manual/jersey2/auth/HttpBasicAuthTest.java

@@ -22,10 +22,11 @@ public class HttpBasicAuthTest {
     public void testApplyToParams() {
         List<Pair> queryParams = new ArrayList<Pair>();
         Map<String, String> headerParams = new HashMap<String, String>();
+        Map<String, String> cookieParams = new HashMap<String, String>();
 
         auth.setUsername("my-username");
         auth.setPassword("my-password");
-        auth.applyToParams(queryParams, headerParams);
+        auth.applyToParams(queryParams, headerParams, cookieParams);
 
         // no changes to query parameters
         assertEquals(0, queryParams.size());
@@ -36,7 +37,7 @@ public class HttpBasicAuthTest {
 
         // null username should be treated as empty string
         auth.setUsername(null);
-        auth.applyToParams(queryParams, headerParams);
+        auth.applyToParams(queryParams, headerParams, cookieParams);
         // the string below is base64-encoded result of ":my-password" with the "Basic " prefix
         expected = "Basic Om15LXBhc3N3b3Jk";
         assertEquals(expected, headerParams.get("Authorization"));
@@ -44,7 +45,7 @@ public class HttpBasicAuthTest {
         // null password should be treated as empty string
         auth.setUsername("my-username");
         auth.setPassword(null);
-        auth.applyToParams(queryParams, headerParams);
+        auth.applyToParams(queryParams, headerParams, cookieParams);
         // the string below is base64-encoded result of "my-username:" with the "Basic " prefix
         expected = "Basic bXktdXNlcm5hbWU6";
         assertEquals(expected, headerParams.get("Authorization"));

CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/ApiClientTest.java

@@ -10,6 +10,7 @@ import java.util.TimeZone;
 
 import org.junit.*;
 import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.*;
 
 
 public class ApiClientTest {
@@ -329,24 +330,18 @@ public class ApiClientTest {
         assertEquals("sun.gif", apiClient.sanitizeFilename(".\\sun.gif"));
     }
 
-
     @Test
-    public void testInterceptorCleanupWithNewClient() {
+    public void testNewHttpClient() {
         OkHttpClient oldClient = apiClient.getHttpClient();
-        assertEquals(1, oldClient.networkInterceptors().size());
-
-        OkHttpClient newClient = new OkHttpClient();
-        apiClient.setHttpClient(newClient);
-        assertEquals(1, apiClient.getHttpClient().networkInterceptors().size());
-        apiClient.setHttpClient(newClient);
-        assertEquals(1, apiClient.getHttpClient().networkInterceptors().size());
+        apiClient.setHttpClient(oldClient.newBuilder().build());
+        assertThat(apiClient.getHttpClient(), is(not(oldClient)));
     }
 
-    @Test
-    public void testInterceptorCleanupWithSameClient() {
-        OkHttpClient oldClient = apiClient.getHttpClient();
-        assertEquals(1, oldClient.networkInterceptors().size());
-        apiClient.setHttpClient(oldClient);
-        assertEquals(1, apiClient.getHttpClient().networkInterceptors().size());
+    /**
+     * Tests the invariant that the HttpClient for the ApiClient must never be null
+     */
+    @Test(expected = NullPointerException.class)
+    public void testNullHttpClient() {
+        apiClient.setHttpClient(null);
     }
 }

CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/api/PetApiTest.java

@@ -61,6 +61,7 @@ public class PetApiTest {
         ApiClient oldClient = api.getApiClient();
 
         ApiClient newClient = new ApiClient();
+        newClient.setVerifyingSsl(true);
         newClient.setBasePath("http://example.com");
         newClient.setDebugging(true);
 

CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/auth/ApiKeyAuthTest.java

@@ -15,46 +15,52 @@ public class ApiKeyAuthTest {
     public void testApplyToParamsInQuery() {
         List<Pair> queryParams = new ArrayList<Pair>();
         Map<String, String> headerParams = new HashMap<String, String>();
+        Map<String, String> cookieParams = new HashMap<String, String>();
 
         ApiKeyAuth auth = new ApiKeyAuth("query", "api_key");
         auth.setApiKey("my-api-key");
-        auth.applyToParams(queryParams, headerParams);
+        auth.applyToParams(queryParams, headerParams, cookieParams);
 
         assertEquals(1, queryParams.size());
         for (Pair queryParam : queryParams) {
             assertEquals("my-api-key", queryParam.getValue());
         }
 
-        // no changes to header parameters
+        // no changes to header or cookie parameters
         assertEquals(0, headerParams.size());
+        assertEquals(0, cookieParams.size());
     }
 
     @Test
     public void testApplyToParamsInQueryWithNullValue() {
         List<Pair> queryParams = new ArrayList<Pair>();
         Map<String, String> headerParams = new HashMap<String, String>();
+        Map<String, String> cookieParams = new HashMap<String, String>();
 
         ApiKeyAuth auth = new ApiKeyAuth("query", "api_key");
         auth.setApiKey(null);
-        auth.applyToParams(queryParams, headerParams);
+        auth.applyToParams(queryParams, headerParams, cookieParams);
 
         // no changes to parameters
         assertEquals(0, queryParams.size());
         assertEquals(0, headerParams.size());
+        assertEquals(0, cookieParams.size());
     }
 
     @Test
     public void testApplyToParamsInHeaderWithPrefix() {
         List<Pair> queryParams = new ArrayList<Pair>();
         Map<String, String> headerParams = new HashMap<String, String>();
+        Map<String, String> cookieParams = new HashMap<String, String>();
 
         ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN");
         auth.setApiKey("my-api-token");
         auth.setApiKeyPrefix("Token");
-        auth.applyToParams(queryParams, headerParams);
+        auth.applyToParams(queryParams, headerParams, cookieParams);
 
-        // no changes to query parameters
+        // no changes to query or cookie parameters
         assertEquals(0, queryParams.size());
+        assertEquals(0, cookieParams.size());
         assertEquals(1, headerParams.size());
         assertEquals("Token my-api-token", headerParams.get("X-API-TOKEN"));
     }
@@ -63,14 +69,51 @@ public class ApiKeyAuthTest {
     public void testApplyToParamsInHeaderWithNullValue() {
         List<Pair> queryParams = new ArrayList<Pair>();
         Map<String, String> headerParams = new HashMap<String, String>();
+        Map<String, String> cookieParams = new HashMap<String, String>();
 
         ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN");
         auth.setApiKey(null);
         auth.setApiKeyPrefix("Token");
-        auth.applyToParams(queryParams, headerParams);
+        auth.applyToParams(queryParams, headerParams, cookieParams);
 
         // no changes to parameters
         assertEquals(0, queryParams.size());
+        assertEquals(0, cookieParams.size());
+        assertEquals(0, headerParams.size());
+    }
+
+    @Test
+    public void testApplyToParamsInCookieWithPrefix() {
+        List<Pair> queryParams = new ArrayList<Pair>();
+        Map<String, String> headerParams = new HashMap<String, String>();
+        Map<String, String> cookieParams = new HashMap<String, String>();
+
+        ApiKeyAuth auth = new ApiKeyAuth("cookie", "X-API-TOKEN");
+        auth.setApiKey("my-api-token");
+        auth.setApiKeyPrefix("Token");
+        auth.applyToParams(queryParams, headerParams, cookieParams);
+
+        // no changes to query or header parameters
+        assertEquals(0, queryParams.size());
+        assertEquals(0, headerParams.size());
+        assertEquals(1, cookieParams.size());
+        assertEquals("Token my-api-token", cookieParams.get("X-API-TOKEN"));
+    }
+
+    @Test
+    public void testApplyToParamsInCookieWithNullValue() {
+        List<Pair> queryParams = new ArrayList<Pair>();
+        Map<String, String> headerParams = new HashMap<String, String>();
+        Map<String, String> cookieParams = new HashMap<String, String>();
+
+        ApiKeyAuth auth = new ApiKeyAuth("cookie", "X-API-TOKEN");
+        auth.setApiKey(null);
+        auth.setApiKeyPrefix("Token");
+        auth.applyToParams(queryParams, headerParams, cookieParams);
+
+        // no changes to parameters
+        assertEquals(0, queryParams.size());
+        assertEquals(0, cookieParams.size());
         assertEquals(0, headerParams.size());
     }
 }

CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/auth/HttpBasicAuthTest.java

@@ -22,13 +22,15 @@ public class HttpBasicAuthTest {
     public void testApplyToParams() {
         List<Pair> queryParams = new ArrayList<Pair>();
         Map<String, String> headerParams = new HashMap<String, String>();
+        Map<String, String> cookieParams = new HashMap<String, String>();
 
         auth.setUsername("my-username");
         auth.setPassword("my-password");
-        auth.applyToParams(queryParams, headerParams);
+        auth.applyToParams(queryParams, headerParams, cookieParams);
 
-        // no changes to query parameters
+        // no changes to query or cookie parameters
         assertEquals(0, queryParams.size());
+        assertEquals(0, cookieParams.size());
         assertEquals(1, headerParams.size());
         // the string below is base64-encoded result of "my-username:my-password" with the "Basic " prefix
         String expected = "Basic bXktdXNlcm5hbWU6bXktcGFzc3dvcmQ=";
@@ -36,7 +38,7 @@ public class HttpBasicAuthTest {
 
         // null username should be treated as empty string
         auth.setUsername(null);
-        auth.applyToParams(queryParams, headerParams);
+        auth.applyToParams(queryParams, headerParams, cookieParams);
         // the string below is base64-encoded result of ":my-password" with the "Basic " prefix
         expected = "Basic Om15LXBhc3N3b3Jk";
         assertEquals(expected, headerParams.get("Authorization"));
@@ -44,7 +46,7 @@ public class HttpBasicAuthTest {
         // null password should be treated as empty string
         auth.setUsername("my-username");
         auth.setPassword(null);
-        auth.applyToParams(queryParams, headerParams);
+        auth.applyToParams(queryParams, headerParams, cookieParams);
         // the string below is base64-encoded result of "my-username:" with the "Basic " prefix
         expected = "Basic bXktdXNlcm5hbWU6";
         assertEquals(expected, headerParams.get("Authorization"));
@@ -54,7 +56,7 @@ public class HttpBasicAuthTest {
         headerParams = new HashMap<String, String>();
         auth.setUsername(null);
         auth.setPassword(null);
-        auth.applyToParams(queryParams, headerParams);
+        auth.applyToParams(queryParams, headerParams, cookieParams);
         // no changes to parameters
         assertEquals(0, queryParams.size());
         assertEquals(0, headerParams.size());

CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/model/ArrayOfArrayOfNumberOnlyTest.java

@@ -53,6 +53,7 @@ public class ArrayOfArrayOfNumberOnlyTest {
         List<BigDecimal> arrayArrayNumber = new ArrayList<BigDecimal>();
         arrayArrayNumber.add(b1);
         arrayArrayNumber.add(b2);
+        model.setArrayArrayNumber(new ArrayList<List<BigDecimal>>());
         model.getArrayArrayNumber().add(arrayArrayNumber);
 
         // create another instance for comparison
@@ -62,6 +63,7 @@ public class ArrayOfArrayOfNumberOnlyTest {
         List<BigDecimal> arrayArrayNumber2 = new ArrayList<BigDecimal>();
         arrayArrayNumber2.add(b1);
         arrayArrayNumber2.add(b2);
+        model2.setArrayArrayNumber(new ArrayList<List<BigDecimal>>());
         model2.getArrayArrayNumber().add(arrayArrayNumber2);
 
         Assert.assertTrue(model2.equals(model));

CI/samples.ci/client/petstore/java/test-manual/resttemplate/auth/ApiKeyAuthTest.java

@@ -17,31 +17,53 @@ public class ApiKeyAuthTest {
     public void testApplyToParamsInQuery() {
         MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
         HttpHeaders headerParams = new HttpHeaders();
+        MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
 
         ApiKeyAuth auth = new ApiKeyAuth("query", "api_key");
         auth.setApiKey("my-api-key");
-        auth.applyToParams(queryParams, headerParams);
+        auth.applyToParams(queryParams, headerParams, cookieParams);
 
         assertEquals(1, queryParams.size());
         assertEquals("my-api-key", queryParams.get("api_key").get(0));
 
-        // no changes to header parameters
+        // no changes to header or cookie parameters
         assertEquals(0, headerParams.size());
+        assertEquals(0, cookieParams.size());
     }
 
     @Test
     public void testApplyToParamsInHeaderWithPrefix() {
         MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
         HttpHeaders headerParams = new HttpHeaders();
+        MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
 
         ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN");
         auth.setApiKey("my-api-token");
         auth.setApiKeyPrefix("Token");
-        auth.applyToParams(queryParams, headerParams);
+        auth.applyToParams(queryParams, headerParams, cookieParams);
 
-        // no changes to query parameters
+        // no changes to query or cookie parameters
         assertEquals(0, queryParams.size());
+        assertEquals(0, cookieParams.size());
         assertEquals(1, headerParams.size());
         assertEquals("Token my-api-token", headerParams.get("X-API-TOKEN").get(0));
     }
+
+    @Test
+    public void testApplyToParamsInCookieWithPrefix() {
+        MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
+        HttpHeaders headerParams = new HttpHeaders();
+        MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
+
+        ApiKeyAuth auth = new ApiKeyAuth("cookie", "X-API-TOKEN");
+        auth.setApiKey("my-api-token");
+        auth.setApiKeyPrefix("Token");
+        auth.applyToParams(queryParams, headerParams, cookieParams);
+
+        // no changes to query or cookie parameters
+        assertEquals(0, queryParams.size());
+        assertEquals(0, headerParams.size());
+        assertEquals(1, cookieParams.size());
+        assertEquals("Token my-api-token", cookieParams.get("X-API-TOKEN").get(0));
+    }
 }

CI/samples.ci/client/petstore/java/test-manual/resttemplate/auth/HttpBasicAuthTest.java

@@ -24,13 +24,15 @@ public class HttpBasicAuthTest {
     public void testApplyToParams() {
         MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
         HttpHeaders headerParams = new HttpHeaders();
+        MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
 
         auth.setUsername("my-username");
         auth.setPassword("my-password");
-        auth.applyToParams(queryParams, headerParams);
+        auth.applyToParams(queryParams, headerParams, cookieParams);
 
-        // no changes to query parameters
+        // no changes to query or cookie parameters
         assertEquals(0, queryParams.size());
+        assertEquals(0, cookieParams.size());
         assertEquals(1, headerParams.size());
         // the string below is base64-encoded result of "my-username:my-password" with the "Basic " prefix
         String expected = "Basic bXktdXNlcm5hbWU6bXktcGFzc3dvcmQ=";
@@ -38,7 +40,7 @@ public class HttpBasicAuthTest {
 
         // null username should be treated as empty string
         auth.setUsername(null);
-        auth.applyToParams(queryParams, headerParams);
+        auth.applyToParams(queryParams, headerParams, cookieParams);
         // the string below is base64-encoded result of ":my-password" with the "Basic " prefix
         expected = "Basic Om15LXBhc3N3b3Jk";
         assertEquals(expected, headerParams.get("Authorization").get(1));
@@ -46,7 +48,7 @@ public class HttpBasicAuthTest {
         // null password should be treated as empty string
         auth.setUsername("my-username");
         auth.setPassword(null);
-        auth.applyToParams(queryParams, headerParams);
+        auth.applyToParams(queryParams, headerParams, cookieParams);
         // the string below is base64-encoded result of "my-username:" with the "Basic " prefix
         expected = "Basic bXktdXNlcm5hbWU6";
         assertEquals(expected, headerParams.get("Authorization").get(2));

CI/samples.ci/client/petstore/typescript-fetch/builds/multiple-parameters/pom.xml

@@ -0,0 +1,26 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools</groupId>
+    <artifactId>TypeScriptAngularBuildPestoreClientTests</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>TS Fetch Multiple Parameters Petstore Client</name>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

CI/samples.ci/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/pom.xml

@@ -0,0 +1,73 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools</groupId>
+    <artifactId>TypeScriptFetchBuildPrefixParameterInterfacesPestoreClientTests</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>TS Fetch Petstore Client (with namespacing for parameter interfaces)</name>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <id>npm-install</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>install</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm-build</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>run</argument>
+                                <argument>build</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>test</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

CONTRIBUTING.md

@@ -31,6 +31,8 @@ Please file the pull request against the correct branch, e.g. `master` for non-b
 
 All the code generators can be found in [modules/openapi-generator/src/main/java/org/openapitools/codegen/languages](https://github.com/openapitools/openapi-generator/tree/master/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages)
 
+If you want to add a new generator, follow the [new-generator](https://openapi-generator.tech/docs/new-generator) guide. 
+
 ### Templates
 
 All the templates ([mustache](https://mustache.github.io/)) can be found in [modules/openapi-generator/src/main/resources](https://github.com/openapitools/openapi-generator/tree/master/modules/openapi-generator/src/main/resources).
@@ -83,7 +85,7 @@ For [Vendor Extensions](https://github.com/OAI/OpenAPI-Specification/blob/master
 To add test cases (optional) covering the change in the code generator, please refer to [modules/openapi-generator/src/test/java/org/openapitools/codegen](https://github.com/openapitools/openapi-generator/tree/master/modules/openapi-generator/src/test/java/org/openapitools/codegen)
 
 To test the templates, please perform the following:
-- Update the Petstore sample by running the shell scripts under `bin` and `bin/openapi3` folder. For example, run `./bin/python-client-petstore.sh` and `./bin/openapi3/python-client-petstore.sh` to update the Python PetStore API client under [`samples/client/petstore/python`](https://github.com/openapitools/openapi-generator/tree/master/samples/client/petstore/python) and [`samples/openapi3/client/petstore/python`](https://github.com/openapitools/openapi-generator/tree/master/samples/openapi3/client/petstore/python). For Windows, the batch files can be found under `bin\windows` folder. (If you find that there are new files generated or unexpected changes as a result of the update, that's not unusual as the test cases are added to the OpenAPI spec from time to time. If you've questions or concerns, please open a ticket to start a discussion)
+- Update the Petstore sample by running the shell scripts under `bin` and `bin/openapi3` folder. For example, run `./bin/python-petstore.sh` and `./bin/openapi3/python-petstore.sh` to update the Python PetStore API client under [`samples/client/petstore/python`](https://github.com/openapitools/openapi-generator/tree/master/samples/client/petstore/python) and [`samples/openapi3/client/petstore/python`](https://github.com/openapitools/openapi-generator/tree/master/samples/openapi3/client/petstore/python). For Windows, the batch files can be found under `bin\windows` folder. (If you find that there are new files generated or unexpected changes as a result of the update, that's not unusual as the test cases are added to the OpenAPI spec from time to time. If you've questions or concerns, please open a ticket to start a discussion)
 - Run the tests in the sample folder using maven `mvn integration-test -rf :<artifactId>`, e.g. open a shell in `samples/client/petstore/python`, run `mvn integration-test -rf :PythonPetstoreClientTests`. The artifactId of the project can be found in the pom.xml file. (some languages may not contain unit testing for Petstore and we're looking for contribution from the community to implement those tests)
 - Finally, git commit the updated samples files: `git commit -a`
   (`git add -A` if added files with new test cases)

README.md

@@ -2,16 +2,22 @@
 
 <div align="center">
 
-[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`4.0.0`): [![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/master.svg?label=Integration%20Test)](https://travis-ci.org/OpenAPITools/openapi-generator)
+[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`4.2.0-SNAPSHOT`): [![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/master.svg?label=Integration%20Test)](https://travis-ci.org/OpenAPITools/openapi-generator)
 [![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator)
 [![Run Status](https://api.shippable.com/projects/5af6bf74e790f4070084a115/badge?branch=master)](https://app.shippable.com/github/OpenAPITools/openapi-generator)
 [![Windows Test](https://ci.appveyor.com/api/projects/status/github/openapitools/openapi-generator?branch=master&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/WilliamCheng/openapi-generator-wh2wu)
+[![JDK11 Build](https://cloud.drone.io/api/badges/OpenAPITools/openapi-generator/status.svg?ref=refs/heads/master)](https://cloud.drone.io/OpenAPITools/openapi-generator)
 
+[`5.0.x`](https://github.com/OpenAPITools/openapi-generator/tree/5.0.x) branch: [![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/5.0.x.svg?label=Integration%20Test)](https://travis-ci.org/OpenAPITools/openapi-generator)
+[![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator/tree/5.0.x.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator)
+[![Run Status](https://api.shippable.com/projects/5af6bf74e790f4070084a115/badge?branch=5.0.x)](https://app.shippable.com/github/OpenAPITools/openapi-generator)
+[![Windows Test](https://ci.appveyor.com/api/projects/status/github/openapitools/openapi-generator?branch=5.0.x&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/WilliamCheng/openapi-generator-wh2wu)
+[![JDK11 Build](https://cloud.drone.io/api/badges/OpenAPITools/openapi-generator/status.svg?ref=refs/heads/5.0.x)](https://cloud.drone.io/OpenAPITools/openapi-generator)
 </div>
 
 <div align="center">
 
-[![Join the chat at https://gitter.im/OpenAPITools/openapi-generator](https://badges.gitter.im/OpenAPITools/openapi-generator.svg)](https://gitter.im/OpenAPITools/openapi-generator?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Jion the Slack chat room](https://img.shields.io/badge/Slack-Join%20the%20chat%20room-orange)](https://join.slack.com/t/openapi-generator/shared_invite/enQtNzAyNDMyOTU0OTE1LTY5ZDBiNDI5NzI5ZjQ1Y2E5OWVjMjZkYzY1ZGM2MWQ4YWFjMzcyNDY5MGI4NjQxNDBiMTlmZTc5NjY2ZTQ5MGM)
 [![Stable releaases in the Maven store](https://img.shields.io/maven-metadata/v/http/central.maven.org/maven2/org/openapitools/openapi-generator/maven-metadata.xml.svg)](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.openapitools%22%20AND%20a%3A%22openapi-generator%22)
 [![Follow OpenAPI Generator Twitter account to get the latest update](https://img.shields.io/twitter/follow/oas_generator.svg?style=social&label=Follow)](https://twitter.com/oas_generator)
 
@@ -40,6 +46,12 @@ If you find OpenAPI Generator useful for work, please consider asking your compa
 #### Thank you to our bronze sponsors!
 
 [![NamSor](https://openapi-generator.tech/img/companies/namsor.png)](https://www.namsor.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
+[![LightBow](https://openapi-generator.tech/img/companies/lightbow.png)](https://www.lightbow.net/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
+
+#### Thank you GoDaddy for sponsoring the domain names and Linode for sponsoring the VPS
+
+[<img src="https://openapi-generator.tech/img/companies/godaddy.png" width="150">](https://www.godaddy.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
+[![Linode](https://www.linode.com/media/images/logos/standard/light/linode-logo_standard_light_small.png)](https://www.linode.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
 
 
 ## Overview
@@ -47,11 +59,11 @@ 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), **C++** (cpprest, 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), **Kotlin**, **Lua**, **Node.js** (ES5, ES6, AngularJS with Google Closure Compiler annotations, Flow types) **Objective-C**, **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 - 7.x), Aurelia, Axios, Fetch, Inversify, jQuery, Node, Rxjs)
-**Server stubs**                 | **Ada**, **C#** (ASP.NET Core, NancyFx), **C++** (Pistache, Restbed), **Erlang**, **Go** (net/http, Gin), **Haskell** (Servant), **Java** (MSF4J, Spring, Undertow, JAX-RS: CDI, CXF, Inflector, RestEasy, Play Framework, [PKMST](https://github.com/ProKarma-Inc/pkmst-getting-started-examples)), **Kotlin** (Spring Boot, Ktor), **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**
+**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), **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)
+**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/)
-**Others**                       | **GraphQL**, **JMeter**, **MySQL Schema**
+**Others**                       | **GraphQL**, **JMeter**, **MySQL Schema**, **Protocol Buffer**
 
 ## Table of contents
 
@@ -72,6 +84,7 @@ OpenAPI Generator allows generation of API client libraries (SDK generation), se
     - [3.2 - Workflow Integration](#32---workflow-integration-maven-gradle-github-cicd)
     - [3.3 - Online Generators](#33---online-openapi-generator)
     - [3.4 - License Information on Generated Code](#34---license-information-on-generated-code)
+    - [3.5 - IDE Integration](#35---ide-integration)
   - [4 - Companies/Projects using OpenAPI Generator](#4---companiesprojects-using-openapi-generator)
   - [5 - Presentations/Videos/Tutorials/Books](#5---presentationsvideostutorialsbooks)
   - [6 - About Us](#6---about-us)
@@ -88,8 +101,9 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20
 
 OpenAPI Generator Version    | Release Date | Notes
 ---------------------------- | ------------ | -----
-4.0.0 (upcoming release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/4.0.0-SNAPSHOT/)| 20.12.2018 | Major release with breaking changes (with or without fallback)
-[3.3.4](https://github.com/OpenAPITools/openapi-generator/releases/tag/v3.3.4) (latest stable release) | 30.11.2018 | Bugfix release
+5.0.0 (upcoming major release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/5.0.0-SNAPSHOT/)| 13.05.2020 | Major release with breaking changes (no fallback)
+4.2.0 (upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/4.2.0-SNAPSHOT/)| 09.10.2019 | Minor release (breaking changes with fallbacks)
+[4.1.3](https://github.com/OpenAPITools/openapi-generator/releases/tag/v4.1.3) (latest stable release) | 04.10.2019 | Patch release (bug fixes, enhancements)
 
 OpenAPI Spec compatibility: 1.0, 1.1, 1.2, 2.0, 3.0
 
@@ -142,19 +156,19 @@ See the different versions of the [openapi-generator-cli](https://mvnrepository.
 * [Readme](https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator-gradle-plugin/README.adoc)
 
 ### [1.3 - Download JAR](#table-of-contents)
-
+<!-- RELEASE_VERSION -->
 If you're looking for the latest stable version, you can grab it directly from Maven.org (Java 8 runtime at a minimum):
 
-JAR location: `http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/3.3.4/openapi-generator-cli-3.3.4.jar`
+JAR location: `http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/4.1.3/openapi-generator-cli-4.1.3.jar`
 
 For **Mac/Linux** users:
 ```sh
-wget http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/3.3.4/openapi-generator-cli-3.3.4.jar -O openapi-generator-cli.jar
+wget http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/4.1.3/openapi-generator-cli-4.1.3.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/3.3.4/openapi-generator-cli-3.3.4.jar
+Invoke-WebRequest -OutFile openapi-generator-cli.jar http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/4.1.3/openapi-generator-cli-4.1.3.jar
 ```
 
 After downloading the JAR, run `java -jar openapi-generator-cli.jar help` to show the usage.
@@ -164,7 +178,7 @@ For Mac users, please make sure Java 8 is installed (Tips: run `java -version` t
 export JAVA_HOME=`/usr/libexec/java_home -v 1.8`
 export PATH=${JAVA_HOME}/bin:$PATH
 ```
-
+<!-- /RELEASE_VERSION -->
 ### Launcher Script
 
 One downside to manual jar downloads is that you don't keep up-to-date with the latest released version. We have a Bash launcher script at [bin/utils/openapi-generator.cli.sh](./bin/utils/openapi-generator-cli.sh) which resolves this issue.
@@ -212,9 +226,9 @@ openapi-generator-cli version # is always 3.0.2, unless any of the above overrid
 
 To build from source, you need the following installed and available in your `$PATH:`
 
-* [Java 8](http://java.oracle.com)
+* [Java 8](https://www.oracle.com/technetwork/java/index.html)
 
-* [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:
 ```sh
@@ -237,6 +251,17 @@ openapi-generator generate -i https://raw.githubusercontent.com/openapitools/ope
 
 To reinstall with the latest master, run `brew uninstall openapi-generator && brew install --HEAD openapi-generator`
 
+To install OpenJDK (pre-requisites), please run
+```sh
+brew cask install adoptopenjdk12
+export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-12.0.2.jdk/Contents/Home/
+```
+
+To install Maven, please run
+```sh
+brew install maven
+```
+
 ### [1.6 - Docker](#table-of-contents)
 
 #### Public Pre-built Docker images
@@ -270,7 +295,7 @@ Example usage:
 
 ```sh
 # Start container at port 8888 and save the container id
-> CID=$(docker run -d -p 8888:8080 -e GENERATOR_HOST=http://localhost:8888 openapitools/openapi-generator-online)
+> CID=$(docker run -d -p 8888:8080 openapitools/openapi-generator-online)
 
 # allow for startup
 > sleep 10
@@ -337,7 +362,7 @@ Right now: no solution for this one :|
 #### Run Docker in Vagrant
 Prerequisite: install [Vagrant](https://www.vagrantup.com/downloads.html) and [VirtualBox](https://www.virtualbox.org/wiki/Downloads).
  ```sh
-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
@@ -357,10 +382,11 @@ npm install @openapitools/openapi-generator-cli -g
 openapi-generator version
 ```
 
-Or install a particualar OpenAPI Generator version (e.g. v3.3.4):
+<!-- RELEASE_VERSION -->
+Or install a particular OpenAPI Generator version (e.g. v4.1.3):
 
 ```sh
-npm install @openapitools/openapi-generator-cli@cli-3.3.4 -g
+npm install @openapitools/openapi-generator-cli@cli-4.1.3 -g
 ```
 
 Or install it as dev-dependency:
@@ -368,7 +394,7 @@ Or install it as dev-dependency:
 ```sh
 npm install @openapitools/openapi-generator-cli -D
 ```
-
+<!-- /RELEASE_VERSION -->
 ## [2 - Getting Started](#table-of-contents)
 
 To generate a PHP client for [petstore.yaml](https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/2_0/petstore.yaml), please run the following
@@ -383,7 +409,9 @@ 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/3.3.4/openapi-generator-cli-3.3.4.jar)
+<!-- RELEASE_VERSION -->
+You can also download the JAR (latest release) directly from [maven.org](http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/4.1.3/openapi-generator-cli-4.1.3.jar)
+<!-- /RELEASE_VERSION -->
 
 To get a list of **general** options available, please run `java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar help generate`
 
@@ -421,7 +449,7 @@ NAME
 SYNOPSIS
         openapi-generator-cli generate
                 [(-a <authorization> | --auth <authorization>)]
-                [--additional-properties <additional properties>...]
+                [--api-name-suffix <api name suffix>]
                 [--api-package <api package>] [--artifact-id <artifact id>]
                 [--artifact-version <artifact version>]
                 [(-c <configuration file> | --config <configuration file>)]
@@ -442,11 +470,13 @@ SYNOPSIS
                 [--model-name-prefix <model name prefix>]
                 [--model-name-suffix <model name suffix>]
                 [--model-package <model package>]
-                [(-o <output directory> | --output <output directory>)]
+                [(-o <output directory> | --output <output directory>)] 
+                [(-p <additional properties> | --additional-properties <additional properties>)...]
                 [--package-name <package name>] [--release-note <release note>]
                 [--remove-operation-id-prefix]
                 [--reserved-words-mappings <reserved word mappings>...]
-                [(-s | --skip-overwrite)] [--skip-validate-spec]
+                [(-s | --skip-overwrite)] [--server-variables <server variables>...]
+                [--skip-validate-spec] [--strict-spec <true/false strict behavior>]
                 [(-t <template directory> | --template-dir <template directory>)]
                 [--type-mappings <type mappings>...] [(-v | --verbose)]
 
@@ -491,8 +521,8 @@ Please refer to [integration.md](docs/integration.md) on how to integrate OpenAP
 
 Here are the public online services:
 
-- latest stable version: http://api.openapi-generator.tech
-- latest master: http://api-latest-master.openapi-generator.tech (updated with latest master every hour)
+- latest stable version: https://api.openapi-generator.tech
+- latest master: https://api-latest-master.openapi-generator.tech (updated with latest master every hour)
 
 The server is sponsored by [Linode](https://www.linode.com/) [![Linode Logo](https://www.linode.com/media/images/logos/standard/light/linode-logo_standard_light_small.png)](https://www.linode.com/)
 
@@ -508,39 +538,78 @@ The OpenAPI Generator project is intended as a benefit for users of the Open API
 * Generated code is intentionally _not_ subject to the parent project license
 
 When code is generated from this project, it shall be considered **AS IS** and owned by the user of the software.  There are no warranties--expressed or implied--for generated code.  You can do what you wish with it, and once generated, the code is your responsibility and subject to the licensing terms that you deem appropriate.
+
+### [3.5 - IDE Integration](#table-of-contents)
+
+Here is a list of community-conitributed IDE plug-ins that integrate with OpenAPI Generator:
+
+- Eclipse: [Codewind OpenAPI Tools for Eclipse](https://www.eclipse.org/codewind/open-api-tools-for-eclipse.html) by [IBM](https://www.ibm.com)
+- IntelliJ IDEA: [OpenAPI Generator](https://plugins.jetbrains.com/plugin/8433-openapi-generator) by [Jim Schubert](https://jimschubert.us/#/)
+- IntelliJ IDEA: [Senya Editor](https://plugins.jetbrains.com/plugin/10690-senya-editor) by [senya.io](https://senya.io)
+- [RepreZen API Studio](https://www.reprezen.com/)
+- Visual Studio: [REST API Client Code Generator](https://marketplace.visualstudio.com/items?itemName=ChristianResmaHelle.ApiClientCodeGenerator) by [Christian Resma Helle](https://christian-helle.blogspot.com/)
+- Visual Studio Code: [Codewind OpenAPI Tools](https://marketplace.visualstudio.com/items?itemName=IBM.codewind-openapi-tools) by [IBM](https://marketplace.visualstudio.com/publishers/IBM)
+
  
 ## [4 - Companies/Projects using OpenAPI Generator](#table-of-contents)
 Here are some companies/projects (alphabetical order) using OpenAPI Generator in production. To add your company/project to the list, please visit [README.md](README.md) and click on the icon to edit the page.
 
 - [Adaptant Solutions AG](https://www.adaptant.io/)
 - [Angular.Schule](https://angular.schule/)
+- [Australia and New Zealand Banking Group (ANZ)](http://www.anz.com/)
 - [ASKUL](https://www.askul.co.jp)
+- [Arduino](https://www.arduino.cc/)
 - [b<>com](https://b-com.com/en)
+- [Banzai Cloud](https://banzaicloud.com)
 - [BIMData.io](https://bimdata.io)
 - [Bithost GmbH](https://www.bithost.ch)
+- [Bosch Connected Industry](https://www.bosch-connected-industry.com)
 - [Boxever](https://www.boxever.com/)
+- [California State University, Northridge](https://www.csun.edu)
+- [CAM](https://www.cam-inc.co.jp/)
 - [Camptocamp](https://www.camptocamp.com/en)
 - [codecentric AG](https://www.codecentric.de/)
+- [Commencis](https://www.commencis.com/)
 - [Cupix](https://www.cupix.com/)
+- [DB Systel](https://www.dbsystel.de)
+- [dwango](https://dwango.co.jp/)
+- [Edge Impulse](https://www.edgeimpulse.com/)
+- [Element AI](https://www.elementai.com/)
+- [Fenergo](https://www.fenergo.com/)
 - [FormAPI](https://formapi.io/)
+- [Fuse](https://www.fuse.no/)
+- [Gantner](https://www.gantner.com)
 - [GenFlow](https://github.com/RepreZen/GenFlow)
 - [GMO Pepabo](https://pepabo.com/en/)
 - [GoDaddy](https://godaddy.com)
+- [Here](https://developer.here.com/)
+- [IBM](https://www.ibm.com/)
 - [JustStar](https://www.juststarinfo.com)
 - [Klarna](https://www.klarna.com/)
+- [Médiavision](https://www.mediavision.fr/)
 - [Metaswitch](https://www.metaswitch.com/)
 - [Myworkout](https://myworkout.com)
+- [NamSor](https://www.namsor.com/)
+- [Openet](https://www.openet.com/)
+- [Paxos](https://www.paxos.com)
+- [Ponicode](https://ponicode.dev/)
+- [Pricefx](https://www.pricefx.com/)
 - [Prometheus/Alertmanager](https://github.com/prometheus/alertmanager)
 - [Raiffeisen Schweiz Genossenschaft](https://www.raiffeisen.ch)
+- [RedHat](https://www.redhat.com)
 - [RepreZen API Studio](https://www.reprezen.com/swagger-openapi-code-generation-api-first-microservices-enterprise-development)
 - [REST United](https://restunited.com)
 - [Stingray](http://www.stingray.com)
 - [Suva](https://www.suva.ch/)
 - [Telstra](https://dev.telstra.com)
+- [TravelTime platform](https://www.traveltimeplatform.com/)
 - [TUI InfoTec GmbH](http://www.tui-infotec.com/)
 - [unblu inc.](https://www.unblu.com/)
 - [Veamly](https://www.veamly.com/)
+- [WSO2](https://wso2.com/)
+- [Vouchery.io](https://vouchery.io)
 - [Xero](https://www.xero.com/)
+- [Yelp](https://www.yelp.com/)
 - [Zalando](https://www.zalando.com)
 
 ## [5 - Presentations/Videos/Tutorials/Books](#table-of-contents)
@@ -561,6 +630,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - 2018/12/09 - [openapi-generator をカスタマイズする方法](https://qiita.com/watiko/items/0961287c02eac9211572) by [@watiko](https://qiita.com/watiko)
 - 2019/01/03 - [Calling a Swagger service from Apex using openapi-generator](https://lekkimworld.com/2019/01/03/calling-a-swagger-service-from-apex-using-openapi-generator/) by [Mikkel Flindt Heisterberg](https://lekkimworld.com)
 - 2019/01/13 - [OpenAPI GeneratorでRESTful APIの定義書から色々自動生成する](https://ky-yk-d.hatenablog.com/entry/2019/01/13/234108) by [@ky_yk_d](https://twitter.com/ky_yk_d)
+- 2019/01/20 - [Contract-First API Development with OpenAPI Generator and Connexion](https://medium.com/commencis/contract-first-api-development-with-openapi-generator-and-connexion-b21bbf2f9244) by [Anil Can Aydin](https://github.com/anlcnydn)
 - 2019/01/30 - [Rapid Application Development With API First Approach Using Open-API Generator](https://dzone.com/articles/rapid-api-development-using-open-api-generator) by [Milan Sonkar](https://dzone.com/users/828329/milan_sonkar.html)  
 - 2019/02/02 - [平静を保ち、コードを生成せよ 〜 OpenAPI Generator誕生の背景と軌跡 〜](https://speakerdeck.com/akihito_nakano/gunmaweb34) by [中野暁人](https://github.com/ackintosh) at [Gunma.web #34 スキーマ駆動開発](https://gunmaweb.connpass.com/event/113974/)
 - 2019/02/20 - [An adventure in OpenAPI V3 code generation](https://mux.com/blog/an-adventure-in-openapi-v3-api-code-generation/) by [Phil Cluff](https://mux.com/blog/author/philc/)
@@ -570,8 +640,43 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - 2019-03-25 - [Access any REST service with the SAP S/4HANA Cloud SDK](https://blogs.sap.com/2019/03/25/integrate-sap-s4hana-cloud-sdk-with-open-api/) by [Alexander Duemont](https://people.sap.com/alexander.duemont)
 - 2019-03-25 - [OpenAPI generatorを試してみる](https://qiita.com/amuyikam/items/e8a45daae59c68be0fc8) by [@amuyikam](https://twitter.com/amuyikam)
 - 2019-03-27 - [OpenAPI3を使ってみよう！Go言語でクライアントとスタブの自動生成まで！](https://techblog.zozo.com/entry/openapi3/go) by [@gold_kou](https://twitter.com/gold_kou)
+- 2019-04-17 - [OpenAPIによるスキーマファースト開発の実施サンプルとCloud Runについて](https://tech-blog.optim.co.jp/entry/2019/04/17/174000) by [@yukey1031](https://twitter.com/yukey1031)
 - 2019-04-18 - [How to use OpenAPI3 for API developer (RubyKaigi 2019)](https://speakerdeck.com/ota42y/how-to-use-openapi3-for-api-developer) by [@ota42y](https://twitter.com/ota42y) at [RubyKaigi 2019](https://rubykaigi.org/2019)
 - 2019-04-29 - [A Beginner's Guide to Code Generation for REST APIs (OpenAPI Generator)](https://gum.co/openapi_generator_ebook) by [William Cheng](https://twitter.com/wing328)
+- 2019-05-01 - [Design and generate a REST API from Swagger / OpenAPI in Java, Python, C# and more](https://simply-how.com/design-and-generate-api-code-from-openapi) by [Simply How](https://simply-how.com/)
+- 2019-05-17 - [Generate Spring Boot REST API using Swagger/OpenAPI](https://www.47northlabs.com/knowledge-base/generate-spring-boot-rest-api-using-swagger-openapi/) by [Antonie Zafirov](https://www.47northlabs.com/author/antonie-zafirov/)
+- 2019-05-22 - [REST APIs代码生成指南(OpenAPI Generator)](https://gum.co/openapi_generator_ebook_gb) by [William Cheng](https://twitter.com/wing328), [Xin Meng](https://github.com/xmeng1)
+- 2019-05-24 - [REST API 代碼生成指南 (OpenAPI Generator)](https://gum.co/openapi_generator_ebook_big5) by [William Cheng](https://twitter.com/wing328)
+- 2019-06-24 - [Kubernetes Clients and OpenAPI Generator](https://speakerdeck.com/wing328/kubernetes-clients-and-openapi-generator) by [William Cheng](https://twitter.com/wing328) at [Kubernetes Contributor Summits Shanghai 2019](https://www.lfasiallc.com/events/contributors-summit-china-2019/)
+- 2019-06-28 [Codewind OpenAPI Tools](https://marketplace.eclipse.org/content/codewind-openapi-tools) in [Eclipse Marketplace](https://marketplace.eclipse.org/) by IBM
+- 2019-06-29 [Codewind OpenAPI Tools](https://marketplace.visualstudio.com/items?itemName=IBM.codewind-openapi-tools) in [Visual Studio Marketplace](https://marketplace.visualstudio.com/) by IBM
+- 2019-07-04 - [REST API のためのコード生成入門 (OpenAPI Generator)](https://gum.co/openapi_generator_ebook_big5) by [William Cheng](https://twitter.com/wing328), [中野暁人](https://github.com/ackintosh), [和田拓朗](https://github.com/taxpon)
+- 2019-07-08 - [OpenAPI Generator にコントリビュートしたら社名が載った話。(CAM) - CAM TECH BLOG](https://tech.cam-inc.co.jp/entry/2019/07/08/140000) by [CAM, Inc.](https://www.cam-inc.co.jp/)
+- 2019-07-14 - [OpenAPI GeneratorでPythonのクライアントライブラリを作成した](https://qiita.com/yuji38kwmt/items/dfb929316a1335a161c0) by [yuji38kwmt](https://qiita.com/yuji38kwmt)
+- 2019-07-19 - [Developer Experience (DX) for Open-Source Projects: How to Engage Developers and Build a Growing Developer Community](https://speakerdeck.com/wing328/developer-experience-dx-for-open-source-projects-english-japanese) by [William Cheng](https://twitter.com/wing328), [中野暁人](https://github.com/ackintosh) at [Open Source Summit Japan 2019](https://events.linuxfoundation.org/events/open-source-summit-japan-2019/)
+- 2019-08-14 - [Our OpenAPI journey with Standardizing SDKs](https://bitmovin.com/our-openapi-journey-with-standardizing-sdks/) by [Sebastian Burgstaller](https://bitmovin.com/author/sburgstaller/) at [Bitmovin](https://www.bitmovin.com)
+- 2019-08-15 - [APIのコードを自動生成させたいだけならgRPCでなくてもよくない?](https://www.m3tech.blog/entry/2019/08/15/110000) by [M3, Inc.](https://corporate.m3.com/)
+- 2019-08-22 - [マイクロサービスにおけるWeb APIスキーマの管理─ GraphQL、gRPC、OpenAPIの特徴と使いどころ](https://employment.en-japan.com/engineerhub/entry/2019/08/22/103000) by [@ota42y](https://twitter.com/ota42y)
+- 2019-08-24 - [SwaggerドキュメントからOpenAPI Generatorを使ってモックサーバー作成](https://qiita.com/masayoshi0222/items/4845e4c715d04587c104) by [坂本正義](https://qiita.com/masayoshi0222)
+- 2019-08-29 - [OpenAPI初探](https://cloud.tencent.com/developer/article/1495986) by [peakxie](https://cloud.tencent.com/developer/user/1113152) at [腾讯云社区](https://cloud.tencent.com/developer)
+- 2019-08-29 - [全面进化：Kubernetes CRD 1.16 GA前瞻](https://www.servicemesher.com/blog/kubernetes-1.16-crd-ga-preview/) by [Min Kim](https://github.com/yue9944882) at [ServiceMesher Blog](https://www.servicemesher.com/blog/)
+- 2019-09-01 - [Creating a PHP-Slim server using OpenAPI (Youtube video)](https://www.youtube.com/watch?v=5cJtbIrsYkg) by [Daniel Persson](https://www.youtube.com/channel/UCnG-TN23lswO6QbvWhMtxpA)
+- 2019-09-06 - [Vert.x and OpenAPI](https://wissel.net/blog/2019/09/vertx-and-openapi.html) by [Stephan H Wissel](https://twitter.com/notessensei) at [wissel.net blog](https://wissel.net)
+- 2019-09-09 - [Cloud-native development - Creating RESTful microservices](https://cloud.ibm.com/docs/cloud-native?topic=cloud-native-rest-api) in [IBM Cloud Docs](https://cloud.ibm.com/docs)
+- 2019-09-14 - [Generating and Configuring a Mastercard API Client](https://developer.mastercard.com/platform/documentation/generating-and-configuring-a-mastercard-api-client/) at [Mastercard Developers Platform](https://developer.mastercard.com/platform/documentation/)
+- 2019-09-15 - [OpenAPI(Swagger)導入下調べ](https://qiita.com/ShoichiKuraoka/items/f1f7a3c2376f7cd9c56a) by [Shoichi Kuraoka](https://qiita.com/ShoichiKuraoka)
+- 2019-09-17 - [Tutorial: Documenting http4k APIs with OpenApi3](https://www.http4k.org/tutorials/documenting_apis_with_openapi/) by [http4k](https://www.http4k.org/)
+- 2019-09-22 - [OpenAPI 3を完全に理解できる本](https://booth.pm/ja/items/1571902) by [@ota42y](https://twitter.com/ota42y)
+- 2019-09-22 - [RESTful APIs: Tutorial of OpenAPI Specification](https://medium.com/@amirm.lavasani/restful-apis-tutorial-of-openapi-specification-eeada0e3901d) by [Amir Lavasani](https://medium.com/@amirm.lavasani)
+- 2019-09-22 - [Redefining SDKs as software diversity kits](https://devrel.net/dev-rel/redefining-sdks-as-software-diversity-kits) by [Sid Maestre (Xero)](https://twitter.com/sidneyallen) at [DevRelCon San Francisco 2019](https://sf2019.devrel.net/)
+- 2019-09-23 - [swaggerからOpenApi GeneratorでSpringのコードを自動生成](https://qiita.com/littleFeet/items/492df2ad68a0799a5e5e) by [@littleFeet](https://qiita.com/littleFeet) at [Qiita](https://qiita.com/)
+- 2019-09-24 - [Eine Stunde was mit Api First!](https://www.slideshare.net/JanWeinschenker/eine-stunde-was-mit-api-first) by [@janweinschenker](https://twitter.com/janweinschenker) at [Java Forum Nord](https://javaforumnord.de/)
+- 2019-10-09 - [openapi-generator で生成した Go クライアントで Bearer 認証をする](https://autopp-tech.hatenablog.com/entry/2019/10/09/222039) by [Akira Tanimura](https://github.com/autopp)
+- 2019-10-10 - [Automatic Generation of REST Clients](https://www.meetup.com/fr-FR/Criteo-Labs-Tech-Talks/events/264775768/) by Thomas Peyrard, Senior Software Engineer at Criteo in [Full-Stack Tech Talks (Meetup)](https://www.meetup.com/fr-FR/Criteo-Labs-Tech-Talks/events/264775768/)
+- 2019-10-12 - [OpenApi自动生成client](https://blog.csdn.net/wxid2798226/article/details/102527467) by [郑泽洲](https://me.csdn.net/wxid2798226)
+- 2019-10-16 - [How to ship APIs faster?](https://medium.com/@accounts_76224/how-to-ship-apis-faster-cabef2f819e4) by [Simon Guilliams @ PoniCode](https://ponicode.dev)
+- 2019-10-22 - [OpenAPI + Spring Boot(Kotlin)でファイルダウンロードAPIを作成する](https://qiita.com/boronngo/items/4b78b92526209daeaee9) by [Yuki Furukawa](https://twitter.com/yuki_furukawa5)
+- 2019-10-24 - [Microprofile OpenAPI - Code First or Design First?](https://github.com/pe-st/apidocs/blob/master/MicroProfile-OpenAPI-all-slides.pdf) by [Peter [pɛʃə] Steiner](https://twitter.com/pesche) at [eclipsecon Europe 2019](https://www.eclipsecon.org/europe2019/sessions/microprofile-openapi-code-first-or-design-first)
 
 ## [6 - About Us](#table-of-contents)
 
@@ -584,7 +689,8 @@ OpenAPI Generator core team members are contributors who have been making signif
 * [@jimschubert](https://github.com/jimschubert) (2016/05) [:heart:](https://www.patreon.com/jimschubert)
 * [@cbornet](https://github.com/cbornet) (2016/05)
 * [@ackintosh](https://github.com/ackintosh) (2018/02) [:heart:](https://www.patreon.com/ackintosh/overview)
-* [@jmini](https://github.com/jmini) (2018/04)
+* [@jmini](https://github.com/jmini) (2018/04)  [:heart:](https://www.patreon.com/jmini)
+* [@etherealjoy](https://github.com/etherealjoy) (2019/06)
 
 :heart: = Link to support the contributor directly 
 
@@ -595,7 +701,6 @@ OpenAPI Generator core team members are contributors who have been making signif
 Here is a list of template creators:
  * API Clients:
    * Ada: @stcarrez
-   * Akka-Scala: @cchafer
    * Apex: @asnelling
    * Bash: @bkryza
    * C: @PowerOfCreation @zhemant [:heart:](https://www.patreon.com/zhemant)
@@ -608,6 +713,7 @@ Here is a list of template creators:
    * Dart (refactor): @joernahrens
    * Dart 2: @swipesight
    * Dart (Jaguar): @jaumard
+   * Dart (Dio): @athornz
    * Elixir: @niku
    * Elm: @eriktim
    * Eiffel: @jvelilla
@@ -628,19 +734,25 @@ Here is a list of template creators:
    * Java (Vertx): @lopesmcc
    * Java (Google APIs Client Library): @charlescapps
    * Java (Rest-assured): @viclovsky
+   * Java (Java 11 Native HTTP client): @bbdouglas
    * Javascript/NodeJS: @jfiala
    * Javascript (Closure-annotated Angular) @achew22
    * Javascript (Flow types) @jaypea
    * JMeter: @davidkiss
    * Kotlin: @jimschubert [:heart:](https://www.patreon.com/jimschubert)
+   * Kotlin (MultiPlatform): @andrewemery
    * Lua: @daurnimator
+   * Nim: @hokamoto
+   * OCaml: @cgensoul
    * Perl: @wing328 [:heart:](https://www.patreon.com/wing328)
    * PHP (Guzzle): @baartosz
    * PowerShell: @beatcracker
    * R: @ramnov
+   * Ruby (Faraday): @meganemura @dkliban 
    * Rust: @farcaller
    * Rust (rust-server): @metaswitch
    * Scala (scalaz & http4s): @tbrown1979
+   * Scala (Akka): @cchafer
    * Swift: @tkqubo
    * Swift 3: @hexelon
    * Swift 4: @ehyche
@@ -653,14 +765,17 @@ Here is a list of template creators:
    * TypeScript (jQuery): @bherila
    * TypeScript (Node):  @mhardorf
    * TypeScript (Rxjs): @denyo
+   * TypeScript (Inversify): @gualtierim
  * Server Stubs
    * Ada: @stcarrez
-   * C# ASP.NET5: @jimschubert [:heart:](https://www.patreon.com/jimschubert)
+   * C# ASP.NET 5: @jimschubert [:heart:](https://www.patreon.com/jimschubert)
+   * C# ASP.NET Core 3.0: @A-Joshi 
    * C# NancyFX: @mstefaniuk
    * C++ (Qt5 QHttpEngine): @etherealjoy
    * C++ Pistache: @sebymiano
    * C++ Restbed: @stkrwork
    * Erlang Server: @galaxie
+   * F# (Giraffe) Server: @nmfisher
    * Go Server: @guohuang
    * Go (Gin) Server: @kemokemo
    * GraphQL Express Server: @renepardon
@@ -670,12 +785,15 @@ Here is a list of template creators:
    * Java Undertow: @stevehu
    * Java Play Framework: @JFCote
    * Java PKMST: @anshu2185 @sanshuman @rkumar-pk @ninodpillai
+   * Java Vert.x: @lwlee2608
    * JAX-RS RestEasy: @chameleon82
    * JAX-RS CXF: @hiveship
    * JAX-RS CXF (CDI): @nickcmaynard
    * JAX-RS RestEasy (JBoss EAP): @jfiala
    * Kotlin: @jimschubert [:heart:](https://www.patreon.com/jimschubert)
    * Kotlin (Spring Boot): @dr4ke616
+   * Kotlin (Vertx): @Wooyme
+   * NodeJS Express: @YishTish
    * PHP Laravel: @renepardon
    * PHP Lumen: @abcsun
    * PHP Slim: @jfastnacht
@@ -688,13 +806,16 @@ Here is a list of template creators:
    * Scala Lagom: @gmkumar2005
    * Scala Play: @adigerber
  * Documentation
+   * AsciiDoc: @man-at-home
    * HTML Doc 2: @jhitchcock
    * Confluence Wiki: @jhitchcock
  * Configuration
    * Apache2: @stkrwork
  * Schema
+   * Avro: @sgadouar 
    * GraphQL: @wing328 [:heart:](https://www.patreon.com/wing328)
    * MySQL: @ybelenko
+   * Protocol Buffer: @wing328
 
 :heart: = Link to support the contributor directly
 
@@ -735,33 +856,36 @@ If you want to join the committee, please kindly apply by sending an email to te
 | Apex      |  |
 | Bash      | @frol (2017/07) @bkryza (2017/08) @kenjones-cisco (2017/09) |
 | C         | @zhemant (2018/11) |
-| C++       | @ravinikam (2017/07) @stkrwork (2017/07) @fvarose (2017/11) @etherealjoy (2018/02) @martindelille (2018/03) |
-| C#        | @mandrean (2017/08), @jimschubert (2017/09) [:heart:](https://www.patreon.com/jimschubert) |
+| C++       | @ravinikam (2017/07) @stkrwork (2017/07) @etherealjoy (2018/02) @martindelille (2018/03) @muttleyxd (2019/08) |
+| C#        | @mandrean (2017/08), @jimschubert (2017/09) [:heart:](https://www.patreon.com/jimschubert) @frankyjuang (2019/09) |
 | Clojure   |  |
-| Dart      | @ircecho (2017/07) @swipesight (2018/09) @jaumard (2018/09) |
+| Dart      | @ircecho (2017/07) @swipesight (2018/09) @jaumard (2018/09) @nickmeinhold (2019/09)  |
 | Eiffel    | @jvelilla (2017/09) |
 | Elixir    | @mrmstn (2018/12) |
 | Elm       | @eriktim (2018/09) |
 | Erlang    | @tsloughter (2017/11) @jfacorro (2018/10) @robertoaloi (2018/10) |
-| Go        | @antihax (2017/11) @bvwells (2017/12) @grokify (2018/07) @kemokemo (2018/09 |
+| F#        | @nmfisher (2019/05) |
+| Go        | @antihax (2017/11) @bvwells (2017/12) @grokify (2018/07) @kemokemo (2018/09) @bkabrda (2019/07) |
 | GraphQL   | @renepardon (2018/12) |
 | Groovy    |  |
 | Haskell   |  |
-| Java      | @bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03) @Zomzog (2019/04) |
-| Kotlin    | @jimschubert (2017/09) [:heart:](https://www.patreon.com/jimschubert), @dr4ke616 (2018/08) @karismann (2019/03) @Zomzog (2019/04) |
+| Java      | @bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03) @Zomzog (2019/04) @lwlee2608 (2019/10) |
+| Kotlin    | @jimschubert (2017/09) [:heart:](https://www.patreon.com/jimschubert), @dr4ke616 (2018/08) @karismann (2019/03) @Zomzog (2019/04) @andrewemery (2019/10) |
 | Lua       | @daurnimator (2017/08) |
+| Nim       |  |
 | NodeJS/Javascript | @CodeNinjai (2017/07) @frol (2017/07) @cliffano (2017/07) |
 | ObjC      |  |
-| Perl      | @wing328 (2017/07) [:heart:](https://www.patreon.com/wing328) |
+| OCaml     | @cgensoul (2019/08) |
+| Perl      | @wing328 (2017/07) [:heart:](https://www.patreon.com/wing328) @yue9944882 (2019/06) |
 | PHP       | @jebentier (2017/07), @dkarlovi (2017/07), @mandrean (2017/08), @jfastnacht (2017/09), @ackintosh (2017/09) [:heart:](https://www.patreon.com/ackintosh/overview), @ybelenko (2018/07), @renepardon (2018/12) |
 | PowerShell | |
 | Python    | @taxpon (2017/07) @frol (2017/07) @mbohlool (2017/07) @cbornet (2017/09) @kenjones-cisco (2017/11) @tomplus (2018/10) @Jyhess (2019/01) |
-| R         |  |
+| R         | @Ramanth (2019/07) @saigiridhar21 (2019/07) |
 | Ruby      | @cliffano (2017/07) @zlx (2017/09) @autopp (2019/02) |
-| Rust      | @frol (2017/07) @farcaller (2017/08) @bjgill (2017/12) |
+| Rust      | @frol (2017/07) @farcaller (2017/08) @bjgill (2017/12) @richardwhiuk (2019/07) |
 | Scala     | @clasnake (2017/07), @jimschubert (2017/09) [:heart:](https://www.patreon.com/jimschubert), @shijinkui  (2018/01), @ramzimaalej (2018/03) |
 | Swift     | @jgavris (2017/07) @ehyche (2017/08) @Edubits (2017/09) @jaz-ah (2017/09) @d-date  (2018/03) |
-| TypeScript | @TiFu (2017/07) @taxpon (2017/07) @sebastianhaas (2017/07) @kenisteward (2017/07) @Vrolijkx (2017/09) @macjohnny (2018/01) @nicokoenig (2018/09) @topce (2018/10) |
+| TypeScript | @TiFu (2017/07) @taxpon (2017/07) @sebastianhaas (2017/07) @kenisteward (2017/07) @Vrolijkx (2017/09) @macjohnny (2018/01) @nicokoenig (2018/09) @topce (2018/10) @akehir (2019/07) |
 
 :heart: = Link to support the contributor directly
 
@@ -789,7 +913,7 @@ OpenAPI Generator is a fork of [Swagger Codegen](https://github.com/swagger-api/
 - [Jean-François Côté](https://github.com/JFCote)
 - [Jim Schubert](https://github.com/jimschubert)
 - [Jon Schoning](https://github.com/jonschoning)
-- [Jérémie Bresson](https://github.com/jmini)
+- [Jérémie Bresson](https://github.com/jmini) [:heart:](https://www.patreon.com/jmini)
 - [Jörn Ahrens](https://github.com/jayearn)
 - [Keni Steward](https://github.com/kenisteward)
 - [Marcin Stefaniuk](https://github.com/mstefaniuk)
@@ -831,7 +955,7 @@ Copyright 2018 SmartBear Software
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
-You may obtain a copy of the License at [apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
+You may obtain a copy of the License at [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,

appveyor.yml

@@ -30,7 +30,6 @@ install:
   - cmd: SET M2_HOME=C:\maven\apache-maven-3.2.5
   - cmd: java -version
   - cmd: gradle -v
-  - cmd: gradle -b modules\openapi-generator-gradle-plugin\samples\local-spec\build.gradle buildGoSdk --info
   - cmd: dir/w
   - git clone https://github.com/wing328/swagger-samples
   - ps: Start-Process -FilePath 'C:\maven\apache-maven-3.2.5\bin\mvn' -ArgumentList 'jetty:run' -WorkingDirectory "$env:appveyor_build_folder\swagger-samples\java\java-jersey-jaxrs-ci"
@@ -50,6 +49,8 @@ build_script:
   - msbuild samples\client\petstore\csharp\OpenAPIClientNetStandard\Org.OpenAPITools.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
   # install openapi-generator locally
   - mvn clean install --quiet
+  # run the locally installed openapi-generator-gradle-plugin
+  - gradle -b modules\openapi-generator-gradle-plugin\samples\local-spec\build.gradle buildGoSdk --info
 test_script:
   # restore test-related files
   - copy /b/v/y CI\samples.ci\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj samples\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
@@ -57,9 +58,9 @@ test_script:
   - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
   - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClientCore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
   # test c# API client
-  - nunit-console samples\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\bin\Debug\Org.OpenAPITools.Test.dll --result=myresults.xml;format=AppVeyor
+  - nunit3-console samples\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\bin\Debug\Org.OpenAPITools.Test.dll --result=myresults.xml;format=AppVeyor
   # test c# API client (with PropertyChanged)
-  - nunit-console samples\client\petstore\csharp\OpenAPIClientWithPropertyChanged\src\Org.OpenAPITools.Test\bin\Debug\Org.OpenAPITools.Test.dll --result=myresults.xml;format=AppVeyor
+  - nunit3-console samples\client\petstore\csharp\OpenAPIClientWithPropertyChanged\src\Org.OpenAPITools.Test\bin\Debug\Org.OpenAPITools.Test.dll --result=myresults.xml;format=AppVeyor
 
   # generate all petstore clients
   - .\bin\windows\run-all-petstore.cmd

bin/ada-petstore.sh

@@ -30,7 +30,7 @@ export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
 model="modules/openapi-generator/src/test/resources/2_0/petstore.yaml"
 ags="generate --template-dir modules/openapi-generator/src/main/resources/Ada -g ada $@"
 ags="$ags -i $model -t modules/openapi-generator/src/main/resources/Ada -o samples/client/petstore/ada"
-ags="$ags -DprojectName=Petstore --model-package Samples.Petstore"
+ags="$ags --additional-properties projectName=Petstore --model-package Samples.Petstore"
 
 java $JAVA_OPTS -jar $executable $ags
 rm -rf  samples/client/petstore/ada/src/server

bin/android-petstore-httpclient.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/android -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g android -Dlibrary=httpclient -o samples/client/petstore/android/httpclient $@"
+ags="generate -t modules/openapi-generator/src/main/resources/android -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g android --additional-properties library=httpclient -o samples/client/petstore/android/httpclient $@"
 
 java $JAVA_OPTS -jar $executable $ags

bin/asciidoc-documentation-petstore.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+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 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/asciidoc-documentation  --additional-properties=specDir=modules/openapi-generator/src/main/resources/asciidoc-documentation,snippetDir=. -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g asciidoc -o samples/documentation/asciidoc"
+
+java ${JAVA_OPTS} -jar ${executable} ${ags}

bin/aspnetcore-petstore-server.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 -g aspnetcore -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -o samples/server/petstore/aspnetcore --additional-properties packageGuid={3C799344-F285-4669-8FD5-7ED9B795D5C5} $@"
+ags="generate -g aspnetcore -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -t modules/openapi-generator/src/main/resources/aspnetcore/2.1/ -o samples/server/petstore/aspnetcore --additional-properties packageGuid={3C799344-F285-4669-8FD5-7ED9B795D5C5} $@"
 
 java $JAVA_OPTS -jar $executable $ags

bin/ci/apex-petstore.json

@@ -0,0 +1,6 @@
+{
+  "generatorName": "apex",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
+  "outputDir": "samples/client/petstore/apex",
+  "templateDir": "modules/openapi-generator/src/main/resources/apex"
+}

bin/ci/csharp-netcore-petstore-1.json

@@ -0,0 +1,11 @@
+{
+  "generatorName": "csharp-netcore",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/client/petstore/csharp-netcore/OpenAPIClientCore",
+  "templateDir": "modules/openapi-generator/src/main/resources/csharp-netcore/",
+  "additionalProperties": {
+    "packageGuid": "{321C8C3F-0156-40C1-AE42-D59761FB9B6C}",
+    "useCompareNetObjects": true,
+    "targetFramework": "netcoreapp2.0"
+  }
+}

bin/ci/csharp-netcore-petstore.json

@@ -0,0 +1,10 @@
+{
+  "generatorName": "csharp-netcore",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/client/petstore/csharp-netcore/OpenAPIClient",
+  "templateDir": "modules/openapi-generator/src/main/resources/csharp-netcore/",
+  "additionalProperties": {
+    "packageGuid": "{321C8C3F-0156-40C1-AE42-D59761FB9B6C}",
+    "useCompareNetObjects": true
+  }
+}

bin/ci/csharp-petstore.json

@@ -0,0 +1,8 @@
+{
+  "generatorName": "csharp",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/client/petstore/csharp/OpenAPIClient",
+  "additionalProperties": {
+    "packageGuid": "{321C8C3F-0156-40C1-AE42-D59761FB9B6C}"
+  }
+}

bin/ci/dart-flutter-petstore.json

@@ -0,0 +1,11 @@
+{
+  "generatorName": "dart",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
+  "outputDir": "samples/client/petstore/dart/flutter_petstore/openapi",
+  "templateDir": "modules/openapi-generator/src/main/resources/dart",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "browserClient": false,
+    "supportDart2": false
+  }
+}

bin/ci/dart-jaguar-petstore-1.json

@@ -0,0 +1,10 @@
+{
+  "generatorName": "dart-jaguar",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
+  "outputDir": "samples/client/petstore/dart-jaguar/flutter_petstore/openapi",
+  "templateDir": "modules/openapi-generator/src/main/resources/dart-jaguar",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "pubName": "openapi"
+  }
+}

bin/ci/dart-jaguar-petstore-2.json

@@ -0,0 +1,11 @@
+{
+  "generatorName": "dart-jaguar",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-proto.yaml",
+  "outputDir": "samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi",
+  "templateDir": "modules/openapi-generator/src/main/resources/dart-jaguar",
+  "additionalProperties": {
+    "serialization": "proto",
+    "hideGenerationTimestamp": true,
+    "pubName": "openapi"
+  }
+}

bin/ci/dart-jaguar-petstore-3.json

@@ -0,0 +1,11 @@
+{
+  "generatorName": "dart-jaguar",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-proto.yaml",
+  "outputDir": "samples/client/petstore/dart-jaguar/openapi_proto",
+  "templateDir": "modules/openapi-generator/src/main/resources/dart-jaguar",
+  "additionalProperties": {
+    "serialization": "proto",
+    "hideGenerationTimestamp": true,
+    "pubName": "openapi"
+  }
+}

bin/ci/dart-jaguar-petstore.json

@@ -0,0 +1,10 @@
+{
+  "generatorName": "dart-jaguar",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
+  "outputDir": "samples/client/petstore/dart-jaguar/openapi",
+  "templateDir": "modules/openapi-generator/src/main/resources/dart-jaguar",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "pubName": "openapi"
+  }
+}

bin/ci/dart-petstore-flutter.json

@@ -0,0 +1,11 @@
+{
+  "generatorName": "dart",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
+  "outputDir": "samples/client/petstore/dart/flutter_petstore/openapi",
+  "templateDir": "modules/openapi-generator/src/main/resources/dart",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "browserClient": false,
+    "supportDart2": false
+  }
+}

bin/ci/dart-petstore-openapi-browser-client.json

@@ -0,0 +1,11 @@
+{
+  "generatorName": "dart",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
+  "outputDir": "samples/client/petstore/dart/openapi-browser-client",
+  "templateDir": "modules/openapi-generator/src/main/resources/dart",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "browserClient": true,
+    "supportDart2": false
+  }
+}

bin/ci/dart-petstore.json

@@ -0,0 +1,11 @@
+{
+  "generatorName": "dart",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
+  "outputDir": "samples/client/petstore/dart/openapi",
+  "templateDir": "modules/openapi-generator/src/main/resources/dart",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "browserClient": false,
+    "supportDart2": false
+  }
+}

bin/ci/dart2-petstore.json

@@ -0,0 +1,9 @@
+{
+  "generatorName": "dart",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
+  "outputDir": "samples/client/petstore/dart2/openapi",
+  "templateDir": "modules/openapi-generator/src/main/resources/dart2",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true
+  }
+}

bin/ci/elixir-petstore.json

@@ -0,0 +1,9 @@
+{
+  "generatorName": "elixir",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/client/petstore/elixir/",
+  "templateDir": "modules/openapi-generator/src/main/resources/elixir",
+  "additionalProperties": {
+    "invokerPackage": "OpenapiPetstore"
+  }
+}

bin/ci/go-gin-petstore-server.json

@@ -0,0 +1,10 @@
+{
+  "generatorName": "go-gin-server",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
+  "outputDir": "samples/server/petstore/go-gin-api-server",
+  "templateDir": "modules/openapi-generator/src/main/resources/go-gin-server",
+  "additionalProperties": {
+    "packageName": "petstoreserver",
+    "hideGenerationTimestamp": true
+  }
+}

bin/ci/go-petstore-withxml.json

@@ -0,0 +1,11 @@
+{
+  "generatorName": "go",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/client/petstore/go/go-petstore-withXml",
+  "templateDir": "modules/openapi-generator/src/main/resources/go",
+  "additionalProperties": {
+    "packageName": "petstore",
+    "withXml": true,
+    "withGoCodegenComment": true
+  }
+}

bin/ci/go-petstore.json

@@ -0,0 +1,9 @@
+{
+  "generatorName": "go",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/client/petstore/go/go-petstore",
+  "templateDir": "modules/openapi-generator/src/main/resources/go",
+  "additionalProperties": {
+    "packageName": "petstore"
+  }
+}

bin/ci/groovy-petstore.json

@@ -0,0 +1,9 @@
+{
+  "generatorName": "groovy",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
+  "outputDir": "samples/client/petstore/groovy",
+  "templateDir": "modules/openapi-generator/src/main/resources/Groovy/",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true
+  }
+}

bin/ci/haskell-http-client-petstore.json

@@ -0,0 +1,6 @@
+{
+  "generatorName": "haskell-http-client",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/client/petstore/haskell-http-client",
+  "templateDir": "modules/openapi-generator/src/main/resources/haskell-http-client"
+}

bin/ci/java-feign.json

@@ -0,0 +1,11 @@
+{
+  "!include": "bin/java-petstore-feign-9x.json",
+  "generatorName": "java",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/client/petstore/java/feign",
+  "templateDir": "modules/openapi-generator/src/main/resources/Java/libraries/feign",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "booleanGetterPrefix": "is"
+  }
+}

bin/ci/java-feign10x.json

@@ -0,0 +1,11 @@
+{
+  "!include": "bin/java-petstore-feign-10x.json",
+  "generatorName": "java",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/client/petstore/java/feign10x",
+  "templateDir": "modules/openapi-generator/src/main/resources/Java/libraries/feign",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "booleanGetterPrefix": "is"
+  }
+}

bin/ci/java-google-api-client.json

@@ -0,0 +1,10 @@
+{
+  "!include": "bin/java-petstore-google-api-client.json",
+  "generatorName": "java",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/client/petstore/java/google-api-client",
+  "templateDir": "modules/openapi-generator/src/main/resources/Java/libraries/google-api-client",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true
+  }
+}

bin/ci/java-jaxrs-cxf-annotated-base-path.json

@@ -0,0 +1,12 @@
+{
+  "artifactId": "cxf-annotated-basepath",
+  "generatorName": "jaxrs-cxf",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
+  "outputDir": "samples/server/petstore/jaxrs-cxf-annotated-base-path",
+  "templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS/cxf",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "useAnnotatedBasePath": true,
+    "serverPort": "8082"
+  }
+}

bin/ci/java-jaxrs-cxf-cdi.json

@@ -0,0 +1,9 @@
+{
+  "generatorName": "jaxrs-cxf-cdi",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
+  "outputDir": "samples/server/petstore/jaxrs-cxf-cdi",
+  "templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true
+  }
+}

bin/ci/java-jaxrs-cxf-non-spring-app.json

@@ -0,0 +1,12 @@
+{
+  "artifactId": "cxf-server-non-spring",
+  "generatorName": "jaxrs-cxf",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
+  "outputDir": "samples/server/petstore/jaxrs-cxf-non-spring-app",
+  "templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS/cxf",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "generateNonSpringApplication": true,
+    "serverPort": "8082"
+  }
+}

bin/ci/java-jaxrs-cxf.json

@@ -0,0 +1,10 @@
+{
+  "generatorName": "jaxrs-cxf",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/server/petstore/jaxrs-cxf",
+  "templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS/cxf",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "serverPort": "8082"
+  }
+}

bin/ci/java-jaxrs-datelib-j8.json

@@ -0,0 +1,11 @@
+{
+  "!include": "./bin/jaxrs-datelib-j8.json",
+  "generatorName": "jaxrs-jersey",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/server/petstore/jaxrs-datelib-j8/",
+  "templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS/",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "serverPort": "8082"
+  }
+}

bin/ci/java-jaxrs-jersey.json

@@ -0,0 +1,10 @@
+{
+  "artifactId": "openapiv3-jaxrs-jersey-petstore-server",
+  "generatorName": "jaxrs-jersey",
+  "inputSpec": "modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/server/petstore/jaxrs-jersey",
+  "templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS/",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true
+  }
+}

bin/ci/java-jaxrs-jersey1-useTags.json

@@ -0,0 +1,13 @@
+{
+  "artifactId": "jaxrs-jersey1-useTags",
+  "generatorName": "jaxrs-jersey",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "library": "jersey1",
+  "outputDir": "samples/server/petstore/jaxrs/jersey1-useTags",
+  "templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "serverPort": "8082",
+    "useTags": true
+  }
+}

bin/ci/java-jaxrs-jersey1.json

@@ -0,0 +1,12 @@
+{
+  "artifactId": "jaxrs-jersey1-server",
+  "generatorName": "jaxrs-jersey",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "library": "jersey1",
+  "outputDir": "samples/server/petstore/jaxrs/jersey1",
+  "templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "serverPort": "8082"
+  }
+}

bin/ci/java-jaxrs-jersey2-useTags.json

@@ -0,0 +1,12 @@
+{
+  "artifactId": "jaxrs-jersey2-useTags",
+  "generatorName": "jaxrs-jersey",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/server/petstore/jaxrs/jersey2-useTags",
+  "templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "serverPort": "8082",
+    "useTags": true
+  }
+}

bin/ci/java-jaxrs-jersey2.json

@@ -0,0 +1,11 @@
+{
+  "artifactId": "jaxrs-jersey-petstore-server",
+  "generatorName": "jaxrs-jersey",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/server/petstore/jaxrs/jersey2",
+  "templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "serverPort": "8082"
+  }
+}

bin/ci/java-jaxrs-resteasy-eap-java8-server.json

@@ -0,0 +1,11 @@
+{
+  "!include": "./bin/jaxrs-resteasy-eap-java8-petstore-server.json",
+  "artifactId": "jaxrs-resteasy-eap-java8-server",
+  "generatorName": "jaxrs-resteasy-eap",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
+  "outputDir": "samples/server/petstore/jaxrs-resteasy/eap-java8",
+  "templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true
+  }
+}

bin/ci/java-jaxrs-resteasy-eap-joda-server.json

@@ -0,0 +1,11 @@
+{
+  "!include": "./bin/jaxrs-resteasy-eap-joda-petstore-server.json",
+  "artifactId": "jaxrs-resteasy-eap-joda-server",
+  "generatorName": "jaxrs-resteasy-eap",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
+  "outputDir": "samples/server/petstore/jaxrs-resteasy/eap-joda",
+  "templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true
+  }
+}

bin/ci/java-jaxrs-resteasy-eap.json

@@ -0,0 +1,9 @@
+{
+  "generatorName": "jaxrs-resteasy-eap",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
+  "outputDir": "samples/server/petstore/jaxrs-resteasy/eap",
+  "templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true
+  }
+}

bin/ci/java-jaxrs-resteasy-joda-server.json

@@ -0,0 +1,11 @@
+{
+  "!include": "./bin/jaxrs-resteasy-joda-petstore-server.json",
+  "artifactId": "jaxrs-resteasy-joda-server",
+  "generatorName": "jaxrs-resteasy",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
+  "outputDir": "samples/server/petstore/jaxrs-resteasy/joda",
+  "templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true
+  }
+}

bin/ci/java-jaxrs-resteasy.json

@@ -0,0 +1,9 @@
+{
+  "generatorName": "jaxrs-resteasy",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
+  "outputDir": "samples/server/petstore/jaxrs-resteasy/default",
+  "templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true
+  }
+}

bin/ci/java-jaxrs-spec-interface.json

@@ -0,0 +1,11 @@
+{
+  "artifactId": "jaxrs-spec-interface-petstore-server",
+  "generatorName": "jaxrs-spec",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/server/petstore/jaxrs-spec-interface",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "serializableModel": true,
+    "interfaceOnly": true
+  }
+}

bin/ci/java-jaxrs-spec.json

@@ -0,0 +1,10 @@
+{
+  "artifactId": "jaxrs-spec-petstore-server",
+  "generatorName": "jaxrs-spec",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/server/petstore/jaxrs-spec",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "serializableModel": true
+  }
+}

bin/ci/java-jersey1.json

@@ -0,0 +1,11 @@
+{
+  "artifactId": "petstore-java-client-jersey1",
+  "generatorName": "java",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "library": "jersey1",
+  "outputDir": "samples/client/petstore/java/jersey1",
+  "templateDir": "modules/openapi-generator/src/main/resources/Java",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true
+  }
+}

bin/ci/java-jersey2-java6.json

@@ -0,0 +1,12 @@
+{
+  "!include": "bin/java-petstore-jersey2.json",
+  "artifactId": "petstore-jersey2-java6",
+  "generatorName": "java",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/client/petstore/java/jersey2-java6",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "supportJava6": true,
+    "booleanGetterPrefix": "is"
+  }
+}

bin/ci/java-jersey2-java8.json

@@ -0,0 +1,11 @@
+{
+  "!include": "bin/java8-petstore-jersey2.json",
+  "artifactId": "petstore-jersey2-java8",
+  "generatorName": "java",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/client/petstore/java/jersey2-java8",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "serverPort": "8082"
+  }
+}

bin/ci/java-jersey2.json

@@ -0,0 +1,9 @@
+{
+  "!include": "bin/java-petstore-jersey2.json",
+  "generatorName": "java",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/client/petstore/java/jersey2",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true
+  }
+}

bin/ci/java-msf4j-petstore-server.json

@@ -0,0 +1,10 @@
+{
+  "generatorName": "java-msf4j",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/server/petstore/java-msf4j/",
+  "templateDir": "modules/openapi-generator/src/main/resources/java-msf4j-server",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "artifactId": "java-msf4j-server"
+  }
+}

bin/ci/java-native.json

@@ -0,0 +1,10 @@
+{
+  "!include": "bin/java-petstore-native.json",
+  "generatorName": "java",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/client/petstore/java/native",
+  "templateDir": "modules/openapi-generator/src/main/resources/Java/libraries/native",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true
+  }
+}

bin/ci/java-okhttp-gson-parcelableModel.json

@@ -0,0 +1,12 @@
+{
+  "!include": "bin/java-petstore-okhttp-gson.json",
+  "artifactId": "petstore-okhttp-gson-parcelableModel",
+  "generatorName": "java",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/client/petstore/java/okhttp-gson-parcelableModel",
+  "templateDir": "modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "parcelableModel": true
+  }
+}

bin/ci/java-okhttp-gson.json

@@ -0,0 +1,10 @@
+{
+  "!include": "bin/java-petstore-okhttp-gson.json",
+  "generatorName": "java",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/client/petstore/java/okhttp-gson",
+  "templateDir": "modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true
+  }
+}

bin/ci/java-petstore-feign-10x.json

@@ -0,0 +1,11 @@
+{
+  "generatorName": "java",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "templateDir": "modules/openapi-generator/src/main/resources/Java/libraries/feign",
+  "outputDir": "samples/client/petstore/java/feign10x",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "booleanGetterPrefix": "is"
+  },
+  "!include": "bin/java-petstore-feign-10x.json"
+}

bin/ci/java-play-framework-api-package-override.json

@@ -0,0 +1,10 @@
+{
+  "generatorName": "java-play-framework",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
+  "outputDir": "samples/server/petstore/java-play-framework-api-package-override",
+  "templateDir": "modules/openapi-generator/src/main/resources/JavaPlayFramework",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "apiPackage": "com.puppies.store.apis"
+  }
+}

bin/ci/java-play-framework-async.json

@@ -0,0 +1,10 @@
+{
+  "!include": "bin/java-play-framework-petstore-server-async.json",
+  "generatorName": "java-play-framework",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
+  "outputDir": "samples/server/petstore/java-play-framework-async",
+  "templateDir": "modules/openapi-generator/src/main/resources/JavaPlayFramework",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true
+  }
+}

bin/ci/java-play-framework-controller-only.json

@@ -0,0 +1,10 @@
+{
+  "generatorName": "java-play-framework",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
+  "outputDir": "samples/server/petstore/java-play-framework-controller-only",
+  "templateDir": "modules/openapi-generator/src/main/resources/JavaPlayFramework",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "controllerOnly": true
+  }
+}

bin/ci/java-play-framework-fake-endpoints.json

@@ -0,0 +1,9 @@
+{
+  "generatorName": "java-play-framework",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/server/petstore/java-play-framework-fake-endpoints",
+  "templateDir": "modules/openapi-generator/src/main/resources/JavaPlayFramework",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true
+  }
+}

bin/ci/java-play-framework-no-bean-validation.json

@@ -0,0 +1,10 @@
+{
+  "generatorName": "java-play-framework",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
+  "outputDir": "samples/server/petstore/java-play-framework-no-bean-validation",
+  "templateDir": "modules/openapi-generator/src/main/resources/JavaPlayFramework",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "useBeanValidation": false
+  }
+}

bin/ci/java-play-framework-no-exception-handling.json

@@ -0,0 +1,10 @@
+{
+  "generatorName": "java-play-framework",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
+  "outputDir": "samples/server/petstore/java-play-framework-no-exception-handling",
+  "templateDir": "modules/openapi-generator/src/main/resources/JavaPlayFramework",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "handleExceptions": false
+  }
+}

bin/ci/java-play-framework-no-interface.json

@@ -0,0 +1,10 @@
+{
+  "generatorName": "java-play-framework",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
+  "outputDir": "samples/server/petstore/java-play-framework-no-interface",
+  "templateDir": "modules/openapi-generator/src/main/resources/JavaPlayFramework",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "useInterfaces": false
+  }
+}

bin/ci/java-play-framework-no-swagger-ui.json

@@ -0,0 +1,10 @@
+{
+  "generatorName": "java-play-framework",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
+  "outputDir": "samples/server/petstore/java-play-framework-no-swagger-ui",
+  "templateDir": "modules/openapi-generator/src/main/resources/JavaPlayFramework",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "useSwaggerUI": false
+  }
+}

bin/ci/java-play-framework-no-wrap-calls.json

@@ -0,0 +1,10 @@
+{
+  "generatorName": "java-play-framework",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
+  "outputDir": "samples/server/petstore/java-play-framework-no-wrap-calls",
+  "templateDir": "modules/openapi-generator/src/main/resources/JavaPlayFramework",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "wrapCalls": false
+  }
+}

bin/ci/java-play-framework.json

@@ -0,0 +1,9 @@
+{
+  "generatorName": "java-play-framework",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
+  "outputDir": "samples/server/petstore/java-play-framework",
+  "templateDir": "modules/openapi-generator/src/main/resources/JavaPlayFramework",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true
+  }
+}

bin/ci/java-rest-assured.json

@@ -0,0 +1,11 @@
+{
+  "!include": "bin/java-petstore-rest-assured.json",
+  "generatorName": "java",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/client/petstore/java/rest-assured",
+  "templateDir": "modules/openapi-generator/src/main/resources/Java/libraries/rest-assured",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "booleanGetterPrefix": "is"
+  }
+}

bin/ci/java-resteasy.json

@@ -0,0 +1,9 @@
+{
+  "!include": "bin/java-petstore-resteasy.json",
+  "generatorName": "java",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/client/petstore/java/resteasy",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true
+  }
+}

bin/ci/java-resttemplate-withXml.json

@@ -0,0 +1,11 @@
+{
+  "!include": "bin/java-petstore-resttemplate.json",
+  "artifactId": "petstore-resttemplate-withxml",
+  "generatorName": "java",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/client/petstore/java/resttemplate-withXml",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "withXml": true
+  }
+}

bin/ci/java-resttemplate.json

@@ -0,0 +1,9 @@
+{
+  "!include": "bin/java-petstore-resttemplate.json",
+  "generatorName": "java",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/client/petstore/java/resttemplate",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true
+  }
+}

bin/ci/java-retrofit.json

@@ -0,0 +1,10 @@
+{
+  "!include": "bin/java-petstore-retrofit.json",
+  "generatorName": "java",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/client/petstore/java/retrofit",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true,
+    "dateLibrary": "joda"
+  }
+}

bin/ci/java-retrofit2-play24.json

@@ -0,0 +1,10 @@
+{
+  "!include": "bin/java-petstore-retrofit2-play24.json",
+  "artifactId": "petstore-java-client-retrofit2-play24",
+  "generatorName": "java",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/client/petstore/java/retrofit2-play24",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true
+  }
+}

bin/ci/java-retrofit2-play25.json

@@ -0,0 +1,10 @@
+{
+  "!include": "bin/java-petstore-retrofit2-play25.json",
+  "artifactId": "petstore-java-client-retrofit2-play25",
+  "generatorName": "java",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/client/petstore/java/retrofit2-play25",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true
+  }
+}

bin/ci/java-retrofit2-play26.json

@@ -0,0 +1,10 @@
+{
+  "!include": "bin/java-petstore-retrofit2-play26.json",
+  "artifactId": "petstore-java-client-retrofit2-play26",
+  "generatorName": "java",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/client/petstore/java/retrofit2-play26",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true
+  }
+}

bin/ci/java-retrofit2.json

@@ -0,0 +1,10 @@
+{
+  "!include": "bin/java-petstore-retrofit2.json",
+  "generatorName": "java",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/client/petstore/java/retrofit2",
+  "templateDir": "modules/openapi-generator/src/main/resources/Java/libraries/retrofit2",
+  "additionalProperties": {
+    "hideGenerationTimestamp": true
+  }
+}

bin/ci/java-retrofit2rx.json

@@ -0,0 +1,11 @@
+{
+  "!include": "bin/java-petstore-retrofit2rx.json",
+  "generatorName": "java",
+  "inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
+  "outputDir": "samples/client/petstore/java/retrofit2rx",
+  "templateDir": "modules/openapi-generator/src/main/resources/Java/libraries/retrofit2",
+  "additionalProperties": {
+    "useRxJava": true,
+    "hideGenerationTimestamp": true
+  }
+}