Set java8 to true by default (#6278)

* set java8 to true by default

* update samples

* update java-petstore-jersey2-java6.bat

bin/java-petstore-all.sh

@@ -6,8 +6,8 @@
 ./bin/java-petstore-google-api-client.sh
 ./bin/java-petstore-jersey1.sh
 ./bin/java-petstore-jersey2-java6.sh
+./bin/java-petstore-jersey2-java7.sh
 ./bin/java-petstore-jersey2-java8.sh
-./bin/java-petstore-jersey2.sh
 ./bin/java-petstore-microprofile.sh
 ./bin/java-petstore-native.sh
 ./bin/java-petstore-okhttp-gson-parcelable.sh

bin/java-petstore-jersey2-java6.sh

@@ -27,7 +27,7 @@ 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 --artifact-id petstore-jersey2-java6 -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin/java-petstore-jersey2.json -o samples/client/petstore/java/jersey2-java6 --additional-properties hideGenerationTimestamp=true,supportJava6=true,booleanGetterPrefix=is $@"
+ags="generate --artifact-id petstore-jersey2-java6 -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g java -o samples/client/petstore/java/jersey2-java6 --additional-properties hideGenerationTimestamp=true,supportJava6=true,booleanGetterPrefix=is $@"
 
 echo "Removing files and folders under samples/client/petstore/java/jersey2-java6/src/main"
 rm -rf samples/client/petstore/java/jersey2-java6/src/main

bin/java-petstore-jersey2-java7.json

@@ -0,0 +1,5 @@
+{
+    "library": "jersey2",
+    "java8": false,
+    "artifactId": "petstore-jersey2-java7"
+}

bin/java-petstore-jersey2-java7.sh

@@ -27,7 +27,7 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin/java-petstore-jersey2.json -o samples/client/petstore/java/jersey2 --additional-properties hideGenerationTimestamp=true $@"
+ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin/java-petstore-jersey2-java7.json -o samples/client/petstore/java/jersey2-java7 --additional-properties java8=false,hideGenerationTimestamp=true $@"
 
 echo "Removing files and folders under samples/client/petstore/java/jersey2/src/main"
 rm -rf samples/client/petstore/java/jersey2/src/main

bin/java-petstore-jersey2.json

@@ -1,4 +0,0 @@
-{
-    "library": "jersey2",
-    "artifactId": "petstore-jersey2"
-}

bin/windows/java-petstore-all.bat

@@ -1,5 +1,5 @@
 call .\bin\windows\java-petstore-jersey1.bat
-call .\bin\windows\java-petstore-jersey2.bat
+call .\bin\windows\java-petstore-jersey2-java8.bat
 call .\bin\windows\java-petstore-feign.bat
 call .\bin\windows\java-petstore-feign-10x.bat
 call .\bin\windows\java-petstore-native.bat

bin/windows/java-petstore-jersey2-java6.bat

@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate --artifact-id petstore-jersey2-java6 -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin\java-petstore-jersey2.json -o samples\client\petstore\java\jersey2-java6 --additional-properties hideGenerationTimestamp=true,supportJava6=true,booleanGetterPrefix=is
+set ags=generate --artifact-id petstore-jersey2-java6 -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g java -o samples\client\petstore\java\jersey2-java6 --additional-properties hideGenerationTimestamp=true,supportJava6=true,booleanGetterPrefix=is
 
 java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/java-petstore-jersey2-java8.bat

@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin\java-petstore-jersey2.json -o samples\client\petstore\java\jersey2 --additional-properties hideGenerationTimestamp=true
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin\java-petstore-jersey2-java7.json -o samples\client\petstore\java\jersey2 --additional-properties hideGenerationTimestamp=true
 
 java %JAVA_OPTS% -jar %executable% %ags%

docs/generators/groovy.md

@@ -24,7 +24,7 @@ sidebar_label: groovy
 |groupId|groupId in generated pom.xml| |org.openapitools|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
 |invokerPackage|root package for generated code| |org.openapitools.api|
-|java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|false|
+|java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|

docs/generators/java-inflector.md

@@ -26,7 +26,7 @@ sidebar_label: java-inflector
 |groupId|groupId in generated pom.xml| |org.openapitools|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
 |invokerPackage|root package for generated code| |org.openapitools.controllers|
-|java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|false|
+|java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|

docs/generators/java-msf4j.md

@@ -27,7 +27,7 @@ sidebar_label: java-msf4j
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
 |implFolder|folder for generated implementation code| |src/main/java|
 |invokerPackage|root package for generated code| |org.openapitools.api|
-|java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|false|
+|java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |library|library template (sub-template)|<dl><dt>**jersey1**</dt><dd>Jersey core 1.x</dd><dt>**jersey2**</dt><dd>Jersey core 2.x</dd></dl>|jersey2|
 |licenseName|The name of the license| |Unlicense|

docs/generators/java-pkmst.md

@@ -28,7 +28,7 @@ sidebar_label: java-pkmst
 |groupId|groupId in generated pom.xml| |com.prokarma|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
 |invokerPackage|root package for generated code| |com.prokarma.pkmst.controller|
-|java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|false|
+|java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|

docs/generators/java-play-framework.md

@@ -30,7 +30,7 @@ sidebar_label: java-play-framework
 |handleExceptions|Add a 'throw exception' to each controller function. Add also a custom error handler where you can put your custom logic| |true|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
 |invokerPackage|root package for generated code| |org.openapitools.api|
-|java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|false|
+|java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|

docs/generators/java-undertow-server.md

@@ -26,7 +26,7 @@ sidebar_label: java-undertow-server
 |groupId|groupId in generated pom.xml| |org.openapitools|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
 |invokerPackage|root package for generated code| |org.openapitools.handler|
-|java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|false|
+|java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|

docs/generators/java-vertx-web.md

@@ -26,7 +26,7 @@ sidebar_label: java-vertx-web
 |groupId|groupId in generated pom.xml| |org.openapitools|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
 |invokerPackage|root package for generated code| |org.openapitools.vertxweb.server|
-|java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|false|
+|java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|

docs/generators/java-vertx.md

@@ -26,7 +26,7 @@ sidebar_label: java-vertx
 |groupId|groupId in generated pom.xml| |org.openapitools|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
 |invokerPackage|root package for generated code| |org.openapitools|
-|java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|false|
+|java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|

docs/generators/java.md

@@ -29,7 +29,7 @@ sidebar_label: java
 |groupId|groupId in generated pom.xml| |org.openapitools|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
 |invokerPackage|root package for generated code| |org.openapitools.client|
-|java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|false|
+|java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |library|library template (sub-template) to use|<dl><dt>**jersey1**</dt><dd>HTTP client: Jersey client 1.19.x. JSON processing: Jackson 2.9.x. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'. IMPORTANT NOTE: jersey 1.x is no longer actively maintained so please upgrade to 'jersey2' or other HTTP libaries instead.</dd><dt>**jersey2**</dt><dd>HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.9.x</dd><dt>**feign**</dt><dd>HTTP client: OpenFeign 9.x (deprecated) or 10.x (default). JSON processing: Jackson 2.9.x.</dd><dt>**okhttp-gson**</dt><dd>[DEFAULT] HTTP client: OkHttp 3.x. JSON processing: Gson 2.8.x. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.</dd><dt>**retrofit**</dt><dd>HTTP client: OkHttp 2.x. JSON processing: Gson 2.x (Retrofit 1.9.0). IMPORTANT NOTE: retrofit1.x is no longer actively maintained so please upgrade to 'retrofit2' instead.</dd><dt>**retrofit2**</dt><dd>HTTP client: OkHttp 3.x. JSON processing: Gson 2.x (Retrofit 2.3.0). Enable the RxJava adapter using '-DuseRxJava[2]=true'. (RxJava 1.x or 2.x)</dd><dt>**resttemplate**</dt><dd>HTTP client: Spring RestTemplate 4.x. JSON processing: Jackson 2.9.x</dd><dt>**webclient**</dt><dd>HTTP client: Spring WebClient 5.x. JSON processing: Jackson 2.9.x</dd><dt>**resteasy**</dt><dd>HTTP client: Resteasy client 3.x. JSON processing: Jackson 2.9.x</dd><dt>**vertx**</dt><dd>HTTP client: VertX client 3.x. JSON processing: Jackson 2.9.x</dd><dt>**google-api-client**</dt><dd>HTTP client: Google API client 1.x. JSON processing: Jackson 2.9.x</dd><dt>**rest-assured**</dt><dd>HTTP client: rest-assured : 4.x. JSON processing: Gson 2.x or Jackson 2.10.x. Only for Java 8</dd><dt>**native**</dt><dd>HTTP client: Java native HttpClient. JSON processing: Jackson 2.9.x. Only for Java11+</dd><dt>**microprofile**</dt><dd>HTTP client: Microprofile client X.x. JSON processing: Jackson 2.9.x</dd></dl>|okhttp-gson|
 |licenseName|The name of the license| |Unlicense|
@@ -51,7 +51,7 @@ sidebar_label: java
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
 |sourceFolder|source folder for generated code| |src/main/java|
-|supportJava6|Whether to support Java6 with the Jersey1 library.| |false|
+|supportJava6|Whether to support Java6 with the Jersey1 library. This option has been deprecated and will be removed in the 5.x release| |false|
 |useBeanValidation|Use BeanValidation API annotations| |false|
 |useGzipFeature|Send gzip-encoded requests| |false|
 |usePlayWS|Use Play! Async HTTP client (Play WS API)| |false|

docs/generators/jaxrs-cxf-cdi.md

@@ -30,7 +30,7 @@ sidebar_label: jaxrs-cxf-cdi
 |implFolder|folder for generated implementation code| |src/main/java|
 |interfaceOnly|Whether to generate only API interface stubs without the server files.| |false|
 |invokerPackage|root package for generated code| |org.openapitools.api|
-|java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|false|
+|java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |library|library template (sub-template)|<dl><dt>**&lt;default&gt;**</dt><dd>JAXRS spec only, to be deployed in an app server (TomEE, JBoss, WLS, ...)</dd><dt>**quarkus**</dt><dd>Server using Quarkus</dd><dt>**thorntail**</dt><dd>Server using Thorntail</dd><dt>**openliberty**</dt><dd>Server using Open Liberty</dd><dt>**helidon**</dt><dd>Server using Helidon</dd></dl>|&lt;default&gt;|
 |licenseName|The name of the license| |Unlicense|

docs/generators/jaxrs-cxf-client.md

@@ -26,7 +26,7 @@ sidebar_label: jaxrs-cxf-client
 |groupId|groupId in generated pom.xml| |org.openapitools|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
 |invokerPackage|root package for generated code| |org.openapitools.api|
-|java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|false|
+|java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|

docs/generators/jaxrs-cxf-extended.md

@@ -33,7 +33,7 @@ sidebar_label: jaxrs-cxf-extended
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
 |implFolder|folder for generated implementation code| |src/main/java|
 |invokerPackage|root package for generated code| |org.openapitools.api|
-|java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|false|
+|java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|

docs/generators/jaxrs-cxf.md

@@ -32,7 +32,7 @@ sidebar_label: jaxrs-cxf
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
 |implFolder|folder for generated implementation code| |src/main/java|
 |invokerPackage|root package for generated code| |org.openapitools.api|
-|java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|false|
+|java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|

docs/generators/jaxrs-jersey.md

@@ -27,7 +27,7 @@ sidebar_label: jaxrs-jersey
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
 |implFolder|folder for generated implementation code| |src/main/java|
 |invokerPackage|root package for generated code| |org.openapitools.api|
-|java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|false|
+|java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |library|library template (sub-template)|<dl><dt>**jersey1**</dt><dd>Jersey core 1.x</dd><dt>**jersey2**</dt><dd>Jersey core 2.x</dd></dl>|jersey2|
 |licenseName|The name of the license| |Unlicense|

docs/generators/jaxrs-resteasy-eap.md

@@ -28,7 +28,7 @@ sidebar_label: jaxrs-resteasy-eap
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
 |implFolder|folder for generated implementation code| |src/main/java|
 |invokerPackage|root package for generated code| |org.openapitools.api|
-|java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|false|
+|java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|

docs/generators/jaxrs-resteasy.md

@@ -28,7 +28,7 @@ sidebar_label: jaxrs-resteasy
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
 |implFolder|folder for generated implementation code| |src/main/java|
 |invokerPackage|root package for generated code| |org.openapitools.api|
-|java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|false|
+|java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|

docs/generators/jaxrs-spec.md

@@ -30,7 +30,7 @@ sidebar_label: jaxrs-spec
 |implFolder|folder for generated implementation code| |src/main/java|
 |interfaceOnly|Whether to generate only API interface stubs without the server files.| |false|
 |invokerPackage|root package for generated code| |org.openapitools.api|
-|java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|false|
+|java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |library|library template (sub-template)|<dl><dt>**&lt;default&gt;**</dt><dd>JAXRS spec only, to be deployed in an app server (TomEE, JBoss, WLS, ...)</dd><dt>**quarkus**</dt><dd>Server using Quarkus</dd><dt>**thorntail**</dt><dd>Server using Thorntail</dd><dt>**openliberty**</dt><dd>Server using Open Liberty</dd><dt>**helidon**</dt><dd>Server using Helidon</dd></dl>|&lt;default&gt;|
 |licenseName|The name of the license| |Unlicense|

docs/generators/spring.md

@@ -34,7 +34,7 @@ sidebar_label: spring
 |implicitHeaders|Skip header parameters in the generated API methods using @ApiImplicitParams annotation.| |false|
 |interfaceOnly|Whether to generate only API interface stubs without the server files.| |false|
 |invokerPackage|root package for generated code| |org.openapitools.api|
-|java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64. Use java8 default interface when a responseWrapper is used</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|false|
+|java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64. Use java8 default interface when a responseWrapper is used</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |library|library template (sub-template)|<dl><dt>**spring-boot**</dt><dd>Spring-boot Server application using the SpringFox integration.</dd><dt>**spring-mvc**</dt><dd>Spring-MVC Server application using the SpringFox integration.</dd><dt>**spring-cloud**</dt><dd>Spring-Cloud-Feign client with Spring-Boot auto-configured settings.</dd></dl>|spring-boot|
 |licenseName|The name of the license| |Unlicense|

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java

@@ -62,7 +62,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
 
     protected String dateLibrary = "threetenbp";
     protected boolean supportAsync = false;
-    protected boolean java8Mode = false;
+    protected boolean java8Mode = true;
     protected boolean withXml = false;
     protected String invokerPackage = "org.openapitools";
     protected String groupId = "org.openapitools";
@@ -205,7 +205,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
         dateLibrary.setEnum(dateOptions);
         cliOptions.add(dateLibrary);
 
-        CliOption java8Mode = CliOption.newBoolean(JAVA8_MODE, "Option. Use Java8 classes instead of third party equivalents", this.java8Mode);
+        CliOption java8Mode = CliOption.newBoolean(JAVA8_MODE, "Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped", this.java8Mode);
         Map<String, String> java8ModeOptions = new HashMap<>();
         java8ModeOptions.put("true", "Use Java 8 classes such as Base64");
         java8ModeOptions.put("false", "Various third party libraries as needed");
@@ -480,10 +480,15 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
         importMapping.put("com.fasterxml.jackson.annotation.JsonProperty", "com.fasterxml.jackson.annotation.JsonCreator");
 
         if (additionalProperties.containsKey(JAVA8_MODE)) {
+            LOGGER.info("containing java 8 mode ...");
             setJava8Mode(Boolean.parseBoolean(additionalProperties.get(JAVA8_MODE).toString()));
             if (java8Mode) {
-                additionalProperties.put("java8", "true");
+                LOGGER.info("containing java 8 mode to true...");
+                additionalProperties.put("java8", true);
+            } else {
+                additionalProperties.put("java8", false);
             }
+            LOGGER.info("containing java 8 mode to something {}...", java8Mode);
         }
 
         if (additionalProperties.containsKey(SUPPORT_ASYNC)) {

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java

@@ -135,7 +135,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen
         cliOptions.add(CliOption.newBoolean(PARCELABLE_MODEL, "Whether to generate models for Android that implement Parcelable with the okhttp-gson library."));
         cliOptions.add(CliOption.newBoolean(USE_PLAY_WS, "Use Play! Async HTTP client (Play WS API)"));
         cliOptions.add(CliOption.newString(PLAY_VERSION, "Version of Play! Framework (possible values \"play24\", \"play25\" (default), \"play26\")"));
-        cliOptions.add(CliOption.newBoolean(SUPPORT_JAVA6, "Whether to support Java6 with the Jersey1 library."));
+        cliOptions.add(CliOption.newBoolean(SUPPORT_JAVA6, "Whether to support Java6 with the Jersey1 library. This option has been deprecated and will be removed in the 5.x release"));
         cliOptions.add(CliOption.newBoolean(USE_BEANVALIDATION, "Use BeanValidation API annotations"));
         cliOptions.add(CliOption.newBoolean(PERFORM_BEANVALIDATION, "Perform BeanValidation"));
         cliOptions.add(CliOption.newBoolean(USE_GZIP_FEATURE, "Send gzip-encoded requests"));

pom.xml

@@ -691,7 +691,7 @@
             </modules>
         </profile>
         <profile>
-            <id>java-client-jersey2</id>
+            <id>java-client-jersey2-java7</id>
             <activation>
                 <property>
                     <name>env</name>
@@ -699,7 +699,7 @@
                 </property>
             </activation>
             <modules>
-                <module>samples/client/petstore/java/jersey2</module>
+                <module>samples/client/petstore/java/jersey2-java7</module>
             </modules>
         </profile>
         <profile>
@@ -1303,7 +1303,6 @@
                 <module>samples/client/petstore/java/feign</module>
                 <module>samples/client/petstore/java/feign10x</module>
                 <module>samples/client/petstore/java/jersey1</module>
-                <module>samples/client/petstore/java/jersey2</module>
                 <module>samples/client/petstore/java/jersey2-java8</module>
                 <module>samples/client/petstore/java/okhttp-gson</module>
                 <module>samples/client/petstore/java/retrofit</module>
@@ -1397,7 +1396,7 @@
                 <module>samples/client/petstore/scala-httpclient</module>
                 <module>samples/client/petstore/java/feign</module>
                 <module>samples/client/petstore/java/jersey1</module>
-                <module>samples/client/petstore/java/jersey2</module>
+                <module>samples/client/petstore/java/jersey2-java7</module>
                 <module>samples/client/petstore/java/okhttp-gson</module>
                 <module>samples/client/petstore/java/retrofit</module>
                 <module>samples/client/petstore/java/retrofit2</module>

samples/client/petstore/java/jersey2-java6/README.md

@@ -1,7 +1,6 @@
 # petstore-jersey2-java6
 
 OpenAPI Petstore
-
 - API version: 1.0.0
 
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
@@ -9,10 +8,10 @@ This spec is mainly for testing Petstore server and contains fake endpoints, mod
 
 *Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
 
+
 ## Requirements
 
 Building the API client library requires:
-
 1. Java 1.6+
 2. Maven/Gradle
 
@@ -63,8 +62,8 @@ mvn clean package
 
 Then manually install the following JARs:
 
-- `target/petstore-jersey2-java6-1.0.0.jar`
+* `target/petstore-jersey2-java6-1.0.0.jar`
-- `target/lib/*.jar`
+* `target/lib/*.jar`
 
 ## Getting Started
 
@@ -72,13 +71,14 @@ Please follow the [installation](#installation) instruction and execute the foll
 
 ```java
 
-import org.openapitools.client.*;
+// Import classes:
-import org.openapitools.client.auth.*;
+import org.openapitools.client.ApiClient;
-import org.openapitools.client.model.*;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
 import org.openapitools.client.api.AnotherFakeApi;
 
-public class AnotherFakeApiExample {
+public class Example {
-
   public static void main(String[] args) {
     ApiClient defaultClient = Configuration.getDefaultApiClient();
     defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
@@ -200,26 +200,22 @@ Class | Method | HTTP request | Description
 Authentication schemes defined for the API:
 ### api_key
 
-
 - **Type**: API key
 - **API key parameter name**: api_key
 - **Location**: HTTP header
 
 ### api_key_query
 
-
 - **Type**: API key
 - **API key parameter name**: api_key_query
 - **Location**: URL query string
 
 ### http_basic_test
 
-
 - **Type**: HTTP basic authentication
 
 ### petstore_auth
 
-
 - **Type**: OAuth
 - **Flow**: implicit
 - **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog

samples/client/petstore/java/jersey2-java6/build.gradle

@@ -1,5 +1,6 @@
 apply plugin: 'idea'
 apply plugin: 'eclipse'
+apply plugin: 'java'
 
 group = 'org.openapitools'
 version = '1.0.0'
@@ -18,7 +19,9 @@ buildscript {
 repositories {
     jcenter()
 }
-
+sourceSets {
+    main.java.srcDirs = ['src/main/java']
+}
 
 if(hasProperty('target') && target == 'android') {
 
@@ -49,7 +52,7 @@ if(hasProperty('target') && target == 'android') {
         }
 
         dependencies {
-            provided 'javax.annotation:jsr250-api:1.0'
+            provided 'javax.annotation:javax.annotation-api:1.3.2'
         }
     }
 
@@ -78,6 +81,7 @@ if(hasProperty('target') && target == 'android') {
 
     apply plugin: 'java'
     apply plugin: 'maven'
+
     sourceCompatibility = JavaVersion.VERSION_1_6
     targetCompatibility = JavaVersion.VERSION_1_6
 
@@ -93,33 +97,17 @@ if(hasProperty('target') && target == 'android') {
     }
 }
 
-ext {
-    swagger_annotations_version = "1.5.22"
-    jackson_version = "2.10.3"
-    jackson_databind_version = "2.10.3"
-    jackson_databind_nullable_version = "0.2.1"
-    jersey_version = "2.6"
-    commons_io_version=2.5
-    commons_lang3_version=3.6
-    junit_version = "4.13"
-    threetenbp_version = "2.9.10"
-}
-
 dependencies {
-    compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile 'io.swagger:swagger-annotations:1.5.24'
     compile "com.google.code.findbugs:jsr305:3.0.2"
-    compile "org.glassfish.jersey.core:jersey-client:$jersey_version"
+    compile 'com.squareup.okhttp3:okhttp:3.14.7'
-    compile "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version"
+    compile 'com.squareup.okhttp3:logging-interceptor:3.14.7'
-    compile "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version"
+    compile 'com.google.code.gson:gson:2.8.6'
-    compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
+    compile 'io.gsonfire:gson-fire:1.8.4'
-    compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
+    compile group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1'
-    compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
+    compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
-    compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
+    compile 'org.threeten:threetenbp:1.4.3'
-    compile "commons-io:commons-io:$commons_io_version"
+    testCompile 'junit:junit:4.13'
-    compile "org.apache.commons:commons-lang3:$commons_lang3_version"
-    compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version"
-    compile "com.brsanthu:migbase64:2.2"
-    testCompile "junit:junit:$junit_version"
 }
 
 javadoc {

samples/client/petstore/java/jersey2-java6/build.sbt

@@ -9,17 +9,16 @@ lazy val root = (project in file(".")).
     publishArtifact in (Compile, packageDoc) := false,
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
-      "io.swagger" % "swagger-annotations" % "1.5.22",
+      "io.swagger" % "swagger-annotations" % "1.5.24",
-      "org.glassfish.jersey.core" % "jersey-client" % "2.6",
+      "com.squareup.okhttp3" % "okhttp" % "3.14.7",
-      "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.6",
+      "com.squareup.okhttp3" % "logging-interceptor" % "3.14.7",
-      "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.6",
+      "com.google.code.gson" % "gson" % "2.8.6",
-      "com.fasterxml.jackson.core" % "jackson-core" % "2.10.3" % "compile",
+      "org.apache.commons" % "commons-lang3" % "3.10",
-      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.3" % "compile",
+      "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.3" % "compile",
+      "org.threeten" % "threetenbp" % "1.4.3" % "compile",
-      "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
+      "io.gsonfire" % "gson-fire" % "1.8.3" % "compile",
-      "com.brsanthu" % "migbase64" % "2.2",
+      "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
-      "org.apache.commons" % "commons-lang3" % "3.6",
+      "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
-      "commons-io" % "commons-io" % "2.5",
       "junit" % "junit" % "4.13" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )

samples/client/petstore/java/jersey2-java6/docs/AnotherFakeApi.md

@@ -7,9 +7,8 @@ Method | HTTP request | Description
 [**call123testSpecialTags**](AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
 
 
-
+<a name="call123testSpecialTags"></a>
-## call123testSpecialTags
+# **call123testSpecialTags**
-
 > Client call123testSpecialTags(body)
 
 To test special tags
@@ -17,7 +16,6 @@ To test special tags
 To test special tags and operation ID starting with number
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -49,7 +47,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **body** | [**Client**](Client.md)| client model |
@@ -64,11 +61,11 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: application/json
+ - **Content-Type**: application/json
-- **Accept**: application/json
+ - **Accept**: application/json
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | successful operation |  -  |
+**200** | successful operation |  -  |
 

samples/client/petstore/java/jersey2-java6/docs/FakeApi.md

@@ -20,9 +20,8 @@ Method | HTTP request | Description
 [**testQueryParameterCollectionFormat**](FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
 
 
-
+<a name="createXmlItem"></a>
-## createXmlItem
+# **createXmlItem**
-
 > createXmlItem(xmlItem)
 
 creates an XmlItem
@@ -30,7 +29,6 @@ creates an XmlItem
 this route creates an XmlItem
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -61,7 +59,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **xmlItem** | [**XmlItem**](XmlItem.md)| XmlItem Body |
@@ -76,17 +73,16 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: application/xml, application/xml; charset=utf-8, application/xml; charset=utf-16, text/xml, text/xml; charset=utf-8, text/xml; charset=utf-16
+ - **Content-Type**: application/xml, application/xml; charset=utf-8, application/xml; charset=utf-16, text/xml, text/xml; charset=utf-8, text/xml; charset=utf-16
-- **Accept**: Not defined
+ - **Accept**: Not defined
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | successful operation |  -  |
+**200** | successful operation |  -  |
-
-
-## fakeOuterBooleanSerialize
 
+<a name="fakeOuterBooleanSerialize"></a>
+# **fakeOuterBooleanSerialize**
 > Boolean fakeOuterBooleanSerialize(body)
 
 
@@ -94,7 +90,6 @@ No authorization required
 Test serialization of outer boolean types
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -126,7 +121,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **body** | **Boolean**| Input boolean as post body | [optional]
@@ -141,17 +135,16 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: Not defined
+ - **Content-Type**: Not defined
-- **Accept**: */*
+ - **Accept**: */*
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | Output boolean |  -  |
+**200** | Output boolean |  -  |
-
-
-## fakeOuterCompositeSerialize
 
+<a name="fakeOuterCompositeSerialize"></a>
+# **fakeOuterCompositeSerialize**
 > OuterComposite fakeOuterCompositeSerialize(body)
 
 
@@ -159,7 +152,6 @@ No authorization required
 Test serialization of object with outer number type
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -191,7 +183,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **body** | [**OuterComposite**](OuterComposite.md)| Input composite as post body | [optional]
@@ -206,17 +197,16 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: Not defined
+ - **Content-Type**: Not defined
-- **Accept**: */*
+ - **Accept**: */*
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | Output composite |  -  |
+**200** | Output composite |  -  |
-
-
-## fakeOuterNumberSerialize
 
+<a name="fakeOuterNumberSerialize"></a>
+# **fakeOuterNumberSerialize**
 > BigDecimal fakeOuterNumberSerialize(body)
 
 
@@ -224,7 +214,6 @@ No authorization required
 Test serialization of outer number types
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -256,7 +245,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **body** | **BigDecimal**| Input number as post body | [optional]
@@ -271,17 +259,16 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: Not defined
+ - **Content-Type**: Not defined
-- **Accept**: */*
+ - **Accept**: */*
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | Output number |  -  |
+**200** | Output number |  -  |
-
-
-## fakeOuterStringSerialize
 
+<a name="fakeOuterStringSerialize"></a>
+# **fakeOuterStringSerialize**
 > String fakeOuterStringSerialize(body)
 
 
@@ -289,7 +276,6 @@ No authorization required
 Test serialization of outer string types
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -321,7 +307,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **body** | **String**| Input string as post body | [optional]
@@ -336,25 +321,23 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: Not defined
+ - **Content-Type**: Not defined
-- **Accept**: */*
+ - **Accept**: */*
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | Output string |  -  |
+**200** | Output string |  -  |
-
-
-## testBodyWithFileSchema
 
+<a name="testBodyWithFileSchema"></a>
+# **testBodyWithFileSchema**
 > testBodyWithFileSchema(body)
 
 
 
-For this test, the body for this request much reference a schema named `File`.
+For this test, the body for this request much reference a schema named &#x60;File&#x60;.
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -385,7 +368,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **body** | [**FileSchemaTestClass**](FileSchemaTestClass.md)|  |
@@ -400,23 +382,21 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: application/json
+ - **Content-Type**: application/json
-- **Accept**: Not defined
+ - **Accept**: Not defined
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | Success |  -  |
+**200** | Success |  -  |
-
-
-## testBodyWithQueryParams
 
+<a name="testBodyWithQueryParams"></a>
+# **testBodyWithQueryParams**
 > testBodyWithQueryParams(query, body)
 
 
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -448,7 +428,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **query** | **String**|  |
@@ -464,25 +443,23 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: application/json
+ - **Content-Type**: application/json
-- **Accept**: Not defined
+ - **Accept**: Not defined
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | Success |  -  |
+**200** | Success |  -  |
-
-
-## testClientModel
 
+<a name="testClientModel"></a>
+# **testClientModel**
 > Client testClientModel(body)
 
 To test \&quot;client\&quot; model
 
-To test "client" model
+To test \&quot;client\&quot; model
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -514,7 +491,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **body** | [**Client**](Client.md)| client model |
@@ -529,28 +505,23 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: application/json
+ - **Content-Type**: application/json
-- **Accept**: application/json
+ - **Accept**: application/json
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | successful operation |  -  |
+**200** | successful operation |  -  |
-
-
-## testEndpointParameters
 
+<a name="testEndpointParameters"></a>
+# **testEndpointParameters**
 > testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 
-Fake endpoint for testing various parameters
+Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
- 假端點
- 偽のエンドポイント
- 가짜 엔드 포인트
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -600,7 +571,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **number** | **BigDecimal**| None |
@@ -628,18 +598,17 @@ null (empty response body)
 
 ### HTTP request headers
 
-- **Content-Type**: application/x-www-form-urlencoded
+ - **Content-Type**: application/x-www-form-urlencoded
-- **Accept**: Not defined
+ - **Accept**: Not defined
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Invalid username supplied |  -  |
+**400** | Invalid username supplied |  -  |
-| **404** | User not found |  -  |
+**404** | User not found |  -  |
-
-
-## testEnumParameters
 
+<a name="testEnumParameters"></a>
+# **testEnumParameters**
 > testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString)
 
 To test enum parameters
@@ -647,7 +616,6 @@ To test enum parameters
 To test enum parameters
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -685,7 +653,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **enumHeaderStringArray** | [**List&lt;String&gt;**](String.md)| Header parameter enum test (string array) | [optional] [enum: >, $]
@@ -707,26 +674,24 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: application/x-www-form-urlencoded
+ - **Content-Type**: application/x-www-form-urlencoded
-- **Accept**: Not defined
+ - **Accept**: Not defined
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Invalid request |  -  |
+**400** | Invalid request |  -  |
-| **404** | Not found |  -  |
+**404** | Not found |  -  |
 
-
+<a name="testGroupParameters"></a>
-## testGroupParameters
+# **testGroupParameters**
-
+> testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group).stringGroup(stringGroup).booleanGroup(booleanGroup).int64Group(int64Group).execute();
-> testGroupParameters().requiredStringGroup(requiredStringGroup).requiredBooleanGroup(requiredBooleanGroup).requiredInt64Group(requiredInt64Group).stringGroup(stringGroup).booleanGroup(booleanGroup).int64Group(int64Group).execute();
 
 Fake endpoint to test group parameters (optional)
 
 Fake endpoint to test group parameters (optional)
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -748,10 +713,7 @@ public class Example {
     Boolean booleanGroup = true; // Boolean | Boolean in group parameters
     Long int64Group = 56L; // Long | Integer in group parameters
     try {
-            api.testGroupParameters()
+      apiInstance.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group)
-                .requiredStringGroup(requiredStringGroup)
-                .requiredBooleanGroup(requiredBooleanGroup)
-                .requiredInt64Group(requiredInt64Group)
             .stringGroup(stringGroup)
             .booleanGroup(booleanGroup)
             .int64Group(int64Group)
@@ -769,7 +731,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **requiredStringGroup** | **Integer**| Required String in group parameters |
@@ -789,23 +750,21 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: Not defined
+ - **Content-Type**: Not defined
-- **Accept**: Not defined
+ - **Accept**: Not defined
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+**400** | Someting wrong |  -  |
-
-
-## testInlineAdditionalProperties
 
+<a name="testInlineAdditionalProperties"></a>
+# **testInlineAdditionalProperties**
 > testInlineAdditionalProperties(param)
 
 test inline additionalProperties
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -836,7 +795,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **param** | [**Map&lt;String, String&gt;**](String.md)| request body |
@@ -851,23 +809,21 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: application/json
+ - **Content-Type**: application/json
-- **Accept**: Not defined
+ - **Accept**: Not defined
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | successful operation |  -  |
+**200** | successful operation |  -  |
-
-
-## testJsonFormData
 
+<a name="testJsonFormData"></a>
+# **testJsonFormData**
 > testJsonFormData(param, param2)
 
 test json serialization of form data
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -899,7 +855,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **param** | **String**| field1 |
@@ -915,17 +870,16 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: application/x-www-form-urlencoded
+ - **Content-Type**: application/x-www-form-urlencoded
-- **Accept**: Not defined
+ - **Accept**: Not defined
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | successful operation |  -  |
+**200** | successful operation |  -  |
-
-
-## testQueryParameterCollectionFormat
 
+<a name="testQueryParameterCollectionFormat"></a>
+# **testQueryParameterCollectionFormat**
 > testQueryParameterCollectionFormat(pipe, ioutil, http, url, context)
 
 
@@ -933,7 +887,6 @@ No authorization required
 To test the collection format in query parameters
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -968,7 +921,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **pipe** | [**List&lt;String&gt;**](String.md)|  |
@@ -987,11 +939,11 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: Not defined
+ - **Content-Type**: Not defined
-- **Accept**: Not defined
+ - **Accept**: Not defined
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | Success |  -  |
+**200** | Success |  -  |
 

samples/client/petstore/java/jersey2-java6/docs/FakeClassnameTags123Api.md

@@ -7,9 +7,8 @@ Method | HTTP request | Description
 [**testClassname**](FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
 
 
-
+<a name="testClassname"></a>
-## testClassname
+# **testClassname**
-
 > Client testClassname(body)
 
 To test class name in snake case
@@ -17,7 +16,6 @@ To test class name in snake case
 To test class name in snake case
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -56,7 +54,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **body** | [**Client**](Client.md)| client model |
@@ -71,11 +68,11 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
-- **Content-Type**: application/json
+ - **Content-Type**: application/json
-- **Accept**: application/json
+ - **Accept**: application/json
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | successful operation |  -  |
+**200** | successful operation |  -  |
 

samples/client/petstore/java/jersey2-java6/docs/PetApi.md

@@ -15,15 +15,13 @@ Method | HTTP request | Description
 [**uploadFileWithRequiredFile**](PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 
 
-
+<a name="addPet"></a>
-## addPet
+# **addPet**
-
 > addPet(body)
 
 Add a new pet to the store
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -59,7 +57,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |
@@ -74,24 +71,22 @@ null (empty response body)
 
 ### HTTP request headers
 
-- **Content-Type**: application/json, application/xml
+ - **Content-Type**: application/json, application/xml
-- **Accept**: Not defined
+ - **Accept**: Not defined
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | successful operation |  -  |
+**200** | successful operation |  -  |
-| **405** | Invalid input |  -  |
+**405** | Invalid input |  -  |
-
-
-## deletePet
 
+<a name="deletePet"></a>
+# **deletePet**
 > deletePet(petId, apiKey)
 
 Deletes a pet
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -128,7 +123,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **petId** | **Long**| Pet id to delete |
@@ -144,18 +138,17 @@ null (empty response body)
 
 ### HTTP request headers
 
-- **Content-Type**: Not defined
+ - **Content-Type**: Not defined
-- **Accept**: Not defined
+ - **Accept**: Not defined
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | successful operation |  -  |
+**200** | successful operation |  -  |
-| **400** | Invalid pet value |  -  |
+**400** | Invalid pet value |  -  |
-
-
-## findPetsByStatus
 
+<a name="findPetsByStatus"></a>
+# **findPetsByStatus**
 > List&lt;Pet&gt; findPetsByStatus(status)
 
 Finds Pets by status
@@ -163,7 +156,6 @@ Finds Pets by status
 Multiple status values can be provided with comma separated strings
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -200,7 +192,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **status** | [**List&lt;String&gt;**](String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
@@ -215,18 +206,17 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
-- **Content-Type**: Not defined
+ - **Content-Type**: Not defined
-- **Accept**: application/xml, application/json
+ - **Accept**: application/xml, application/json
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | successful operation |  -  |
+**200** | successful operation |  -  |
-| **400** | Invalid status value |  -  |
+**400** | Invalid status value |  -  |
-
-
-## findPetsByTags
 
+<a name="findPetsByTags"></a>
+# **findPetsByTags**
 > List&lt;Pet&gt; findPetsByTags(tags)
 
 Finds Pets by tags
@@ -234,7 +224,6 @@ Finds Pets by tags
 Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -271,7 +260,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **tags** | [**List&lt;String&gt;**](String.md)| Tags to filter by |
@@ -286,18 +274,17 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
-- **Content-Type**: Not defined
+ - **Content-Type**: Not defined
-- **Accept**: application/xml, application/json
+ - **Accept**: application/xml, application/json
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | successful operation |  -  |
+**200** | successful operation |  -  |
-| **400** | Invalid tag value |  -  |
+**400** | Invalid tag value |  -  |
-
-
-## getPetById
 
+<a name="getPetById"></a>
+# **getPetById**
 > Pet getPetById(petId)
 
 Find pet by ID
@@ -305,7 +292,6 @@ Find pet by ID
 Returns a single pet
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -344,7 +330,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **petId** | **Long**| ID of pet to return |
@@ -359,25 +344,23 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
-- **Content-Type**: Not defined
+ - **Content-Type**: Not defined
-- **Accept**: application/xml, application/json
+ - **Accept**: application/xml, application/json
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | successful operation |  -  |
+**200** | successful operation |  -  |
-| **400** | Invalid ID supplied |  -  |
+**400** | Invalid ID supplied |  -  |
-| **404** | Pet not found |  -  |
+**404** | Pet not found |  -  |
-
-
-## updatePet
 
+<a name="updatePet"></a>
+# **updatePet**
 > updatePet(body)
 
 Update an existing pet
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -413,7 +396,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |
@@ -428,26 +410,24 @@ null (empty response body)
 
 ### HTTP request headers
 
-- **Content-Type**: application/json, application/xml
+ - **Content-Type**: application/json, application/xml
-- **Accept**: Not defined
+ - **Accept**: Not defined
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | successful operation |  -  |
+**200** | successful operation |  -  |
-| **400** | Invalid ID supplied |  -  |
+**400** | Invalid ID supplied |  -  |
-| **404** | Pet not found |  -  |
+**404** | Pet not found |  -  |
-| **405** | Validation exception |  -  |
+**405** | Validation exception |  -  |
-
-
-## updatePetWithForm
 
+<a name="updatePetWithForm"></a>
+# **updatePetWithForm**
 > updatePetWithForm(petId, name, status)
 
 Updates a pet in the store with form data
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -485,7 +465,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **petId** | **Long**| ID of pet that needs to be updated |
@@ -502,23 +481,21 @@ null (empty response body)
 
 ### HTTP request headers
 
-- **Content-Type**: application/x-www-form-urlencoded
+ - **Content-Type**: application/x-www-form-urlencoded
-- **Accept**: Not defined
+ - **Accept**: Not defined
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **405** | Invalid input |  -  |
+**405** | Invalid input |  -  |
-
-
-## uploadFile
 
+<a name="uploadFile"></a>
+# **uploadFile**
 > ModelApiResponse uploadFile(petId, additionalMetadata, file)
 
 uploads an image
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -557,7 +534,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **petId** | **Long**| ID of pet to update |
@@ -574,23 +550,21 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
-- **Content-Type**: multipart/form-data
+ - **Content-Type**: multipart/form-data
-- **Accept**: application/json
+ - **Accept**: application/json
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | successful operation |  -  |
+**200** | successful operation |  -  |
-
-
-## uploadFileWithRequiredFile
 
+<a name="uploadFileWithRequiredFile"></a>
+# **uploadFileWithRequiredFile**
 > ModelApiResponse uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata)
 
 uploads an image (required)
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -629,7 +603,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **petId** | **Long**| ID of pet to update |
@@ -646,11 +619,11 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
-- **Content-Type**: multipart/form-data
+ - **Content-Type**: multipart/form-data
-- **Accept**: application/json
+ - **Accept**: application/json
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | successful operation |  -  |
+**200** | successful operation |  -  |
 

samples/client/petstore/java/jersey2-java6/docs/StoreApi.md

@@ -10,17 +10,15 @@ Method | HTTP request | Description
 [**placeOrder**](StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet
 
 
-
+<a name="deleteOrder"></a>
-## deleteOrder
+# **deleteOrder**
-
 > deleteOrder(orderId)
 
 Delete purchase order by ID
 
-For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -51,7 +49,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **orderId** | **String**| ID of the order that needs to be deleted |
@@ -66,18 +63,17 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: Not defined
+ - **Content-Type**: Not defined
-- **Accept**: Not defined
+ - **Accept**: Not defined
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Invalid ID supplied |  -  |
+**400** | Invalid ID supplied |  -  |
-| **404** | Order not found |  -  |
+**404** | Order not found |  -  |
-
-
-## getInventory
 
+<a name="getInventory"></a>
+# **getInventory**
 > Map&lt;String, Integer&gt; getInventory()
 
 Returns pet inventories by status
@@ -85,7 +81,6 @@ Returns pet inventories by status
 Returns a map of status codes to quantities
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -122,7 +117,6 @@ public class Example {
 ```
 
 ### Parameters
-
 This endpoint does not need any parameter.
 
 ### Return type
@@ -135,25 +129,23 @@ This endpoint does not need any parameter.
 
 ### HTTP request headers
 
-- **Content-Type**: Not defined
+ - **Content-Type**: Not defined
-- **Accept**: application/json
+ - **Accept**: application/json
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | successful operation |  -  |
+**200** | successful operation |  -  |
-
-
-## getOrderById
 
+<a name="getOrderById"></a>
+# **getOrderById**
 > Order getOrderById(orderId)
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -185,7 +177,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **orderId** | **Long**| ID of pet that needs to be fetched |
@@ -200,25 +191,23 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: Not defined
+ - **Content-Type**: Not defined
-- **Accept**: application/xml, application/json
+ - **Accept**: application/xml, application/json
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | successful operation |  -  |
+**200** | successful operation |  -  |
-| **400** | Invalid ID supplied |  -  |
+**400** | Invalid ID supplied |  -  |
-| **404** | Order not found |  -  |
+**404** | Order not found |  -  |
-
-
-## placeOrder
 
+<a name="placeOrder"></a>
+# **placeOrder**
 > Order placeOrder(body)
 
 Place an order for a pet
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -250,7 +239,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **body** | [**Order**](Order.md)| order placed for purchasing the pet |
@@ -265,12 +253,12 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: Not defined
+ - **Content-Type**: Not defined
-- **Accept**: application/xml, application/json
+ - **Accept**: application/xml, application/json
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | successful operation |  -  |
+**200** | successful operation |  -  |
-| **400** | Invalid Order |  -  |
+**400** | Invalid Order |  -  |
 

samples/client/petstore/java/jersey2-java6/docs/UserApi.md

@@ -14,9 +14,8 @@ Method | HTTP request | Description
 [**updateUser**](UserApi.md#updateUser) | **PUT** /user/{username} | Updated user
 
 
-
+<a name="createUser"></a>
-## createUser
+# **createUser**
-
 > createUser(body)
 
 Create user
@@ -24,7 +23,6 @@ Create user
 This can only be done by the logged in user.
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -55,7 +53,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **body** | [**User**](User.md)| Created user object |
@@ -70,23 +67,21 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: Not defined
+ - **Content-Type**: Not defined
-- **Accept**: Not defined
+ - **Accept**: Not defined
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **0** | successful operation |  -  |
+**0** | successful operation |  -  |
-
-
-## createUsersWithArrayInput
 
+<a name="createUsersWithArrayInput"></a>
+# **createUsersWithArrayInput**
 > createUsersWithArrayInput(body)
 
 Creates list of users with given input array
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -117,7 +112,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **body** | [**List&lt;User&gt;**](User.md)| List of user object |
@@ -132,23 +126,21 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: Not defined
+ - **Content-Type**: Not defined
-- **Accept**: Not defined
+ - **Accept**: Not defined
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **0** | successful operation |  -  |
+**0** | successful operation |  -  |
-
-
-## createUsersWithListInput
 
+<a name="createUsersWithListInput"></a>
+# **createUsersWithListInput**
 > createUsersWithListInput(body)
 
 Creates list of users with given input array
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -179,7 +171,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **body** | [**List&lt;User&gt;**](User.md)| List of user object |
@@ -194,17 +185,16 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: Not defined
+ - **Content-Type**: Not defined
-- **Accept**: Not defined
+ - **Accept**: Not defined
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **0** | successful operation |  -  |
+**0** | successful operation |  -  |
-
-
-## deleteUser
 
+<a name="deleteUser"></a>
+# **deleteUser**
 > deleteUser(username)
 
 Delete user
@@ -212,7 +202,6 @@ Delete user
 This can only be done by the logged in user.
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -243,7 +232,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **username** | **String**| The name that needs to be deleted |
@@ -258,24 +246,22 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: Not defined
+ - **Content-Type**: Not defined
-- **Accept**: Not defined
+ - **Accept**: Not defined
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Invalid username supplied |  -  |
+**400** | Invalid username supplied |  -  |
-| **404** | User not found |  -  |
+**404** | User not found |  -  |
-
-
-## getUserByName
 
+<a name="getUserByName"></a>
+# **getUserByName**
 > User getUserByName(username)
 
 Get user by user name
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -307,7 +293,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **username** | **String**| The name that needs to be fetched. Use user1 for testing. |
@@ -322,25 +307,23 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: Not defined
+ - **Content-Type**: Not defined
-- **Accept**: application/xml, application/json
+ - **Accept**: application/xml, application/json
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | successful operation |  -  |
+**200** | successful operation |  -  |
-| **400** | Invalid username supplied |  -  |
+**400** | Invalid username supplied |  -  |
-| **404** | User not found |  -  |
+**404** | User not found |  -  |
-
-
-## loginUser
 
+<a name="loginUser"></a>
+# **loginUser**
 > String loginUser(username, password)
 
 Logs user into the system
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -373,7 +356,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **username** | **String**| The user name for login |
@@ -389,24 +371,22 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: Not defined
+ - **Content-Type**: Not defined
-- **Accept**: application/xml, application/json
+ - **Accept**: application/xml, application/json
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | successful operation |  * X-Rate-Limit - calls per hour allowed by the user <br>  * X-Expires-After - date in UTC when token expires <br>  |
+**200** | successful operation |  * X-Rate-Limit - calls per hour allowed by the user <br>  * X-Expires-After - date in UTC when token expires <br>  |
-| **400** | Invalid username/password supplied |  -  |
+**400** | Invalid username/password supplied |  -  |
-
-
-## logoutUser
 
+<a name="logoutUser"></a>
+# **logoutUser**
 > logoutUser()
 
 Logs out current logged in user session
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -435,7 +415,6 @@ public class Example {
 ```
 
 ### Parameters
-
 This endpoint does not need any parameter.
 
 ### Return type
@@ -448,17 +427,16 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: Not defined
+ - **Content-Type**: Not defined
-- **Accept**: Not defined
+ - **Accept**: Not defined
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **0** | successful operation |  -  |
+**0** | successful operation |  -  |
-
-
-## updateUser
 
+<a name="updateUser"></a>
+# **updateUser**
 > updateUser(username, body)
 
 Updated user
@@ -466,7 +444,6 @@ Updated user
 This can only be done by the logged in user.
 
 ### Example
-
 ```java
 // Import classes:
 import org.openapitools.client.ApiClient;
@@ -498,7 +475,6 @@ public class Example {
 
 ### Parameters
 
-
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **username** | **String**| name that need to be deleted |
@@ -514,12 +490,12 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: Not defined
+ - **Content-Type**: Not defined
-- **Accept**: Not defined
+ - **Accept**: Not defined
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Invalid user supplied |  -  |
+**400** | Invalid user supplied |  -  |
-| **404** | User not found |  -  |
+**404** | User not found |  -  |
 

samples/client/petstore/java/jersey2-java6/pom.xml

@@ -33,6 +33,20 @@
 
     <build>
         <plugins>
+           <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <fork>true</fork>
+                    <meminitial>128m</meminitial>
+                    <maxmem>512m</maxmem>
+                    <compilerArgs>
+                        <arg>-Xlint:all</arg>
+                        <arg>-J-Xss4m</arg><!-- Compiling the generated JSON.java file may require larger stack size. -->
+                    </compilerArgs>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
@@ -88,7 +102,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.6</version>
+                <version>2.2</version>
                 <executions>
                     <execution>
                         <goals>
@@ -132,22 +146,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                        <source>1.6</source>
-                        <target>1.6</target>
-                    <fork>true</fork>
-                    <meminitial>128m</meminitial>
-                    <maxmem>512m</maxmem>
-                    <compilerArgs>
-                        <arg>-Xlint:all</arg>
-                        <arg>-J-Xss4m</arg><!-- Compiling the generated JSON.java file may require larger stack size. -->
-                    </compilerArgs>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
@@ -215,64 +213,38 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-annotations-version}</version>
+            <version>${swagger-core-version}</version>
         </dependency>
-
         <!-- @Nullable annotation -->
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
             <version>3.0.2</version>
         </dependency>
-        
-        <!-- HTTP client: jersey-client -->
         <dependency>
-            <groupId>org.glassfish.jersey.core</groupId>
+            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>jersey-client</artifactId>
+            <artifactId>okhttp</artifactId>
-            <version>${jersey-version}</version>
+            <version>${okhttp-version}</version>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.jersey.media</groupId>
+            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>jersey-media-multipart</artifactId>
+            <artifactId>logging-interceptor</artifactId>
-            <version>${jersey-version}</version>
+            <version>${okhttp-version}</version>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.jersey.media</groupId>
+            <groupId>com.google.code.gson</groupId>
-            <artifactId>jersey-media-json-jackson</artifactId>
+            <artifactId>gson</artifactId>
-            <version>${jersey-version}</version>
+            <version>${gson-version}</version>
-        </dependency>
-
-        <!-- JSON processing: jackson -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>${jackson-version}</version>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
+            <groupId>io.gsonfire</groupId>
-            <artifactId>jackson-annotations</artifactId>
+            <artifactId>gson-fire</artifactId>
-            <version>${jackson-version}</version>
+            <version>${gson-fire-version}</version>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
+            <groupId>org.apache.oltu.oauth2</groupId>
-            <artifactId>jackson-databind</artifactId>
+            <artifactId>org.apache.oltu.oauth2.client</artifactId>
-            <version>${jackson-databind-version}</version>
+            <version>1.0.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.openapitools</groupId>
-            <artifactId>jackson-databind-nullable</artifactId>
-            <version>${jackson-databind-nullable-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.joschi.jackson</groupId>
-            <artifactId>jackson-datatype-threetenbp</artifactId>
-            <version>${threetenbp-version}</version>
-        </dependency>
-        <!-- Base64 encoding that works in both JVM and Android -->
-        <dependency>
-            <groupId>com.brsanthu</groupId>
-            <artifactId>migbase64</artifactId>
-            <version>2.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -280,19 +252,14 @@
             <version>${commons-lang3-version}</version>
         </dependency>
         <dependency>
-            <groupId>commons-io</groupId>
+            <groupId>org.threeten</groupId>
-            <artifactId>commons-io</artifactId>
+            <artifactId>threetenbp</artifactId>
-            <version>${commons-io-version}</version>
+            <version>${threetenbp-version}</version>
         </dependency>
         <dependency>
-            <groupId>org.tomitribe</groupId>
+            <groupId>javax.annotation</groupId>
-            <artifactId>tomitribe-http-signatures</artifactId>
+            <artifactId>javax.annotation-api</artifactId>
-            <version>${http-signature-version}</version>
+            <version>${javax-annotation-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.scribejava</groupId>
-            <artifactId>scribejava-apis</artifactId>
-            <version>6.9.0</version>
         </dependency>
         <!-- test dependencies -->
         <dependency>
@@ -303,16 +270,17 @@
         </dependency>
     </dependencies>
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <java.version>1.6</java.version>
-        <swagger-annotations-version>1.6.1</swagger-annotations-version>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <jersey-version>2.6</jersey-version>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
-        <commons-io-version>2.5</commons-io-version>
+        <gson-fire-version>1.8.4</gson-fire-version>
-        <commons-lang3-version>3.6</commons-lang3-version>
+        <swagger-core-version>1.5.24</swagger-core-version>
-        <jackson-version>2.10.3</jackson-version>
+        <okhttp-version>3.14.7</okhttp-version>
-        <jackson-databind-version>2.10.3</jackson-databind-version>
+        <gson-version>2.8.6</gson-version>
-        <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
+        <commons-lang3-version>3.10</commons-lang3-version>
-        <threetenbp-version>2.9.10</threetenbp-version>
+        <threetenbp-version>1.4.3</threetenbp-version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <junit-version>4.13</junit-version>
-        <http-signature-version>1.3</http-signature-version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 </project>

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/ApiCallback.java

@@ -0,0 +1,62 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client;
+
+import java.io.IOException;
+
+import java.util.Map;
+import java.util.List;
+
+/**
+ * Callback for asynchronous API call.
+ *
+ * @param <T> The return type
+ */
+public interface ApiCallback<T> {
+    /**
+     * This is called when the API call fails.
+     *
+     * @param e The exception causing the failure
+     * @param statusCode Status code of the response if available, otherwise it would be 0
+     * @param responseHeaders Headers of the response if available, otherwise it would be null
+     */
+    void onFailure(ApiException e, int statusCode, Map<String, List<String>> responseHeaders);
+
+    /**
+     * This is called when the API call succeeded.
+     *
+     * @param result The result deserialized from response
+     * @param statusCode Status code of the response
+     * @param responseHeaders Headers of the response
+     */
+    void onSuccess(T result, int statusCode, Map<String, List<String>> responseHeaders);
+
+    /**
+     * This is called when the API upload processing.
+     *
+     * @param bytesWritten bytes Written
+     * @param contentLength content length of request body
+     * @param done write end
+     */
+    void onUploadProgress(long bytesWritten, long contentLength, boolean done);
+
+    /**
+     * This is called when the API downlond processing.
+     *
+     * @param bytesRead bytes Read
+     * @param contentLength content lenngth of the response
+     * @param done Read end
+     */
+    void onDownloadProgress(long bytesRead, long contentLength, boolean done);
+}

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/ApiException.java

@@ -16,9 +16,6 @@ package org.openapitools.client;
 import java.util.Map;
 import java.util.List;
 
-/**
- * API Exception
- */
 
 public class ApiException extends Exception {
     private int code = 0;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/ApiResponse.java

@@ -22,9 +22,9 @@ import java.util.Map;
  * @param <T> The type of data that is deserialized from response body
  */
 public class ApiResponse<T> {
-    private final int statusCode;
+    final private int statusCode;
-    private final Map<String, List<String>> headers;
+    final private Map<String, List<String>> headers;
-    private final T data;
+    final private T data;
 
     /**
      * @param statusCode The status code of HTTP response
@@ -45,29 +45,14 @@ public class ApiResponse<T> {
         this.data = data;
     }
 
-    /**
-     * Get the status code
-     *
-     * @return status code
-     */
     public int getStatusCode() {
         return statusCode;
     }
 
-    /**
-     * Get the headers
-     *
-     * @return map of headers
-     */
     public Map<String, List<String>> getHeaders() {
         return headers;
     }
 
-    /**
-     * Get the data
-     *
-     * @return data
-     */
     public T getData() {
         return data;
     }

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/GzipRequestInterceptor.java

@@ -0,0 +1,85 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client;
+
+import okhttp3.*;
+import okio.Buffer;
+import okio.BufferedSink;
+import okio.GzipSink;
+import okio.Okio;
+
+import java.io.IOException;
+
+/**
+ * Encodes request bodies using gzip.
+ *
+ * Taken from https://github.com/square/okhttp/issues/350
+ */
+class GzipRequestInterceptor implements Interceptor {
+    @Override
+    public Response intercept(Chain chain) throws IOException {
+        Request originalRequest = chain.request();
+        if (originalRequest.body() == null || originalRequest.header("Content-Encoding") != null) {
+            return chain.proceed(originalRequest);
+        }
+
+        Request compressedRequest = originalRequest.newBuilder()
+                                                   .header("Content-Encoding", "gzip")
+                                                   .method(originalRequest.method(), forceContentLength(gzip(originalRequest.body())))
+                                                   .build();
+        return chain.proceed(compressedRequest);
+    }
+
+    private RequestBody forceContentLength(final RequestBody requestBody) throws IOException {
+        final Buffer buffer = new Buffer();
+        requestBody.writeTo(buffer);
+        return new RequestBody() {
+            @Override
+            public MediaType contentType() {
+                return requestBody.contentType();
+            }
+
+            @Override
+            public long contentLength() {
+                return buffer.size();
+            }
+
+            @Override
+            public void writeTo(BufferedSink sink) throws IOException {
+                sink.write(buffer.snapshot());
+            }
+        };
+    }
+
+    private RequestBody gzip(final RequestBody body) {
+        return new RequestBody() {
+            @Override
+            public MediaType contentType() {
+                return body.contentType();
+            }
+
+            @Override
+            public long contentLength() {
+                return -1; // We don't know the compressed length in advance!
+            }
+
+            @Override
+            public void writeTo(BufferedSink sink) throws IOException {
+                BufferedSink gzipSink = Okio.buffer(new GzipSink(sink));
+                body.writeTo(gzipSink);
+                gzipSink.close();
+            }
+        };
+    }
+}

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/JSON.java

@@ -1,54 +1,442 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
 package org.openapitools.client;
 
-import org.threeten.bp.*;
+import com.google.gson.Gson;
-import com.fasterxml.jackson.annotation.*;
+import com.google.gson.GsonBuilder;
-import com.fasterxml.jackson.databind.*;
+import com.google.gson.JsonParseException;
-import org.openapitools.jackson.nullable.JsonNullableModule;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.datatype.threetenbp.ThreeTenModule;
+import com.google.gson.internal.bind.util.ISO8601Utils;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import com.google.gson.JsonElement;
+import io.gsonfire.GsonFireBuilder;
+import io.gsonfire.TypeSelector;
+import org.threeten.bp.LocalDate;
+import org.threeten.bp.OffsetDateTime;
+import org.threeten.bp.format.DateTimeFormatter;
 
+import org.openapitools.client.model.*;
+import okio.ByteString;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.lang.reflect.Type;
 import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.ParsePosition;
+import java.util.Date;
+import java.util.Locale;
+import java.util.Map;
+import java.util.HashMap;
 
-import javax.ws.rs.ext.ContextResolver;
+public class JSON {
+    private Gson gson;
+    private boolean isLenientOnJson = false;
+    private DateTypeAdapter dateTypeAdapter = new DateTypeAdapter();
+    private SqlDateTypeAdapter sqlDateTypeAdapter = new SqlDateTypeAdapter();
+    private OffsetDateTimeTypeAdapter offsetDateTimeTypeAdapter = new OffsetDateTimeTypeAdapter();
+    private LocalDateTypeAdapter localDateTypeAdapter = new LocalDateTypeAdapter();
+    private ByteArrayAdapter byteArrayAdapter = new ByteArrayAdapter();
 
+    public static GsonBuilder createGson() {
+        GsonFireBuilder fireBuilder = new GsonFireBuilder()
+                .registerTypeSelector(Animal.class, new TypeSelector() {
+                    @Override
+                    public Class getClassForElement(JsonElement readElement) {
+                        Map<String, Class> classByDiscriminatorValue = new HashMap<String, Class>();
+                        classByDiscriminatorValue.put("BigCat", BigCat.class);
+                        classByDiscriminatorValue.put("Cat", Cat.class);
+                        classByDiscriminatorValue.put("Dog", Dog.class);
+                        classByDiscriminatorValue.put("Animal", Animal.class);
+                        return getClassByDiscriminator(classByDiscriminatorValue,
+                                getDiscriminatorValue(readElement, "className"));
+                    }
+          })
+                .registerTypeSelector(BigCat.class, new TypeSelector() {
+                    @Override
+                    public Class getClassForElement(JsonElement readElement) {
+                        Map<String, Class> classByDiscriminatorValue = new HashMap<String, Class>();
+                        classByDiscriminatorValue.put("BigCat", BigCat.class);
+                        return getClassByDiscriminator(classByDiscriminatorValue,
+                                getDiscriminatorValue(readElement, "className"));
+                    }
+          })
+                .registerTypeSelector(Cat.class, new TypeSelector() {
+                    @Override
+                    public Class getClassForElement(JsonElement readElement) {
+                        Map<String, Class> classByDiscriminatorValue = new HashMap<String, Class>();
+                        classByDiscriminatorValue.put("BigCat", BigCat.class);
+                        classByDiscriminatorValue.put("Cat", Cat.class);
+                        return getClassByDiscriminator(classByDiscriminatorValue,
+                                getDiscriminatorValue(readElement, "className"));
+                    }
+          })
+                .registerTypeSelector(Dog.class, new TypeSelector() {
+                    @Override
+                    public Class getClassForElement(JsonElement readElement) {
+                        Map<String, Class> classByDiscriminatorValue = new HashMap<String, Class>();
+                        classByDiscriminatorValue.put("Dog", Dog.class);
+                        return getClassByDiscriminator(classByDiscriminatorValue,
+                                getDiscriminatorValue(readElement, "className"));
+                    }
+          })
+        ;
+        GsonBuilder builder = fireBuilder.createGsonBuilder();
+        return builder;
+    }
 
-public class JSON implements ContextResolver<ObjectMapper> {
+    private static String getDiscriminatorValue(JsonElement readElement, String discriminatorField) {
-  private ObjectMapper mapper;
+        JsonElement element = readElement.getAsJsonObject().get(discriminatorField);
-
+        if (null == element) {
-  public JSON() {
+            throw new IllegalArgumentException("missing discriminator field: <" + discriminatorField + ">");
-    mapper = new ObjectMapper();
+        }
-    mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+        return element.getAsString();
-    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, true);
-    mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true);
-    mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-    mapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
-    mapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING);
-    mapper.setDateFormat(new RFC3339DateFormat());
-    ThreeTenModule module = new ThreeTenModule();
-    module.addDeserializer(Instant.class, CustomInstantDeserializer.INSTANT);
-    module.addDeserializer(OffsetDateTime.class, CustomInstantDeserializer.OFFSET_DATE_TIME);
-    module.addDeserializer(ZonedDateTime.class, CustomInstantDeserializer.ZONED_DATE_TIME);
-    mapper.registerModule(module);
-    JsonNullableModule jnm = new JsonNullableModule();
-    mapper.registerModule(jnm);
     }
 
     /**
-   * Set the date format for JSON (de)serialization with Date properties.
+     * Returns the Java class that implements the OpenAPI schema for the specified discriminator value.
-   * @param dateFormat Date format
+     *
+     * @param classByDiscriminatorValue The map of discriminator values to Java classes.
+     * @param discriminatorValue The value of the OpenAPI discriminator in the input data.
+     * @return The Java class that implements the OpenAPI schema
      */
-  public void setDateFormat(DateFormat dateFormat) {
+    private static Class getClassByDiscriminator(Map classByDiscriminatorValue, String discriminatorValue) {
-    mapper.setDateFormat(dateFormat);
+        Class clazz = (Class) classByDiscriminatorValue.get(discriminatorValue);
+        if (null == clazz) {
+            throw new IllegalArgumentException("cannot determine model class of name: <" + discriminatorValue + ">");
+        }
+        return clazz;
+    }
+
+    public JSON() {
+        gson = createGson()
+            .registerTypeAdapter(Date.class, dateTypeAdapter)
+            .registerTypeAdapter(java.sql.Date.class, sqlDateTypeAdapter)
+            .registerTypeAdapter(OffsetDateTime.class, offsetDateTimeTypeAdapter)
+            .registerTypeAdapter(LocalDate.class, localDateTypeAdapter)
+            .registerTypeAdapter(byte[].class, byteArrayAdapter)
+            .create();
+    }
+
+    /**
+     * Get Gson.
+     *
+     * @return Gson
+     */
+    public Gson getGson() {
+        return gson;
+    }
+
+    /**
+     * Set Gson.
+     *
+     * @param gson Gson
+     * @return JSON
+     */
+    public JSON setGson(Gson gson) {
+        this.gson = gson;
+        return this;
+    }
+
+    public JSON setLenientOnJson(boolean lenientOnJson) {
+        isLenientOnJson = lenientOnJson;
+        return this;
+    }
+
+    /**
+     * Serialize the given Java object into JSON string.
+     *
+     * @param obj Object
+     * @return String representation of the JSON
+     */
+    public String serialize(Object obj) {
+        return gson.toJson(obj);
+    }
+
+    /**
+     * Deserialize the given JSON string to Java object.
+     *
+     * @param <T>        Type
+     * @param body       The JSON string
+     * @param returnType The type to deserialize into
+     * @return The deserialized Java object
+     */
+    @SuppressWarnings("unchecked")
+    public <T> T deserialize(String body, Type returnType) {
+        try {
+            if (isLenientOnJson) {
+                JsonReader jsonReader = new JsonReader(new StringReader(body));
+                // see https://google-gson.googlecode.com/svn/trunk/gson/docs/javadocs/com/google/gson/stream/JsonReader.html#setLenient(boolean)
+                jsonReader.setLenient(true);
+                return gson.fromJson(jsonReader, returnType);
+            } else {
+                return gson.fromJson(body, returnType);
+            }
+        } catch (JsonParseException e) {
+            // Fallback processing when failed to parse JSON form response body:
+            // return the response body string directly for the String return type;
+            if (returnType.equals(String.class)) {
+                return (T) body;
+            } else {
+                throw (e);
+            }
+        }
+    }
+
+    /**
+     * Gson TypeAdapter for Byte Array type
+     */
+    public class ByteArrayAdapter extends TypeAdapter<byte[]> {
+
+        @Override
+        public void write(JsonWriter out, byte[] value) throws IOException {
+            if (value == null) {
+                out.nullValue();
+            } else {
+                out.value(ByteString.of(value).base64());
+            }
         }
 
         @Override
-  public ObjectMapper getContext(Class<?> type) {
+        public byte[] read(JsonReader in) throws IOException {
-    return mapper;
+            switch (in.peek()) {
+                case NULL:
+                    in.nextNull();
+                    return null;
+                default:
+                    String bytesAsBase64 = in.nextString();
+                    ByteString byteString = ByteString.decodeBase64(bytesAsBase64);
+                    return byteString.toByteArray();
+            }
+        }
     }
 
     /**
-   * Get the object mapper
+     * Gson TypeAdapter for JSR310 OffsetDateTime type
-   *
-   * @return object mapper
      */
-  public ObjectMapper getMapper() { return mapper; }
+    public static class OffsetDateTimeTypeAdapter extends TypeAdapter<OffsetDateTime> {
+
+        private DateTimeFormatter formatter;
+
+        public OffsetDateTimeTypeAdapter() {
+            this(DateTimeFormatter.ISO_OFFSET_DATE_TIME);
+        }
+
+        public OffsetDateTimeTypeAdapter(DateTimeFormatter formatter) {
+            this.formatter = formatter;
+        }
+
+        public void setFormat(DateTimeFormatter dateFormat) {
+            this.formatter = dateFormat;
+        }
+
+        @Override
+        public void write(JsonWriter out, OffsetDateTime date) throws IOException {
+            if (date == null) {
+                out.nullValue();
+            } else {
+                out.value(formatter.format(date));
+            }
+        }
+
+        @Override
+        public OffsetDateTime read(JsonReader in) throws IOException {
+            switch (in.peek()) {
+                case NULL:
+                    in.nextNull();
+                    return null;
+                default:
+                    String date = in.nextString();
+                    if (date.endsWith("+0000")) {
+                        date = date.substring(0, date.length()-5) + "Z";
+                    }
+                    return OffsetDateTime.parse(date, formatter);
+            }
+        }
+    }
+
+    /**
+     * Gson TypeAdapter for JSR310 LocalDate type
+     */
+    public class LocalDateTypeAdapter extends TypeAdapter<LocalDate> {
+
+        private DateTimeFormatter formatter;
+
+        public LocalDateTypeAdapter() {
+            this(DateTimeFormatter.ISO_LOCAL_DATE);
+        }
+
+        public LocalDateTypeAdapter(DateTimeFormatter formatter) {
+            this.formatter = formatter;
+        }
+
+        public void setFormat(DateTimeFormatter dateFormat) {
+            this.formatter = dateFormat;
+        }
+
+        @Override
+        public void write(JsonWriter out, LocalDate date) throws IOException {
+            if (date == null) {
+                out.nullValue();
+            } else {
+                out.value(formatter.format(date));
+            }
+        }
+
+        @Override
+        public LocalDate read(JsonReader in) throws IOException {
+            switch (in.peek()) {
+                case NULL:
+                    in.nextNull();
+                    return null;
+                default:
+                    String date = in.nextString();
+                    return LocalDate.parse(date, formatter);
+            }
+        }
+    }
+
+    public JSON setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
+        offsetDateTimeTypeAdapter.setFormat(dateFormat);
+        return this;
+    }
+
+    public JSON setLocalDateFormat(DateTimeFormatter dateFormat) {
+        localDateTypeAdapter.setFormat(dateFormat);
+        return this;
+    }
+
+    /**
+     * Gson TypeAdapter for java.sql.Date type
+     * If the dateFormat is null, a simple "yyyy-MM-dd" format will be used
+     * (more efficient than SimpleDateFormat).
+     */
+    public static class SqlDateTypeAdapter extends TypeAdapter<java.sql.Date> {
+
+        private DateFormat dateFormat;
+
+        public SqlDateTypeAdapter() {}
+
+        public SqlDateTypeAdapter(DateFormat dateFormat) {
+            this.dateFormat = dateFormat;
+        }
+
+        public void setFormat(DateFormat dateFormat) {
+            this.dateFormat = dateFormat;
+        }
+
+        @Override
+        public void write(JsonWriter out, java.sql.Date date) throws IOException {
+            if (date == null) {
+                out.nullValue();
+            } else {
+                String value;
+                if (dateFormat != null) {
+                    value = dateFormat.format(date);
+                } else {
+                    value = date.toString();
+                }
+                out.value(value);
+            }
+        }
+
+        @Override
+        public java.sql.Date read(JsonReader in) throws IOException {
+            switch (in.peek()) {
+                case NULL:
+                    in.nextNull();
+                    return null;
+                default:
+                    String date = in.nextString();
+                    try {
+                        if (dateFormat != null) {
+                            return new java.sql.Date(dateFormat.parse(date).getTime());
+                        }
+                        return new java.sql.Date(ISO8601Utils.parse(date, new ParsePosition(0)).getTime());
+                    } catch (ParseException e) {
+                        throw new JsonParseException(e);
+                    }
+            }
+        }
+    }
+
+    /**
+     * Gson TypeAdapter for java.util.Date type
+     * If the dateFormat is null, ISO8601Utils will be used.
+     */
+    public static class DateTypeAdapter extends TypeAdapter<Date> {
+
+        private DateFormat dateFormat;
+
+        public DateTypeAdapter() {}
+
+        public DateTypeAdapter(DateFormat dateFormat) {
+            this.dateFormat = dateFormat;
+        }
+
+        public void setFormat(DateFormat dateFormat) {
+            this.dateFormat = dateFormat;
+        }
+
+        @Override
+        public void write(JsonWriter out, Date date) throws IOException {
+            if (date == null) {
+                out.nullValue();
+            } else {
+                String value;
+                if (dateFormat != null) {
+                    value = dateFormat.format(date);
+                } else {
+                    value = ISO8601Utils.format(date, true);
+                }
+                out.value(value);
+            }
+        }
+
+        @Override
+        public Date read(JsonReader in) throws IOException {
+            try {
+                switch (in.peek()) {
+                    case NULL:
+                        in.nextNull();
+                        return null;
+                    default:
+                        String date = in.nextString();
+                        try {
+                            if (dateFormat != null) {
+                                return dateFormat.parse(date);
+                            }
+                            return ISO8601Utils.parse(date, new ParsePosition(0));
+                        } catch (ParseException e) {
+                            throw new JsonParseException(e);
+                        }
+                }
+            } catch (IllegalArgumentException e) {
+                throw new JsonParseException(e);
+            }
+        }
+    }
+
+    public JSON setDateFormat(DateFormat dateFormat) {
+        dateTypeAdapter.setFormat(dateFormat);
+        return this;
+    }
+
+    public JSON setSqlDateFormat(DateFormat dateFormat) {
+        sqlDateTypeAdapter.setFormat(dateFormat);
+        return this;
+    }
+
 }

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/ProgressRequestBody.java

@@ -0,0 +1,73 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client;
+
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+
+import java.io.IOException;
+
+import okio.Buffer;
+import okio.BufferedSink;
+import okio.ForwardingSink;
+import okio.Okio;
+import okio.Sink;
+
+public class ProgressRequestBody extends RequestBody {
+
+    private final RequestBody requestBody;
+
+    private final ApiCallback callback;
+
+    public ProgressRequestBody(RequestBody requestBody, ApiCallback callback) {
+        this.requestBody = requestBody;
+        this.callback = callback;
+    }
+
+    @Override
+    public MediaType contentType() {
+        return requestBody.contentType();
+    }
+
+    @Override
+    public long contentLength() throws IOException {
+        return requestBody.contentLength();
+    }
+
+    @Override
+    public void writeTo(BufferedSink sink) throws IOException {
+        BufferedSink bufferedSink = Okio.buffer(sink(sink));
+        requestBody.writeTo(bufferedSink);
+        bufferedSink.flush();
+    }
+
+    private Sink sink(Sink sink) {
+        return new ForwardingSink(sink) {
+
+            long bytesWritten = 0L;
+            long contentLength = 0L;
+
+            @Override
+            public void write(Buffer source, long byteCount) throws IOException {
+                super.write(source, byteCount);
+                if (contentLength == 0) {
+                    contentLength = contentLength();
+                }
+
+                bytesWritten += byteCount;
+                callback.onUploadProgress(bytesWritten, contentLength, bytesWritten == contentLength);
+            }
+        };
+    }
+}

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/ProgressResponseBody.java

@@ -0,0 +1,72 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client;
+
+import okhttp3.MediaType;
+import okhttp3.ResponseBody;
+
+import java.io.IOException;
+
+import okio.Buffer;
+import okio.BufferedSource;
+import okio.ForwardingSource;
+import okio.Okio;
+import okio.Source;
+
+public class ProgressResponseBody extends ResponseBody {
+
+    private final ResponseBody responseBody;
+    private final ApiCallback callback;
+    private BufferedSource bufferedSource;
+
+    public ProgressResponseBody(ResponseBody responseBody, ApiCallback callback) {
+        this.responseBody = responseBody;
+        this.callback = callback;
+    }
+
+    @Override
+    public MediaType contentType() {
+        return responseBody.contentType();
+    }
+
+    @Override
+    public long contentLength() {
+        return responseBody.contentLength();
+    }
+
+    @Override
+    public BufferedSource source() {
+        if (bufferedSource == null) {
+            bufferedSource = Okio.buffer(source(responseBody.source()));
+        }
+        return bufferedSource;
+    }
+
+    private Source source(Source source) {
+        return new ForwardingSource(source) {
+            long totalBytesRead = 0L;
+
+            @Override
+            public long read(Buffer sink, long byteCount) throws IOException {
+                long bytesRead = super.read(sink, byteCount);
+                // read() returns the number of bytes read, or -1 if this source is exhausted.
+                totalBytesRead += bytesRead != -1 ? bytesRead : 0;
+                callback.onDownloadProgress(totalBytesRead, responseBody.contentLength(), bytesRead == -1);
+                return bytesRead;
+            }
+        };
+    }
+}
+
+

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/api/AnotherFakeApi.java

@@ -1,48 +1,112 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
 package org.openapitools.client.api;
 
-import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiCallback;
 import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
 import org.openapitools.client.ApiResponse;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.Pair;
+import org.openapitools.client.ProgressRequestBody;
+import org.openapitools.client.ProgressResponseBody;
+
+import com.google.gson.reflect.TypeToken;
+
+import java.io.IOException;
 
-import javax.ws.rs.core.GenericType;
 
 import org.openapitools.client.model.Client;
 
+import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
 public class AnotherFakeApi {
-  private ApiClient apiClient;
+    private ApiClient localVarApiClient;
 
     public AnotherFakeApi() {
         this(Configuration.getDefaultApiClient());
     }
 
     public AnotherFakeApi(ApiClient apiClient) {
-    this.apiClient = apiClient;
+        this.localVarApiClient = apiClient;
     }
 
-  /**
-   * Get the API cilent
-   *
-   * @return API client
-   */
     public ApiClient getApiClient() {
-    return apiClient;
+        return localVarApiClient;
+    }
+
+    public void setApiClient(ApiClient apiClient) {
+        this.localVarApiClient = apiClient;
     }
 
     /**
-   * Set the API cilent
+     * Build call for call123testSpecialTags
-   *
+     * @param body client model (required)
-   * @param apiClient an instance of API client
+     * @param _callback Callback for upload/download progress
+     * @return Call to execute
+     * @throws ApiException If fail to serialize the request body object
+     * @http.response.details
+     <table summary="Response Details" border="1">
+        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+     </table>
      */
-  public void setApiClient(ApiClient apiClient) {
+    public okhttp3.Call call123testSpecialTagsCall(Client body, final ApiCallback _callback) throws ApiException {
-    this.apiClient = apiClient;
+        Object localVarPostBody = body;
+
+        // create path and map variables
+        String localVarPath = "/another-fake/dummy";
+
+        List<Pair> localVarQueryParams = new ArrayList<Pair>();
+        List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+        Map<String, String> localVarCookieParams = new HashMap<String, String>();
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+        final String[] localVarAccepts = {
+            "application/json"
+        };
+        final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) {
+            localVarHeaderParams.put("Accept", localVarAccept);
+        }
+
+        final String[] localVarContentTypes = {
+            "application/json"
+        };
+        final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        String[] localVarAuthNames = new String[] {  };
+        return localVarApiClient.buildCall(localVarPath, "PATCH", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
+    }
+
+    @SuppressWarnings("rawtypes")
+    private okhttp3.Call call123testSpecialTagsValidateBeforeCall(Client body, final ApiCallback _callback) throws ApiException {
+        
+        // verify the required parameter 'body' is set
+        if (body == null) {
+            throw new ApiException("Missing the required parameter 'body' when calling call123testSpecialTags(Async)");
+        }
+        
+
+        okhttp3.Call localVarCall = call123testSpecialTagsCall(body, _callback);
+        return localVarCall;
+
     }
 
     /**
@@ -50,7 +114,7 @@ public class AnotherFakeApi {
      * To test special tags and operation ID starting with number
      * @param body client model (required)
      * @return Client
-   * @throws ApiException if fails to make API call
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      * @http.response.details
      <table summary="Response Details" border="1">
         <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
@@ -58,7 +122,8 @@ public class AnotherFakeApi {
      </table>
      */
     public Client call123testSpecialTags(Client body) throws ApiException {
-    return call123testSpecialTagsWithHttpInfo(body).getData();
+        ApiResponse<Client> localVarResp = call123testSpecialTagsWithHttpInfo(body);
+        return localVarResp.getData();
     }
 
     /**
@@ -66,7 +131,7 @@ public class AnotherFakeApi {
      * To test special tags and operation ID starting with number
      * @param body client model (required)
      * @return ApiResponse&lt;Client&gt;
-   * @throws ApiException if fails to make API call
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      * @http.response.details
      <table summary="Response Details" border="1">
         <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
@@ -74,42 +139,29 @@ public class AnotherFakeApi {
      </table>
      */
     public ApiResponse<Client> call123testSpecialTagsWithHttpInfo(Client body) throws ApiException {
-    Object localVarPostBody = body;
+        okhttp3.Call localVarCall = call123testSpecialTagsValidateBeforeCall(body, null);
-    
+        Type localVarReturnType = new TypeToken<Client>(){}.getType();
-    // verify the required parameter 'body' is set
+        return localVarApiClient.execute(localVarCall, localVarReturnType);
-    if (body == null) {
-      throw new ApiException(400, "Missing the required parameter 'body' when calling call123testSpecialTags");
     }
 
-    // create path and map variables
+    /**
-    String localVarPath = "/another-fake/dummy";
+     * To test special tags (asynchronously)
+     * To test special tags and operation ID starting with number
+     * @param body client model (required)
+     * @param _callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     * @http.response.details
+     <table summary="Response Details" border="1">
+        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+     </table>
+     */
+    public okhttp3.Call call123testSpecialTagsAsync(Client body, final ApiCallback<Client> _callback) throws ApiException {
 
-    // query params
+        okhttp3.Call localVarCall = call123testSpecialTagsValidateBeforeCall(body, _callback);
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+        Type localVarReturnType = new TypeToken<Client>(){}.getType();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+        localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback);
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
+        return localVarCall;
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      "application/json"
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] {  };
-
-    GenericType<Client> localVarReturnType = new GenericType<Client>() {};
-
-    return apiClient.invokeAPI("AnotherFakeApi.call123testSpecialTags", localVarPath, "PATCH", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
     }
 }

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java

@@ -1,48 +1,112 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
 package org.openapitools.client.api;
 
-import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiCallback;
 import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
 import org.openapitools.client.ApiResponse;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.Pair;
+import org.openapitools.client.ProgressRequestBody;
+import org.openapitools.client.ProgressResponseBody;
+
+import com.google.gson.reflect.TypeToken;
+
+import java.io.IOException;
 
-import javax.ws.rs.core.GenericType;
 
 import org.openapitools.client.model.Client;
 
+import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
 public class FakeClassnameTags123Api {
-  private ApiClient apiClient;
+    private ApiClient localVarApiClient;
 
     public FakeClassnameTags123Api() {
         this(Configuration.getDefaultApiClient());
     }
 
     public FakeClassnameTags123Api(ApiClient apiClient) {
-    this.apiClient = apiClient;
+        this.localVarApiClient = apiClient;
     }
 
-  /**
-   * Get the API cilent
-   *
-   * @return API client
-   */
     public ApiClient getApiClient() {
-    return apiClient;
+        return localVarApiClient;
+    }
+
+    public void setApiClient(ApiClient apiClient) {
+        this.localVarApiClient = apiClient;
     }
 
     /**
-   * Set the API cilent
+     * Build call for testClassname
-   *
+     * @param body client model (required)
-   * @param apiClient an instance of API client
+     * @param _callback Callback for upload/download progress
+     * @return Call to execute
+     * @throws ApiException If fail to serialize the request body object
+     * @http.response.details
+     <table summary="Response Details" border="1">
+        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+     </table>
      */
-  public void setApiClient(ApiClient apiClient) {
+    public okhttp3.Call testClassnameCall(Client body, final ApiCallback _callback) throws ApiException {
-    this.apiClient = apiClient;
+        Object localVarPostBody = body;
+
+        // create path and map variables
+        String localVarPath = "/fake_classname_test";
+
+        List<Pair> localVarQueryParams = new ArrayList<Pair>();
+        List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+        Map<String, String> localVarCookieParams = new HashMap<String, String>();
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+        final String[] localVarAccepts = {
+            "application/json"
+        };
+        final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) {
+            localVarHeaderParams.put("Accept", localVarAccept);
+        }
+
+        final String[] localVarContentTypes = {
+            "application/json"
+        };
+        final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        String[] localVarAuthNames = new String[] { "api_key_query" };
+        return localVarApiClient.buildCall(localVarPath, "PATCH", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
+    }
+
+    @SuppressWarnings("rawtypes")
+    private okhttp3.Call testClassnameValidateBeforeCall(Client body, final ApiCallback _callback) throws ApiException {
+        
+        // verify the required parameter 'body' is set
+        if (body == null) {
+            throw new ApiException("Missing the required parameter 'body' when calling testClassname(Async)");
+        }
+        
+
+        okhttp3.Call localVarCall = testClassnameCall(body, _callback);
+        return localVarCall;
+
     }
 
     /**
@@ -50,7 +114,7 @@ public class FakeClassnameTags123Api {
      * To test class name in snake case
      * @param body client model (required)
      * @return Client
-   * @throws ApiException if fails to make API call
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      * @http.response.details
      <table summary="Response Details" border="1">
         <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
@@ -58,7 +122,8 @@ public class FakeClassnameTags123Api {
      </table>
      */
     public Client testClassname(Client body) throws ApiException {
-    return testClassnameWithHttpInfo(body).getData();
+        ApiResponse<Client> localVarResp = testClassnameWithHttpInfo(body);
+        return localVarResp.getData();
     }
 
     /**
@@ -66,7 +131,7 @@ public class FakeClassnameTags123Api {
      * To test class name in snake case
      * @param body client model (required)
      * @return ApiResponse&lt;Client&gt;
-   * @throws ApiException if fails to make API call
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      * @http.response.details
      <table summary="Response Details" border="1">
         <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
@@ -74,42 +139,29 @@ public class FakeClassnameTags123Api {
      </table>
      */
     public ApiResponse<Client> testClassnameWithHttpInfo(Client body) throws ApiException {
-    Object localVarPostBody = body;
+        okhttp3.Call localVarCall = testClassnameValidateBeforeCall(body, null);
-    
+        Type localVarReturnType = new TypeToken<Client>(){}.getType();
-    // verify the required parameter 'body' is set
+        return localVarApiClient.execute(localVarCall, localVarReturnType);
-    if (body == null) {
-      throw new ApiException(400, "Missing the required parameter 'body' when calling testClassname");
     }
 
-    // create path and map variables
+    /**
-    String localVarPath = "/fake_classname_test";
+     * To test class name in snake case (asynchronously)
+     * To test class name in snake case
+     * @param body client model (required)
+     * @param _callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     * @http.response.details
+     <table summary="Response Details" border="1">
+        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+     </table>
+     */
+    public okhttp3.Call testClassnameAsync(Client body, final ApiCallback<Client> _callback) throws ApiException {
 
-    // query params
+        okhttp3.Call localVarCall = testClassnameValidateBeforeCall(body, _callback);
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+        Type localVarReturnType = new TypeToken<Client>(){}.getType();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+        localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback);
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
+        return localVarCall;
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      "application/json"
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] { "api_key_query" };
-
-    GenericType<Client> localVarReturnType = new GenericType<Client>() {};
-
-    return apiClient.invokeAPI("FakeClassnameTags123Api.testClassname", localVarPath, "PATCH", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
     }
 }

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/api/StoreApi.java

@@ -1,55 +1,121 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
 package org.openapitools.client.api;
 
-import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiCallback;
 import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
 import org.openapitools.client.ApiResponse;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.Pair;
+import org.openapitools.client.ProgressRequestBody;
+import org.openapitools.client.ProgressResponseBody;
+
+import com.google.gson.reflect.TypeToken;
+
+import java.io.IOException;
 
-import javax.ws.rs.core.GenericType;
 
 import org.openapitools.client.model.Order;
 
+import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
 public class StoreApi {
-  private ApiClient apiClient;
+    private ApiClient localVarApiClient;
 
     public StoreApi() {
         this(Configuration.getDefaultApiClient());
     }
 
     public StoreApi(ApiClient apiClient) {
-    this.apiClient = apiClient;
+        this.localVarApiClient = apiClient;
     }
 
-  /**
-   * Get the API cilent
-   *
-   * @return API client
-   */
     public ApiClient getApiClient() {
-    return apiClient;
+        return localVarApiClient;
+    }
+
+    public void setApiClient(ApiClient apiClient) {
+        this.localVarApiClient = apiClient;
     }
 
     /**
-   * Set the API cilent
+     * Build call for deleteOrder
-   *
+     * @param orderId ID of the order that needs to be deleted (required)
-   * @param apiClient an instance of API client
+     * @param _callback Callback for upload/download progress
+     * @return Call to execute
+     * @throws ApiException If fail to serialize the request body object
+     * @http.response.details
+     <table summary="Response Details" border="1">
+        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+        <tr><td> 400 </td><td> Invalid ID supplied </td><td>  -  </td></tr>
+        <tr><td> 404 </td><td> Order not found </td><td>  -  </td></tr>
+     </table>
      */
-  public void setApiClient(ApiClient apiClient) {
+    public okhttp3.Call deleteOrderCall(String orderId, final ApiCallback _callback) throws ApiException {
-    this.apiClient = apiClient;
+        Object localVarPostBody = null;
+
+        // create path and map variables
+        String localVarPath = "/store/order/{order_id}"
+            .replaceAll("\\{" + "order_id" + "\\}", localVarApiClient.escapeString(orderId.toString()));
+
+        List<Pair> localVarQueryParams = new ArrayList<Pair>();
+        List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+        Map<String, String> localVarCookieParams = new HashMap<String, String>();
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+        final String[] localVarAccepts = {
+            
+        };
+        final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) {
+            localVarHeaderParams.put("Accept", localVarAccept);
+        }
+
+        final String[] localVarContentTypes = {
+            
+        };
+        final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        String[] localVarAuthNames = new String[] {  };
+        return localVarApiClient.buildCall(localVarPath, "DELETE", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
+    }
+
+    @SuppressWarnings("rawtypes")
+    private okhttp3.Call deleteOrderValidateBeforeCall(String orderId, final ApiCallback _callback) throws ApiException {
+        
+        // verify the required parameter 'orderId' is set
+        if (orderId == null) {
+            throw new ApiException("Missing the required parameter 'orderId' when calling deleteOrder(Async)");
+        }
+        
+
+        okhttp3.Call localVarCall = deleteOrderCall(orderId, _callback);
+        return localVarCall;
+
     }
 
     /**
      * Delete purchase order by ID
      * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
      * @param orderId ID of the order that needs to be deleted (required)
-   * @throws ApiException if fails to make API call
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      * @http.response.details
      <table summary="Response Details" border="1">
         <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
@@ -66,7 +132,7 @@ public class StoreApi {
      * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
      * @param orderId ID of the order that needs to be deleted (required)
      * @return ApiResponse&lt;Void&gt;
-   * @throws ApiException if fails to make API call
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      * @http.response.details
      <table summary="Response Details" border="1">
         <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
@@ -75,48 +141,84 @@ public class StoreApi {
      </table>
      */
     public ApiResponse<Void> deleteOrderWithHttpInfo(String orderId) throws ApiException {
-    Object localVarPostBody = null;
+        okhttp3.Call localVarCall = deleteOrderValidateBeforeCall(orderId, null);
-    
+        return localVarApiClient.execute(localVarCall);
-    // verify the required parameter 'orderId' is set
-    if (orderId == null) {
-      throw new ApiException(400, "Missing the required parameter 'orderId' when calling deleteOrder");
     }
 
-    // create path and map variables
+    /**
-    String localVarPath = "/store/order/{order_id}"
+     * Delete purchase order by ID (asynchronously)
-      .replaceAll("\\{" + "order_id" + "\\}", apiClient.escapeString(orderId.toString()));
+     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+     * @param orderId ID of the order that needs to be deleted (required)
+     * @param _callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     * @http.response.details
+     <table summary="Response Details" border="1">
+        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+        <tr><td> 400 </td><td> Invalid ID supplied </td><td>  -  </td></tr>
+        <tr><td> 404 </td><td> Order not found </td><td>  -  </td></tr>
+     </table>
+     */
+    public okhttp3.Call deleteOrderAsync(String orderId, final ApiCallback<Void> _callback) throws ApiException {
+
+        okhttp3.Call localVarCall = deleteOrderValidateBeforeCall(orderId, _callback);
+        localVarApiClient.executeAsync(localVarCall, _callback);
+        return localVarCall;
+    }
+    /**
+     * Build call for getInventory
+     * @param _callback Callback for upload/download progress
+     * @return Call to execute
+     * @throws ApiException If fail to serialize the request body object
+     * @http.response.details
+     <table summary="Response Details" border="1">
+        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+     </table>
+     */
+    public okhttp3.Call getInventoryCall(final ApiCallback _callback) throws ApiException {
+        Object localVarPostBody = null;
+
+        // create path and map variables
+        String localVarPath = "/store/inventory";
 
-    // query params
         List<Pair> localVarQueryParams = new ArrayList<Pair>();
+        List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
         Map<String, String> localVarHeaderParams = new HashMap<String, String>();
         Map<String, String> localVarCookieParams = new HashMap<String, String>();
         Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    
         final String[] localVarAccepts = {
-      
+            "application/json"
         };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) {
+            localVarHeaderParams.put("Accept", localVarAccept);
+        }
 
         final String[] localVarContentTypes = {
             
         };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
 
-    String[] localVarAuthNames = new String[] {  };
+        String[] localVarAuthNames = new String[] { "api_key" };
-
+        return localVarApiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
-    return apiClient.invokeAPI("StoreApi.deleteOrder", localVarPath, "DELETE", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
     }
+
+    @SuppressWarnings("rawtypes")
+    private okhttp3.Call getInventoryValidateBeforeCall(final ApiCallback _callback) throws ApiException {
+        
+
+        okhttp3.Call localVarCall = getInventoryCall(_callback);
+        return localVarCall;
+
+    }
+
     /**
      * Returns pet inventories by status
      * Returns a map of status codes to quantities
      * @return Map&lt;String, Integer&gt;
-   * @throws ApiException if fails to make API call
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      * @http.response.details
      <table summary="Response Details" border="1">
         <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
@@ -124,14 +226,15 @@ public class StoreApi {
      </table>
      */
     public Map<String, Integer> getInventory() throws ApiException {
-    return getInventoryWithHttpInfo().getData();
+        ApiResponse<Map<String, Integer>> localVarResp = getInventoryWithHttpInfo();
+        return localVarResp.getData();
     }
 
     /**
      * Returns pet inventories by status
      * Returns a map of status codes to quantities
      * @return ApiResponse&lt;Map&lt;String, Integer&gt;&gt;
-   * @throws ApiException if fails to make API call
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      * @http.response.details
      <table summary="Response Details" border="1">
         <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
@@ -139,45 +242,94 @@ public class StoreApi {
      </table>
      */
     public ApiResponse<Map<String, Integer>> getInventoryWithHttpInfo() throws ApiException {
+        okhttp3.Call localVarCall = getInventoryValidateBeforeCall(null);
+        Type localVarReturnType = new TypeToken<Map<String, Integer>>(){}.getType();
+        return localVarApiClient.execute(localVarCall, localVarReturnType);
+    }
+
+    /**
+     * Returns pet inventories by status (asynchronously)
+     * Returns a map of status codes to quantities
+     * @param _callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     * @http.response.details
+     <table summary="Response Details" border="1">
+        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+     </table>
+     */
+    public okhttp3.Call getInventoryAsync(final ApiCallback<Map<String, Integer>> _callback) throws ApiException {
+
+        okhttp3.Call localVarCall = getInventoryValidateBeforeCall(_callback);
+        Type localVarReturnType = new TypeToken<Map<String, Integer>>(){}.getType();
+        localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback);
+        return localVarCall;
+    }
+    /**
+     * Build call for getOrderById
+     * @param orderId ID of pet that needs to be fetched (required)
+     * @param _callback Callback for upload/download progress
+     * @return Call to execute
+     * @throws ApiException If fail to serialize the request body object
+     * @http.response.details
+     <table summary="Response Details" border="1">
+        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+        <tr><td> 400 </td><td> Invalid ID supplied </td><td>  -  </td></tr>
+        <tr><td> 404 </td><td> Order not found </td><td>  -  </td></tr>
+     </table>
+     */
+    public okhttp3.Call getOrderByIdCall(Long orderId, final ApiCallback _callback) throws ApiException {
         Object localVarPostBody = null;
 
         // create path and map variables
-    String localVarPath = "/store/inventory";
+        String localVarPath = "/store/order/{order_id}"
+            .replaceAll("\\{" + "order_id" + "\\}", localVarApiClient.escapeString(orderId.toString()));
 
-    // query params
         List<Pair> localVarQueryParams = new ArrayList<Pair>();
+        List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
         Map<String, String> localVarHeaderParams = new HashMap<String, String>();
         Map<String, String> localVarCookieParams = new HashMap<String, String>();
         Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    
         final String[] localVarAccepts = {
-      "application/json"
+            "application/xml", "application/json"
         };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) {
+            localVarHeaderParams.put("Accept", localVarAccept);
+        }
 
         final String[] localVarContentTypes = {
             
         };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
 
-    String[] localVarAuthNames = new String[] { "api_key" };
+        String[] localVarAuthNames = new String[] {  };
-
+        return localVarApiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
-    GenericType<Map<String, Integer>> localVarReturnType = new GenericType<Map<String, Integer>>() {};
-
-    return apiClient.invokeAPI("StoreApi.getInventory", localVarPath, "GET", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
     }
+
+    @SuppressWarnings("rawtypes")
+    private okhttp3.Call getOrderByIdValidateBeforeCall(Long orderId, final ApiCallback _callback) throws ApiException {
+        
+        // verify the required parameter 'orderId' is set
+        if (orderId == null) {
+            throw new ApiException("Missing the required parameter 'orderId' when calling getOrderById(Async)");
+        }
+        
+
+        okhttp3.Call localVarCall = getOrderByIdCall(orderId, _callback);
+        return localVarCall;
+
+    }
+
     /**
      * Find purchase order by ID
      * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
      * @param orderId ID of pet that needs to be fetched (required)
      * @return Order
-   * @throws ApiException if fails to make API call
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      * @http.response.details
      <table summary="Response Details" border="1">
         <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
@@ -187,7 +339,8 @@ public class StoreApi {
      </table>
      */
     public Order getOrderById(Long orderId) throws ApiException {
-    return getOrderByIdWithHttpInfo(orderId).getData();
+        ApiResponse<Order> localVarResp = getOrderByIdWithHttpInfo(orderId);
+        return localVarResp.getData();
     }
 
     /**
@@ -195,7 +348,7 @@ public class StoreApi {
      * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
      * @param orderId ID of pet that needs to be fetched (required)
      * @return ApiResponse&lt;Order&gt;
-   * @throws ApiException if fails to make API call
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      * @http.response.details
      <table summary="Response Details" border="1">
         <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
@@ -205,51 +358,95 @@ public class StoreApi {
      </table>
      */
     public ApiResponse<Order> getOrderByIdWithHttpInfo(Long orderId) throws ApiException {
-    Object localVarPostBody = null;
+        okhttp3.Call localVarCall = getOrderByIdValidateBeforeCall(orderId, null);
-    
+        Type localVarReturnType = new TypeToken<Order>(){}.getType();
-    // verify the required parameter 'orderId' is set
+        return localVarApiClient.execute(localVarCall, localVarReturnType);
-    if (orderId == null) {
-      throw new ApiException(400, "Missing the required parameter 'orderId' when calling getOrderById");
     }
 
-    // create path and map variables
+    /**
-    String localVarPath = "/store/order/{order_id}"
+     * Find purchase order by ID (asynchronously)
-      .replaceAll("\\{" + "order_id" + "\\}", apiClient.escapeString(orderId.toString()));
+     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+     * @param orderId ID of pet that needs to be fetched (required)
+     * @param _callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     * @http.response.details
+     <table summary="Response Details" border="1">
+        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+        <tr><td> 400 </td><td> Invalid ID supplied </td><td>  -  </td></tr>
+        <tr><td> 404 </td><td> Order not found </td><td>  -  </td></tr>
+     </table>
+     */
+    public okhttp3.Call getOrderByIdAsync(Long orderId, final ApiCallback<Order> _callback) throws ApiException {
+
+        okhttp3.Call localVarCall = getOrderByIdValidateBeforeCall(orderId, _callback);
+        Type localVarReturnType = new TypeToken<Order>(){}.getType();
+        localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback);
+        return localVarCall;
+    }
+    /**
+     * Build call for placeOrder
+     * @param body order placed for purchasing the pet (required)
+     * @param _callback Callback for upload/download progress
+     * @return Call to execute
+     * @throws ApiException If fail to serialize the request body object
+     * @http.response.details
+     <table summary="Response Details" border="1">
+        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+        <tr><td> 400 </td><td> Invalid Order </td><td>  -  </td></tr>
+     </table>
+     */
+    public okhttp3.Call placeOrderCall(Order body, final ApiCallback _callback) throws ApiException {
+        Object localVarPostBody = body;
+
+        // create path and map variables
+        String localVarPath = "/store/order";
 
-    // query params
         List<Pair> localVarQueryParams = new ArrayList<Pair>();
+        List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
         Map<String, String> localVarHeaderParams = new HashMap<String, String>();
         Map<String, String> localVarCookieParams = new HashMap<String, String>();
         Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    
         final String[] localVarAccepts = {
             "application/xml", "application/json"
         };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) {
+            localVarHeaderParams.put("Accept", localVarAccept);
+        }
 
         final String[] localVarContentTypes = {
             
         };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
 
         String[] localVarAuthNames = new String[] {  };
-
+        return localVarApiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback);
-    GenericType<Order> localVarReturnType = new GenericType<Order>() {};
-
-    return apiClient.invokeAPI("StoreApi.getOrderById", localVarPath, "GET", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
     }
+
+    @SuppressWarnings("rawtypes")
+    private okhttp3.Call placeOrderValidateBeforeCall(Order body, final ApiCallback _callback) throws ApiException {
+        
+        // verify the required parameter 'body' is set
+        if (body == null) {
+            throw new ApiException("Missing the required parameter 'body' when calling placeOrder(Async)");
+        }
+        
+
+        okhttp3.Call localVarCall = placeOrderCall(body, _callback);
+        return localVarCall;
+
+    }
+
     /**
      * Place an order for a pet
      * 
      * @param body order placed for purchasing the pet (required)
      * @return Order
-   * @throws ApiException if fails to make API call
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      * @http.response.details
      <table summary="Response Details" border="1">
         <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
@@ -258,7 +455,8 @@ public class StoreApi {
      </table>
      */
     public Order placeOrder(Order body) throws ApiException {
-    return placeOrderWithHttpInfo(body).getData();
+        ApiResponse<Order> localVarResp = placeOrderWithHttpInfo(body);
+        return localVarResp.getData();
     }
 
     /**
@@ -266,7 +464,7 @@ public class StoreApi {
      * 
      * @param body order placed for purchasing the pet (required)
      * @return ApiResponse&lt;Order&gt;
-   * @throws ApiException if fails to make API call
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      * @http.response.details
      <table summary="Response Details" border="1">
         <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
@@ -275,42 +473,30 @@ public class StoreApi {
      </table>
      */
     public ApiResponse<Order> placeOrderWithHttpInfo(Order body) throws ApiException {
-    Object localVarPostBody = body;
+        okhttp3.Call localVarCall = placeOrderValidateBeforeCall(body, null);
-    
+        Type localVarReturnType = new TypeToken<Order>(){}.getType();
-    // verify the required parameter 'body' is set
+        return localVarApiClient.execute(localVarCall, localVarReturnType);
-    if (body == null) {
-      throw new ApiException(400, "Missing the required parameter 'body' when calling placeOrder");
     }
 
-    // create path and map variables
+    /**
-    String localVarPath = "/store/order";
+     * Place an order for a pet (asynchronously)
+     * 
+     * @param body order placed for purchasing the pet (required)
+     * @param _callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     * @http.response.details
+     <table summary="Response Details" border="1">
+        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+        <tr><td> 400 </td><td> Invalid Order </td><td>  -  </td></tr>
+     </table>
+     */
+    public okhttp3.Call placeOrderAsync(Order body, final ApiCallback<Order> _callback) throws ApiException {
 
-    // query params
+        okhttp3.Call localVarCall = placeOrderValidateBeforeCall(body, _callback);
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+        Type localVarReturnType = new TypeToken<Order>(){}.getType();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+        localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback);
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
+        return localVarCall;
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      "application/xml", "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] {  };
-
-    GenericType<Order> localVarReturnType = new GenericType<Order>() {};
-
-    return apiClient.invokeAPI("StoreApi.placeOrder", localVarPath, "POST", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
     }
 }

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java

@@ -14,9 +14,7 @@
 package org.openapitools.client.auth;
 
 import org.openapitools.client.Pair;
-import org.openapitools.client.ApiException;
 
-import java.net.URI;
 import java.util.Map;
 import java.util.List;
 
@@ -58,7 +56,7 @@ public class ApiKeyAuth implements Authentication {
   }
 
   @Override
-  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams, String payload, String method, URI uri) throws ApiException {
+  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams) {
     if (apiKey == null) {
       return;
     }

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/auth/Authentication.java

@@ -14,9 +14,7 @@
 package org.openapitools.client.auth;
 
 import org.openapitools.client.Pair;
-import org.openapitools.client.ApiException;
 
-import java.net.URI;
 import java.util.Map;
 import java.util.List;
 
@@ -28,6 +26,5 @@ public interface Authentication {
      * @param headerParams Map of header parameters
      * @param cookieParams Map of cookie parameters
      */
-    void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams, String payload, String method, URI uri) throws ApiException;
+    void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams);
-
 }

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java

@@ -14,17 +14,14 @@
 package org.openapitools.client.auth;
 
 import org.openapitools.client.Pair;
-import org.openapitools.client.ApiException;
 
-import com.migcomponents.migbase64.Base64;
+import okhttp3.Credentials;
 
-import java.net.URI;
 import java.util.Map;
 import java.util.List;
 
 import java.io.UnsupportedEncodingException;
 
-
 public class HttpBasicAuth implements Authentication {
     private String username;
     private String password;
@@ -46,15 +43,12 @@ public class HttpBasicAuth implements Authentication {
     }
 
     @Override
-  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams, String payload, String method, URI uri) throws ApiException {
+    public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams) {
         if (username == null && password == null) {
             return;
         }
-    String str = (username == null ? "" : username) + ":" + (password == null ? "" : password);
+        headerParams.put("Authorization", Credentials.basic(
-    try {
+            username == null ? "" : username,
-      headerParams.put("Authorization", "Basic " + Base64.encodeToString(str.getBytes("UTF-8"), false));
+            password == null ? "" : password));
-    } catch (UnsupportedEncodingException e) {
-      throw new RuntimeException(e);
-    }
     }
 }

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java

@@ -14,9 +14,7 @@
 package org.openapitools.client.auth;
 
 import org.openapitools.client.Pair;
-import org.openapitools.client.ApiException;
 
-import java.net.URI;
 import java.util.Map;
 import java.util.List;
 
@@ -48,7 +46,7 @@ public class HttpBearerAuth implements Authentication {
   }
 
   @Override
-  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams, String payload, String method, URI uri) throws ApiException {
+  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams) {
     if(bearerToken == null) {
       return;
     }

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/auth/OAuth.java

@@ -14,170 +14,26 @@
 package org.openapitools.client.auth;
 
 import org.openapitools.client.Pair;
-import org.openapitools.client.ApiException;
-import com.github.scribejava.core.builder.ServiceBuilder;
-import com.github.scribejava.core.builder.api.DefaultApi20;
-import com.github.scribejava.core.exceptions.OAuthException;
-import com.github.scribejava.core.model.OAuth2AccessToken;
-import com.github.scribejava.core.oauth.OAuth20Service;
 
-import javax.ws.rs.core.UriBuilder;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ExecutionException;
+import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 
 public class OAuth implements Authentication {
-  private static final Logger log = Logger.getLogger(OAuth.class.getName());
+  private String accessToken;
 
-  private String tokenUrl;
+  public String getAccessToken() {
-  private String absoluteTokenUrl;
-  private OAuthFlow flow = OAuthFlow.application;
-  private OAuth20Service service;
-  private DefaultApi20 authApi;
-  private String scope;
-  private String username;
-  private String password;
-  private String code;
-  private volatile OAuth2AccessToken accessToken;
-
-  public OAuth(String basePath, String tokenUrl) {
-    this.tokenUrl = tokenUrl;
-    this.absoluteTokenUrl = createAbsoluteTokenUrl(basePath, tokenUrl);
-    authApi = new DefaultApi20() {
-      @Override
-      public String getAccessTokenEndpoint() {
-        return absoluteTokenUrl;
-      }
-
-      @Override
-      protected String getAuthorizationBaseUrl() {
-        throw new UnsupportedOperationException("Shouldn't get there !");
-      }
-    };
-  }
-
-  private static String createAbsoluteTokenUrl(String basePath, String tokenUrl) {
-    if (!URI.create(tokenUrl).isAbsolute()) {
-      try {
-        return UriBuilder.fromPath(basePath).path(tokenUrl).build().toURL().toString();
-      } catch (MalformedURLException e) {
-        log.log(Level.SEVERE, "Couldn't create absolute token URL", e);
-      }
-    }
-    return tokenUrl;
-  }
-
-  @Override
-  public void applyToParams(
-      List<Pair> queryParams,
-      Map<String, String> headerParams,
-      Map<String, String> cookieParams,
-      String payload,
-      String method,
-      URI uri)
-      throws ApiException {
-
-    if (accessToken == null) {
-      obtainAccessToken(null);
-    }
-    if (accessToken != null) {
-      headerParams.put("Authorization", "Bearer " + accessToken.getAccessToken());
-    }
-  }
-
-  public OAuth2AccessToken renewAccessToken() throws ApiException {
-    String refreshToken = null;
-    if (accessToken != null) {
-      refreshToken = accessToken.getRefreshToken();
-      accessToken = null;
-    }
-    return obtainAccessToken(refreshToken);
-  }
-
-  public synchronized OAuth2AccessToken obtainAccessToken(String refreshToken) throws ApiException {
-    if (service == null) {
-      return null;
-    }
-    try {
-      if (refreshToken != null) {
-        return service.refreshAccessToken(refreshToken);
-      }
-    } catch (OAuthException | InterruptedException | ExecutionException | IOException e) {
-      log.log(Level.FINE, "Refreshing the access token using the refresh token failed", e);
-    }
-    try {
-      switch (flow) {
-        case password:
-          if (username != null && password != null) {
-            accessToken = service.getAccessTokenPasswordGrant(username, password, scope);
-          }
-          break;
-        case accessCode:
-          if (code != null) {
-            accessToken = service.getAccessToken(code);
-            code = null;
-          }
-          break;
-        case application:
-          accessToken = service.getAccessTokenClientCredentialsGrant(scope);
-      }
-    } catch (OAuthException | InterruptedException | ExecutionException | IOException e) {
-      throw new ApiException(e);
-    }
     return accessToken;
   }
 
-  public OAuth2AccessToken getAccessToken() {
+  public void setAccessToken(String accessToken) {
-    return accessToken;
-  }
-
-  public OAuth setAccessToken(OAuth2AccessToken accessToken) {
     this.accessToken = accessToken;
-    return this;
   }
 
-  public OAuth setAccessToken(String accessToken) {
+  @Override
-    this.accessToken = new OAuth2AccessToken(accessToken);
+  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams) {
-    return this;
+    if (accessToken != null) {
+      headerParams.put("Authorization", "Bearer " + accessToken);
     }
-
-  public OAuth setScope(String scope) {
-    this.scope = scope;
-    return this;
-  }
-
-  public OAuth setCredentials(String clientId, String clientSecret) {
-    service = new ServiceBuilder(clientId)
-        .apiSecret(clientSecret)
-        .build(authApi);
-    return this;
-  }
-
-  public OAuth usePasswordFlow(String username, String password) {
-    this.flow = OAuthFlow.password;
-    this.username = username;
-    this.password = password;
-    return this;
-  }
-
-  public OAuth useAuthorizationCodeFlow(String code) {
-    this.flow = OAuthFlow.accessCode;
-    this.code = code;
-    return this;
-  }
-
-  public OAuth setFlow(OAuthFlow flow) {
-    this.flow = flow;
-    return this;
-  }
-
-  public void setBasePath(String basePath) {
-    this.absoluteTokenUrl = createAbsoluteTokenUrl(basePath, tokenUrl);
   }
 }

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/auth/OAuthOkHttpClient.java

@@ -0,0 +1,68 @@
+package org.openapitools.client.auth;
+
+import okhttp3.OkHttpClient;
+import okhttp3.MediaType;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+
+import org.apache.oltu.oauth2.client.HttpClient;
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest;
+import org.apache.oltu.oauth2.client.response.OAuthClientResponse;
+import org.apache.oltu.oauth2.client.response.OAuthClientResponseFactory;
+import org.apache.oltu.oauth2.common.exception.OAuthProblemException;
+import org.apache.oltu.oauth2.common.exception.OAuthSystemException;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+public class OAuthOkHttpClient implements HttpClient {
+    private OkHttpClient client;
+
+    public OAuthOkHttpClient() {
+        this.client = new OkHttpClient();
+    }
+
+    public OAuthOkHttpClient(OkHttpClient client) {
+        this.client = client;
+    }
+
+    @Override
+    public <T extends OAuthClientResponse> T execute(OAuthClientRequest request, Map<String, String> headers,
+                                                     String requestMethod, Class<T> responseClass)
+            throws OAuthSystemException, OAuthProblemException {
+
+        MediaType mediaType = MediaType.parse("application/json");
+        Request.Builder requestBuilder = new Request.Builder().url(request.getLocationUri());
+
+        if(headers != null) {
+            for (Entry<String, String> entry : headers.entrySet()) {
+                if (entry.getKey().equalsIgnoreCase("Content-Type")) {
+                    mediaType = MediaType.parse(entry.getValue());
+                } else {
+                    requestBuilder.addHeader(entry.getKey(), entry.getValue());
+                }
+            }
+        }
+
+        RequestBody body = request.getBody() != null ? RequestBody.create(mediaType, request.getBody()) : null;
+        requestBuilder.method(requestMethod, body);
+
+        try {
+            Response response = client.newCall(requestBuilder.build()).execute();
+            return OAuthClientResponseFactory.createCustomResponse(
+                    response.body().string(),
+                    response.body().contentType().toString(),
+                    response.code(),
+                    responseClass);
+        } catch (IOException e) {
+            throw new OAuthSystemException(e);
+        }
+    }
+
+    @Override
+    public void shutdown() {
+        // Nothing to do here
+    }
+}

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/auth/RetryingOAuth.java

@@ -0,0 +1,181 @@
+package org.openapitools.client.auth;
+
+import org.openapitools.client.Pair;
+
+import okhttp3.Interceptor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
+import org.apache.oltu.oauth2.client.OAuthClient;
+import org.apache.oltu.oauth2.client.request.OAuthBearerClientRequest;
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest;
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder;
+import org.apache.oltu.oauth2.client.response.OAuthJSONAccessTokenResponse;
+import org.apache.oltu.oauth2.common.exception.OAuthProblemException;
+import org.apache.oltu.oauth2.common.exception.OAuthSystemException;
+import org.apache.oltu.oauth2.common.message.types.GrantType;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.util.Map;
+import java.util.List;
+
+public class RetryingOAuth extends OAuth implements Interceptor {
+    private OAuthClient oAuthClient;
+
+    private TokenRequestBuilder tokenRequestBuilder;
+
+    public RetryingOAuth(OkHttpClient client, TokenRequestBuilder tokenRequestBuilder) {
+        this.oAuthClient = new OAuthClient(new OAuthOkHttpClient(client));
+        this.tokenRequestBuilder = tokenRequestBuilder;
+    }
+
+    public RetryingOAuth(TokenRequestBuilder tokenRequestBuilder) {
+        this(new OkHttpClient(), tokenRequestBuilder);
+    }
+
+    /**
+    @param tokenUrl The token URL to be used for this OAuth2 flow.
+        Applicable to the following OAuth2 flows: "password", "clientCredentials" and "authorizationCode".
+        The value must be an absolute URL.
+    @param clientId The OAuth2 client ID for the "clientCredentials" flow.
+    @param clientSecret The OAuth2 client secret for the "clientCredentials" flow.
+    */
+    public RetryingOAuth(
+            String tokenUrl,
+            String clientId,
+            OAuthFlow flow,
+            String clientSecret,
+            Map<String, String> parameters
+    ) {
+        this(OAuthClientRequest.tokenLocation(tokenUrl)
+                .setClientId(clientId)
+                .setClientSecret(clientSecret));
+        setFlow(flow);
+        if (parameters != null) {
+            for (String paramName : parameters.keySet()) {
+                tokenRequestBuilder.setParameter(paramName, parameters.get(paramName));
+            }
+        }
+    }
+
+    public void setFlow(OAuthFlow flow) {
+        switch(flow) {
+            case accessCode:
+                tokenRequestBuilder.setGrantType(GrantType.AUTHORIZATION_CODE);
+                break;
+            case implicit:
+                tokenRequestBuilder.setGrantType(GrantType.IMPLICIT);
+                break;
+            case password:
+                tokenRequestBuilder.setGrantType(GrantType.PASSWORD);
+                break;
+            case application:
+                tokenRequestBuilder.setGrantType(GrantType.CLIENT_CREDENTIALS);
+                break;
+            default:
+                break;
+        }
+    }
+
+    @Override
+    public Response intercept(Chain chain) throws IOException {
+        return retryingIntercept(chain, true);
+    }
+
+    private Response retryingIntercept(Chain chain, boolean updateTokenAndRetryOnAuthorizationFailure) throws IOException {
+        Request request = chain.request();
+
+        // If the request already has an authorization (e.g. Basic auth), proceed with the request as is
+        if (request.header("Authorization") != null) {
+            return chain.proceed(request);
+        }
+
+        // Get the token if it has not yet been acquired
+        if (getAccessToken() == null) {
+            updateAccessToken(null);
+        }
+
+        OAuthClientRequest oAuthRequest;
+        if (getAccessToken() != null) {
+            // Build the request
+            Request.Builder requestBuilder = request.newBuilder();
+
+            String requestAccessToken = getAccessToken();
+            try {
+                oAuthRequest =
+                        new OAuthBearerClientRequest(request.url().toString()).
+                                setAccessToken(requestAccessToken).
+                                buildHeaderMessage();
+            } catch (OAuthSystemException e) {
+                throw new IOException(e);
+            }
+
+            Map<String, String> headers = oAuthRequest.getHeaders();
+            for (String headerName : headers.keySet()) {
+                requestBuilder.addHeader(headerName, headers.get(headerName));
+            }
+            requestBuilder.url(oAuthRequest.getLocationUri());
+
+            // Execute the request
+            Response response = chain.proceed(requestBuilder.build());
+
+            // 401/403 response codes most likely indicate an expired access token, unless it happens two times in a row
+            if (
+                    response != null &&
+                            (   response.code() == HttpURLConnection.HTTP_UNAUTHORIZED ||
+                                    response.code() == HttpURLConnection.HTTP_FORBIDDEN     ) &&
+                            updateTokenAndRetryOnAuthorizationFailure
+            ) {
+                try {
+                    if (updateAccessToken(requestAccessToken)) {
+                        response.body().close();
+                        return retryingIntercept(chain, false);
+                    }
+                } catch (Exception e) {
+                    response.body().close();
+                    throw e;
+                }
+            }
+            return response;
+        }
+        else {
+            return chain.proceed(chain.request());
+        }
+    }
+
+    /*
+     * Returns true if the access token has been updated
+     */
+    public synchronized boolean updateAccessToken(String requestAccessToken) throws IOException {
+        if (getAccessToken() == null || getAccessToken().equals(requestAccessToken)) {
+            try {
+                OAuthJSONAccessTokenResponse accessTokenResponse =
+                        oAuthClient.accessToken(tokenRequestBuilder.buildBodyMessage());
+                if (accessTokenResponse != null && accessTokenResponse.getAccessToken() != null) {
+                    setAccessToken(accessTokenResponse.getAccessToken());
+                    return !getAccessToken().equals(requestAccessToken);
+                }
+            } catch (OAuthSystemException | OAuthProblemException e) {
+                throw new IOException(e);
+            }
+        }
+
+        return false;
+    }
+
+    public TokenRequestBuilder getTokenRequestBuilder() {
+        return tokenRequestBuilder;
+    }
+
+    public void setTokenRequestBuilder(TokenRequestBuilder tokenRequestBuilder) {
+        this.tokenRequestBuilder = tokenRequestBuilder;
+    }
+
+    // Applying authorization to parameters is performed in the retryingIntercept method
+    @Override
+    public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams) {
+        // No implementation necessary
+    }
+}

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java

@@ -14,25 +14,24 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 /**
  * AdditionalPropertiesAnyType
  */
-@JsonPropertyOrder({
-  AdditionalPropertiesAnyType.JSON_PROPERTY_NAME
-})
 
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
-  public static final String JSON_PROPERTY_NAME = "name";
+  public static final String SERIALIZED_NAME_NAME = "name";
+  @SerializedName(SERIALIZED_NAME_NAME)
   private String name;
 
 
@@ -48,8 +47,6 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getName() {
     return name;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java

@@ -14,26 +14,25 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 /**
  * AdditionalPropertiesArray
  */
-@JsonPropertyOrder({
-  AdditionalPropertiesArray.JSON_PROPERTY_NAME
-})
 
 public class AdditionalPropertiesArray extends HashMap<String, List> {
-  public static final String JSON_PROPERTY_NAME = "name";
+  public static final String SERIALIZED_NAME_NAME = "name";
+  @SerializedName(SERIALIZED_NAME_NAME)
   private String name;
 
 
@@ -49,8 +48,6 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getName() {
     return name;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java

@@ -14,25 +14,24 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 /**
  * AdditionalPropertiesBoolean
  */
-@JsonPropertyOrder({
-  AdditionalPropertiesBoolean.JSON_PROPERTY_NAME
-})
 
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
-  public static final String JSON_PROPERTY_NAME = "name";
+  public static final String SERIALIZED_NAME_NAME = "name";
+  @SerializedName(SERIALIZED_NAME_NAME)
   private String name;
 
 
@@ -48,8 +47,6 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getName() {
     return name;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java

@@ -14,67 +14,66 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 /**
  * AdditionalPropertiesClass
  */
-@JsonPropertyOrder({
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_STRING,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_NUMBER,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_INTEGER,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_BOOLEAN,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_ARRAY_INTEGER,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_ARRAY_ANYTYPE,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_MAP_STRING,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_MAP_ANYTYPE,
-  AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE1,
-  AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE2,
-  AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE3
-})
 
 public class AdditionalPropertiesClass {
-  public static final String JSON_PROPERTY_MAP_STRING = "map_string";
+  public static final String SERIALIZED_NAME_MAP_STRING = "map_string";
+  @SerializedName(SERIALIZED_NAME_MAP_STRING)
   private Map<String, String> mapString = null;
 
-  public static final String JSON_PROPERTY_MAP_NUMBER = "map_number";
+  public static final String SERIALIZED_NAME_MAP_NUMBER = "map_number";
+  @SerializedName(SERIALIZED_NAME_MAP_NUMBER)
   private Map<String, BigDecimal> mapNumber = null;
 
-  public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer";
+  public static final String SERIALIZED_NAME_MAP_INTEGER = "map_integer";
+  @SerializedName(SERIALIZED_NAME_MAP_INTEGER)
   private Map<String, Integer> mapInteger = null;
 
-  public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean";
+  public static final String SERIALIZED_NAME_MAP_BOOLEAN = "map_boolean";
+  @SerializedName(SERIALIZED_NAME_MAP_BOOLEAN)
   private Map<String, Boolean> mapBoolean = null;
 
-  public static final String JSON_PROPERTY_MAP_ARRAY_INTEGER = "map_array_integer";
+  public static final String SERIALIZED_NAME_MAP_ARRAY_INTEGER = "map_array_integer";
+  @SerializedName(SERIALIZED_NAME_MAP_ARRAY_INTEGER)
   private Map<String, List<Integer>> mapArrayInteger = null;
 
-  public static final String JSON_PROPERTY_MAP_ARRAY_ANYTYPE = "map_array_anytype";
+  public static final String SERIALIZED_NAME_MAP_ARRAY_ANYTYPE = "map_array_anytype";
+  @SerializedName(SERIALIZED_NAME_MAP_ARRAY_ANYTYPE)
   private Map<String, List<Object>> mapArrayAnytype = null;
 
-  public static final String JSON_PROPERTY_MAP_MAP_STRING = "map_map_string";
+  public static final String SERIALIZED_NAME_MAP_MAP_STRING = "map_map_string";
+  @SerializedName(SERIALIZED_NAME_MAP_MAP_STRING)
   private Map<String, Map<String, String>> mapMapString = null;
 
-  public static final String JSON_PROPERTY_MAP_MAP_ANYTYPE = "map_map_anytype";
+  public static final String SERIALIZED_NAME_MAP_MAP_ANYTYPE = "map_map_anytype";
+  @SerializedName(SERIALIZED_NAME_MAP_MAP_ANYTYPE)
   private Map<String, Map<String, Object>> mapMapAnytype = null;
 
-  public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1";
+  public static final String SERIALIZED_NAME_ANYTYPE1 = "anytype_1";
+  @SerializedName(SERIALIZED_NAME_ANYTYPE1)
   private Object anytype1;
 
-  public static final String JSON_PROPERTY_ANYTYPE2 = "anytype_2";
+  public static final String SERIALIZED_NAME_ANYTYPE2 = "anytype_2";
+  @SerializedName(SERIALIZED_NAME_ANYTYPE2)
   private Object anytype2;
 
-  public static final String JSON_PROPERTY_ANYTYPE3 = "anytype_3";
+  public static final String SERIALIZED_NAME_ANYTYPE3 = "anytype_3";
+  @SerializedName(SERIALIZED_NAME_ANYTYPE3)
   private Object anytype3;
 
 
@@ -98,8 +97,6 @@ public class AdditionalPropertiesClass {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Map<String, String> getMapString() {
     return mapString;
@@ -131,8 +128,6 @@ public class AdditionalPropertiesClass {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -164,8 +159,6 @@ public class AdditionalPropertiesClass {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -197,8 +190,6 @@ public class AdditionalPropertiesClass {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -230,8 +221,6 @@ public class AdditionalPropertiesClass {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -263,8 +252,6 @@ public class AdditionalPropertiesClass {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -296,8 +283,6 @@ public class AdditionalPropertiesClass {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -329,8 +314,6 @@ public class AdditionalPropertiesClass {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -354,8 +337,6 @@ public class AdditionalPropertiesClass {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ANYTYPE1)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Object getAnytype1() {
     return anytype1;
@@ -379,8 +360,6 @@ public class AdditionalPropertiesClass {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ANYTYPE2)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Object getAnytype2() {
     return anytype2;
@@ -404,8 +383,6 @@ public class AdditionalPropertiesClass {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ANYTYPE3)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Object getAnytype3() {
     return anytype3;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java

@@ -14,25 +14,24 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 /**
  * AdditionalPropertiesInteger
  */
-@JsonPropertyOrder({
-  AdditionalPropertiesInteger.JSON_PROPERTY_NAME
-})
 
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
-  public static final String JSON_PROPERTY_NAME = "name";
+  public static final String SERIALIZED_NAME_NAME = "name";
+  @SerializedName(SERIALIZED_NAME_NAME)
   private String name;
 
 
@@ -48,8 +47,6 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getName() {
     return name;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java

@@ -14,26 +14,25 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 /**
  * AdditionalPropertiesNumber
  */
-@JsonPropertyOrder({
-  AdditionalPropertiesNumber.JSON_PROPERTY_NAME
-})
 
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
-  public static final String JSON_PROPERTY_NAME = "name";
+  public static final String SERIALIZED_NAME_NAME = "name";
+  @SerializedName(SERIALIZED_NAME_NAME)
   private String name;
 
 
@@ -49,8 +48,6 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getName() {
     return name;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java

@@ -14,25 +14,24 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 /**
  * AdditionalPropertiesObject
  */
-@JsonPropertyOrder({
-  AdditionalPropertiesObject.JSON_PROPERTY_NAME
-})
 
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
-  public static final String JSON_PROPERTY_NAME = "name";
+  public static final String SERIALIZED_NAME_NAME = "name";
+  @SerializedName(SERIALIZED_NAME_NAME)
   private String name;
 
 
@@ -48,8 +47,6 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getName() {
     return name;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java

@@ -14,25 +14,24 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 /**
  * AdditionalPropertiesString
  */
-@JsonPropertyOrder({
-  AdditionalPropertiesString.JSON_PROPERTY_NAME
-})
 
 public class AdditionalPropertiesString extends HashMap<String, String> {
-  public static final String JSON_PROPERTY_NAME = "name";
+  public static final String SERIALIZED_NAME_NAME = "name";
+  @SerializedName(SERIALIZED_NAME_NAME)
   private String name;
 
 
@@ -48,8 +47,6 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getName() {
     return name;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Animal.java

@@ -14,41 +14,35 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.google.gson.stream.JsonReader;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.google.gson.stream.JsonWriter;
-import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
 import org.openapitools.client.model.BigCat;
 import org.openapitools.client.model.Cat;
 import org.openapitools.client.model.Dog;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 /**
  * Animal
  */
-@JsonPropertyOrder({
-  Animal.JSON_PROPERTY_CLASS_NAME,
-  Animal.JSON_PROPERTY_COLOR
-})
 
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
-@JsonSubTypes({
-  @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
-  @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
-  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
-})
 
 public class Animal {
-  public static final String JSON_PROPERTY_CLASS_NAME = "className";
+  public static final String SERIALIZED_NAME_CLASS_NAME = "className";
-  private String className;
+  @SerializedName(SERIALIZED_NAME_CLASS_NAME)
+  protected String className;
 
-  public static final String JSON_PROPERTY_COLOR = "color";
+  public static final String SERIALIZED_NAME_COLOR = "color";
+  @SerializedName(SERIALIZED_NAME_COLOR)
   private String color = "red";
 
+  public Animal() {
+    this.className = this.getClass().getSimpleName();
+  }
 
   public Animal className(String className) {
     
@@ -61,8 +55,6 @@ public class Animal {
    * @return className
   **/
   @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_CLASS_NAME)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public String getClassName() {
     return className;
@@ -86,8 +78,6 @@ public class Animal {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_COLOR)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getColor() {
     return color;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java

@@ -14,26 +14,25 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 /**
  * ArrayOfArrayOfNumberOnly
  */
-@JsonPropertyOrder({
-  ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER
-})
 
 public class ArrayOfArrayOfNumberOnly {
-  public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
+  public static final String SERIALIZED_NAME_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
+  @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_NUMBER)
   private List<List<BigDecimal>> arrayArrayNumber = null;
 
 
@@ -57,8 +56,6 @@ public class ArrayOfArrayOfNumberOnly {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java

@@ -14,26 +14,25 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 /**
  * ArrayOfNumberOnly
  */
-@JsonPropertyOrder({
-  ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER
-})
 
 public class ArrayOfNumberOnly {
-  public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
+  public static final String SERIALIZED_NAME_ARRAY_NUMBER = "ArrayNumber";
+  @SerializedName(SERIALIZED_NAME_ARRAY_NUMBER)
   private List<BigDecimal> arrayNumber = null;
 
 
@@ -57,8 +56,6 @@ public class ArrayOfNumberOnly {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ArrayTest.java

@@ -14,34 +14,33 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import org.openapitools.client.model.ReadOnlyFirst;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 /**
  * ArrayTest
  */
-@JsonPropertyOrder({
-  ArrayTest.JSON_PROPERTY_ARRAY_OF_STRING,
-  ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER,
-  ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL
-})
 
 public class ArrayTest {
-  public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";
+  public static final String SERIALIZED_NAME_ARRAY_OF_STRING = "array_of_string";
+  @SerializedName(SERIALIZED_NAME_ARRAY_OF_STRING)
   private List<String> arrayOfString = null;
 
-  public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer";
+  public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer";
+  @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER)
   private List<List<Long>> arrayArrayOfInteger = null;
 
-  public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model";
+  public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL = "array_array_of_model";
+  @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL)
   private List<List<ReadOnlyFirst>> arrayArrayOfModel = null;
 
 
@@ -65,8 +64,6 @@ public class ArrayTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -98,8 +95,6 @@ public class ArrayTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -131,8 +126,6 @@ public class ArrayTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/BigCat.java

@@ -14,33 +14,27 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.google.gson.stream.JsonReader;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.google.gson.stream.JsonWriter;
-import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
 import org.openapitools.client.model.BigCatAllOf;
 import org.openapitools.client.model.Cat;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 /**
  * BigCat
  */
-@JsonPropertyOrder({
-  BigCat.JSON_PROPERTY_KIND
-})
 
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
-@JsonSubTypes({
-})
 
 public class BigCat extends Cat {
   /**
    * Gets or Sets kind
    */
+  @JsonAdapter(KindEnum.Adapter.class)
   public enum KindEnum {
     LIONS("lions"),
     
@@ -56,7 +50,6 @@ public class BigCat extends Cat {
       this.value = value;
     }
 
-    @JsonValue
     public String getValue() {
       return value;
     }
@@ -66,7 +59,6 @@ public class BigCat extends Cat {
       return String.valueOf(value);
     }
 
-    @JsonCreator
     public static KindEnum fromValue(String value) {
       for (KindEnum b : KindEnum.values()) {
         if (b.value.equals(value)) {
@@ -75,11 +67,28 @@ public class BigCat extends Cat {
       }
       throw new IllegalArgumentException("Unexpected value '" + value + "'");
     }
+
+    public static class Adapter extends TypeAdapter<KindEnum> {
+      @Override
+      public void write(final JsonWriter jsonWriter, final KindEnum enumeration) throws IOException {
+        jsonWriter.value(enumeration.getValue());
       }
 
-  public static final String JSON_PROPERTY_KIND = "kind";
+      @Override
+      public KindEnum read(final JsonReader jsonReader) throws IOException {
+        String value =  jsonReader.nextString();
+        return KindEnum.fromValue(value);
+      }
+    }
+  }
+
+  public static final String SERIALIZED_NAME_KIND = "kind";
+  @SerializedName(SERIALIZED_NAME_KIND)
   private KindEnum kind;
 
+  public BigCat() {
+    this.className = this.getClass().getSimpleName();
+  }
 
   public BigCat kind(KindEnum kind) {
     
@@ -93,8 +102,6 @@ public class BigCat extends Cat {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_KIND)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public KindEnum getKind() {
     return kind;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/BigCatAllOf.java

@@ -14,25 +14,24 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.io.IOException;
 
 /**
  * BigCatAllOf
  */
-@JsonPropertyOrder({
-  BigCatAllOf.JSON_PROPERTY_KIND
-})
 
 public class BigCatAllOf {
   /**
    * Gets or Sets kind
    */
+  @JsonAdapter(KindEnum.Adapter.class)
   public enum KindEnum {
     LIONS("lions"),
     
@@ -48,7 +47,6 @@ public class BigCatAllOf {
       this.value = value;
     }
 
-    @JsonValue
     public String getValue() {
       return value;
     }
@@ -58,7 +56,6 @@ public class BigCatAllOf {
       return String.valueOf(value);
     }
 
-    @JsonCreator
     public static KindEnum fromValue(String value) {
       for (KindEnum b : KindEnum.values()) {
         if (b.value.equals(value)) {
@@ -67,9 +64,23 @@ public class BigCatAllOf {
       }
       throw new IllegalArgumentException("Unexpected value '" + value + "'");
     }
+
+    public static class Adapter extends TypeAdapter<KindEnum> {
+      @Override
+      public void write(final JsonWriter jsonWriter, final KindEnum enumeration) throws IOException {
+        jsonWriter.value(enumeration.getValue());
       }
 
-  public static final String JSON_PROPERTY_KIND = "kind";
+      @Override
+      public KindEnum read(final JsonReader jsonReader) throws IOException {
+        String value =  jsonReader.nextString();
+        return KindEnum.fromValue(value);
+      }
+    }
+  }
+
+  public static final String SERIALIZED_NAME_KIND = "kind";
+  @SerializedName(SERIALIZED_NAME_KIND)
   private KindEnum kind;
 
 
@@ -85,8 +96,6 @@ public class BigCatAllOf {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_KIND)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public KindEnum getKind() {
     return kind;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Capitalization.java

@@ -14,43 +14,42 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.io.IOException;
 
 /**
  * Capitalization
  */
-@JsonPropertyOrder({
-  Capitalization.JSON_PROPERTY_SMALL_CAMEL,
-  Capitalization.JSON_PROPERTY_CAPITAL_CAMEL,
-  Capitalization.JSON_PROPERTY_SMALL_SNAKE,
-  Capitalization.JSON_PROPERTY_CAPITAL_SNAKE,
-  Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS,
-  Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E
-})
 
 public class Capitalization {
-  public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel";
+  public static final String SERIALIZED_NAME_SMALL_CAMEL = "smallCamel";
+  @SerializedName(SERIALIZED_NAME_SMALL_CAMEL)
   private String smallCamel;
 
-  public static final String JSON_PROPERTY_CAPITAL_CAMEL = "CapitalCamel";
+  public static final String SERIALIZED_NAME_CAPITAL_CAMEL = "CapitalCamel";
+  @SerializedName(SERIALIZED_NAME_CAPITAL_CAMEL)
   private String capitalCamel;
 
-  public static final String JSON_PROPERTY_SMALL_SNAKE = "small_Snake";
+  public static final String SERIALIZED_NAME_SMALL_SNAKE = "small_Snake";
+  @SerializedName(SERIALIZED_NAME_SMALL_SNAKE)
   private String smallSnake;
 
-  public static final String JSON_PROPERTY_CAPITAL_SNAKE = "Capital_Snake";
+  public static final String SERIALIZED_NAME_CAPITAL_SNAKE = "Capital_Snake";
+  @SerializedName(SERIALIZED_NAME_CAPITAL_SNAKE)
   private String capitalSnake;
 
-  public static final String JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS = "SCA_ETH_Flow_Points";
+  public static final String SERIALIZED_NAME_SC_A_E_T_H_FLOW_POINTS = "SCA_ETH_Flow_Points";
+  @SerializedName(SERIALIZED_NAME_SC_A_E_T_H_FLOW_POINTS)
   private String scAETHFlowPoints;
 
-  public static final String JSON_PROPERTY_A_T_T_N_A_M_E = "ATT_NAME";
+  public static final String SERIALIZED_NAME_A_T_T_N_A_M_E = "ATT_NAME";
+  @SerializedName(SERIALIZED_NAME_A_T_T_N_A_M_E)
   private String ATT_NAME;
 
 
@@ -66,8 +65,6 @@ public class Capitalization {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getSmallCamel() {
     return smallCamel;
@@ -91,8 +88,6 @@ public class Capitalization {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getCapitalCamel() {
     return capitalCamel;
@@ -116,8 +111,6 @@ public class Capitalization {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getSmallSnake() {
     return smallSnake;
@@ -141,8 +134,6 @@ public class Capitalization {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getCapitalSnake() {
     return capitalSnake;
@@ -166,8 +157,6 @@ public class Capitalization {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -191,8 +180,6 @@ public class Capitalization {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "Name of the pet ")
-  @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getATTNAME() {
     return ATT_NAME;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Cat.java

@@ -14,35 +14,31 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.google.gson.stream.JsonReader;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.google.gson.stream.JsonWriter;
-import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
 import org.openapitools.client.model.Animal;
 import org.openapitools.client.model.BigCat;
 import org.openapitools.client.model.CatAllOf;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 /**
  * Cat
  */
-@JsonPropertyOrder({
-  Cat.JSON_PROPERTY_DECLAWED
-})
 
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
-@JsonSubTypes({
-  @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
-})
 
 public class Cat extends Animal {
-  public static final String JSON_PROPERTY_DECLAWED = "declawed";
+  public static final String SERIALIZED_NAME_DECLAWED = "declawed";
+  @SerializedName(SERIALIZED_NAME_DECLAWED)
   private Boolean declawed;
 
+  public Cat() {
+    this.className = this.getClass().getSimpleName();
+  }
 
   public Cat declawed(Boolean declawed) {
     
@@ -56,8 +52,6 @@ public class Cat extends Animal {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_DECLAWED)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Boolean isDeclawed() {
     return declawed;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/CatAllOf.java

@@ -14,23 +14,22 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.io.IOException;
 
 /**
  * CatAllOf
  */
-@JsonPropertyOrder({
-  CatAllOf.JSON_PROPERTY_DECLAWED
-})
 
 public class CatAllOf {
-  public static final String JSON_PROPERTY_DECLAWED = "declawed";
+  public static final String SERIALIZED_NAME_DECLAWED = "declawed";
+  @SerializedName(SERIALIZED_NAME_DECLAWED)
   private Boolean declawed;
 
 
@@ -46,8 +45,6 @@ public class CatAllOf {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_DECLAWED)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Boolean isDeclawed() {
     return declawed;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Category.java

@@ -14,27 +14,26 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.io.IOException;
 
 /**
  * Category
  */
-@JsonPropertyOrder({
-  Category.JSON_PROPERTY_ID,
-  Category.JSON_PROPERTY_NAME
-})
 
 public class Category {
-  public static final String JSON_PROPERTY_ID = "id";
+  public static final String SERIALIZED_NAME_ID = "id";
+  @SerializedName(SERIALIZED_NAME_ID)
   private Long id;
 
-  public static final String JSON_PROPERTY_NAME = "name";
+  public static final String SERIALIZED_NAME_NAME = "name";
+  @SerializedName(SERIALIZED_NAME_NAME)
   private String name = "default-name";
 
 
@@ -50,8 +49,6 @@ public class Category {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Long getId() {
     return id;
@@ -74,8 +71,6 @@ public class Category {
    * @return name
   **/
   @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public String getName() {
     return name;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ClassModel.java

@@ -14,24 +14,23 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.io.IOException;
 
 /**
  * Model for testing model with \"_class\" property
  */
 @ApiModel(description = "Model for testing model with \"_class\" property")
-@JsonPropertyOrder({
-  ClassModel.JSON_PROPERTY_PROPERTY_CLASS
-})
 
 public class ClassModel {
-  public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
+  public static final String SERIALIZED_NAME_PROPERTY_CLASS = "_class";
+  @SerializedName(SERIALIZED_NAME_PROPERTY_CLASS)
   private String propertyClass;
 
 
@@ -47,8 +46,6 @@ public class ClassModel {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getPropertyClass() {
     return propertyClass;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Client.java

@@ -14,23 +14,22 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.io.IOException;
 
 /**
  * Client
  */
-@JsonPropertyOrder({
-  Client.JSON_PROPERTY_CLIENT
-})
 
 public class Client {
-  public static final String JSON_PROPERTY_CLIENT = "client";
+  public static final String SERIALIZED_NAME_CLIENT = "client";
+  @SerializedName(SERIALIZED_NAME_CLIENT)
   private String client;
 
 
@@ -46,8 +45,6 @@ public class Client {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_CLIENT)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getClient() {
     return client;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Dog.java

@@ -14,33 +14,30 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.google.gson.stream.JsonReader;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.google.gson.stream.JsonWriter;
-import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
 import org.openapitools.client.model.Animal;
 import org.openapitools.client.model.DogAllOf;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 /**
  * Dog
  */
-@JsonPropertyOrder({
-  Dog.JSON_PROPERTY_BREED
-})
 
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
-@JsonSubTypes({
-})
 
 public class Dog extends Animal {
-  public static final String JSON_PROPERTY_BREED = "breed";
+  public static final String SERIALIZED_NAME_BREED = "breed";
+  @SerializedName(SERIALIZED_NAME_BREED)
   private String breed;
 
+  public Dog() {
+    this.className = this.getClass().getSimpleName();
+  }
 
   public Dog breed(String breed) {
     
@@ -54,8 +51,6 @@ public class Dog extends Animal {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BREED)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getBreed() {
     return breed;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/DogAllOf.java

@@ -14,23 +14,22 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.io.IOException;
 
 /**
  * DogAllOf
  */
-@JsonPropertyOrder({
-  DogAllOf.JSON_PROPERTY_BREED
-})
 
 public class DogAllOf {
-  public static final String JSON_PROPERTY_BREED = "breed";
+  public static final String SERIALIZED_NAME_BREED = "breed";
+  @SerializedName(SERIALIZED_NAME_BREED)
   private String breed;
 
 
@@ -46,8 +45,6 @@ public class DogAllOf {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BREED)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getBreed() {
     return breed;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/EnumArrays.java

@@ -14,28 +14,26 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 /**
  * EnumArrays
  */
-@JsonPropertyOrder({
-  EnumArrays.JSON_PROPERTY_JUST_SYMBOL,
-  EnumArrays.JSON_PROPERTY_ARRAY_ENUM
-})
 
 public class EnumArrays {
   /**
    * Gets or Sets justSymbol
    */
+  @JsonAdapter(JustSymbolEnum.Adapter.class)
   public enum JustSymbolEnum {
     GREATER_THAN_OR_EQUAL_TO(">="),
     
@@ -47,7 +45,6 @@ public class EnumArrays {
       this.value = value;
     }
 
-    @JsonValue
     public String getValue() {
       return value;
     }
@@ -57,7 +54,6 @@ public class EnumArrays {
       return String.valueOf(value);
     }
 
-    @JsonCreator
     public static JustSymbolEnum fromValue(String value) {
       for (JustSymbolEnum b : JustSymbolEnum.values()) {
         if (b.value.equals(value)) {
@@ -66,14 +62,29 @@ public class EnumArrays {
       }
       throw new IllegalArgumentException("Unexpected value '" + value + "'");
     }
+
+    public static class Adapter extends TypeAdapter<JustSymbolEnum> {
+      @Override
+      public void write(final JsonWriter jsonWriter, final JustSymbolEnum enumeration) throws IOException {
+        jsonWriter.value(enumeration.getValue());
       }
 
-  public static final String JSON_PROPERTY_JUST_SYMBOL = "just_symbol";
+      @Override
+      public JustSymbolEnum read(final JsonReader jsonReader) throws IOException {
+        String value =  jsonReader.nextString();
+        return JustSymbolEnum.fromValue(value);
+      }
+    }
+  }
+
+  public static final String SERIALIZED_NAME_JUST_SYMBOL = "just_symbol";
+  @SerializedName(SERIALIZED_NAME_JUST_SYMBOL)
   private JustSymbolEnum justSymbol;
 
   /**
    * Gets or Sets arrayEnum
    */
+  @JsonAdapter(ArrayEnumEnum.Adapter.class)
   public enum ArrayEnumEnum {
     FISH("fish"),
     
@@ -85,7 +96,6 @@ public class EnumArrays {
       this.value = value;
     }
 
-    @JsonValue
     public String getValue() {
       return value;
     }
@@ -95,7 +105,6 @@ public class EnumArrays {
       return String.valueOf(value);
     }
 
-    @JsonCreator
     public static ArrayEnumEnum fromValue(String value) {
       for (ArrayEnumEnum b : ArrayEnumEnum.values()) {
         if (b.value.equals(value)) {
@@ -104,9 +113,23 @@ public class EnumArrays {
       }
       throw new IllegalArgumentException("Unexpected value '" + value + "'");
     }
+
+    public static class Adapter extends TypeAdapter<ArrayEnumEnum> {
+      @Override
+      public void write(final JsonWriter jsonWriter, final ArrayEnumEnum enumeration) throws IOException {
+        jsonWriter.value(enumeration.getValue());
       }
 
-  public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum";
+      @Override
+      public ArrayEnumEnum read(final JsonReader jsonReader) throws IOException {
+        String value =  jsonReader.nextString();
+        return ArrayEnumEnum.fromValue(value);
+      }
+    }
+  }
+
+  public static final String SERIALIZED_NAME_ARRAY_ENUM = "array_enum";
+  @SerializedName(SERIALIZED_NAME_ARRAY_ENUM)
   private List<ArrayEnumEnum> arrayEnum = null;
 
 
@@ -122,8 +145,6 @@ public class EnumArrays {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -155,8 +176,6 @@ public class EnumArrays {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/EnumClass.java

@@ -14,14 +14,18 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.google.gson.annotations.SerializedName;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
+import java.io.IOException;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 
 /**
  * Gets or Sets EnumClass
  */
+@JsonAdapter(EnumClass.Adapter.class)
 public enum EnumClass {
   
   _ABC("_abc"),
@@ -36,7 +40,6 @@ public enum EnumClass {
     this.value = value;
   }
 
-  @JsonValue
   public String getValue() {
     return value;
   }
@@ -46,7 +49,6 @@ public enum EnumClass {
     return String.valueOf(value);
   }
 
-  @JsonCreator
   public static EnumClass fromValue(String value) {
     for (EnumClass b : EnumClass.values()) {
       if (b.value.equals(value)) {
@@ -55,5 +57,18 @@ public enum EnumClass {
     }
     throw new IllegalArgumentException("Unexpected value '" + value + "'");
   }
+
+  public static class Adapter extends TypeAdapter<EnumClass> {
+    @Override
+    public void write(final JsonWriter jsonWriter, final EnumClass enumeration) throws IOException {
+      jsonWriter.value(enumeration.getValue());
+    }
+
+    @Override
+    public EnumClass read(final JsonReader jsonReader) throws IOException {
+      String value = jsonReader.nextString();
+      return EnumClass.fromValue(value);
+    }
+  }
 }
 

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/EnumTest.java

@@ -14,30 +14,25 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
 import org.openapitools.client.model.OuterEnum;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 /**
  * EnumTest
  */
-@JsonPropertyOrder({
-  EnumTest.JSON_PROPERTY_ENUM_STRING,
-  EnumTest.JSON_PROPERTY_ENUM_STRING_REQUIRED,
-  EnumTest.JSON_PROPERTY_ENUM_INTEGER,
-  EnumTest.JSON_PROPERTY_ENUM_NUMBER,
-  EnumTest.JSON_PROPERTY_OUTER_ENUM
-})
 
 public class EnumTest {
   /**
    * Gets or Sets enumString
    */
+  @JsonAdapter(EnumStringEnum.Adapter.class)
   public enum EnumStringEnum {
     UPPER("UPPER"),
     
@@ -51,7 +46,6 @@ public class EnumTest {
       this.value = value;
     }
 
-    @JsonValue
     public String getValue() {
       return value;
     }
@@ -61,7 +55,6 @@ public class EnumTest {
       return String.valueOf(value);
     }
 
-    @JsonCreator
     public static EnumStringEnum fromValue(String value) {
       for (EnumStringEnum b : EnumStringEnum.values()) {
         if (b.value.equals(value)) {
@@ -70,14 +63,29 @@ public class EnumTest {
       }
       throw new IllegalArgumentException("Unexpected value '" + value + "'");
     }
+
+    public static class Adapter extends TypeAdapter<EnumStringEnum> {
+      @Override
+      public void write(final JsonWriter jsonWriter, final EnumStringEnum enumeration) throws IOException {
+        jsonWriter.value(enumeration.getValue());
       }
 
-  public static final String JSON_PROPERTY_ENUM_STRING = "enum_string";
+      @Override
+      public EnumStringEnum read(final JsonReader jsonReader) throws IOException {
+        String value =  jsonReader.nextString();
+        return EnumStringEnum.fromValue(value);
+      }
+    }
+  }
+
+  public static final String SERIALIZED_NAME_ENUM_STRING = "enum_string";
+  @SerializedName(SERIALIZED_NAME_ENUM_STRING)
   private EnumStringEnum enumString;
 
   /**
    * Gets or Sets enumStringRequired
    */
+  @JsonAdapter(EnumStringRequiredEnum.Adapter.class)
   public enum EnumStringRequiredEnum {
     UPPER("UPPER"),
     
@@ -91,7 +99,6 @@ public class EnumTest {
       this.value = value;
     }
 
-    @JsonValue
     public String getValue() {
       return value;
     }
@@ -101,7 +108,6 @@ public class EnumTest {
       return String.valueOf(value);
     }
 
-    @JsonCreator
     public static EnumStringRequiredEnum fromValue(String value) {
       for (EnumStringRequiredEnum b : EnumStringRequiredEnum.values()) {
         if (b.value.equals(value)) {
@@ -110,14 +116,29 @@ public class EnumTest {
       }
       throw new IllegalArgumentException("Unexpected value '" + value + "'");
     }
+
+    public static class Adapter extends TypeAdapter<EnumStringRequiredEnum> {
+      @Override
+      public void write(final JsonWriter jsonWriter, final EnumStringRequiredEnum enumeration) throws IOException {
+        jsonWriter.value(enumeration.getValue());
       }
 
-  public static final String JSON_PROPERTY_ENUM_STRING_REQUIRED = "enum_string_required";
+      @Override
+      public EnumStringRequiredEnum read(final JsonReader jsonReader) throws IOException {
+        String value =  jsonReader.nextString();
+        return EnumStringRequiredEnum.fromValue(value);
+      }
+    }
+  }
+
+  public static final String SERIALIZED_NAME_ENUM_STRING_REQUIRED = "enum_string_required";
+  @SerializedName(SERIALIZED_NAME_ENUM_STRING_REQUIRED)
   private EnumStringRequiredEnum enumStringRequired;
 
   /**
    * Gets or Sets enumInteger
    */
+  @JsonAdapter(EnumIntegerEnum.Adapter.class)
   public enum EnumIntegerEnum {
     NUMBER_1(1),
     
@@ -129,7 +150,6 @@ public class EnumTest {
       this.value = value;
     }
 
-    @JsonValue
     public Integer getValue() {
       return value;
     }
@@ -139,7 +159,6 @@ public class EnumTest {
       return String.valueOf(value);
     }
 
-    @JsonCreator
     public static EnumIntegerEnum fromValue(Integer value) {
       for (EnumIntegerEnum b : EnumIntegerEnum.values()) {
         if (b.value.equals(value)) {
@@ -148,14 +167,29 @@ public class EnumTest {
       }
       throw new IllegalArgumentException("Unexpected value '" + value + "'");
     }
+
+    public static class Adapter extends TypeAdapter<EnumIntegerEnum> {
+      @Override
+      public void write(final JsonWriter jsonWriter, final EnumIntegerEnum enumeration) throws IOException {
+        jsonWriter.value(enumeration.getValue());
       }
 
-  public static final String JSON_PROPERTY_ENUM_INTEGER = "enum_integer";
+      @Override
+      public EnumIntegerEnum read(final JsonReader jsonReader) throws IOException {
+        Integer value =  jsonReader.nextInt();
+        return EnumIntegerEnum.fromValue(value);
+      }
+    }
+  }
+
+  public static final String SERIALIZED_NAME_ENUM_INTEGER = "enum_integer";
+  @SerializedName(SERIALIZED_NAME_ENUM_INTEGER)
   private EnumIntegerEnum enumInteger;
 
   /**
    * Gets or Sets enumNumber
    */
+  @JsonAdapter(EnumNumberEnum.Adapter.class)
   public enum EnumNumberEnum {
     NUMBER_1_DOT_1(1.1),
     
@@ -167,7 +201,6 @@ public class EnumTest {
       this.value = value;
     }
 
-    @JsonValue
     public Double getValue() {
       return value;
     }
@@ -177,7 +210,6 @@ public class EnumTest {
       return String.valueOf(value);
     }
 
-    @JsonCreator
     public static EnumNumberEnum fromValue(Double value) {
       for (EnumNumberEnum b : EnumNumberEnum.values()) {
         if (b.value.equals(value)) {
@@ -186,12 +218,27 @@ public class EnumTest {
       }
       throw new IllegalArgumentException("Unexpected value '" + value + "'");
     }
+
+    public static class Adapter extends TypeAdapter<EnumNumberEnum> {
+      @Override
+      public void write(final JsonWriter jsonWriter, final EnumNumberEnum enumeration) throws IOException {
+        jsonWriter.value(enumeration.getValue());
       }
 
-  public static final String JSON_PROPERTY_ENUM_NUMBER = "enum_number";
+      @Override
+      public EnumNumberEnum read(final JsonReader jsonReader) throws IOException {
+        Double value =  jsonReader.nextDouble();
+        return EnumNumberEnum.fromValue(value);
+      }
+    }
+  }
+
+  public static final String SERIALIZED_NAME_ENUM_NUMBER = "enum_number";
+  @SerializedName(SERIALIZED_NAME_ENUM_NUMBER)
   private EnumNumberEnum enumNumber;
 
-  public static final String JSON_PROPERTY_OUTER_ENUM = "outerEnum";
+  public static final String SERIALIZED_NAME_OUTER_ENUM = "outerEnum";
+  @SerializedName(SERIALIZED_NAME_OUTER_ENUM)
   private OuterEnum outerEnum;
 
 
@@ -207,8 +254,6 @@ public class EnumTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ENUM_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -231,8 +276,6 @@ public class EnumTest {
    * @return enumStringRequired
   **/
   @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -256,8 +299,6 @@ public class EnumTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -281,8 +322,6 @@ public class EnumTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -306,8 +345,6 @@ public class EnumTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_OUTER_ENUM)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OuterEnum getOuterEnum() {
     return outerEnum;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java

@@ -14,29 +14,28 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 /**
  * FileSchemaTestClass
  */
-@JsonPropertyOrder({
-  FileSchemaTestClass.JSON_PROPERTY_FILE,
-  FileSchemaTestClass.JSON_PROPERTY_FILES
-})
 
 public class FileSchemaTestClass {
-  public static final String JSON_PROPERTY_FILE = "file";
+  public static final String SERIALIZED_NAME_FILE = "file";
+  @SerializedName(SERIALIZED_NAME_FILE)
   private java.io.File file;
 
-  public static final String JSON_PROPERTY_FILES = "files";
+  public static final String SERIALIZED_NAME_FILES = "files";
+  @SerializedName(SERIALIZED_NAME_FILES)
   private List<java.io.File> files = null;
 
 
@@ -52,8 +51,6 @@ public class FileSchemaTestClass {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_FILE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public java.io.File getFile() {
     return file;
@@ -85,8 +82,6 @@ public class FileSchemaTestClass {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_FILES)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public List<java.io.File> getFiles() {
     return files;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/FormatTest.java

@@ -14,80 +14,79 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.File;
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.UUID;
 import org.threeten.bp.LocalDate;
 import org.threeten.bp.OffsetDateTime;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 /**
  * FormatTest
  */
-@JsonPropertyOrder({
-  FormatTest.JSON_PROPERTY_INTEGER,
-  FormatTest.JSON_PROPERTY_INT32,
-  FormatTest.JSON_PROPERTY_INT64,
-  FormatTest.JSON_PROPERTY_NUMBER,
-  FormatTest.JSON_PROPERTY_FLOAT,
-  FormatTest.JSON_PROPERTY_DOUBLE,
-  FormatTest.JSON_PROPERTY_STRING,
-  FormatTest.JSON_PROPERTY_BYTE,
-  FormatTest.JSON_PROPERTY_BINARY,
-  FormatTest.JSON_PROPERTY_DATE,
-  FormatTest.JSON_PROPERTY_DATE_TIME,
-  FormatTest.JSON_PROPERTY_UUID,
-  FormatTest.JSON_PROPERTY_PASSWORD,
-  FormatTest.JSON_PROPERTY_BIG_DECIMAL
-})
 
 public class FormatTest {
-  public static final String JSON_PROPERTY_INTEGER = "integer";
+  public static final String SERIALIZED_NAME_INTEGER = "integer";
+  @SerializedName(SERIALIZED_NAME_INTEGER)
   private Integer integer;
 
-  public static final String JSON_PROPERTY_INT32 = "int32";
+  public static final String SERIALIZED_NAME_INT32 = "int32";
+  @SerializedName(SERIALIZED_NAME_INT32)
   private Integer int32;
 
-  public static final String JSON_PROPERTY_INT64 = "int64";
+  public static final String SERIALIZED_NAME_INT64 = "int64";
+  @SerializedName(SERIALIZED_NAME_INT64)
   private Long int64;
 
-  public static final String JSON_PROPERTY_NUMBER = "number";
+  public static final String SERIALIZED_NAME_NUMBER = "number";
+  @SerializedName(SERIALIZED_NAME_NUMBER)
   private BigDecimal number;
 
-  public static final String JSON_PROPERTY_FLOAT = "float";
+  public static final String SERIALIZED_NAME_FLOAT = "float";
+  @SerializedName(SERIALIZED_NAME_FLOAT)
   private Float _float;
 
-  public static final String JSON_PROPERTY_DOUBLE = "double";
+  public static final String SERIALIZED_NAME_DOUBLE = "double";
+  @SerializedName(SERIALIZED_NAME_DOUBLE)
   private Double _double;
 
-  public static final String JSON_PROPERTY_STRING = "string";
+  public static final String SERIALIZED_NAME_STRING = "string";
+  @SerializedName(SERIALIZED_NAME_STRING)
   private String string;
 
-  public static final String JSON_PROPERTY_BYTE = "byte";
+  public static final String SERIALIZED_NAME_BYTE = "byte";
+  @SerializedName(SERIALIZED_NAME_BYTE)
   private byte[] _byte;
 
-  public static final String JSON_PROPERTY_BINARY = "binary";
+  public static final String SERIALIZED_NAME_BINARY = "binary";
+  @SerializedName(SERIALIZED_NAME_BINARY)
   private File binary;
 
-  public static final String JSON_PROPERTY_DATE = "date";
+  public static final String SERIALIZED_NAME_DATE = "date";
+  @SerializedName(SERIALIZED_NAME_DATE)
   private LocalDate date;
 
-  public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
+  public static final String SERIALIZED_NAME_DATE_TIME = "dateTime";
+  @SerializedName(SERIALIZED_NAME_DATE_TIME)
   private OffsetDateTime dateTime;
 
-  public static final String JSON_PROPERTY_UUID = "uuid";
+  public static final String SERIALIZED_NAME_UUID = "uuid";
+  @SerializedName(SERIALIZED_NAME_UUID)
   private UUID uuid;
 
-  public static final String JSON_PROPERTY_PASSWORD = "password";
+  public static final String SERIALIZED_NAME_PASSWORD = "password";
+  @SerializedName(SERIALIZED_NAME_PASSWORD)
   private String password;
 
-  public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal";
+  public static final String SERIALIZED_NAME_BIG_DECIMAL = "BigDecimal";
+  @SerializedName(SERIALIZED_NAME_BIG_DECIMAL)
   private BigDecimal bigDecimal;
 
 
@@ -105,8 +104,6 @@ public class FormatTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Integer getInteger() {
     return integer;
@@ -132,8 +129,6 @@ public class FormatTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_INT32)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Integer getInt32() {
     return int32;
@@ -157,8 +152,6 @@ public class FormatTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_INT64)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Long getInt64() {
     return int64;
@@ -183,8 +176,6 @@ public class FormatTest {
    * @return number
   **/
   @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public BigDecimal getNumber() {
     return number;
@@ -210,8 +201,6 @@ public class FormatTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_FLOAT)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Float getFloat() {
     return _float;
@@ -237,8 +226,6 @@ public class FormatTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_DOUBLE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Double getDouble() {
     return _double;
@@ -262,8 +249,6 @@ public class FormatTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getString() {
     return string;
@@ -286,8 +271,6 @@ public class FormatTest {
    * @return _byte
   **/
   @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_BYTE)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public byte[] getByte() {
     return _byte;
@@ -311,8 +294,6 @@ public class FormatTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BINARY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public File getBinary() {
     return binary;
@@ -335,8 +316,6 @@ public class FormatTest {
    * @return date
   **/
   @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_DATE)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public LocalDate getDate() {
     return date;
@@ -360,8 +339,6 @@ public class FormatTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_DATE_TIME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -385,8 +362,6 @@ public class FormatTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
-  @JsonProperty(JSON_PROPERTY_UUID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
     return uuid;
@@ -409,8 +384,6 @@ public class FormatTest {
    * @return password
   **/
   @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_PASSWORD)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public String getPassword() {
     return password;
@@ -434,8 +407,6 @@ public class FormatTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BIG_DECIMAL)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public BigDecimal getBigDecimal() {
     return bigDecimal;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java

@@ -14,27 +14,26 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.io.IOException;
 
 /**
  * HasOnlyReadOnly
  */
-@JsonPropertyOrder({
-  HasOnlyReadOnly.JSON_PROPERTY_BAR,
-  HasOnlyReadOnly.JSON_PROPERTY_FOO
-})
 
 public class HasOnlyReadOnly {
-  public static final String JSON_PROPERTY_BAR = "bar";
+  public static final String SERIALIZED_NAME_BAR = "bar";
+  @SerializedName(SERIALIZED_NAME_BAR)
   private String bar;
 
-  public static final String JSON_PROPERTY_FOO = "foo";
+  public static final String SERIALIZED_NAME_FOO = "foo";
+  @SerializedName(SERIALIZED_NAME_FOO)
   private String foo;
 
 
@@ -44,8 +43,6 @@ public class HasOnlyReadOnly {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BAR)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getBar() {
     return bar;
@@ -60,8 +57,6 @@ public class HasOnlyReadOnly {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_FOO)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getFoo() {
     return foo;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/MapTest.java

@@ -14,34 +14,31 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 /**
  * MapTest
  */
-@JsonPropertyOrder({
-  MapTest.JSON_PROPERTY_MAP_MAP_OF_STRING,
-  MapTest.JSON_PROPERTY_MAP_OF_ENUM_STRING,
-  MapTest.JSON_PROPERTY_DIRECT_MAP,
-  MapTest.JSON_PROPERTY_INDIRECT_MAP
-})
 
 public class MapTest {
-  public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string";
+  public static final String SERIALIZED_NAME_MAP_MAP_OF_STRING = "map_map_of_string";
+  @SerializedName(SERIALIZED_NAME_MAP_MAP_OF_STRING)
   private Map<String, Map<String, String>> mapMapOfString = null;
 
   /**
    * Gets or Sets inner
    */
+  @JsonAdapter(InnerEnum.Adapter.class)
   public enum InnerEnum {
     UPPER("UPPER"),
     
@@ -53,7 +50,6 @@ public class MapTest {
       this.value = value;
     }
 
-    @JsonValue
     public String getValue() {
       return value;
     }
@@ -63,7 +59,6 @@ public class MapTest {
       return String.valueOf(value);
     }
 
-    @JsonCreator
     public static InnerEnum fromValue(String value) {
       for (InnerEnum b : InnerEnum.values()) {
         if (b.value.equals(value)) {
@@ -72,15 +67,31 @@ public class MapTest {
       }
       throw new IllegalArgumentException("Unexpected value '" + value + "'");
     }
+
+    public static class Adapter extends TypeAdapter<InnerEnum> {
+      @Override
+      public void write(final JsonWriter jsonWriter, final InnerEnum enumeration) throws IOException {
+        jsonWriter.value(enumeration.getValue());
       }
 
-  public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string";
+      @Override
+      public InnerEnum read(final JsonReader jsonReader) throws IOException {
+        String value =  jsonReader.nextString();
+        return InnerEnum.fromValue(value);
+      }
+    }
+  }
+
+  public static final String SERIALIZED_NAME_MAP_OF_ENUM_STRING = "map_of_enum_string";
+  @SerializedName(SERIALIZED_NAME_MAP_OF_ENUM_STRING)
   private Map<String, InnerEnum> mapOfEnumString = null;
 
-  public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map";
+  public static final String SERIALIZED_NAME_DIRECT_MAP = "direct_map";
+  @SerializedName(SERIALIZED_NAME_DIRECT_MAP)
   private Map<String, Boolean> directMap = null;
 
-  public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map";
+  public static final String SERIALIZED_NAME_INDIRECT_MAP = "indirect_map";
+  @SerializedName(SERIALIZED_NAME_INDIRECT_MAP)
   private Map<String, Boolean> indirectMap = null;
 
 
@@ -104,8 +115,6 @@ public class MapTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -137,8 +146,6 @@ public class MapTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -170,8 +177,6 @@ public class MapTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -203,8 +208,6 @@ public class MapTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -14,37 +14,36 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import org.openapitools.client.model.Animal;
 import org.threeten.bp.OffsetDateTime;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
-@JsonPropertyOrder({
-  MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_UUID,
-  MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME,
-  MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP
-})
 
 public class MixedPropertiesAndAdditionalPropertiesClass {
-  public static final String JSON_PROPERTY_UUID = "uuid";
+  public static final String SERIALIZED_NAME_UUID = "uuid";
+  @SerializedName(SERIALIZED_NAME_UUID)
   private UUID uuid;
 
-  public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
+  public static final String SERIALIZED_NAME_DATE_TIME = "dateTime";
+  @SerializedName(SERIALIZED_NAME_DATE_TIME)
   private OffsetDateTime dateTime;
 
-  public static final String JSON_PROPERTY_MAP = "map";
+  public static final String SERIALIZED_NAME_MAP = "map";
+  @SerializedName(SERIALIZED_NAME_MAP)
   private Map<String, Animal> map = null;
 
 
@@ -60,8 +59,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_UUID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
     return uuid;
@@ -85,8 +82,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_DATE_TIME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -118,8 +113,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Map<String, Animal> getMap() {
     return map;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Model200Response.java

@@ -14,28 +14,27 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.io.IOException;
 
 /**
  * Model for testing model name starting with number
  */
 @ApiModel(description = "Model for testing model name starting with number")
-@JsonPropertyOrder({
-  Model200Response.JSON_PROPERTY_NAME,
-  Model200Response.JSON_PROPERTY_PROPERTY_CLASS
-})
 
 public class Model200Response {
-  public static final String JSON_PROPERTY_NAME = "name";
+  public static final String SERIALIZED_NAME_NAME = "name";
+  @SerializedName(SERIALIZED_NAME_NAME)
   private Integer name;
 
-  public static final String JSON_PROPERTY_PROPERTY_CLASS = "class";
+  public static final String SERIALIZED_NAME_PROPERTY_CLASS = "class";
+  @SerializedName(SERIALIZED_NAME_PROPERTY_CLASS)
   private String propertyClass;
 
 
@@ -51,8 +50,6 @@ public class Model200Response {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Integer getName() {
     return name;
@@ -76,8 +73,6 @@ public class Model200Response {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getPropertyClass() {
     return propertyClass;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ModelApiResponse.java

@@ -14,31 +14,30 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.io.IOException;
 
 /**
  * ModelApiResponse
  */
-@JsonPropertyOrder({
-  ModelApiResponse.JSON_PROPERTY_CODE,
-  ModelApiResponse.JSON_PROPERTY_TYPE,
-  ModelApiResponse.JSON_PROPERTY_MESSAGE
-})
 
 public class ModelApiResponse {
-  public static final String JSON_PROPERTY_CODE = "code";
+  public static final String SERIALIZED_NAME_CODE = "code";
+  @SerializedName(SERIALIZED_NAME_CODE)
   private Integer code;
 
-  public static final String JSON_PROPERTY_TYPE = "type";
+  public static final String SERIALIZED_NAME_TYPE = "type";
+  @SerializedName(SERIALIZED_NAME_TYPE)
   private String type;
 
-  public static final String JSON_PROPERTY_MESSAGE = "message";
+  public static final String SERIALIZED_NAME_MESSAGE = "message";
+  @SerializedName(SERIALIZED_NAME_MESSAGE)
   private String message;
 
 
@@ -54,8 +53,6 @@ public class ModelApiResponse {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_CODE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Integer getCode() {
     return code;
@@ -79,8 +76,6 @@ public class ModelApiResponse {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_TYPE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getType() {
     return type;
@@ -104,8 +99,6 @@ public class ModelApiResponse {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MESSAGE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getMessage() {
     return message;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ModelReturn.java

@@ -14,24 +14,23 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.io.IOException;
 
 /**
  * Model for testing reserved words
  */
 @ApiModel(description = "Model for testing reserved words")
-@JsonPropertyOrder({
-  ModelReturn.JSON_PROPERTY_RETURN
-})
 
 public class ModelReturn {
-  public static final String JSON_PROPERTY_RETURN = "return";
+  public static final String SERIALIZED_NAME_RETURN = "return";
+  @SerializedName(SERIALIZED_NAME_RETURN)
   private Integer _return;
 
 
@@ -47,8 +46,6 @@ public class ModelReturn {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_RETURN)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Integer getReturn() {
     return _return;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Name.java

@@ -14,36 +14,35 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.io.IOException;
 
 /**
  * Model for testing model name same as property name
  */
 @ApiModel(description = "Model for testing model name same as property name")
-@JsonPropertyOrder({
-  Name.JSON_PROPERTY_NAME,
-  Name.JSON_PROPERTY_SNAKE_CASE,
-  Name.JSON_PROPERTY_PROPERTY,
-  Name.JSON_PROPERTY_123NUMBER
-})
 
 public class Name {
-  public static final String JSON_PROPERTY_NAME = "name";
+  public static final String SERIALIZED_NAME_NAME = "name";
+  @SerializedName(SERIALIZED_NAME_NAME)
   private Integer name;
 
-  public static final String JSON_PROPERTY_SNAKE_CASE = "snake_case";
+  public static final String SERIALIZED_NAME_SNAKE_CASE = "snake_case";
+  @SerializedName(SERIALIZED_NAME_SNAKE_CASE)
   private Integer snakeCase;
 
-  public static final String JSON_PROPERTY_PROPERTY = "property";
+  public static final String SERIALIZED_NAME_PROPERTY = "property";
+  @SerializedName(SERIALIZED_NAME_PROPERTY)
   private String property;
 
-  public static final String JSON_PROPERTY_123NUMBER = "123Number";
+  public static final String SERIALIZED_NAME_123NUMBER = "123Number";
+  @SerializedName(SERIALIZED_NAME_123NUMBER)
   private Integer _123number;
 
 
@@ -58,8 +57,6 @@ public class Name {
    * @return name
   **/
   @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public Integer getName() {
     return name;
@@ -77,8 +74,6 @@ public class Name {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Integer getSnakeCase() {
     return snakeCase;
@@ -99,8 +94,6 @@ public class Name {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PROPERTY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getProperty() {
     return property;
@@ -118,8 +111,6 @@ public class Name {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_123NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Integer get123number() {
     return _123number;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/NumberOnly.java

@@ -14,24 +14,23 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
 import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 /**
  * NumberOnly
  */
-@JsonPropertyOrder({
-  NumberOnly.JSON_PROPERTY_JUST_NUMBER
-})
 
 public class NumberOnly {
-  public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
+  public static final String SERIALIZED_NAME_JUST_NUMBER = "JustNumber";
+  @SerializedName(SERIALIZED_NAME_JUST_NUMBER)
   private BigDecimal justNumber;
 
 
@@ -47,8 +46,6 @@ public class NumberOnly {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public BigDecimal getJustNumber() {
     return justNumber;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Order.java

@@ -14,43 +14,41 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
 import org.threeten.bp.OffsetDateTime;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 /**
  * Order
  */
-@JsonPropertyOrder({
-  Order.JSON_PROPERTY_ID,
-  Order.JSON_PROPERTY_PET_ID,
-  Order.JSON_PROPERTY_QUANTITY,
-  Order.JSON_PROPERTY_SHIP_DATE,
-  Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
-})
 
 public class Order {
-  public static final String JSON_PROPERTY_ID = "id";
+  public static final String SERIALIZED_NAME_ID = "id";
+  @SerializedName(SERIALIZED_NAME_ID)
   private Long id;
 
-  public static final String JSON_PROPERTY_PET_ID = "petId";
+  public static final String SERIALIZED_NAME_PET_ID = "petId";
+  @SerializedName(SERIALIZED_NAME_PET_ID)
   private Long petId;
 
-  public static final String JSON_PROPERTY_QUANTITY = "quantity";
+  public static final String SERIALIZED_NAME_QUANTITY = "quantity";
+  @SerializedName(SERIALIZED_NAME_QUANTITY)
   private Integer quantity;
 
-  public static final String JSON_PROPERTY_SHIP_DATE = "shipDate";
+  public static final String SERIALIZED_NAME_SHIP_DATE = "shipDate";
+  @SerializedName(SERIALIZED_NAME_SHIP_DATE)
   private OffsetDateTime shipDate;
 
   /**
    * Order Status
    */
+  @JsonAdapter(StatusEnum.Adapter.class)
   public enum StatusEnum {
     PLACED("placed"),
     
@@ -64,7 +62,6 @@ public class Order {
       this.value = value;
     }
 
-    @JsonValue
     public String getValue() {
       return value;
     }
@@ -74,7 +71,6 @@ public class Order {
       return String.valueOf(value);
     }
 
-    @JsonCreator
     public static StatusEnum fromValue(String value) {
       for (StatusEnum b : StatusEnum.values()) {
         if (b.value.equals(value)) {
@@ -83,12 +79,27 @@ public class Order {
       }
       throw new IllegalArgumentException("Unexpected value '" + value + "'");
     }
+
+    public static class Adapter extends TypeAdapter<StatusEnum> {
+      @Override
+      public void write(final JsonWriter jsonWriter, final StatusEnum enumeration) throws IOException {
+        jsonWriter.value(enumeration.getValue());
       }
 
-  public static final String JSON_PROPERTY_STATUS = "status";
+      @Override
+      public StatusEnum read(final JsonReader jsonReader) throws IOException {
+        String value =  jsonReader.nextString();
+        return StatusEnum.fromValue(value);
+      }
+    }
+  }
+
+  public static final String SERIALIZED_NAME_STATUS = "status";
+  @SerializedName(SERIALIZED_NAME_STATUS)
   private StatusEnum status;
 
-  public static final String JSON_PROPERTY_COMPLETE = "complete";
+  public static final String SERIALIZED_NAME_COMPLETE = "complete";
+  @SerializedName(SERIALIZED_NAME_COMPLETE)
   private Boolean complete = false;
 
 
@@ -104,8 +115,6 @@ public class Order {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Long getId() {
     return id;
@@ -129,8 +138,6 @@ public class Order {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PET_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Long getPetId() {
     return petId;
@@ -154,8 +161,6 @@ public class Order {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_QUANTITY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Integer getQuantity() {
     return quantity;
@@ -179,8 +184,6 @@ public class Order {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_SHIP_DATE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -204,8 +207,6 @@ public class Order {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "Order Status")
-  @JsonProperty(JSON_PROPERTY_STATUS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public StatusEnum getStatus() {
     return status;
@@ -229,8 +230,6 @@ public class Order {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_COMPLETE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Boolean isComplete() {
     return complete;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/OuterComposite.java

@@ -14,32 +14,31 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
 import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 /**
  * OuterComposite
  */
-@JsonPropertyOrder({
-  OuterComposite.JSON_PROPERTY_MY_NUMBER,
-  OuterComposite.JSON_PROPERTY_MY_STRING,
-  OuterComposite.JSON_PROPERTY_MY_BOOLEAN
-})
 
 public class OuterComposite {
-  public static final String JSON_PROPERTY_MY_NUMBER = "my_number";
+  public static final String SERIALIZED_NAME_MY_NUMBER = "my_number";
+  @SerializedName(SERIALIZED_NAME_MY_NUMBER)
   private BigDecimal myNumber;
 
-  public static final String JSON_PROPERTY_MY_STRING = "my_string";
+  public static final String SERIALIZED_NAME_MY_STRING = "my_string";
+  @SerializedName(SERIALIZED_NAME_MY_STRING)
   private String myString;
 
-  public static final String JSON_PROPERTY_MY_BOOLEAN = "my_boolean";
+  public static final String SERIALIZED_NAME_MY_BOOLEAN = "my_boolean";
+  @SerializedName(SERIALIZED_NAME_MY_BOOLEAN)
   private Boolean myBoolean;
 
 
@@ -55,8 +54,6 @@ public class OuterComposite {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MY_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -80,8 +77,6 @@ public class OuterComposite {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MY_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getMyString() {
     return myString;
@@ -105,8 +100,6 @@ public class OuterComposite {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Boolean isMyBoolean() {
     return myBoolean;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/OuterEnum.java

@@ -14,14 +14,18 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.google.gson.annotations.SerializedName;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
+import java.io.IOException;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 
 /**
  * Gets or Sets OuterEnum
  */
+@JsonAdapter(OuterEnum.Adapter.class)
 public enum OuterEnum {
   
   PLACED("placed"),
@@ -36,7 +40,6 @@ public enum OuterEnum {
     this.value = value;
   }
 
-  @JsonValue
   public String getValue() {
     return value;
   }
@@ -46,7 +49,6 @@ public enum OuterEnum {
     return String.valueOf(value);
   }
 
-  @JsonCreator
   public static OuterEnum fromValue(String value) {
     for (OuterEnum b : OuterEnum.values()) {
       if (b.value.equals(value)) {
@@ -55,5 +57,18 @@ public enum OuterEnum {
     }
     throw new IllegalArgumentException("Unexpected value '" + value + "'");
   }
+
+  public static class Adapter extends TypeAdapter<OuterEnum> {
+    @Override
+    public void write(final JsonWriter jsonWriter, final OuterEnum enumeration) throws IOException {
+      jsonWriter.value(enumeration.getValue());
+    }
+
+    @Override
+    public OuterEnum read(final JsonReader jsonReader) throws IOException {
+      String value = jsonReader.nextString();
+      return OuterEnum.fromValue(value);
+    }
+  }
 }
 

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Pet.java

@@ -14,49 +14,48 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import org.openapitools.client.model.Category;
 import org.openapitools.client.model.Tag;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 /**
  * Pet
  */
-@JsonPropertyOrder({
-  Pet.JSON_PROPERTY_ID,
-  Pet.JSON_PROPERTY_CATEGORY,
-  Pet.JSON_PROPERTY_NAME,
-  Pet.JSON_PROPERTY_PHOTO_URLS,
-  Pet.JSON_PROPERTY_TAGS,
-  Pet.JSON_PROPERTY_STATUS
-})
 
 public class Pet {
-  public static final String JSON_PROPERTY_ID = "id";
+  public static final String SERIALIZED_NAME_ID = "id";
+  @SerializedName(SERIALIZED_NAME_ID)
   private Long id;
 
-  public static final String JSON_PROPERTY_CATEGORY = "category";
+  public static final String SERIALIZED_NAME_CATEGORY = "category";
+  @SerializedName(SERIALIZED_NAME_CATEGORY)
   private Category category;
 
-  public static final String JSON_PROPERTY_NAME = "name";
+  public static final String SERIALIZED_NAME_NAME = "name";
+  @SerializedName(SERIALIZED_NAME_NAME)
   private String name;
 
-  public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls";
+  public static final String SERIALIZED_NAME_PHOTO_URLS = "photoUrls";
+  @SerializedName(SERIALIZED_NAME_PHOTO_URLS)
   private List<String> photoUrls = new ArrayList<String>();
 
-  public static final String JSON_PROPERTY_TAGS = "tags";
+  public static final String SERIALIZED_NAME_TAGS = "tags";
+  @SerializedName(SERIALIZED_NAME_TAGS)
   private List<Tag> tags = null;
 
   /**
    * pet status in the store
    */
+  @JsonAdapter(StatusEnum.Adapter.class)
   public enum StatusEnum {
     AVAILABLE("available"),
     
@@ -70,7 +69,6 @@ public class Pet {
       this.value = value;
     }
 
-    @JsonValue
     public String getValue() {
       return value;
     }
@@ -80,7 +78,6 @@ public class Pet {
       return String.valueOf(value);
     }
 
-    @JsonCreator
     public static StatusEnum fromValue(String value) {
       for (StatusEnum b : StatusEnum.values()) {
         if (b.value.equals(value)) {
@@ -89,9 +86,23 @@ public class Pet {
       }
       throw new IllegalArgumentException("Unexpected value '" + value + "'");
     }
+
+    public static class Adapter extends TypeAdapter<StatusEnum> {
+      @Override
+      public void write(final JsonWriter jsonWriter, final StatusEnum enumeration) throws IOException {
+        jsonWriter.value(enumeration.getValue());
       }
 
-  public static final String JSON_PROPERTY_STATUS = "status";
+      @Override
+      public StatusEnum read(final JsonReader jsonReader) throws IOException {
+        String value =  jsonReader.nextString();
+        return StatusEnum.fromValue(value);
+      }
+    }
+  }
+
+  public static final String SERIALIZED_NAME_STATUS = "status";
+  @SerializedName(SERIALIZED_NAME_STATUS)
   private StatusEnum status;
 
 
@@ -107,8 +118,6 @@ public class Pet {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Long getId() {
     return id;
@@ -132,8 +141,6 @@ public class Pet {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_CATEGORY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Category getCategory() {
     return category;
@@ -156,8 +163,6 @@ public class Pet {
    * @return name
   **/
   @ApiModelProperty(example = "doggie", required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public String getName() {
     return name;
@@ -185,8 +190,6 @@ public class Pet {
    * @return photoUrls
   **/
   @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -218,8 +221,6 @@ public class Pet {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_TAGS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public List<Tag> getTags() {
     return tags;
@@ -243,8 +244,6 @@ public class Pet {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "pet status in the store")
-  @JsonProperty(JSON_PROPERTY_STATUS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public StatusEnum getStatus() {
     return status;

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java

@@ -14,27 +14,26 @@
 package org.openapitools.client.model;
 
 import org.apache.commons.lang3.ObjectUtils;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.TypeAdapter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.JsonAdapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.gson.annotations.SerializedName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.io.IOException;
 
 /**
  * ReadOnlyFirst
  */
-@JsonPropertyOrder({
-  ReadOnlyFirst.JSON_PROPERTY_BAR,
-  ReadOnlyFirst.JSON_PROPERTY_BAZ
-})
 
 public class ReadOnlyFirst {
-  public static final String JSON_PROPERTY_BAR = "bar";
+  public static final String SERIALIZED_NAME_BAR = "bar";
+  @SerializedName(SERIALIZED_NAME_BAR)
   private String bar;
 
-  public static final String JSON_PROPERTY_BAZ = "baz";
+  public static final String SERIALIZED_NAME_BAZ = "baz";
+  @SerializedName(SERIALIZED_NAME_BAZ)
   private String baz;
 
 
@@ -44,8 +43,6 @@ public class ReadOnlyFirst {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BAR)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getBar() {
     return bar;
@@ -66,8 +63,6 @@ public class ReadOnlyFirst {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BAZ)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getBaz() {
     return baz;