[Java][jersey2] replace jersey2 with jersey2-experimental (#6251)

* replace jersey2 with jersey2-experimental * better handling of oauth * add jersey2 java8 samples * add dependency to test pom * fix test, update doc
2026-03-10 08:31:23 +00:00 · 2020-05-12 18:27:33 +08:00
parent 1f82facf82
commit deec5da8a7
322 changed files with 3311 additions and 27696 deletions
--- a/CI/samples.ci/client/petstore/java/test-manual/jersey2/auth/ApiKeyAuthTest.java
+++ b/CI/samples.ci/client/petstore/java/test-manual/jersey2/auth/ApiKeyAuthTest.java
@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import java.util.Map;
 import java.util.List;

+import org.openapitools.client.ApiException;
 import org.openapitools.client.Pair;
 import org.junit.*;
 import static org.junit.Assert.*;
@@ -12,14 +13,14 @@ import static org.junit.Assert.*;

 public class ApiKeyAuthTest {
    @Test
-    public void testApplyToParamsInQuery() {
+    public void testApplyToParamsInQuery() throws ApiException {
        List<Pair> queryParams = new ArrayList<Pair>();
        Map<String, String> headerParams = new HashMap<String, String>();
        Map<String, String> cookieParams = new HashMap<String, String>();

        ApiKeyAuth auth = new ApiKeyAuth("query", "api_key");
        auth.setApiKey("my-api-key");
-        auth.applyToParams(queryParams, headerParams, cookieParams);
+        auth.applyToParams(queryParams, headerParams, cookieParams, null, null, null);

        assertEquals(1, queryParams.size());
        for (Pair queryParam : queryParams) {
@@ -32,7 +33,7 @@ public class ApiKeyAuthTest {
    }

    @Test
-    public void testApplyToParamsInHeaderWithPrefix() {
+    public void testApplyToParamsInHeaderWithPrefix() throws ApiException {
            List<Pair> queryParams = new ArrayList<Pair>();
        Map<String, String> headerParams = new HashMap<String, String>();
        Map<String, String> cookieParams = new HashMap<String, String>();
@@ -40,7 +41,7 @@ public class ApiKeyAuthTest {
        ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN");
        auth.setApiKey("my-api-token");
        auth.setApiKeyPrefix("Token");
-        auth.applyToParams(queryParams, headerParams, cookieParams);
+        auth.applyToParams(queryParams, headerParams, cookieParams, null, null, null);

        // no changes to query parameters
        assertEquals(0, queryParams.size());
@@ -50,7 +51,7 @@ public class ApiKeyAuthTest {
    }

    @Test
-    public void testApplyToParamsInCookieWithPrefix() {
+    public void testApplyToParamsInCookieWithPrefix() throws ApiException {
            List<Pair> queryParams = new ArrayList<Pair>();
        Map<String, String> headerParams = new HashMap<String, String>();
        Map<String, String> cookieParams = new HashMap<String, String>();
@@ -58,7 +59,7 @@ public class ApiKeyAuthTest {
        ApiKeyAuth auth = new ApiKeyAuth("cookie", "X-API-TOKEN");
        auth.setApiKey("my-api-token");
        auth.setApiKeyPrefix("Token");
-        auth.applyToParams(queryParams, headerParams, cookieParams);
+        auth.applyToParams(queryParams, headerParams, cookieParams, null, null, null);

        // no changes to query or header parameters
        assertEquals(0, queryParams.size());
--- a/CI/samples.ci/client/petstore/java/test-manual/jersey2/auth/HttpBasicAuthTest.java
+++ b/CI/samples.ci/client/petstore/java/test-manual/jersey2/auth/HttpBasicAuthTest.java
@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import java.util.Map;
 import java.util.List;

+import org.openapitools.client.ApiException;
 import org.openapitools.client.Pair;
 import org.junit.*;
 import static org.junit.Assert.*;
@@ -19,14 +20,14 @@ public class HttpBasicAuthTest {
    }

    @Test
-    public void testApplyToParams() {
+    public void testApplyToParams() throws ApiException {
        List<Pair> queryParams = new ArrayList<Pair>();
        Map<String, String> headerParams = new HashMap<String, String>();
        Map<String, String> cookieParams = new HashMap<String, String>();

        auth.setUsername("my-username");
        auth.setPassword("my-password");
-        auth.applyToParams(queryParams, headerParams, cookieParams);
+        auth.applyToParams(queryParams, headerParams, cookieParams, null, null, null);

        // no changes to query parameters
        assertEquals(0, queryParams.size());
@@ -37,7 +38,7 @@ public class HttpBasicAuthTest {

        // null username should be treated as empty string
        auth.setUsername(null);
-        auth.applyToParams(queryParams, headerParams, cookieParams);
+        auth.applyToParams(queryParams, headerParams, cookieParams, null, null, null);
        // the string below is base64-encoded result of ":my-password" with the "Basic " prefix
        expected = "Basic Om15LXBhc3N3b3Jk";
        assertEquals(expected, headerParams.get("Authorization"));
@@ -45,7 +46,7 @@ public class HttpBasicAuthTest {
        // null password should be treated as empty string
        auth.setUsername("my-username");
        auth.setPassword(null);
-        auth.applyToParams(queryParams, headerParams, cookieParams);
+        auth.applyToParams(queryParams, headerParams, cookieParams, null, null, null);
        // the string below is base64-encoded result of "my-username:" with the "Basic " prefix
        expected = "Basic bXktdXNlcm5hbWU6";
        assertEquals(expected, headerParams.get("Authorization"));
--- a/bin/java-petstore-all.sh
+++ b/bin/java-petstore-all.sh
@@ -6,6 +6,7 @@
 ./bin/java-petstore-google-api-client.sh
 ./bin/java-petstore-jersey1.sh
 ./bin/java-petstore-jersey2-java6.sh
+./bin/java-petstore-jersey2-java8.sh
 ./bin/java-petstore-jersey2.sh
 ./bin/java-petstore-microprofile.sh
 ./bin/java-petstore-native.sh
@@ -25,4 +26,3 @@
 ./bin/java-petstore-retrofit2rx2.sh
 ./bin/java-petstore-vertx.sh
 ./bin/java-petstore-webclient.sh
-./bin/java8-petstore-jersey2.sh
--- a/bin/java-petstore-jersey2-experimental.json
+++ b/bin/java-petstore-jersey2-experimental.json
@@ -1,4 +0,0 @@
-{
-    "library": "jersey2-experimental",
-    "artifactId": "petstore-jersey2-exp"
-}
--- a/bin/java-petstore-jersey2-experimental.sh
+++ b/bin/java-petstore-jersey2-experimental.sh
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
-
-while [ -h "$SCRIPT" ] ; do
-  ls=`ls -ld "$SCRIPT"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    SCRIPT="$link"
-  else
-    SCRIPT=`dirname "$SCRIPT"`/"$link"
-  fi
-done
-
-if [ ! -d "${APP_DIR}" ]; then
-  APP_DIR=`dirname "$SCRIPT"`/..
-  APP_DIR=`cd "${APP_DIR}"; pwd`
-fi
-
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
-
-if [ ! -f "$executable" ]
-then
-  mvn -B clean package
-fi
-
-# if you've executed sbt assembly previously it will use that instead.
-export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -i modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin/java-petstore-jersey2-experimental.json -o samples/client/petstore/java/jersey2-experimental -t modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental  --additional-properties hideGenerationTimestamp=true $@"
-
-echo "Removing files and folders under samples/client/petstore/java/jersey2-experimental/src/main"
-rm -rf samples/client/petstore/java/jersey2-experimental/src/main
-find samples/client/petstore/java/jersey2-experimental -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
-java $JAVA_OPTS -jar $executable $ags
-
-#mvn com.coveo:fmt-maven-plugin:format -f samples/client/petstore/java/jersey2-experimental/pom.xml
-
-# copy additional manually written unit-tests
-#mkdir samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client
-#mkdir samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/auth
-#mkdir samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/model
-
-#cp CI/samples.ci/client/petstore/java/test-manual/common/StringUtilTest.java samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/StringUtilTest.java
-#cp CI/samples.ci/client/petstore/java/test-manual/jersey2/ApiClientTest.java samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/ApiClientTest.java
-#cp CI/samples.ci/client/petstore/java/test-manual/common/ConfigurationTest.java samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/ConfigurationTest.java
-#cp CI/samples.ci/client/petstore/java/test-manual/jersey2/auth/ApiKeyAuthTest.java samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/auth/ApiKeyAuthTest.java
-#cp CI/samples.ci/client/petstore/java/test-manual/jersey2/auth/HttpBasicAuthTest.java samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/auth/HttpBasicAuthTest.java
-#cp CI/samples.ci/client/petstore/java/test-manual/jersey2/model/EnumValueTest.java samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/model/EnumValueTest.java
-#cp CI/samples.ci/client/petstore/java/test-manual/jersey2/JSONTest.java samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/JSONTest.java
--- a/bin/java-petstore-jersey2-java8.json
+++ b/bin/java-petstore-jersey2-java8.json
--- a/bin/java-petstore-jersey2-java8.sh
+++ b/bin/java-petstore-jersey2-java8.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-java8 -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin/java8-petstore-jersey2.json -o samples/client/petstore/java/jersey2-java8 --additional-properties hideGenerationTimestamp=true --additional-properties serverPort=8082 $@"
+ags="generate --artifact-id petstore-jersey2-java8 -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin/java-petstore-jersey2-java8.json -o samples/client/petstore/java/jersey2-java8 --additional-properties hideGenerationTimestamp=true --additional-properties serverPort=8082 $@"

 echo "Removing files and folders under samples/client/petstore/java/jersey2-java8/src/main"
 rm -rf samples/client/petstore/java/jersey2-java8/src/main
@@ -45,4 +45,4 @@ cp CI/samples.ci/client/petstore/java/test-manual/common/ConfigurationTest.java
 cp CI/samples.ci/client/petstore/java/test-manual/jersey2/auth/ApiKeyAuthTest.java samples/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/auth/ApiKeyAuthTest.java
 cp CI/samples.ci/client/petstore/java/test-manual/jersey2/auth/HttpBasicAuthTest.java samples/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/auth/HttpBasicAuthTest.java
 cp CI/samples.ci/client/petstore/java/test-manual/jersey2/model/EnumValueTest.java samples/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/model/EnumValueTest.java
-cp CI/samples.ci/client/petstore/java/test-manual/jersey2-java8/JSONTest.java samples/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/JSONTest.java
+cp CI/samples.ci/client/petstore/java/test-manual/jersey2-java8/JSONTest.java samples/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/JSONTest.java
--- a/bin/java-petstore-jersey2.sh
+++ b/bin/java-petstore-jersey2.sh
@@ -35,14 +35,14 @@ find samples/client/petstore/java/jersey2 -maxdepth 1 -type f ! -name "README.md
 java $JAVA_OPTS -jar $executable $ags

 # copy additional manually written unit-tests
-mkdir samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client
-mkdir samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/auth
-mkdir samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/model
-
-cp CI/samples.ci/client/petstore/java/test-manual/common/StringUtilTest.java samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/StringUtilTest.java
-cp CI/samples.ci/client/petstore/java/test-manual/jersey2/ApiClientTest.java samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/ApiClientTest.java
-cp CI/samples.ci/client/petstore/java/test-manual/common/ConfigurationTest.java samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/ConfigurationTest.java
-cp CI/samples.ci/client/petstore/java/test-manual/jersey2/auth/ApiKeyAuthTest.java samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/auth/ApiKeyAuthTest.java
-cp CI/samples.ci/client/petstore/java/test-manual/jersey2/auth/HttpBasicAuthTest.java samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/auth/HttpBasicAuthTest.java
-cp CI/samples.ci/client/petstore/java/test-manual/jersey2/model/EnumValueTest.java samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/model/EnumValueTest.java
-cp CI/samples.ci/client/petstore/java/test-manual/jersey2/JSONTest.java samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/JSONTest.java
+#mkdir samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client
+#mkdir samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/auth
+#mkdir samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/model
+#
+#cp CI/samples.ci/client/petstore/java/test-manual/common/StringUtilTest.java samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/StringUtilTest.java
+#cp CI/samples.ci/client/petstore/java/test-manual/jersey2/ApiClientTest.java samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/ApiClientTest.java
+#cp CI/samples.ci/client/petstore/java/test-manual/common/ConfigurationTest.java samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/ConfigurationTest.java
+#cp CI/samples.ci/client/petstore/java/test-manual/jersey2/auth/ApiKeyAuthTest.java samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/auth/ApiKeyAuthTest.java
+#cp CI/samples.ci/client/petstore/java/test-manual/jersey2/auth/HttpBasicAuthTest.java samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/auth/HttpBasicAuthTest.java
+#cp CI/samples.ci/client/petstore/java/test-manual/jersey2/model/EnumValueTest.java samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/model/EnumValueTest.java
+#cp CI/samples.ci/client/petstore/java/test-manual/jersey2/JSONTest.java samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/JSONTest.java
--- a/docs/generators/java.md
+++ b/docs/generators/java.md
@@ -31,7 +31,7 @@ sidebar_label: java
 |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|
 |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>**jersey2-experimental**</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|
+|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|
 |licenseUrl|The URL of the license| |http://unlicense.org|
 |modelPackage|package for generated models| |org.openapitools.client.model|
--- a/modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml
+++ b/modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml
@@ -130,15 +130,25 @@
          <version>${jackson-version}</version>
        </dependency>
        <dependency>
-          <groupId>com.fasterxml.jackson.jaxrs</groupId>
-          <artifactId>jackson-jaxrs-json-provider</artifactId>
-          <version>${jackson-version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.openapitools</groupId>
-          <artifactId>jackson-databind-nullable</artifactId>
-          <version>${jackson-databind-nullable-version}</version>
-      </dependency>
+            <groupId>com.fasterxml.jackson.jaxrs</groupId>
+            <artifactId>jackson-jaxrs-json-provider</artifactId>
+            <version>${jackson-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openapitools</groupId>
+            <artifactId>jackson-databind-nullable</artifactId>
+            <version>${jackson-databind-nullable-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.scribejava</groupId>
+            <artifactId>scribejava-apis</artifactId>
+            <version>6.9.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.tomitribe</groupId>
+            <artifactId>tomitribe-http-signatures</artifactId>
+            <version>${http-signature-version}</version>
+        </dependency>

        <!-- Joda time: if you use it -->
        <dependency>
--- a/modules/openapi-generator-maven-plugin/examples/multi-module/pom.xml
+++ b/modules/openapi-generator-maven-plugin/examples/multi-module/pom.xml
@@ -20,5 +20,6 @@
        <jodatime-version>2.7</jodatime-version>
        <maven-plugin-version>1.0.0</maven-plugin-version>
        <junit-version>4.8.1</junit-version>
+        <http-signature-version>1.3</http-signature-version>
    </properties>
 </project>
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
@@ -72,7 +72,6 @@ public class JavaClientCodegen extends AbstractJavaCodegen
    public static final String GOOGLE_API_CLIENT = "google-api-client";
    public static final String JERSEY1 = "jersey1";
    public static final String JERSEY2 = "jersey2";
-    public static final String JERSEY2_EXPERIMENTAL = "jersey2-experimental";
    public static final String NATIVE = "native";
    public static final String OKHTTP_GSON = "okhttp-gson";
    public static final String RESTEASY = "resteasy";
@@ -148,7 +147,6 @@ public class JavaClientCodegen extends AbstractJavaCodegen

        supportedLibraries.put(JERSEY1, "HTTP client: Jersey client 1.19.x. JSON processing: Jackson 2.9.x. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'. IMPORTANT NOTE: jersey 1.x is no longer actively maintained so please upgrade to 'jersey2' or other HTTP libaries instead.");
        supportedLibraries.put(JERSEY2, "HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.9.x");
-        supportedLibraries.put(JERSEY2_EXPERIMENTAL, "HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.9.x");
        supportedLibraries.put(FEIGN, "HTTP client: OpenFeign 9.x (deprecated) or 10.x (default). JSON processing: Jackson 2.9.x.");
        supportedLibraries.put(OKHTTP_GSON, "[DEFAULT] HTTP client: OkHttp 3.x. JSON processing: Gson 2.8.x. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
        supportedLibraries.put(RETROFIT_1, "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.");
@@ -376,13 +374,11 @@ public class JavaClientCodegen extends AbstractJavaCodegen
            if ("retrofit2".equals(getLibrary()) && !usePlayWS) {
                supportingFiles.add(new SupportingFile("JSON.mustache", invokerFolder, "JSON.java"));
            }
-        } else if (JERSEY2.equals(getLibrary()) || JERSEY2_EXPERIMENTAL.equals(getLibrary())) {
+        } else if (JERSEY2.equals(getLibrary())) {
            supportingFiles.add(new SupportingFile("JSON.mustache", invokerFolder, "JSON.java"));
            supportingFiles.add(new SupportingFile("ApiResponse.mustache", invokerFolder, "ApiResponse.java"));
-            if (JERSEY2_EXPERIMENTAL.equals(getLibrary())) {
-                supportingFiles.add(new SupportingFile("auth/HttpSignatureAuth.mustache", authFolder, "HttpSignatureAuth.java"));
-                supportingFiles.add(new SupportingFile("AbstractOpenApiSchema.mustache", (sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar), "AbstractOpenApiSchema.java"));
-            }
+            supportingFiles.add(new SupportingFile("auth/HttpSignatureAuth.mustache", authFolder, "HttpSignatureAuth.java"));
+            supportingFiles.add(new SupportingFile("AbstractOpenApiSchema.mustache", (sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar), "AbstractOpenApiSchema.java"));
            forceSerializationLibrary(SERIALIZATION_LIBRARY_JACKSON);
        } else if (NATIVE.equals(getLibrary())) {
            setJava8Mode(true);
@@ -512,11 +508,6 @@ public class JavaClientCodegen extends AbstractJavaCodegen
            additionalProperties.remove(SERIALIZATION_LIBRARY_GSON);
        }

-        if (additionalProperties.containsKey(SERIALIZATION_LIBRARY_JACKSON) && !JERSEY2_EXPERIMENTAL.equals(getLibrary())) {
-            useOneOfInterfaces = true;
-            addOneOfInterfaceImports = true;
-        }
-
    }

    private boolean usesAnyRetrofitLibrary() {
@@ -608,7 +599,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen
            objs = AbstractJavaJAXRSServerCodegen.jaxrsPostProcessOperations(objs);
        }

-        if (JERSEY2_EXPERIMENTAL.equals(getLibrary())) {
+        if (JERSEY2.equals(getLibrary())) {
            // index the model
            HashMap<String, CodegenModel> modelMaps = new HashMap<String, CodegenModel>();
            for (Object o : allModels) {
@@ -816,10 +807,9 @@ public class JavaClientCodegen extends AbstractJavaCodegen
            cm.getVendorExtensions().putIfAbsent("implements", new ArrayList<String>());  // TODO: 5.0 Remove
            cm.getVendorExtensions().putIfAbsent("x-implements", cm.getVendorExtensions().get("implements"));
            //List<String> impl = (List<String>) cm.getVendorExtensions().get("x-implements");
-            if (JERSEY2_EXPERIMENTAL.equals(getLibrary())) {
+            if (JERSEY2.equals(getLibrary())) {
                cm.getVendorExtensions().put("x-implements", new ArrayList<String>());
            }
-
            if (this.parcelableModel) {
                ((ArrayList<String>) cm.getVendorExtensions().get("x-implements")).add("Parcelable");
            }
@@ -857,7 +847,9 @@ public class JavaClientCodegen extends AbstractJavaCodegen
        this.feignVersion = feignVersion;
    }

-    public void setAsyncNative(boolean asyncNative) { this.asyncNative = asyncNative; }
+    public void setAsyncNative(boolean asyncNative) {
+        this.asyncNative = asyncNative;
+    }

    public void setParcelableModel(boolean parcelableModel) {
        this.parcelableModel = parcelableModel;
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/ApiClient.mustache
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/ApiResponse.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/ApiResponse.mustache
@@ -1,73 +0,0 @@
-{{>licenseInfo}}
-
-package {{invokerPackage}};
-
-import java.util.List;
-import java.util.Map;
-{{#caseInsensitiveResponseHeaders}}
-import java.util.Map.Entry;		
-import java.util.TreeMap;
-{{/caseInsensitiveResponseHeaders}}
-
-/**
- * API response returned by API call.
- *
- * @param <T> The type of data that is deserialized from response body
- */
-public class ApiResponse<T> {
-    private final int statusCode;
-    private final Map<String, List<String>> headers;
-    private final T data;
-
-    /**
-     * @param statusCode The status code of HTTP response
-     * @param headers The headers of HTTP response
-     */
-    public ApiResponse(int statusCode, Map<String, List<String>> headers) {
-        this(statusCode, headers, null);
-    }
-
-    /**
-     * @param statusCode The status code of HTTP response
-     * @param headers The headers of HTTP response
-     * @param data The object deserialized from response bod
-     */
-    public ApiResponse(int statusCode, Map<String, List<String>> headers, T data) {
-        this.statusCode = statusCode;
-        {{#caseInsensitiveResponseHeaders}}
-        Map<String, List<String>> responseHeaders = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
-        for(Entry<String, List<String>> entry : headers.entrySet()){
-           responseHeaders.put(entry.getKey().toLowerCase(), entry.getValue());
-        }
-        {{/caseInsensitiveResponseHeaders}}
-        this.headers = {{#caseInsensitiveResponseHeaders}}responseHeaders{{/caseInsensitiveResponseHeaders}}{{^caseInsensitiveResponseHeaders}}headers{{/caseInsensitiveResponseHeaders}};
-        this.data = data;
-    }
-
-    /**
-     * 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;
-    }
-}
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/JSON.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/JSON.mustache
@@ -1,72 +0,0 @@
-package {{invokerPackage}};
-
-{{#threetenbp}}
-import org.threeten.bp.*;
-{{/threetenbp}}
-import com.fasterxml.jackson.annotation.*;
-import com.fasterxml.jackson.databind.*;
-import org.openapitools.jackson.nullable.JsonNullableModule;
-{{#java8}}
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-{{/java8}}
-{{#joda}}
-import com.fasterxml.jackson.datatype.joda.JodaModule;
-{{/joda}}
-{{#threetenbp}}
-import com.fasterxml.jackson.datatype.threetenbp.ThreeTenModule;
-{{/threetenbp}}
-
-import java.text.DateFormat;
-
-import javax.ws.rs.ext.ContextResolver;
-
-{{>generatedAnnotation}}
-public class JSON implements ContextResolver<ObjectMapper> {
-  private ObjectMapper mapper;
-
-  public JSON() {
-    mapper = new ObjectMapper();
-    mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-    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());
-    {{#java8}}
-    mapper.registerModule(new JavaTimeModule());
-    {{/java8}}
-    {{#joda}}
-    mapper.registerModule(new JodaModule());
-    {{/joda}}
-    {{#threetenbp}}
-    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);
-    {{/threetenbp}}
-    JsonNullableModule jnm = new JsonNullableModule();
-    mapper.registerModule(jnm);
-  }
-
-  /**
-   * Set the date format for JSON (de)serialization with Date properties.
-   * @param dateFormat Date format
-   */
-  public void setDateFormat(DateFormat dateFormat) {
-    mapper.setDateFormat(dateFormat);
-  }
-
-  @Override
-  public ObjectMapper getContext(Class<?> type) {
-    return mapper;
-  }
-
-  /**
-   * Get the object mapper
-   *
-   * @return object mapper
-   */
-  public ObjectMapper getMapper() { return mapper; }
-}
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/api.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/api.mustache
@@ -1,262 +0,0 @@
-package {{package}};
-
-import {{invokerPackage}}.ApiException;
-import {{invokerPackage}}.ApiClient;
-import {{invokerPackage}}.ApiResponse;
-import {{invokerPackage}}.Configuration;
-import {{invokerPackage}}.Pair;
-
-import javax.ws.rs.core.GenericType;
-
-{{#imports}}import {{import}};
-{{/imports}}
-
-{{^fullJavaUtil}}
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-{{/fullJavaUtil}}
-{{>generatedAnnotation}}
-{{#operations}}
-public class {{classname}} {
-  private ApiClient apiClient;
-
-  public {{classname}}() {
-    this(Configuration.getDefaultApiClient());
-  }
-
-  public {{classname}}(ApiClient apiClient) {
-    this.apiClient = apiClient;
-  }
-
-  /**
-   * Get the API cilent
-   *
-   * @return API client
-   */
-  public ApiClient getApiClient() {
-    return apiClient;
-  }
-
-  /**
-   * Set the API cilent
-   *
-   * @param apiClient an instance of API client
-   */
-  public void setApiClient(ApiClient apiClient) {
-    this.apiClient = apiClient;
-  }
-
-  {{#operation}}
-  {{^vendorExtensions.x-group-parameters}}
-  /**
-   * {{summary}}
-   * {{notes}}
-   {{#allParams}}
-   * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}
-   {{/allParams}}
-   {{#returnType}}
-   * @return {{returnType}}
-   {{/returnType}}
-   * @throws ApiException if fails to make API call
-   {{#responses.0}}
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       {{#responses}}
-       <tr><td> {{code}} </td><td> {{message}} </td><td> {{#headers}} * {{baseName}} - {{description}} <br> {{/headers}}{{^headers.0}} - {{/headers.0}} </td></tr>
-       {{/responses}}
-     </table>
-   {{/responses.0}}
-   {{#isDeprecated}}
-   * @deprecated
-   {{/isDeprecated}}
-   {{#externalDocs}}
-   * {{description}}
-   * @see <a href="{{url}}">{{summary}} Documentation</a>
-   {{/externalDocs}}
-   */
-  {{#isDeprecated}}
-  @Deprecated
-  {{/isDeprecated}}
-  public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{operationId}}({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException {
-    {{#returnType}}return {{/returnType}}{{operationId}}WithHttpInfo({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}){{#returnType}}.getData(){{/returnType}};
-  }
-  {{/vendorExtensions.x-group-parameters}}
-
-  {{^vendorExtensions.x-group-parameters}}
-  /**
-   * {{summary}}
-   * {{notes}}
-   {{#allParams}}
-   * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}
-   {{/allParams}}
-   * @return ApiResponse&lt;{{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}Void{{/returnType}}&gt;
-   * @throws ApiException if fails to make API call
-   {{#responses.0}}
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       {{#responses}}
-       <tr><td> {{code}} </td><td> {{message}} </td><td> {{#headers}} * {{baseName}} - {{description}} <br> {{/headers}}{{^headers.0}} - {{/headers.0}} </td></tr>
-       {{/responses}}
-     </table>
-   {{/responses.0}}
-   {{#isDeprecated}}
-   * @deprecated
-   {{/isDeprecated}}
-   {{#externalDocs}}
-   * {{description}}
-   * @see <a href="{{url}}">{{summary}} Documentation</a>
-   {{/externalDocs}}
-   */
-  {{#isDeprecated}}
-  @Deprecated
-  {{/isDeprecated}}
-  public{{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-group-parameters}}private{{/vendorExtensions.x-group-parameters}} ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{operationId}}WithHttpInfo({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException {
-    Object localVarPostBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
-    {{#allParams}}{{#required}}
-    // verify the required parameter '{{paramName}}' is set
-    if ({{paramName}} == null) {
-      throw new ApiException(400, "Missing the required parameter '{{paramName}}' when calling {{operationId}}");
-    }
-    {{/required}}{{/allParams}}
-    // create path and map variables
-    String localVarPath = "{{{path}}}"{{#pathParams}}
-      .replaceAll("\\{" + "{{baseName}}" + "\\}", apiClient.escapeString({{{paramName}}}.toString())){{/pathParams}};
-
-    // query params
-    {{javaUtilPrefix}}List<Pair> localVarQueryParams = new {{javaUtilPrefix}}ArrayList<Pair>();
-    {{javaUtilPrefix}}Map<String, String> localVarHeaderParams = new {{javaUtilPrefix}}HashMap<String, String>();
-    {{javaUtilPrefix}}Map<String, String> localVarCookieParams = new {{javaUtilPrefix}}HashMap<String, String>();
-    {{javaUtilPrefix}}Map<String, Object> localVarFormParams = new {{javaUtilPrefix}}HashMap<String, Object>();
-
-    {{#queryParams}}
-    localVarQueryParams.addAll(apiClient.parameterToPairs("{{#collectionFormat}}{{{collectionFormat}}}{{/collectionFormat}}", "{{baseName}}", {{paramName}}));
-    {{/queryParams}}
-
-    {{#headerParams}}if ({{paramName}} != null)
-      localVarHeaderParams.put("{{baseName}}", apiClient.parameterToString({{paramName}}));
-    {{/headerParams}}
-
-    {{#cookieParams}}if ({{paramName}} != null)
-      localVarCookieParams.put("{{baseName}}", apiClient.parameterToString({{paramName}}));
-    {{/cookieParams}}
-
-    {{#formParams}}if ({{paramName}} != null)
-      localVarFormParams.put("{{baseName}}", {{paramName}});
-    {{/formParams}}
-
-    final String[] localVarAccepts = {
-      {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}}
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}}
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
-
-    {{#returnType}}
-    GenericType<{{{returnType}}}> localVarReturnType = new GenericType<{{{returnType}}}>() {};
-
-    {{/returnType}}
-    return apiClient.invokeAPI("{{classname}}.{{operationId}}", localVarPath, "{{httpMethod}}", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, {{#returnType}}localVarReturnType{{/returnType}}{{^returnType}}null{{/returnType}}, {{#vendorExtensions.x-java-return-type-one-of}}new {{{returnType}}}(){{/vendorExtensions.x-java-return-type-one-of}}{{^vendorExtensions.x-java-return-type-one-of}}{{#vendorExtensions.x-java-return-type-any-of}}new {{{returnType}}}(){{/vendorExtensions.x-java-return-type-any-of}}{{^vendorExtensions.x-java-return-type-any-of}}null{{/vendorExtensions.x-java-return-type-any-of}}{{/vendorExtensions.x-java-return-type-one-of}});
-  }
-  {{#vendorExtensions.x-group-parameters}}
-
-  public class API{{operationId}}Request {
-    {{#allParams}}
-    private {{#isRequired}}final {{/isRequired}}{{{dataType}}} {{localVariablePrefix}}{{paramName}};
-    {{/allParams}}
-
-    private API{{operationId}}Request({{#pathParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/pathParams}}) {
-      {{#pathParams}}
-      this.{{localVariablePrefix}}{{paramName}} = {{paramName}};
-      {{/pathParams}}
-    }
-    {{#allParams}}
-    {{^isPathParam}}
-
-    /**
-     * Set {{paramName}}
-     * @param {{paramName}} {{description}} ({{^required}}optional{{^isContainer}}{{#defaultValue}}, default to {{.}}{{/defaultValue}}{{/isContainer}}{{/required}}{{#required}}required{{/required}})
-     * @return API{{operationId}}Request
-     */
-    public API{{operationId}}Request {{paramName}}({{{dataType}}} {{paramName}}) {
-      this.{{localVariablePrefix}}{{paramName}} = {{paramName}};
-      return this;
-    }
-    {{/isPathParam}}
-    {{/allParams}}
-
-    /**
-     * Execute {{operationId}} request
-     {{#returnType}}* @return {{.}}{{/returnType}}
-     * @throws ApiException if fails to make API call
-     {{#responses.0}}
-     * @http.response.details
-       <table summary="Response Details" border="1">
-         <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-         {{#responses}}
-         <tr><td> {{code}} </td><td> {{message}} </td><td> {{#headers}} * {{baseName}} - {{description}} <br> {{/headers}}{{^headers.0}} - {{/headers.0}} </td></tr>
-         {{/responses}}
-       </table>
-     {{/responses.0}}
-     {{#isDeprecated}}* @deprecated{{/isDeprecated}}
-     */
-    {{#isDeprecated}}@Deprecated{{/isDeprecated}}
-    public {{#returnType}}{{{.}}}{{/returnType}}{{^returnType}}void{{/returnType}} execute() throws ApiException {
-      {{#returnType}}return {{/returnType}}this.executeWithHttpInfo().getData();
-    }
-
-    /**
-     * Execute {{operationId}} request with HTTP info returned
-     * @return ApiResponse&lt;{{#returnType}}{{.}}{{/returnType}}{{^returnType}}Void{{/returnType}}&gt;
-     * @throws ApiException if fails to make API call
-     {{#responses.0}}
-     * @http.response.details
-       <table summary="Response Details" border="1">
-         <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-         {{#responses}}
-         <tr><td> {{code}} </td><td> {{message}} </td><td> {{#headers}} * {{baseName}} - {{description}} <br> {{/headers}}{{^headers.0}} - {{/headers.0}} </td></tr>
-         {{/responses}}
-       </table>
-     {{/responses.0}}
-     {{#isDeprecated}}
-     * @deprecated{{/isDeprecated}}
-     */
-    {{#isDeprecated}}
-    @Deprecated
-    {{/isDeprecated}}
-    public ApiResponse<{{#returnType}}{{{.}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> executeWithHttpInfo() throws ApiException {
-      return {{operationId}}WithHttpInfo({{#allParams}}{{localVariablePrefix}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
-    }
-  }
-
-  /**
-   * {{summary}}
-   * {{notes}}{{#pathParams}}
-   * @param {{paramName}} {{description}} (required){{/pathParams}}
-   * @return {{operationId}}Request
-   * @throws ApiException if fails to make API call
-   {{#isDeprecated}}* @deprecated{{/isDeprecated}}
-   {{#externalDocs}}* {{description}}
-   * @see <a href="{{url}}">{{summary}} Documentation</a>{{/externalDocs}}
-   */
-  {{#isDeprecated}}
-  @Deprecated
-  {{/isDeprecated}}
-  public API{{operationId}}Request {{operationId}}({{#pathParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/pathParams}}) throws ApiException {
-    return new API{{operationId}}Request({{#pathParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/pathParams}});
-  }
-  {{/vendorExtensions.x-group-parameters}}
-  {{/operation}}
-}
-{{/operations}}
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/apiException.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/apiException.mustache
@@ -1,99 +0,0 @@
-{{>licenseInfo}}
-
-package {{invokerPackage}};
-
-import java.util.Map;
-import java.util.List;
-{{#caseInsensitiveResponseHeaders}}
-import java.util.Map.Entry;		
-import java.util.TreeMap;
-{{/caseInsensitiveResponseHeaders}}
-
-/**
- * API Exception
- */
-{{>generatedAnnotation}}
-public class ApiException extends{{#useRuntimeException}} RuntimeException {{/useRuntimeException}}{{^useRuntimeException}} Exception {{/useRuntimeException}}{
-    private int code = 0;
-    private Map<String, List<String>> responseHeaders = null;
-    private String responseBody = null;
-
-    public ApiException() {}
-
-    public ApiException(Throwable throwable) {
-        super(throwable);
-    }
-
-    public ApiException(String message) {
-        super(message);
-    }
-
-    public ApiException(String message, Throwable throwable, int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        super(message, throwable);
-        this.code = code;
-        {{#caseInsensitiveResponseHeaders}}
-        Map<String, List<String>> headers = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
-        for(Entry<String, List<String>> entry : responseHeaders.entrySet()){
-        	headers.put(entry.getKey().toLowerCase(), entry.getValue());
-        }
-        {{/caseInsensitiveResponseHeaders}}
-        this.responseHeaders = {{#caseInsensitiveResponseHeaders}}headers{{/caseInsensitiveResponseHeaders}}{{^caseInsensitiveResponseHeaders}}responseHeaders{{/caseInsensitiveResponseHeaders}};
-        this.responseBody = responseBody;
-    }
-
-    public ApiException(String message, int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this(message, (Throwable) null, code, responseHeaders, responseBody);
-    }
-
-    public ApiException(String message, Throwable throwable, int code, Map<String, List<String>> responseHeaders) {
-        this(message, throwable, code, responseHeaders, null);
-    }
-
-    public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
-    }
-
-    public ApiException(int code, String message) {
-        super(message);
-        this.code = code;
-    }
-
-    public ApiException(int code, String message, Map<String, List<String>> responseHeaders, String responseBody) {
-        this(code, message);
-        {{#caseInsensitiveResponseHeaders}}
-        Map<String, List<String>> headers = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
-        for(Entry<String, List<String>> entry : responseHeaders.entrySet()){
-        	headers.put(entry.getKey().toLowerCase(), entry.getValue());
-        }
-        {{/caseInsensitiveResponseHeaders}}
-        this.responseHeaders = {{#caseInsensitiveResponseHeaders}}headers{{/caseInsensitiveResponseHeaders}}{{^caseInsensitiveResponseHeaders}}responseHeaders{{/caseInsensitiveResponseHeaders}};
-        this.responseBody = responseBody;
-    }
-
-    /**
-     * Get the HTTP status code.
-     *
-     * @return HTTP status code
-     */
-    public int getCode() {
-        return code;
-    }
-
-    /**
-     * Get the HTTP response headers.
-     *
-     * @return A map of list of string
-     */
-    public Map<String, List<String>> getResponseHeaders() {
-        return responseHeaders;
-    }
-
-    /**
-     * Get the HTTP response body.
-     *
-     * @return Response body in the form of string
-     */
-    public String getResponseBody() {
-        return responseBody;
-    }
-}
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/api_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/api_doc.mustache
@@ -1,121 +0,0 @@
-# {{classname}}{{#description}}
-
-{{description}}{{/description}}
-
-All URIs are relative to *{{basePath}}*
-
-Method | HTTP request | Description
------------- | ------------- | -------------
-{{#operations}}{{#operation}}[**{{operationId}}**]({{classname}}.md#{{operationId}}) | **{{httpMethod}}** {{path}} | {{#summary}}{{summary}}{{/summary}}
-{{/operation}}{{/operations}}
-
-{{#operations}}
-{{#operation}}
-
-## {{operationId}}
-
-{{^vendorExtensions.x-group-parameters}}
-> {{#returnType}}{{returnType}} {{/returnType}}{{operationId}}({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
-{{/vendorExtensions.x-group-parameters}}
-{{#vendorExtensions.x-group-parameters}}
-> {{#returnType}}{{returnType}} {{/returnType}}{{operationId}}({{#pathParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/pathParams}}){{#allParams}}{{^isPathParam}}.{{paramName}}({{paramName}}){{/isPathParam}}{{/allParams}}.execute();
-{{/vendorExtensions.x-group-parameters}}
-
-{{summary}}{{#notes}}
-
-{{{unescapedNotes}}}{{/notes}}
-
-### Example
-
-```java
-// Import classes:
-import {{{invokerPackage}}}.ApiClient;
-import {{{invokerPackage}}}.ApiException;
-import {{{invokerPackage}}}.Configuration;{{#hasAuthMethods}}
-import {{{invokerPackage}}}.auth.*;{{/hasAuthMethods}}
-import {{{invokerPackage}}}.models.*;
-import {{{package}}}.{{{classname}}};
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("{{{basePath}}}");
-        {{#hasAuthMethods}}
-        {{#authMethods}}{{#isBasic}}{{#isBasicBasic}}
-        // Configure HTTP basic authorization: {{{name}}}
-        HttpBasicAuth {{{name}}} = (HttpBasicAuth) defaultClient.getAuthentication("{{{name}}}");
-        {{{name}}}.setUsername("YOUR USERNAME");
-        {{{name}}}.setPassword("YOUR PASSWORD");{{/isBasicBasic}}{{#isBasicBearer}}
-        // Configure HTTP bearer authorization: {{{name}}}
-        HttpBearerAuth {{{name}}} = (HttpBearerAuth) defaultClient.getAuthentication("{{{name}}}");
-        {{{name}}}.setBearerToken("BEARER TOKEN");{{/isBasicBearer}}{{/isBasic}}{{#isApiKey}}
-        // Configure API key authorization: {{{name}}}
-        ApiKeyAuth {{{name}}} = (ApiKeyAuth) defaultClient.getAuthentication("{{{name}}}");
-        {{{name}}}.setApiKey("YOUR API KEY");
-        // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
-        //{{{name}}}.setApiKeyPrefix("Token");{{/isApiKey}}{{#isOAuth}}
-        // Configure OAuth2 access token for authorization: {{{name}}}
-        OAuth {{{name}}} = (OAuth) defaultClient.getAuthentication("{{{name}}}");
-        {{{name}}}.setAccessToken("YOUR ACCESS TOKEN");{{/isOAuth}}
-        {{/authMethods}}
-        {{/hasAuthMethods}}
-
-        {{{classname}}} apiInstance = new {{{classname}}}(defaultClient);
-        {{#allParams}}
-        {{{dataType}}} {{{paramName}}} = {{{example}}}; // {{{dataType}}} | {{{description}}}
-        {{/allParams}}
-        try {
-            {{^vendorExtensions.x-group-parameters}}
-            {{#returnType}}{{{returnType}}} result = {{/returnType}}apiInstance.{{{operationId}}}({{#allParams}}{{{paramName}}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
-            {{/vendorExtensions.x-group-parameters}}
-            {{#vendorExtensions.x-group-parameters}}
-            {{#returnType}}{{{returnType}}} result = {{/returnType}}api.{{operationId}}({{#pathParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/pathParams}}){{#allParams}}{{^isPathParam}}
-                .{{paramName}}({{paramName}}){{/isPathParam}}{{/allParams}}
-                .execute();
-            {{/vendorExtensions.x-group-parameters}}
-            {{#returnType}}
-            System.out.println(result);
-            {{/returnType}}
-        } catch (ApiException e) {
-            System.err.println("Exception when calling {{{classname}}}#{{{operationId}}}");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-{{^allParams}}This endpoint does not need any parameter.{{/allParams}}{{#allParams}}{{#-last}}
-Name | Type | Description  | Notes
------------- | ------------- | ------------- | -------------{{/-last}}{{/allParams}}
-{{#allParams}} **{{paramName}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isFile}}**{{dataType}}**{{/isFile}}{{^isFile}}[**{{dataType}}**]({{baseType}}.md){{/isFile}}{{/isPrimitiveType}}| {{description}} |{{^required}} [optional]{{/required}}{{^isContainer}}{{#defaultValue}} [default to {{defaultValue}}]{{/defaultValue}}{{/isContainer}}{{#allowableValues}} [enum: {{#values}}{{{.}}}{{^-last}}, {{/-last}}{{/values}}]{{/allowableValues}}
-{{/allParams}}
-
-### Return type
-
-{{#returnType}}{{#returnTypeIsPrimitive}}**{{returnType}}**{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}[**{{returnType}}**]({{returnBaseType}}.md){{/returnTypeIsPrimitive}}{{/returnType}}{{^returnType}}null (empty response body){{/returnType}}
-
-### Authorization
-
-{{^authMethods}}No authorization required{{/authMethods}}{{#authMethods}}[{{name}}](../README.md#{{name}}){{^-last}}, {{/-last}}{{/authMethods}}
-
-### HTTP request headers
-
- **Content-Type**: {{#consumes}}{{{mediaType}}}{{#hasMore}}, {{/hasMore}}{{/consumes}}{{^consumes}}Not defined{{/consumes}}
- **Accept**: {{#produces}}{{{mediaType}}}{{#hasMore}}, {{/hasMore}}{{/produces}}{{^produces}}Not defined{{/produces}}
-
-{{#responses.0}}
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-{{#responses}}
-| **{{code}}** | {{message}} | {{#headers}} * {{baseName}} - {{description}} <br> {{/headers}}{{^headers.0}} - {{/headers.0}} |
-{{/responses}}
-{{/responses.0}}
-
-{{/operation}}
-{{/operations}}
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/api_test.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/api_test.mustache
@@ -1,51 +0,0 @@
-{{>licenseInfo}}
-
-package {{package}};
-
-import {{invokerPackage}}.ApiException;
-{{#imports}}import {{import}};
-{{/imports}}
-import org.junit.Test;
-import org.junit.Ignore;
-import org.junit.Assert;
-
-{{^fullJavaUtil}}
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-{{/fullJavaUtil}}
-
-/**
- * API tests for {{classname}}
- */
-public class {{classname}}Test {
-
-    private final {{classname}} api = new {{classname}}();
-
-    {{#operations}}{{#operation}}
-    /**
-     * {{summary}}
-     *
-     * {{notes}}
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void {{operationId}}Test() throws ApiException {
-        {{#allParams}}
-        //{{{dataType}}} {{paramName}} = null;
-        {{/allParams}}
-        {{^vendorExtensions.x-group-parameters}}
-        //{{#returnType}}{{{returnType}}} response = {{/returnType}}api.{{operationId}}({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
-        {{/vendorExtensions.x-group-parameters}}
-        {{#vendorExtensions.x-group-parameters}}
-        //{{#returnType}}{{{returnType}}} response = {{/returnType}}api.{{operationId}}({{#pathParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/pathParams}}){{#allParams}}{{^isPathParam}}
-        //        .{{paramName}}({{paramName}}){{/isPathParam}}{{/allParams}}
-        //        .execute();
-        {{/vendorExtensions.x-group-parameters}}
-        // TODO: test validations
-    }
-    {{/operation}}{{/operations}}
-}
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/build.gradle.mustache
@@ -1,170 +0,0 @@
-apply plugin: 'idea'
-apply plugin: 'eclipse'
-
-group = '{{groupId}}'
-version = '{{artifactVersion}}'
-
-buildscript {
-    repositories {
-        maven { url "https://repo1.maven.org/maven2" }
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.+'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
-    }
-}
-
-repositories {
-    jcenter()
-}
-
-
-if(hasProperty('target') && target == 'android') {
-
-    apply plugin: 'com.android.library'
-    apply plugin: 'com.github.dcendents.android-maven'
-
-    android {
-        compileSdkVersion 25
-        buildToolsVersion '25.0.2'
-        defaultConfig {
-            minSdkVersion 14
-            targetSdkVersion 25
-        }
-        compileOptions {
-            {{#supportJava6}}
-            sourceCompatibility JavaVersion.VERSION_1_6
-            targetCompatibility JavaVersion.VERSION_1_6
-            {{/supportJava6}}
-            {{^supportJava6}}
-            {{#java8}}
-            sourceCompatibility JavaVersion.VERSION_1_8
-            targetCompatibility JavaVersion.VERSION_1_8
-            {{/java8}}
-            {{^java8}}
-            sourceCompatibility JavaVersion.VERSION_1_7
-            targetCompatibility JavaVersion.VERSION_1_7
-            {{/java8}}
-            {{/supportJava6}}
-        }
-
-        // Rename the aar correctly
-        libraryVariants.all { variant ->
-            variant.outputs.each { output ->
-                def outputFile = output.outputFile
-                if (outputFile != null && outputFile.name.endsWith('.aar')) {
-                    def fileName = "${project.name}-${variant.baseName}-${version}.aar"
-                    output.outputFile = new File(outputFile.parent, fileName)
-                }
-            }
-        }
-
-        dependencies {
-            provided 'javax.annotation:jsr250-api:1.0'
-        }
-    }
-
-    afterEvaluate {
-        android.libraryVariants.all { variant ->
-            def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
-            task.description = "Create jar artifact for ${variant.name}"
-            task.dependsOn variant.javaCompile
-            task.from variant.javaCompile.destinationDir
-            task.destinationDir = project.file("${project.buildDir}/outputs/jar")
-            task.archiveName = "${project.name}-${variant.baseName}-${version}.jar"
-            artifacts.add('archives', task);
-        }
-    }
-
-    task sourcesJar(type: Jar) {
-        from android.sourceSets.main.java.srcDirs
-        classifier = 'sources'
-    }
-
-    artifacts {
-        archives sourcesJar
-    }
-
-} else {
-
-    apply plugin: 'java'
-    apply plugin: 'maven'
-    {{#supportJava6}}
-    sourceCompatibility = JavaVersion.VERSION_1_6
-    targetCompatibility = JavaVersion.VERSION_1_6
-    {{/supportJava6}}
-    {{^supportJava6}}
-    {{#java8}}
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-    {{/java8}}
-    {{^java8}}
-    sourceCompatibility = JavaVersion.VERSION_1_7
-    targetCompatibility = JavaVersion.VERSION_1_7
-    {{/java8}}
-    {{/supportJava6}}
-
-    install {
-        repositories.mavenInstaller {
-            pom.artifactId = '{{artifactId}}'
-        }
-    }
-
-    task execute(type:JavaExec) {
-       main = System.getProperty('mainClass')
-       classpath = sourceSets.main.runtimeClasspath
-    }
-}
-
-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"
-    {{#supportJava6}}
-    jersey_version = "2.6"
-    commons_io_version=2.5
-    commons_lang3_version=3.6
-    {{/supportJava6}}
-    {{^supportJava6}}
-    jersey_version = "2.27"
-    {{/supportJava6}}
-    junit_version = "4.13"
-    {{#threetenbp}}
-    threetenbp_version = "2.9.10"
-    {{/threetenbp}}
-}
-
-dependencies {
-    compile "io.swagger:swagger-annotations:$swagger_annotations_version"
-    compile "com.google.code.findbugs:jsr305:3.0.2"
-    compile "org.glassfish.jersey.core:jersey-client:$jersey_version"
-    compile "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version"
-    compile "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version"
-    compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
-    compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
-    compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
-    compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
-    {{#joda}}
-    compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
-    {{/joda}}
-    {{#java8}}
-    compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
-    {{/java8}}
-    {{#supportJava6}}
-    compile "commons-io:commons-io:$commons_io_version"
-    compile "org.apache.commons:commons-lang3:$commons_lang3_version"
-    {{/supportJava6}}
-    {{#threetenbp}}
-    compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version"
-    {{/threetenbp}}
-    {{^java8}}
-    compile "com.brsanthu:migbase64:2.2"
-    {{/java8}}
-    testCompile "junit:junit:$junit_version"
-}
-
-javadoc {
-    options.tags = [ "http.response.details:a:Http Response Details" ]
-}
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/build.sbt.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/build.sbt.mustache
@@ -1,38 +0,0 @@
-lazy val root = (project in file(".")).
-  settings(
-    organization := "{{groupId}}",
-    name := "{{artifactId}}",
-    version := "{{artifactVersion}}",
-    scalaVersion := "2.11.4",
-    scalacOptions ++= Seq("-feature"),
-    javacOptions in compile ++= Seq("-Xlint:deprecation"),
-    publishArtifact in (Compile, packageDoc) := false,
-    resolvers += Resolver.mavenLocal,
-    libraryDependencies ++= Seq(
-      "io.swagger" % "swagger-annotations" % "1.5.22",
-      "org.glassfish.jersey.core" % "jersey-client" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.25.1"{{/supportJava6}},
-      "org.glassfish.jersey.media" % "jersey-media-multipart" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.25.1"{{/supportJava6}},
-      "org.glassfish.jersey.media" % "jersey-media-json-jackson" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.25.1"{{/supportJava6}},
-      "com.fasterxml.jackson.core" % "jackson-core" % "2.10.3" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.3" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.3" % "compile",
-      {{#joda}}
-      "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.10" % "compile",
-      {{/joda}}
-      {{#java8}}
-      "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile",
-      {{/java8}}
-      {{#threetenbp}}
-      "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
-      {{/threetenbp}}
-      {{^java8}}
-      "com.brsanthu" % "migbase64" % "2.2",
-      {{/java8}}
-      {{#supportJava6}}
-      "org.apache.commons" % "commons-lang3" % "3.6",
-      "commons-io" % "commons-io" % "2.5",
-      {{/supportJava6}}
-      "junit" % "junit" % "4.13" % "test",
-      "com.novocode" % "junit-interface" % "0.10" % "test"
-    )
-  )
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/pom.mustache
@@ -1,390 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>{{groupId}}</groupId>
-    <artifactId>{{artifactId}}</artifactId>
-    <packaging>jar</packaging>
-    <name>{{artifactId}}</name>
-    <version>{{artifactVersion}}</version>
-    <url>{{artifactUrl}}</url>
-    <description>{{artifactDescription}}</description>
-    <scm>
-        <connection>{{scmConnection}}</connection>
-        <developerConnection>{{scmDeveloperConnection}}</developerConnection>
-        <url>{{scmUrl}}</url>
-    </scm>
-{{#parentOverridden}}
-    <parent>
-        <groupId>{{{parentGroupId}}}</groupId>
-        <artifactId>{{{parentArtifactId}}}</artifactId>
-        <version>{{{parentVersion}}}</version>
-    </parent>
-{{/parentOverridden}}
-
-    <licenses>
-        <license>
-            <name>{{licenseName}}</name>
-            <url>{{licenseUrl}}</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
-    <developers>
-        <developer>
-            <name>{{developerName}}</name>
-            <email>{{developerEmail}}</email>
-            <organization>{{developerOrganization}}</organization>
-            <organizationUrl>{{developerOrganizationUrl}}</organizationUrl>
-        </developer>
-    </developers>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0-M1</version>
-                <executions>
-                    <execution>
-                        <id>enforce-maven</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireMavenVersion>
-                                    <version>2.2.0</version>
-                                </requireMavenVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M4</version>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>loggerPath</name>
-                            <value>conf/log4j.properties</value>
-                        </property>
-                    </systemProperties>
-                    <argLine>-Xms512m -Xmx1500m</argLine>
-                    <parallel>methods</parallel>
-                    <threadCount>10</threadCount>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- attach test jar -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.6</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>jar</goal>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.10</version>
-                <executions>
-                    <execution>
-                        <id>add_sources</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>src/main/java</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>add_test_sources</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>src/test/java</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                    {{#supportJava6}}
-                        <source>1.6</source>
-                        <target>1.6</target>
-                    {{/supportJava6}}
-                    {{^supportJava6}}
-                    {{#java8}}
-                        <source>1.8</source>
-                        <target>1.8</target>
-                    {{/java8}}
-                    {{^java8}}
-                        <source>1.7</source>
-                        <target>1.7</target>
-                    {{/java8}}
-                    {{/supportJava6}}
-                    <fork>true</fork>
-                    <meminitial>128m</meminitial>
-                    <maxmem>512m</maxmem>
-                    <compilerArgs>
-                        <arg>-Xlint:all</arg>
-                        <arg>-J-Xss4m</arg><!-- Compiling the generated JSON.java file may require larger stack size. -->
-                    </compilerArgs>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.1.1</version>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <doclint>none</doclint>
-                    <tags>
-                        <tag>
-                            <name>http.response.details</name>
-                            <placement>a</placement>
-                            <head>Http Response Details:</head>
-                        </tag>
-                    </tags>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>2.2.1</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>sign-artifacts</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.5</version>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-    <dependencies>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-annotations-version}</version>
-        </dependency>
-
-        <!-- @Nullable annotation -->
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <version>3.0.2</version>
-        </dependency>
-        
-        <!-- HTTP client: jersey-client -->
-        <dependency>
-            <groupId>org.glassfish.jersey.core</groupId>
-            <artifactId>jersey-client</artifactId>
-            <version>${jersey-version}</version>
-        </dependency>
-        {{^supportJava6}}
-        <dependency>
-            <groupId>org.glassfish.jersey.inject</groupId>
-            <artifactId>jersey-hk2</artifactId>
-            <version>${jersey-version}</version>
-        </dependency>
-        {{/supportJava6}}
-        <dependency>
-            <groupId>org.glassfish.jersey.media</groupId>
-            <artifactId>jersey-media-multipart</artifactId>
-            <version>${jersey-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.media</groupId>
-            <artifactId>jersey-media-json-jackson</artifactId>
-            <version>${jersey-version}</version>
-        </dependency>
-
-        <!-- JSON processing: jackson -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>${jackson-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>${jackson-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson-databind-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.openapitools</groupId>
-            <artifactId>jackson-databind-nullable</artifactId>
-            <version>${jackson-databind-nullable-version}</version>
-        </dependency>
-        {{#withXml}}
-        <!-- XML processing: JAXB -->
-        <dependency>
-            <groupId>org.glassfish.jersey.media</groupId>
-            <artifactId>jersey-media-jaxb</artifactId>
-            <version>${jersey-version}</version>
-        </dependency>
-        {{/withXml}}
-        {{#joda}}
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-joda</artifactId>
-            <version>${jackson-version}</version>
-        </dependency>
-        {{/joda}}
-        {{#java8}}
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>${jackson-version}</version>
-        </dependency>
-        {{/java8}}
-        {{#threetenbp}}
-        <dependency>
-            <groupId>com.github.joschi.jackson</groupId>
-            <artifactId>jackson-datatype-threetenbp</artifactId>
-            <version>${threetenbp-version}</version>
-        </dependency>
-        {{/threetenbp}}
-        {{^java8}}
-        <!-- Base64 encoding that works in both JVM and Android -->
-        <dependency>
-            <groupId>com.brsanthu</groupId>
-            <artifactId>migbase64</artifactId>
-            <version>2.2</version>
-        </dependency>
-        {{/java8}}
-        {{#supportJava6}}
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons-io-version}</version>
-        </dependency>
-        {{/supportJava6}}
-        <dependency>
-            <groupId>org.tomitribe</groupId>
-            <artifactId>tomitribe-http-signatures</artifactId>
-            <version>${http-signature-version}</version>
-        </dependency>
-        {{#hasOAuthMethods}}
-        <dependency>
-            <groupId>com.github.scribejava</groupId>
-            <artifactId>scribejava-apis</artifactId>
-            <version>6.9.0</version>
-        </dependency>
-        {{/hasOAuthMethods}}
-        {{#useBeanValidation}}
-        <!-- Bean Validation API support -->
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-            <version>1.1.0.Final</version>
-            <scope>provided</scope>
-        </dependency>
-        {{/useBeanValidation}}
-        <!-- test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit-version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <swagger-annotations-version>1.6.1</swagger-annotations-version>
-        {{^supportJava6}}
-        <jersey-version>2.30.1</jersey-version>
-        {{/supportJava6}}
-        {{#supportJava6}}
-        <jersey-version>2.6</jersey-version>
-        <commons-io-version>2.5</commons-io-version>
-        <commons-lang3-version>3.6</commons-lang3-version>
-        {{/supportJava6}}
-        <jackson-version>2.10.3</jackson-version>
-        <jackson-databind-version>2.10.3</jackson-databind-version>
-        <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
-        {{#threetenbp}}
-        <threetenbp-version>2.9.10</threetenbp-version>
-        {{/threetenbp}}
-        <junit-version>4.13</junit-version>
-        <http-signature-version>1.3</http-signature-version>
-    </properties>
-</project>
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/AbstractOpenApiSchema.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/AbstractOpenApiSchema.mustache
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache
@@ -11,6 +11,9 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;

+{{#hasOAuthMethods}}
+import com.github.scribejava.core.model.OAuth2AccessToken;
+{{/hasOAuthMethods}}
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.client.ClientProperties;
 import org.glassfish.jersey.client.HttpUrlConnectorProvider;
@@ -23,6 +26,7 @@ import org.glassfish.jersey.media.multipart.MultiPartFeature;
 import java.io.IOException;
 import java.io.InputStream;

+import java.net.URI;
 {{^supportJava6}}
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
@@ -42,7 +46,6 @@ import java.util.List;
 import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.TimeZone;

 import java.net.URLEncoder;

@@ -56,11 +59,12 @@ import java.util.regex.Pattern;
 import {{invokerPackage}}.auth.Authentication;
 import {{invokerPackage}}.auth.HttpBasicAuth;
 import {{invokerPackage}}.auth.HttpBearerAuth;
+import {{invokerPackage}}.auth.HttpSignatureAuth;
 import {{invokerPackage}}.auth.ApiKeyAuth;
-
 {{#hasOAuthMethods}}
 import {{invokerPackage}}.auth.OAuth;
 {{/hasOAuthMethods}}
+import {{invokerPackage}}.model.AbstractOpenApiSchema;

 {{>generatedAnnotation}}
 public class ApiClient {
@@ -158,11 +162,26 @@ public class ApiClient {
    setUserAgent("{{#httpUserAgent}}{{{.}}}{{/httpUserAgent}}{{^httpUserAgent}}OpenAPI-Generator/{{{artifactVersion}}}/java{{/httpUserAgent}}");

    // Setup authentications (key: authentication name, value: authentication).
-    authentications = new HashMap<String, Authentication>();{{#authMethods}}{{#isBasic}}{{#isBasicBasic}}
-    authentications.put("{{name}}", new HttpBasicAuth());{{/isBasicBasic}}{{^isBasicBasic}}
-    authentications.put("{{name}}", new HttpBearerAuth("{{scheme}}"));{{/isBasicBasic}}{{/isBasic}}{{#isApiKey}}
-    authentications.put("{{name}}", new ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{^isKeyInHeader}}"query"{{/isKeyInHeader}}, "{{keyParamName}}"));{{/isApiKey}}{{#isOAuth}}
-    authentications.put("{{name}}", new OAuth());{{/isOAuth}}{{/authMethods}}
+    authentications = new HashMap<String, Authentication>();
+    {{#authMethods}}
+    {{#isBasic}}
+    {{#isBasicBasic}}
+    authentications.put("{{name}}", new HttpBasicAuth());
+    {{/isBasicBasic}}
+    {{#isBasicBearer}}
+    authentications.put("{{name}}", new HttpBearerAuth("{{scheme}}"));
+    {{/isBasicBearer}}
+    {{#isHttpSignature}}
+    authentications.put("{{name}}", new HttpSignatureAuth("{{name}}", null, null));
+    {{/isHttpSignature}}
+    {{/isBasic}}
+    {{#isApiKey}}
+    authentications.put("{{name}}", new ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{^isKeyInHeader}}"query"{{/isKeyInHeader}}, "{{keyParamName}}"));
+    {{/isApiKey}}
+    {{#isOAuth}}
+    authentications.put("{{name}}", new OAuth(basePath, "{{tokenUrl}}"));
+    {{/isOAuth}}
+    {{/authMethods}}
    // Prevent the authentications from being modified.
    authentications = Collections.unmodifiableMap(authentications);

@@ -173,6 +192,7 @@ public class ApiClient {

  /**
   * Gets the JSON instance to do JSON serialization and deserialization.
+   *
   * @return JSON
   */
  public JSON getJSON() {
@@ -194,6 +214,9 @@ public class ApiClient {

  public ApiClient setBasePath(String basePath) {
    this.basePath = basePath;
+    {{#hasOAuthMethods}}
+    setOauthBasePath(basePath);
+    {{/hasOAuthMethods}}
    return this;
  }

@@ -203,6 +226,7 @@ public class ApiClient {

  public ApiClient setServers(List<ServerConfiguration> servers) {
    this.servers = servers;
+    updateBasePath();
    return this;
  }

@@ -212,6 +236,7 @@ public class ApiClient {

  public ApiClient setServerIndex(Integer serverIndex) {
    this.serverIndex = serverIndex;
+    updateBasePath();
    return this;
  }

@@ -221,11 +246,27 @@ public class ApiClient {

  public ApiClient setServerVariables(Map<String, String> serverVariables) {
    this.serverVariables = serverVariables;
+    updateBasePath();
    return this;
  }

+  private void updateBasePath() {
+    setBasePath(servers.get(serverIndex).URL(serverVariables));
+  }
+
+  {{#hasOAuthMethods}}
+  private void setOauthBasePath(String basePath) {
+    for(Authentication auth : authentications.values()) {
+      if (auth instanceof OAuth) {
+        ((OAuth) auth).setBasePath(basePath);
+      }
+    }
+  }
+
+  {{/hasOAuthMethods}}
  /**
   * Get authentications (key: authentication name, value: authentication).
+   *
   * @return Map of authentication object
   */
  public Map<String, Authentication> getAuthentications() {
@@ -244,13 +285,14 @@ public class ApiClient {

  /**
   * Helper method to set username for the first HTTP basic authentication.
+   *
   * @param username Username
   */
-  public void setUsername(String username) {
+  public ApiClient setUsername(String username) {
    for (Authentication auth : authentications.values()) {
      if (auth instanceof HttpBasicAuth) {
        ((HttpBasicAuth) auth).setUsername(username);
-        return;
+        return this;
      }
    }
    throw new RuntimeException("No HTTP basic authentication configured!");
@@ -258,13 +300,14 @@ public class ApiClient {

  /**
   * Helper method to set password for the first HTTP basic authentication.
+   *
   * @param password Password
   */
-  public void setPassword(String password) {
+  public ApiClient setPassword(String password) {
    for (Authentication auth : authentications.values()) {
      if (auth instanceof HttpBasicAuth) {
        ((HttpBasicAuth) auth).setPassword(password);
-        return;
+        return this;
      }
    }
    throw new RuntimeException("No HTTP basic authentication configured!");
@@ -272,13 +315,14 @@ public class ApiClient {

  /**
   * Helper method to set API key value for the first API key authentication.
+   *
   * @param apiKey API key
   */
-  public void setApiKey(String apiKey) {
+  public ApiClient setApiKey(String apiKey) {
    for (Authentication auth : authentications.values()) {
      if (auth instanceof ApiKeyAuth) {
        ((ApiKeyAuth) auth).setApiKey(apiKey);
-        return;
+        return this;
      }
    }
    throw new RuntimeException("No API key authentication configured!");
@@ -289,29 +333,31 @@ public class ApiClient {
   *
   * @param secrets Hash map from authentication name to its secret.
   */
-  public void configureApiKeys(HashMap<String, String> secrets) {
+  public ApiClient configureApiKeys(HashMap<String, String> secrets) {
    for (Map.Entry<String, Authentication> authEntry : authentications.entrySet()) {
      Authentication auth = authEntry.getValue();
      if (auth instanceof ApiKeyAuth) {
        String name = authEntry.getKey();
        // respect x-auth-id-alias property
-        name = authenticationLookup.getOrDefault(name, name);
+        name = authenticationLookup.containsKey(name) ? authenticationLookup.get(name) : name;
        if (secrets.containsKey(name)) {
          ((ApiKeyAuth) auth).setApiKey(secrets.get(name));
        }
      }
    }
+    return this;
  }

  /**
   * Helper method to set API key prefix for the first API key authentication.
+   *
   * @param apiKeyPrefix API key prefix
   */
-  public void setApiKeyPrefix(String apiKeyPrefix) {
+  public ApiClient setApiKeyPrefix(String apiKeyPrefix) {
    for (Authentication auth : authentications.values()) {
      if (auth instanceof ApiKeyAuth) {
        ((ApiKeyAuth) auth).setApiKeyPrefix(apiKeyPrefix);
-        return;
+        return this;
      }
    }
    throw new RuntimeException("No API key authentication configured!");
@@ -319,28 +365,92 @@ public class ApiClient {

  /**
   * Helper method to set bearer token for the first Bearer authentication.
+   *
   * @param bearerToken Bearer token
   */
-  public void setBearerToken(String bearerToken) {
+  public ApiClient setBearerToken(String bearerToken) {
    for (Authentication auth : authentications.values()) {
      if (auth instanceof HttpBearerAuth) {
        ((HttpBearerAuth) auth).setBearerToken(bearerToken);
-        return;
+        return this;
      }
    }
    throw new RuntimeException("No Bearer authentication configured!");
  }

+
  {{#hasOAuthMethods}}
  /**
   * Helper method to set access token for the first OAuth2 authentication.
   * @param accessToken Access token
   */
-  public void setAccessToken(String accessToken) {
+  public ApiClient setAccessToken(String accessToken) {
    for (Authentication auth : authentications.values()) {
      if (auth instanceof OAuth) {
        ((OAuth) auth).setAccessToken(accessToken);
-        return;
+        return this;
+      }
+    }
+    throw new RuntimeException("No OAuth2 authentication configured!");
+  }
+
+  /**
+   * Helper method to set the credentials for the first OAuth2 authentication.
+   *
+   * @param clientId the client ID
+   * @param clientSecret the client secret
+   */
+  public ApiClient setOauthCredentials(String clientId, String clientSecret) {
+    for (Authentication auth : authentications.values()) {
+      if (auth instanceof OAuth) {
+        ((OAuth) auth).setCredentials(clientId, clientSecret);
+        return this;
+      }
+    }
+    throw new RuntimeException("No OAuth2 authentication configured!");
+  }
+
+  /**
+   * Helper method to set the password flow for the first OAuth2 authentication.
+   *
+   * @param username the user name
+   * @param password the user password
+   */
+  public ApiClient setOauthPasswordFlow(String username, String password) {
+    for (Authentication auth : authentications.values()) {
+      if (auth instanceof OAuth) {
+        ((OAuth) auth).usePasswordFlow(username, password);
+        return this;
+      }
+    }
+    throw new RuntimeException("No OAuth2 authentication configured!");
+  }
+
+  /**
+   * Helper method to set the authorization code flow for the first OAuth2 authentication.
+   *
+   * @param code the authorization code
+   */
+  public ApiClient setOauthAuthorizationCodeFlow(String code) {
+    for (Authentication auth : authentications.values()) {
+      if (auth instanceof OAuth) {
+        ((OAuth) auth).useAuthorizationCodeFlow(code);
+        return this;
+      }
+    }
+    throw new RuntimeException("No OAuth2 authentication configured!");
+  }
+
+  /**
+   * Helper method to set the scopes for the first OAuth2 authentication.
+   *
+   * @param scope the oauth scope
+   */
+  public ApiClient setOauthScope(String scope) {
+    for (Authentication auth : authentications.values()) {
+      if (auth instanceof OAuth) {
+        ((OAuth) auth).setScope(scope);
+        return this;
      }
    }
    throw new RuntimeException("No OAuth2 authentication configured!");
@@ -700,6 +810,87 @@ public class ApiClient {
    return entity;
  }

+  /**
+   * Serialize the given Java object into string according the given
+   * Content-Type (only JSON, HTTP form is supported for now).
+   * @param obj Object
+   * @param formParams Form parameters
+   * @param contentType Context type
+   * @return String
+   * @throws ApiException API exception
+   */
+  public String serializeToString(Object obj, Map<String, Object> formParams, String contentType) throws ApiException {
+    try {
+      if (contentType.startsWith("multipart/form-data")) {
+        throw new ApiException("multipart/form-data not yet supported for serializeToString (http signature authentication)");
+      } else if (contentType.startsWith("application/x-www-form-urlencoded")) {
+        String formString = "";
+        for (Entry<String, Object> param : formParams.entrySet()) {
+          formString = param.getKey() + "=" + URLEncoder.encode(parameterToString(param.getValue()), "UTF-8") + "&";
+        }
+
+        if (formString.length() == 0) { // empty string
+          return formString;
+        } else {
+          return formString.substring(0, formString.length() - 1);
+        }
+      } else {
+        return json.getMapper().writeValueAsString(obj);
+      }
+    } catch (Exception ex) {
+      throw new ApiException("Failed to perform serializeToString: " + ex.toString());
+    }
+  }
+
+  public AbstractOpenApiSchema deserializeSchemas(Response response, AbstractOpenApiSchema schema) throws ApiException{
+
+    Object result = null;
+    int matchCounter = 0;
+    ArrayList<String> matchSchemas = new ArrayList<>();
+
+    for (Map.Entry<String, GenericType> entry : schema.getSchemas().entrySet()) {
+      String schemaName = entry.getKey();
+      GenericType schemaType = entry.getValue();
+
+      if (schemaType instanceof GenericType) { // model
+        try {
+          Object deserializedObject = deserialize(response, schemaType);
+          if (deserializedObject != null) {
+            result = deserializedObject;
+            matchCounter++;
+
+            if ("anyOf".equals(schema.getSchemaType())) {
+              break;
+            } else if ("oneOf".equals(schema.getSchemaType())) {
+              matchSchemas.add(schemaName);
+            } else {
+              throw new ApiException("Unknowe type found while expecting anyOf/oneOf:" + schema.getSchemaType());
+            }
+          } else {
+            // failed to deserialize the response in the schema provided, proceed to the next one if any
+          }
+        } catch (Exception ex) {
+          // failed to deserialize, do nothing and try next one (schema)
+        }
+      } else {// unknown type
+        throw new ApiException(schemaType.getClass() + " is not a GenericType and cannot be handled properly in deserialization.");
+      }
+
+    }
+
+    if (matchCounter > 1 && "oneOf".equals(schema.getSchemaType())) {// more than 1 match for oneOf
+      throw new ApiException("Response body is invalid as it matches more than one schema (" + StringUtil.join(matchSchemas, ", ") + ") defined in the oneOf model: " + schema.getClass().getName());
+    } else if (matchCounter == 0) { // fail to match any in oneOf/anyOf schemas
+      throw new ApiException("Response body is invalid as it doens't match any schemas (" + StringUtil.join(schema.getSchemas().keySet(), ", ") + ") defined in the oneOf/anyOf model: " + schema.getClass().getName());
+    } else { // only one matched
+      schema.setActualInstance(result);
+      return schema;
+    }
+
+  }
+
+
+
  /**
   * Deserialize response body to Java object according to the Content-Type.
   * @param <T> Type
@@ -728,6 +919,9 @@ public class ApiClient {
    if (contentTypes != null && !contentTypes.isEmpty())
      contentType = String.valueOf(contentTypes.get(0));

+    // read the entity stream multiple times
+    response.bufferEntity();
+
    return response.readEntity(returnType);
  }

@@ -804,33 +998,39 @@ public class ApiClient {
   * @param contentType The request's Content-Type header
   * @param authNames The authentications to apply
   * @param returnType The return type into which to deserialize the response
+   * @param schema An instance of the response that uses oneOf/anyOf
   * @return The response body in type of string
   * @throws ApiException API exception
   */
-  public <T> ApiResponse<T> invokeAPI(String operation, String path, String method, List<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, String> cookieParams, Map<String, Object> formParams, String accept, String contentType, String[] authNames, GenericType<T> returnType) throws ApiException {
-    updateParamsForAuth(authNames, queryParams, headerParams, cookieParams);
+  public <T> ApiResponse<T> invokeAPI(
+      String operation,
+      String path,
+      String method,
+      List<Pair> queryParams,
+      Object body,
+      Map<String, String> headerParams,
+      Map<String, String> cookieParams,
+      Map<String, Object> formParams,
+      String accept,
+      String contentType,
+      String[] authNames,
+      GenericType<T> returnType,
+      AbstractOpenApiSchema schema)
+      throws ApiException {

    // Not using `.target(targetURL).path(path)` below,
    // to support (constant) query string in `path`, e.g. "/posts?draft=1"
    String targetURL;
-    if (serverIndex != null) {
-      Integer index;
-      List<ServerConfiguration> serverConfigurations;
-      Map<String, String> variables;
-
-      if (operationServers.containsKey(operation)) {
-        index = operationServerIndex.getOrDefault(operation, serverIndex);
-        variables = operationServerVariables.getOrDefault(operation, serverVariables);
-        serverConfigurations = operationServers.get(operation);
-      } else {
-        index = serverIndex;
-        variables = serverVariables;
-        serverConfigurations = servers;
-      }
+    if (operationServers.containsKey(operation)) {
+      Integer index = operationServerIndex.containsKey(operation) ? operationServerIndex.get(operation) : serverIndex;
+      Map<String, String> variables = operationServerVariables.containsKey(operation) ?
+        operationServerVariables.get(operation) : serverVariables;
+      List<ServerConfiguration> serverConfigurations = operationServers.get(operation);
      if (index < 0 || index >= serverConfigurations.size()) {
-        throw new ArrayIndexOutOfBoundsException(String.format(
-          "Invalid index %d when selecting the host settings. Must be less than %d", index, serverConfigurations.size()
-        ));
+        throw new ArrayIndexOutOfBoundsException(
+            String.format(
+                "Invalid index %d when selecting the host settings. Must be less than %d",
+                index, serverConfigurations.size()));
      }
      targetURL = serverConfigurations.get(index).URL(variables) + path;
    } else {
@@ -848,13 +1048,6 @@ public class ApiClient {

    Invocation.Builder invocationBuilder = target.request().accept(accept);

-    for (Entry<String, String> entry : headerParams.entrySet()) {
-      String value = entry.getValue();
-      if (value != null) {
-        invocationBuilder = invocationBuilder.header(entry.getKey(), value);
-      }
-    }
-
    for (Entry<String, String> entry : cookieParams.entrySet()) {
      String value = entry.getValue();
      if (value != null) {
@@ -869,51 +1062,65 @@ public class ApiClient {
      }
    }

-    for (Entry<String, String> entry : defaultHeaderMap.entrySet()) {
-      String key = entry.getKey();
-      if (!headerParams.containsKey(key)) {
-        String value = entry.getValue();
-        if (value != null) {
-          invocationBuilder = invocationBuilder.header(key, value);
-        }
+    Entity<?> entity = serialize(body, formParams, contentType);
+
+    // put all headers in one place
+    Map<String, String> allHeaderParams = new HashMap<>(defaultHeaderMap);
+    allHeaderParams.putAll(headerParams);
+
+    // update different parameters (e.g. headers) for authentication
+    updateParamsForAuth(
+        authNames,
+        queryParams,
+        allHeaderParams,
+        cookieParams,
+        serializeToString(body, formParams, contentType),
+        method,
+        target.getUri());
+
+    for (Entry<String, String> entry : allHeaderParams.entrySet()) {
+      String value = entry.getValue();
+      if (value != null) {
+        invocationBuilder = invocationBuilder.header(entry.getKey(), value);
      }
    }

-    Entity<?> entity = serialize(body, formParams, contentType);
-
    Response response = null;

    try {
-      if ("GET".equals(method)) {
-        response = invocationBuilder.get();
-      } else if ("POST".equals(method)) {
-        response = invocationBuilder.post(entity);
-      } else if ("PUT".equals(method)) {
-        response = invocationBuilder.put(entity);
-      } else if ("DELETE".equals(method)) {
-        response = invocationBuilder.method("DELETE", entity);
-      } else if ("PATCH".equals(method)) {
-        response = invocationBuilder.method("PATCH", entity);
-      } else if ("HEAD".equals(method)) {
-        response = invocationBuilder.head();
-      } else if ("OPTIONS".equals(method)) {
-        response = invocationBuilder.options();
-      } else if ("TRACE".equals(method)) {
-        response = invocationBuilder.trace();
-      } else {
-        throw new ApiException(500, "unknown method type " + method);
+      response = sendRequest(method, invocationBuilder, entity);
+
+      {{#hasOAuthMethods}}
+      // If OAuth is used and a status 401 is received, renew the access token and retry the request
+      if (response.getStatusInfo() == Status.UNAUTHORIZED) {
+        for (String authName : authNames) {
+          Authentication authentication = authentications.get(authName);
+          if (authentication instanceof OAuth) {
+            OAuth2AccessToken accessToken = ((OAuth) authentication).renewAccessToken();
+            if (accessToken != null) {
+              invocationBuilder.header("Authorization", null);
+              invocationBuilder.header("Authorization", "Bearer " + accessToken.getAccessToken());
+              response = sendRequest(method, invocationBuilder, entity);
+            }
+            break;
+          }
+        }
      }

+      {{/hasOAuthMethods}}
      int statusCode = response.getStatusInfo().getStatusCode();
      Map<String, List<String>> responseHeaders = buildResponseHeaders(response);

-      if (response.getStatus() == Status.NO_CONTENT.getStatusCode()) {
-        return new ApiResponse<{{#supportJava6}}T{{/supportJava6}}>(statusCode, responseHeaders);
+      if (response.getStatusInfo() == Status.NO_CONTENT) {
+        return new ApiResponse<T>(statusCode, responseHeaders);
      } else if (response.getStatusInfo().getFamily() == Status.Family.SUCCESSFUL) {
-        if (returnType == null)
-          return new ApiResponse<{{#supportJava6}}T{{/supportJava6}}>(statusCode, responseHeaders);
-        else
-          return new ApiResponse<{{#supportJava6}}T{{/supportJava6}}>(statusCode, responseHeaders, deserialize(response, returnType));
+        if (returnType == null) return new ApiResponse<T>(statusCode, responseHeaders);
+        else if (schema == null) {
+          return new ApiResponse<T>(statusCode, responseHeaders, deserialize(response, returnType));
+        } else { // oneOf/anyOf
+          return new ApiResponse<T>(
+              statusCode, responseHeaders, (T) deserializeSchemas(response, schema));
+        }
      } else {
        String message = "error";
        String respBody = null;
@@ -926,26 +1133,40 @@ public class ApiClient {
          }
        }
        throw new ApiException(
-          response.getStatus(),
-          message,
-          buildResponseHeaders(response),
-          respBody);
+            response.getStatus(), message, buildResponseHeaders(response), respBody);
      }
    } finally {
      try {
        response.close();
      } catch (Exception e) {
-        // it's not critical, since the response object is local in method invokeAPI; that's fine, just continue
+        // it's not critical, since the response object is local in method invokeAPI; that's fine,
+        // just continue
      }
    }
  }

+  private Response sendRequest(String method, Invocation.Builder invocationBuilder, Entity<?> entity) {
+    Response response;
+    if ("POST".equals(method)) {
+      response = invocationBuilder.post(entity);
+    } else if ("PUT".equals(method)) {
+      response = invocationBuilder.put(entity);
+    } else if ("DELETE".equals(method)) {
+      response = invocationBuilder.method("DELETE", entity);
+    } else if ("PATCH".equals(method)) {
+      response = invocationBuilder.method("PATCH", entity);
+    } else {
+      response = invocationBuilder.method(method);
+    }
+    return response;
+  }
+
  /**
   * @deprecated Add qualified name of the operation as a first parameter.
   */
  @Deprecated
-  public <T> ApiResponse<T> invokeAPI(String path, String method, List<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, String> cookieParams, Map<String, Object> formParams, String accept, String contentType, String[] authNames, GenericType<T> returnType) throws ApiException {
-    return invokeAPI(null, path, method, queryParams, body, headerParams, cookieParams, formParams, accept, contentType, authNames, returnType);
+  public <T> ApiResponse<T> invokeAPI(String path, String method, List<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, String> cookieParams, Map<String, Object> formParams, String accept, String contentType, String[] authNames, GenericType<T> returnType, AbstractOpenApiSchema schema) throws ApiException {
+    return invokeAPI(null, path, method, queryParams, body, headerParams, cookieParams, formParams, accept, contentType, authNames, returnType, schema);
  }

  /**
@@ -1003,12 +1224,17 @@ public class ApiClient {
   * @param queryParams List of query parameters
   * @param headerParams Map of header parameters
   * @param cookieParams Map of cookie parameters
+   * @param method HTTP method (e.g. POST)
+   * @param uri HTTP URI
   */
-  protected void updateParamsForAuth(String[] authNames, List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams) {
+  protected void updateParamsForAuth(String[] authNames, List<Pair> queryParams, Map<String, String> headerParams,
+                                     Map<String, String> cookieParams, String payload, String method, URI uri) throws ApiException {
    for (String authName : authNames) {
      Authentication auth = authentications.get(authName);
-      if (auth == null) throw new RuntimeException("Authentication undefined: " + authName);
-      auth.applyToParams(queryParams, headerParams, cookieParams);
+      if (auth == null) {
+        throw new RuntimeException("Authentication undefined: " + authName);
+      }
+      auth.applyToParams(queryParams, headerParams, cookieParams, payload, method, uri);
    }
  }
 }
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiResponse.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiResponse.mustache
@@ -44,14 +44,29 @@ 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;
    }
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/JSON.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/JSON.mustache
@@ -27,8 +27,8 @@ public class JSON implements ContextResolver<ObjectMapper> {
  public JSON() {
    mapper = new ObjectMapper();
    mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-    mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, false);
+    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);
@@ -62,4 +62,11 @@ public class JSON implements ContextResolver<ObjectMapper> {
  public ObjectMapper getContext(Class<?> type) {
    return mapper;
  }
+
+  /**
+   * Get the object mapper
+   *
+   * @return object mapper
+   */
+  public ObjectMapper getMapper() { return mapper; }
 }
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/anyof_model.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/anyof_model.mustache
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api.mustache
@@ -16,8 +16,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-{{/fullJavaUtil}}

+{{/fullJavaUtil}}
 {{>generatedAnnotation}}
 {{#operations}}
 public class {{classname}} {
@@ -31,13 +31,24 @@ public class {{classname}} {
    this.apiClient = apiClient;
  }

+  /**
+   * Get the API cilent
+   *
+   * @return API client
+   */
  public ApiClient getApiClient() {
    return apiClient;
  }

+  /**
+   * Set the API cilent
+   *
+   * @param apiClient an instance of API client
+   */
  public void setApiClient(ApiClient apiClient) {
    this.apiClient = apiClient;
  }
+
  {{#operation}}
  {{^vendorExtensions.x-group-parameters}}
  /**
@@ -150,8 +161,13 @@ public class {{classname}} {

    String[] localVarAuthNames = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };

-    {{#returnType}}GenericType<{{{returnType}}}> localVarReturnType = new GenericType<{{{returnType}}}>() {};{{/returnType}}
-    return apiClient.invokeAPI("{{classname}}.{{operationId}}", localVarPath, "{{httpMethod}}", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, {{#returnType}}localVarReturnType{{/returnType}}{{^returnType}}null{{/returnType}});
+    {{#returnType}}
+    GenericType<{{{returnType}}}> localVarReturnType = new GenericType<{{{returnType}}}>() {};
+
+    {{/returnType}}
+    return apiClient.invokeAPI("{{classname}}.{{operationId}}", localVarPath, "{{httpMethod}}", localVarQueryParams, localVarPostBody,
+                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
+                               localVarAuthNames, {{#returnType}}localVarReturnType{{/returnType}}{{^returnType}}null{{/returnType}}, {{#vendorExtensions.x-java-return-type-one-of}}new {{{returnType}}}(){{/vendorExtensions.x-java-return-type-one-of}}{{^vendorExtensions.x-java-return-type-one-of}}{{#vendorExtensions.x-java-return-type-any-of}}new {{{returnType}}}(){{/vendorExtensions.x-java-return-type-any-of}}{{^vendorExtensions.x-java-return-type-any-of}}null{{/vendorExtensions.x-java-return-type-any-of}}{{/vendorExtensions.x-java-return-type-one-of}});
  }
  {{#vendorExtensions.x-group-parameters}}

@@ -165,7 +181,8 @@ public class {{classname}} {
      this.{{localVariablePrefix}}{{paramName}} = {{paramName}};
      {{/pathParams}}
    }
-    {{#allParams}}{{^isPathParam}}
+    {{#allParams}}
+    {{^isPathParam}}

    /**
     * Set {{paramName}}
@@ -176,7 +193,8 @@ public class {{classname}} {
      this.{{localVariablePrefix}}{{paramName}} = {{paramName}};
      return this;
    }
-    {{/isPathParam}}{{/allParams}}
+    {{/isPathParam}}
+    {{/allParams}}

    /**
     * Execute {{operationId}} request
@@ -211,9 +229,12 @@ public class {{classname}} {
         {{/responses}}
       </table>
     {{/responses.0}}
-     {{#isDeprecated}}* @deprecated{{/isDeprecated}}
+     {{#isDeprecated}}
+     * @deprecated{{/isDeprecated}}
     */
-    {{#isDeprecated}}@Deprecated{{/isDeprecated}}
+    {{#isDeprecated}}
+    @Deprecated
+    {{/isDeprecated}}
    public ApiResponse<{{#returnType}}{{{.}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> executeWithHttpInfo() throws ApiException {
      return {{operationId}}WithHttpInfo({{#allParams}}{{localVariablePrefix}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
    }
@@ -229,7 +250,9 @@ public class {{classname}} {
   {{#externalDocs}}* {{description}}
   * @see <a href="{{url}}">{{summary}} Documentation</a>{{/externalDocs}}
   */
-  {{#isDeprecated}}@Deprecated{{/isDeprecated}}
+  {{#isDeprecated}}
+  @Deprecated
+  {{/isDeprecated}}
  public API{{operationId}}Request {{operationId}}({{#pathParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/pathParams}}) throws ApiException {
    return new API{{operationId}}Request({{#pathParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/pathParams}});
  }
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/apiException.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/apiException.mustache
@@ -9,6 +9,9 @@ import java.util.Map.Entry;
 import java.util.TreeMap;
 {{/caseInsensitiveResponseHeaders}}

+/**
+ * API Exception
+ */
 {{>generatedAnnotation}}
 public class ApiException extends{{#useRuntimeException}} RuntimeException {{/useRuntimeException}}{{^useRuntimeException}} Exception {{/useRuntimeException}}{
    private int code = 0;
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api_test.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api_test.mustache
@@ -7,6 +7,7 @@ import {{invokerPackage}}.ApiException;
 {{/imports}}
 import org.junit.Test;
 import org.junit.Ignore;
+import org.junit.Assert;

 {{^fullJavaUtil}}
 import java.util.ArrayList;
@@ -18,7 +19,6 @@ import java.util.Map;
 /**
 * API tests for {{classname}}
 */
-@Ignore
 public class {{classname}}Test {

    private final {{classname}} api = new {{classname}}();
@@ -35,15 +35,15 @@ public class {{classname}}Test {
    @Test
    public void {{operationId}}Test() throws ApiException {
        {{#allParams}}
-        {{{dataType}}} {{paramName}} = null;
+        //{{{dataType}}} {{paramName}} = null;
        {{/allParams}}
        {{^vendorExtensions.x-group-parameters}}
-        {{#returnType}}{{{returnType}}} response = {{/returnType}}api.{{operationId}}({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
+        //{{#returnType}}{{{returnType}}} response = {{/returnType}}api.{{operationId}}({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
        {{/vendorExtensions.x-group-parameters}}
        {{#vendorExtensions.x-group-parameters}}
-        {{#returnType}}{{{returnType}}} response = {{/returnType}}api.{{operationId}}({{#pathParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/pathParams}}){{#allParams}}{{^isPathParam}}
-                .{{paramName}}({{paramName}}){{/isPathParam}}{{/allParams}}
-                .execute();
+        //{{#returnType}}{{{returnType}}} response = {{/returnType}}api.{{operationId}}({{#pathParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/pathParams}}){{#allParams}}{{^isPathParam}}
+        //        .{{paramName}}({{paramName}}){{/isPathParam}}{{/allParams}}
+        //        .execute();
        {{/vendorExtensions.x-group-parameters}}
        // TODO: test validations
    }
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/auth/ApiKeyAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/auth/ApiKeyAuth.mustache
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/auth/Authentication.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/auth/Authentication.mustache
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/auth/HttpBasicAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/auth/HttpBasicAuth.mustache
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/auth/HttpBearerAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/auth/HttpBearerAuth.mustache
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/auth/HttpSignatureAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/auth/HttpSignatureAuth.mustache
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/auth/OAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/auth/OAuth.mustache
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/auth/OAuthFlow.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/auth/OAuthFlow.mustache
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/model.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/model.mustache
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/oneof_model.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/oneof_model.mustache
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2-experimental/pojo.mustache
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache
@@ -63,7 +63,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.12</version>
+                <version>3.0.0-M4</version>
                <configuration>
                    <systemProperties>
                        <property>
@@ -73,7 +73,7 @@
                    </systemProperties>
                    <argLine>-Xms512m -Xmx1500m</argLine>
                    <parallel>methods</parallel>
-                    <forkMode>pertest</forkMode>
+                    <threadCount>10</threadCount>
                </configuration>
            </plugin>
            <plugin>
@@ -142,7 +142,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.1</version>
+                <version>3.8.1</version>
                <configuration>
                    {{#supportJava6}}
                        <source>1.6</source>
@@ -158,6 +158,13 @@
                        <target>1.7</target>
                    {{/java8}}
                    {{/supportJava6}}
+                    <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>
@@ -283,64 +290,74 @@
            <version>${jackson-databind-nullable-version}</version>
        </dependency>
        {{#withXml}}
-
-            <!-- XML processing: JAXB -->
-            <dependency>
-                <groupId>org.glassfish.jersey.media</groupId>
-                <artifactId>jersey-media-jaxb</artifactId>
-                <version>${jersey-version}</version>
-            </dependency>
-
+        <!-- XML processing: JAXB -->
+        <dependency>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <artifactId>jersey-media-jaxb</artifactId>
+            <version>${jersey-version}</version>
+        </dependency>
        {{/withXml}}
        {{#joda}}
-            <dependency>
-                <groupId>com.fasterxml.jackson.datatype</groupId>
-                <artifactId>jackson-datatype-joda</artifactId>
-                <version>${jackson-version}</version>
-            </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-joda</artifactId>
+            <version>${jackson-version}</version>
+        </dependency>
        {{/joda}}
        {{#java8}}
-            <dependency>
-                <groupId>com.fasterxml.jackson.datatype</groupId>
-                <artifactId>jackson-datatype-jsr310</artifactId>
-                <version>${jackson-version}</version>
-            </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>${jackson-version}</version>
+        </dependency>
        {{/java8}}
        {{#threetenbp}}
-            <dependency>
-                <groupId>com.github.joschi.jackson</groupId>
-                <artifactId>jackson-datatype-threetenbp</artifactId>
-                <version>${threetenbp-version}</version>
-            </dependency>
+        <dependency>
+            <groupId>com.github.joschi.jackson</groupId>
+            <artifactId>jackson-datatype-threetenbp</artifactId>
+            <version>${threetenbp-version}</version>
+        </dependency>
        {{/threetenbp}}
        {{^java8}}
-            <!-- Base64 encoding that works in both JVM and Android -->
-            <dependency>
-                <groupId>com.brsanthu</groupId>
-                <artifactId>migbase64</artifactId>
-                <version>2.2</version>
-            </dependency>
+        <!-- Base64 encoding that works in both JVM and Android -->
+        <dependency>
+            <groupId>com.brsanthu</groupId>
+            <artifactId>migbase64</artifactId>
+            <version>2.2</version>
+        </dependency>
        {{/java8}}
        {{#supportJava6}}
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-lang3</artifactId>
-                <version>${commons_lang3_version}</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>${commons_io_version}</version>
-            </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons-io-version}</version>
+        </dependency>
        {{/supportJava6}}
+        <dependency>
+            <groupId>org.tomitribe</groupId>
+            <artifactId>tomitribe-http-signatures</artifactId>
+            <version>${http-signature-version}</version>
+        </dependency>
+        {{#hasOAuthMethods}}
+        <dependency>
+            <groupId>com.github.scribejava</groupId>
+            <artifactId>scribejava-apis</artifactId>
+            <version>6.9.0</version>
+        </dependency>
+        {{/hasOAuthMethods}}
        {{#useBeanValidation}}
-            <!-- Bean Validation API support -->
-            <dependency>
-                <groupId>javax.validation</groupId>
-                <artifactId>validation-api</artifactId>
-                <version>1.1.0.Final</version>
-                <scope>provided</scope>
-            </dependency>
+        <!-- Bean Validation API support -->
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>1.1.0.Final</version>
+            <scope>provided</scope>
+        </dependency>
        {{/useBeanValidation}}
        <!-- test dependencies -->
        <dependency>
@@ -354,12 +371,12 @@
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <swagger-annotations-version>1.6.1</swagger-annotations-version>
        {{^supportJava6}}
-        <jersey-version>2.27</jersey-version>
+        <jersey-version>2.30.1</jersey-version>
        {{/supportJava6}}
        {{#supportJava6}}
        <jersey-version>2.6</jersey-version>
-        <commons_io_version>2.5</commons_io_version>
-        <commons_lang3_version>3.6</commons_lang3_version>
+        <commons-io-version>2.5</commons-io-version>
+        <commons-lang3-version>3.6</commons-lang3-version>
        {{/supportJava6}}
        <jackson-version>2.10.3</jackson-version>
        <jackson-databind-version>2.10.3</jackson-databind-version>
@@ -367,7 +384,7 @@
        {{#threetenbp}}
        <threetenbp-version>2.9.10</threetenbp-version>
        {{/threetenbp}}
-        <maven-plugin-version>1.0.0</maven-plugin-version>
        <junit-version>4.13</junit-version>
+        <http-signature-version>1.3</http-signature-version>
    </properties>
 </project>
--- a/pom.xml
+++ b/pom.xml
@@ -1305,7 +1305,6 @@
                <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/jersey2-experimental</module>
                <module>samples/client/petstore/java/okhttp-gson</module>
                <module>samples/client/petstore/java/retrofit</module>
                <module>samples/client/petstore/java/retrofit2</module>
@@ -1399,7 +1398,6 @@
                <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-experimental</module>
                <module>samples/client/petstore/java/okhttp-gson</module>
                <module>samples/client/petstore/java/retrofit</module>
                <module>samples/client/petstore/java/retrofit2</module>
--- a/samples/client/petstore/java/jersey2-experimental/.gitignore
+++ b/samples/client/petstore/java/jersey2-experimental/.gitignore
@@ -1,21 +0,0 @@
-*.class
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.ear
-
-# exclude jar for gradle wrapper
-!gradle/wrapper/*.jar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-# build files
-**/target
-target
-.gradle
-build
--- a/samples/client/petstore/java/jersey2-experimental/.openapi-generator-ignore
+++ b/samples/client/petstore/java/jersey2-experimental/.openapi-generator-ignore
@@ -1,23 +0,0 @@
-# OpenAPI Generator Ignore
-# Generated by openapi-generator https://github.com/openapitools/openapi-generator
-
-# Use this file to prevent files from being overwritten by the generator.
-# The patterns follow closely to .gitignore or .dockerignore.
-
-# As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
-#ApiClient.cs
-
-# You can match any string of characters against a directory, file or extension with a single asterisk (*):
-#foo/*/qux
-# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
-
-# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
-#foo/**/qux
-# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
-
-# You can also negate patterns with an exclamation (!).
-# For example, you can ignore all files in a docs folder with the file extension .md:
-#docs/*.md
-# Then explicitly reverse the ignore rule for a single file:
-#!docs/README.md
--- a/samples/client/petstore/java/jersey2-experimental/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/jersey2-experimental/.openapi-generator/VERSION
@@ -1 +0,0 @@
-5.0.0-SNAPSHOT
--- a/samples/client/petstore/java/jersey2-experimental/.travis.yml
+++ b/samples/client/petstore/java/jersey2-experimental/.travis.yml
@@ -1,22 +0,0 @@
-#
-# Generated by OpenAPI Generator: https://openapi-generator.tech
-#
-# Ref: https://docs.travis-ci.com/user/languages/java/
-#
-language: java
-jdk:
-  - openjdk12
-  - openjdk11
-  - openjdk10
-  - openjdk9
-  - openjdk8
-before_install:
-  # ensure gradlew has proper permission
-  - chmod a+x ./gradlew
-script:
-  # test using maven
-  #- mvn test
-  # test using gradle
-  - gradle test
-  # test using sbt 
-  # - sbt test
--- a/samples/client/petstore/java/jersey2-experimental/README.md
+++ b/samples/client/petstore/java/jersey2-experimental/README.md
@@ -1,251 +0,0 @@
-# petstore-jersey2-exp
-
-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: \" \\
-
-
-*Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
-
-## Requirements
-
-Building the API client library requires:
-
-1. Java 1.7+
-2. Maven/Gradle
-
-## Installation
-
-To install the API client library to your local Maven repository, simply execute:
-
-```shell
-mvn clean install
-```
-
-To deploy it to a remote Maven repository instead, configure the settings of the repository and execute:
-
-```shell
-mvn clean deploy
-```
-
-Refer to the [OSSRH Guide](http://central.sonatype.org/pages/ossrh-guide.html) for more information.
-
-### Maven users
-
-Add this dependency to your project's POM:
-
-```xml
-<dependency>
-  <groupId>org.openapitools</groupId>
-  <artifactId>petstore-jersey2-exp</artifactId>
-  <version>1.0.0</version>
-  <scope>compile</scope>
-</dependency>
-```
-
-### Gradle users
-
-Add this dependency to your project's build file:
-
-```groovy
-compile "org.openapitools:petstore-jersey2-exp:1.0.0"
-```
-
-### Others
-
-At first generate the JAR by executing:
-
-```shell
-mvn clean package
-```
-
-Then manually install the following JARs:
-
- `target/petstore-jersey2-exp-1.0.0.jar`
- `target/lib/*.jar`
-
-## Getting Started
-
-Please follow the [installation](#installation) instruction and execute the following Java code:
-
-```java
-
-import org.openapitools.client.*;
-import org.openapitools.client.auth.*;
-import org.openapitools.client.model.*;
-import org.openapitools.client.api.AnotherFakeApi;
-
-public class AnotherFakeApiExample {
-
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-        
-        AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
-        Client client = new Client(); // Client | client model
-        try {
-            Client result = apiInstance.call123testSpecialTags(client);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-
-```
-
-## Documentation for API Endpoints
-
-All URIs are relative to *http://petstore.swagger.io:80/v2*
-
-Class | Method | HTTP request | Description
------------ | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
-*DefaultApi* | [**fooGet**](docs/DefaultApi.md#fooGet) | **GET** /foo | 
-*FakeApi* | [**fakeHealthGet**](docs/FakeApi.md#fakeHealthGet) | **GET** /fake/health | Health check endpoint
-*FakeApi* | [**fakeHttpSignatureTest**](docs/FakeApi.md#fakeHttpSignatureTest) | **GET** /fake/http-signature-test | test http signature authentication
-*FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
-*FakeApi* | [**fakeOuterCompositeSerialize**](docs/FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
-*FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
-*FakeApi* | [**fakeOuterStringSerialize**](docs/FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
-*FakeApi* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
-*FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
-*FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \&quot;client\&quot; model
-*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-*FakeApi* | [**testEnumParameters**](docs/FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
-*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
-*FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
-*FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
-*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
-*FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
-*PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
-*PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
-*PetApi* | [**findPetsByStatus**](docs/PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status
-*PetApi* | [**findPetsByTags**](docs/PetApi.md#findPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags
-*PetApi* | [**getPetById**](docs/PetApi.md#getPetById) | **GET** /pet/{petId} | Find pet by ID
-*PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
-*PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
-*PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
-*PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
-*StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
-*StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
-*StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
-*StoreApi* | [**placeOrder**](docs/StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet
-*UserApi* | [**createUser**](docs/UserApi.md#createUser) | **POST** /user | Create user
-*UserApi* | [**createUsersWithArrayInput**](docs/UserApi.md#createUsersWithArrayInput) | **POST** /user/createWithArray | Creates list of users with given input array
-*UserApi* | [**createUsersWithListInput**](docs/UserApi.md#createUsersWithListInput) | **POST** /user/createWithList | Creates list of users with given input array
-*UserApi* | [**deleteUser**](docs/UserApi.md#deleteUser) | **DELETE** /user/{username} | Delete user
-*UserApi* | [**getUserByName**](docs/UserApi.md#getUserByName) | **GET** /user/{username} | Get user by user name
-*UserApi* | [**loginUser**](docs/UserApi.md#loginUser) | **GET** /user/login | Logs user into the system
-*UserApi* | [**logoutUser**](docs/UserApi.md#logoutUser) | **GET** /user/logout | Logs out current logged in user session
-*UserApi* | [**updateUser**](docs/UserApi.md#updateUser) | **PUT** /user/{username} | Updated user
-
-
-## Documentation for Models
-
- - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
- - [Animal](docs/Animal.md)
- - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
- - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
- - [ArrayTest](docs/ArrayTest.md)
- - [Capitalization](docs/Capitalization.md)
- - [Cat](docs/Cat.md)
- - [CatAllOf](docs/CatAllOf.md)
- - [Category](docs/Category.md)
- - [ClassModel](docs/ClassModel.md)
- - [Client](docs/Client.md)
- - [Dog](docs/Dog.md)
- - [DogAllOf](docs/DogAllOf.md)
- - [EnumArrays](docs/EnumArrays.md)
- - [EnumClass](docs/EnumClass.md)
- - [EnumTest](docs/EnumTest.md)
- - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
- - [Foo](docs/Foo.md)
- - [FormatTest](docs/FormatTest.md)
- - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
- - [HealthCheckResult](docs/HealthCheckResult.md)
- - [InlineObject](docs/InlineObject.md)
- - [InlineObject1](docs/InlineObject1.md)
- - [InlineObject2](docs/InlineObject2.md)
- - [InlineObject3](docs/InlineObject3.md)
- - [InlineObject4](docs/InlineObject4.md)
- - [InlineObject5](docs/InlineObject5.md)
- - [InlineResponseDefault](docs/InlineResponseDefault.md)
- - [MapTest](docs/MapTest.md)
- - [MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md)
- - [Model200Response](docs/Model200Response.md)
- - [ModelApiResponse](docs/ModelApiResponse.md)
- - [ModelReturn](docs/ModelReturn.md)
- - [Name](docs/Name.md)
- - [NullableClass](docs/NullableClass.md)
- - [NumberOnly](docs/NumberOnly.md)
- - [Order](docs/Order.md)
- - [OuterComposite](docs/OuterComposite.md)
- - [OuterEnum](docs/OuterEnum.md)
- - [OuterEnumDefaultValue](docs/OuterEnumDefaultValue.md)
- - [OuterEnumInteger](docs/OuterEnumInteger.md)
- - [OuterEnumIntegerDefaultValue](docs/OuterEnumIntegerDefaultValue.md)
- - [Pet](docs/Pet.md)
- - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
- - [SpecialModelName](docs/SpecialModelName.md)
- - [Tag](docs/Tag.md)
- - [User](docs/User.md)
-
-
-## Documentation for Authorization
-
-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
-
-### bearer_test
-
-
- **Type**: HTTP basic authentication
-
-### http_basic_test
-
-
- **Type**: HTTP basic authentication
-
-### http_signature_test
-
-
- **Type**: HTTP basic authentication
-
-### petstore_auth
-
-
- **Type**: OAuth
- **Flow**: implicit
- **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
- **Scopes**: 
-  - write:pets: modify pets in your account
-  - read:pets: read your pets
-
-
-## Recommendation
-
-It's recommended to create an instance of `ApiClient` per thread in a multithreaded environment to avoid any potential issues.
-
-## Author
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/api/openapi.yaml
+++ b/samples/client/petstore/java/jersey2-experimental/api/openapi.yaml
--- a/samples/client/petstore/java/jersey2-experimental/build.gradle
+++ b/samples/client/petstore/java/jersey2-experimental/build.gradle
@@ -1,123 +0,0 @@
-apply plugin: 'idea'
-apply plugin: 'eclipse'
-
-group = 'org.openapitools'
-version = '1.0.0'
-
-buildscript {
-    repositories {
-        maven { url "https://repo1.maven.org/maven2" }
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.+'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
-    }
-}
-
-repositories {
-    jcenter()
-}
-
-
-if(hasProperty('target') && target == 'android') {
-
-    apply plugin: 'com.android.library'
-    apply plugin: 'com.github.dcendents.android-maven'
-
-    android {
-        compileSdkVersion 25
-        buildToolsVersion '25.0.2'
-        defaultConfig {
-            minSdkVersion 14
-            targetSdkVersion 25
-        }
-        compileOptions {
-            sourceCompatibility JavaVersion.VERSION_1_7
-            targetCompatibility JavaVersion.VERSION_1_7
-        }
-
-        // Rename the aar correctly
-        libraryVariants.all { variant ->
-            variant.outputs.each { output ->
-                def outputFile = output.outputFile
-                if (outputFile != null && outputFile.name.endsWith('.aar')) {
-                    def fileName = "${project.name}-${variant.baseName}-${version}.aar"
-                    output.outputFile = new File(outputFile.parent, fileName)
-                }
-            }
-        }
-
-        dependencies {
-            provided 'javax.annotation:jsr250-api:1.0'
-        }
-    }
-
-    afterEvaluate {
-        android.libraryVariants.all { variant ->
-            def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
-            task.description = "Create jar artifact for ${variant.name}"
-            task.dependsOn variant.javaCompile
-            task.from variant.javaCompile.destinationDir
-            task.destinationDir = project.file("${project.buildDir}/outputs/jar")
-            task.archiveName = "${project.name}-${variant.baseName}-${version}.jar"
-            artifacts.add('archives', task);
-        }
-    }
-
-    task sourcesJar(type: Jar) {
-        from android.sourceSets.main.java.srcDirs
-        classifier = 'sources'
-    }
-
-    artifacts {
-        archives sourcesJar
-    }
-
-} else {
-
-    apply plugin: 'java'
-    apply plugin: 'maven'
-    sourceCompatibility = JavaVersion.VERSION_1_7
-    targetCompatibility = JavaVersion.VERSION_1_7
-
-    install {
-        repositories.mavenInstaller {
-            pom.artifactId = 'petstore-jersey2-exp'
-        }
-    }
-
-    task execute(type:JavaExec) {
-       main = System.getProperty('mainClass')
-       classpath = sourceSets.main.runtimeClasspath
-    }
-}
-
-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.27"
-    junit_version = "4.13"
-    threetenbp_version = "2.9.10"
-}
-
-dependencies {
-    compile "io.swagger:swagger-annotations:$swagger_annotations_version"
-    compile "com.google.code.findbugs:jsr305:3.0.2"
-    compile "org.glassfish.jersey.core:jersey-client:$jersey_version"
-    compile "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version"
-    compile "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version"
-    compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
-    compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
-    compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
-    compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
-    compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version"
-    compile "com.brsanthu:migbase64:2.2"
-    testCompile "junit:junit:$junit_version"
-}
-
-javadoc {
-    options.tags = [ "http.response.details:a:Http Response Details" ]
-}
--- a/samples/client/petstore/java/jersey2-experimental/build.sbt
+++ b/samples/client/petstore/java/jersey2-experimental/build.sbt
@@ -1,24 +0,0 @@
-lazy val root = (project in file(".")).
-  settings(
-    organization := "org.openapitools",
-    name := "petstore-jersey2-exp",
-    version := "1.0.0",
-    scalaVersion := "2.11.4",
-    scalacOptions ++= Seq("-feature"),
-    javacOptions in compile ++= Seq("-Xlint:deprecation"),
-    publishArtifact in (Compile, packageDoc) := false,
-    resolvers += Resolver.mavenLocal,
-    libraryDependencies ++= Seq(
-      "io.swagger" % "swagger-annotations" % "1.5.22",
-      "org.glassfish.jersey.core" % "jersey-client" % "2.25.1",
-      "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.25.1",
-      "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.25.1",
-      "com.fasterxml.jackson.core" % "jackson-core" % "2.10.3" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.3" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.3" % "compile",
-      "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
-      "com.brsanthu" % "migbase64" % "2.2",
-      "junit" % "junit" % "4.13" % "test",
-      "com.novocode" % "junit-interface" % "0.10" % "test"
-    )
-  )
--- a/samples/client/petstore/java/jersey2-experimental/docs/AdditionalPropertiesAnyType.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/AdditionalPropertiesAnyType.md
@@ -1,12 +0,0 @@
-
-
-# AdditionalPropertiesAnyType
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**name** | **String** |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/AdditionalPropertiesArray.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/AdditionalPropertiesArray.md
@@ -1,12 +0,0 @@
-
-
-# AdditionalPropertiesArray
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**name** | **String** |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/AdditionalPropertiesBoolean.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/AdditionalPropertiesBoolean.md
@@ -1,12 +0,0 @@
-
-
-# AdditionalPropertiesBoolean
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**name** | **String** |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/AdditionalPropertiesClass.md
@@ -1,13 +0,0 @@
-
-
-# AdditionalPropertiesClass
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**mapProperty** | **Map&lt;String, String&gt;** |  |  [optional]
-**mapOfMapProperty** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/AdditionalPropertiesInteger.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/AdditionalPropertiesInteger.md
@@ -1,12 +0,0 @@
-
-
-# AdditionalPropertiesInteger
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**name** | **String** |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/AdditionalPropertiesNumber.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/AdditionalPropertiesNumber.md
@@ -1,12 +0,0 @@
-
-
-# AdditionalPropertiesNumber
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**name** | **String** |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/AdditionalPropertiesObject.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/AdditionalPropertiesObject.md
@@ -1,12 +0,0 @@
-
-
-# AdditionalPropertiesObject
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**name** | **String** |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/AdditionalPropertiesString.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/AdditionalPropertiesString.md
@@ -1,12 +0,0 @@
-
-
-# AdditionalPropertiesString
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**name** | **String** |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/Animal.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/Animal.md
@@ -1,13 +0,0 @@
-
-
-# Animal
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**className** | **String** |  | 
-**color** | **String** |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/AnotherFakeApi.md
@@ -1,74 +0,0 @@
-# AnotherFakeApi
-
-All URIs are relative to *http://petstore.swagger.io:80/v2*
-
-Method | HTTP request | Description
------------- | ------------- | -------------
-[**call123testSpecialTags**](AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
-
-
-
-## call123testSpecialTags
-
-> Client call123testSpecialTags(client)
-
-To test special tags
-
-To test special tags and operation ID starting with number
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.AnotherFakeApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
-        Client client = new Client(); // Client | client model
-        try {
-            Client result = apiInstance.call123testSpecialTags(client);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
------------- | ------------- | ------------- | -------------
- **client** | [**Client**](Client.md)| client model |
-
-### Return type
-
-[**Client**](Client.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- **Content-Type**: application/json
- **Accept**: application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/ArrayOfArrayOfNumberOnly.md
@@ -1,12 +0,0 @@
-
-
-# ArrayOfArrayOfNumberOnly
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**arrayArrayNumber** | [**List&lt;List&lt;BigDecimal&gt;&gt;**](List.md) |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/ArrayOfNumberOnly.md
@@ -1,12 +0,0 @@
-
-
-# ArrayOfNumberOnly
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**arrayNumber** | [**List&lt;BigDecimal&gt;**](BigDecimal.md) |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/ArrayTest.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/ArrayTest.md
@@ -1,14 +0,0 @@
-
-
-# ArrayTest
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**arrayOfString** | **List&lt;String&gt;** |  |  [optional]
-**arrayArrayOfInteger** | [**List&lt;List&lt;Long&gt;&gt;**](List.md) |  |  [optional]
-**arrayArrayOfModel** | [**List&lt;List&lt;ReadOnlyFirst&gt;&gt;**](List.md) |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/BigCat.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/BigCat.md
@@ -1,23 +0,0 @@
-
-
-# BigCat
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**kind** | [**KindEnum**](#KindEnum) |  |  [optional]
-
-
-
-## Enum: KindEnum
-
-Name | Value
---- | -----
-LIONS | &quot;lions&quot;
-TIGERS | &quot;tigers&quot;
-LEOPARDS | &quot;leopards&quot;
-JAGUARS | &quot;jaguars&quot;
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/BigCatAllOf.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/BigCatAllOf.md
@@ -1,23 +0,0 @@
-
-
-# BigCatAllOf
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**kind** | [**KindEnum**](#KindEnum) |  |  [optional]
-
-
-
-## Enum: KindEnum
-
-Name | Value
---- | -----
-LIONS | &quot;lions&quot;
-TIGERS | &quot;tigers&quot;
-LEOPARDS | &quot;leopards&quot;
-JAGUARS | &quot;jaguars&quot;
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/Capitalization.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/Capitalization.md
@@ -1,17 +0,0 @@
-
-
-# Capitalization
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**smallCamel** | **String** |  |  [optional]
-**capitalCamel** | **String** |  |  [optional]
-**smallSnake** | **String** |  |  [optional]
-**capitalSnake** | **String** |  |  [optional]
-**scAETHFlowPoints** | **String** |  |  [optional]
-**ATT_NAME** | **String** | Name of the pet  |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/Cat.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/Cat.md
@@ -1,12 +0,0 @@
-
-
-# Cat
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**declawed** | **Boolean** |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/CatAllOf.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/CatAllOf.md
@@ -1,12 +0,0 @@
-
-
-# CatAllOf
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**declawed** | **Boolean** |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/Category.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/Category.md
@@ -1,13 +0,0 @@
-
-
-# Category
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**id** | **Long** |  |  [optional]
-**name** | **String** |  | 
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/ClassModel.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/ClassModel.md
@@ -1,13 +0,0 @@
-
-
-# ClassModel
-
-Model for testing model with \"_class\" property
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**propertyClass** | **String** |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/Client.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/Client.md
@@ -1,12 +0,0 @@
-
-
-# Client
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**client** | **String** |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/DefaultApi.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/DefaultApi.md
@@ -1,68 +0,0 @@
-# DefaultApi
-
-All URIs are relative to *http://petstore.swagger.io:80/v2*
-
-Method | HTTP request | Description
------------- | ------------- | -------------
-[**fooGet**](DefaultApi.md#fooGet) | **GET** /foo | 
-
-
-
-## fooGet
-
-> InlineResponseDefault fooGet()
-
-
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.DefaultApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        DefaultApi apiInstance = new DefaultApi(defaultClient);
-        try {
-            InlineResponseDefault result = apiInstance.fooGet();
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling DefaultApi#fooGet");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-This endpoint does not need any parameter.
-
-### Return type
-
-[**InlineResponseDefault**](InlineResponseDefault.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- **Content-Type**: Not defined
- **Accept**: application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **0** | response |  -  |
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/Dog.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/Dog.md
@@ -1,12 +0,0 @@
-
-
-# Dog
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**breed** | **String** |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/DogAllOf.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/DogAllOf.md
@@ -1,12 +0,0 @@
-
-
-# DogAllOf
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**breed** | **String** |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/EnumArrays.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/EnumArrays.md
@@ -1,31 +0,0 @@
-
-
-# EnumArrays
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**justSymbol** | [**JustSymbolEnum**](#JustSymbolEnum) |  |  [optional]
-**arrayEnum** | [**List&lt;ArrayEnumEnum&gt;**](#List&lt;ArrayEnumEnum&gt;) |  |  [optional]
-
-
-
-## Enum: JustSymbolEnum
-
-Name | Value
---- | -----
-GREATER_THAN_OR_EQUAL_TO | &quot;&gt;&#x3D;&quot;
-DOLLAR | &quot;$&quot;
-
-
-
-## Enum: List&lt;ArrayEnumEnum&gt;
-
-Name | Value
---- | -----
-FISH | &quot;fish&quot;
-CRAB | &quot;crab&quot;
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/EnumClass.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/EnumClass.md
@@ -1,15 +0,0 @@
-
-
-# EnumClass
-
-## Enum
-
-
-* `_ABC` (value: `"_abc"`)
-
-* `_EFG` (value: `"-efg"`)
-
-* `_XYZ_` (value: `"(xyz)"`)
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/EnumTest.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/EnumTest.md
@@ -1,57 +0,0 @@
-
-
-# EnumTest
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**enumString** | [**EnumStringEnum**](#EnumStringEnum) |  |  [optional]
-**enumStringRequired** | [**EnumStringRequiredEnum**](#EnumStringRequiredEnum) |  | 
-**enumInteger** | [**EnumIntegerEnum**](#EnumIntegerEnum) |  |  [optional]
-**enumNumber** | [**EnumNumberEnum**](#EnumNumberEnum) |  |  [optional]
-**outerEnum** | [**OuterEnum**](OuterEnum.md) |  |  [optional]
-**outerEnumInteger** | [**OuterEnumInteger**](OuterEnumInteger.md) |  |  [optional]
-**outerEnumDefaultValue** | [**OuterEnumDefaultValue**](OuterEnumDefaultValue.md) |  |  [optional]
-**outerEnumIntegerDefaultValue** | [**OuterEnumIntegerDefaultValue**](OuterEnumIntegerDefaultValue.md) |  |  [optional]
-
-
-
-## Enum: EnumStringEnum
-
-Name | Value
---- | -----
-UPPER | &quot;UPPER&quot;
-LOWER | &quot;lower&quot;
-EMPTY | &quot;&quot;
-
-
-
-## Enum: EnumStringRequiredEnum
-
-Name | Value
---- | -----
-UPPER | &quot;UPPER&quot;
-LOWER | &quot;lower&quot;
-EMPTY | &quot;&quot;
-
-
-
-## Enum: EnumIntegerEnum
-
-Name | Value
---- | -----
-NUMBER_1 | 1
-NUMBER_MINUS_1 | -1
-
-
-
-## Enum: EnumNumberEnum
-
-Name | Value
---- | -----
-NUMBER_1_DOT_1 | 1.1
-NUMBER_MINUS_1_DOT_2 | -1.2
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/FakeApi.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/FakeApi.md
--- a/samples/client/petstore/java/jersey2-experimental/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/FakeClassnameTags123Api.md
@@ -1,81 +0,0 @@
-# FakeClassnameTags123Api
-
-All URIs are relative to *http://petstore.swagger.io:80/v2*
-
-Method | HTTP request | Description
------------- | ------------- | -------------
-[**testClassname**](FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
-
-
-
-## testClassname
-
-> Client testClassname(client)
-
-To test class name in snake case
-
-To test class name in snake case
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.auth.*;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.FakeClassnameTags123Api;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-        
-        // Configure API key authorization: api_key_query
-        ApiKeyAuth api_key_query = (ApiKeyAuth) defaultClient.getAuthentication("api_key_query");
-        api_key_query.setApiKey("YOUR API KEY");
-        // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
-        //api_key_query.setApiKeyPrefix("Token");
-
-        FakeClassnameTags123Api apiInstance = new FakeClassnameTags123Api(defaultClient);
-        Client client = new Client(); // Client | client model
-        try {
-            Client result = apiInstance.testClassname(client);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FakeClassnameTags123Api#testClassname");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
------------- | ------------- | ------------- | -------------
- **client** | [**Client**](Client.md)| client model |
-
-### Return type
-
-[**Client**](Client.md)
-
-### Authorization
-
-[api_key_query](../README.md#api_key_query)
-
-### HTTP request headers
-
- **Content-Type**: application/json
- **Accept**: application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/FileSchemaTestClass.md
@@ -1,13 +0,0 @@
-
-
-# FileSchemaTestClass
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**file** | [**java.io.File**](java.io.File.md) |  |  [optional]
-**files** | [**List&lt;java.io.File&gt;**](java.io.File.md) |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/Foo.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/Foo.md
@@ -1,12 +0,0 @@
-
-
-# Foo
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**bar** | **String** |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/FormatTest.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/FormatTest.md
@@ -1,26 +0,0 @@
-
-
-# FormatTest
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**integer** | **Integer** |  |  [optional]
-**int32** | **Integer** |  |  [optional]
-**int64** | **Long** |  |  [optional]
-**number** | [**BigDecimal**](BigDecimal.md) |  | 
-**_float** | **Float** |  |  [optional]
-**_double** | **Double** |  |  [optional]
-**string** | **String** |  |  [optional]
-**_byte** | **byte[]** |  | 
-**binary** | [**File**](File.md) |  |  [optional]
-**date** | [**LocalDate**](LocalDate.md) |  | 
-**dateTime** | [**OffsetDateTime**](OffsetDateTime.md) |  |  [optional]
-**uuid** | [**UUID**](UUID.md) |  |  [optional]
-**password** | **String** |  | 
-**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. |  [optional]
-**patternWithDigitsAndDelimiter** | **String** | A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01. |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/HasOnlyReadOnly.md
@@ -1,13 +0,0 @@
-
-
-# HasOnlyReadOnly
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**bar** | **String** |  |  [optional] [readonly]
-**foo** | **String** |  |  [optional] [readonly]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/HealthCheckResult.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/HealthCheckResult.md
@@ -1,13 +0,0 @@
-
-
-# HealthCheckResult
-
-Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**nullableMessage** | **String** |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/InlineObject.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/InlineObject.md
@@ -1,13 +0,0 @@
-
-
-# InlineObject
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**name** | **String** | Updated name of the pet |  [optional]
-**status** | **String** | Updated status of the pet |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/InlineObject1.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/InlineObject1.md
@@ -1,13 +0,0 @@
-
-
-# InlineObject1
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**additionalMetadata** | **String** | Additional data to pass to server |  [optional]
-**file** | [**File**](File.md) | file to upload |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/InlineObject2.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/InlineObject2.md
@@ -1,32 +0,0 @@
-
-
-# InlineObject2
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**enumFormStringArray** | [**List&lt;EnumFormStringArrayEnum&gt;**](#List&lt;EnumFormStringArrayEnum&gt;) | Form parameter enum test (string array) |  [optional]
-**enumFormString** | [**EnumFormStringEnum**](#EnumFormStringEnum) | Form parameter enum test (string) |  [optional]
-
-
-
-## Enum: List&lt;EnumFormStringArrayEnum&gt;
-
-Name | Value
---- | -----
-GREATER_THAN | &quot;&gt;&quot;
-DOLLAR | &quot;$&quot;
-
-
-
-## Enum: EnumFormStringEnum
-
-Name | Value
---- | -----
-_ABC | &quot;_abc&quot;
-_EFG | &quot;-efg&quot;
-_XYZ_ | &quot;(xyz)&quot;
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/InlineObject3.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/InlineObject3.md
@@ -1,25 +0,0 @@
-
-
-# InlineObject3
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**integer** | **Integer** | None |  [optional]
-**int32** | **Integer** | None |  [optional]
-**int64** | **Long** | None |  [optional]
-**number** | [**BigDecimal**](BigDecimal.md) | None | 
-**_float** | **Float** | None |  [optional]
-**_double** | **Double** | None | 
-**string** | **String** | None |  [optional]
-**patternWithoutDelimiter** | **String** | None | 
-**_byte** | **byte[]** | None | 
-**binary** | [**File**](File.md) | None |  [optional]
-**date** | [**LocalDate**](LocalDate.md) | None |  [optional]
-**dateTime** | [**OffsetDateTime**](OffsetDateTime.md) | None |  [optional]
-**password** | **String** | None |  [optional]
-**callback** | **String** | None |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/InlineObject4.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/InlineObject4.md
@@ -1,13 +0,0 @@
-
-
-# InlineObject4
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**param** | **String** | field1 | 
-**param2** | **String** | field2 | 
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/InlineObject5.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/InlineObject5.md
@@ -1,13 +0,0 @@
-
-
-# InlineObject5
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**additionalMetadata** | **String** | Additional data to pass to server |  [optional]
-**requiredFile** | [**File**](File.md) | file to upload | 
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/InlineResponseDefault.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/InlineResponseDefault.md
@@ -1,12 +0,0 @@
-
-
-# InlineResponseDefault
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**string** | [**Foo**](Foo.md) |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/MapTest.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/MapTest.md
@@ -1,24 +0,0 @@
-
-
-# MapTest
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**mapMapOfString** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
-**mapOfEnumString** | [**Map&lt;String, InnerEnum&gt;**](#Map&lt;String, InnerEnum&gt;) |  |  [optional]
-**directMap** | **Map&lt;String, Boolean&gt;** |  |  [optional]
-**indirectMap** | **Map&lt;String, Boolean&gt;** |  |  [optional]
-
-
-
-## Enum: Map&lt;String, InnerEnum&gt;
-
-Name | Value
---- | -----
-UPPER | &quot;UPPER&quot;
-LOWER | &quot;lower&quot;
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -1,14 +0,0 @@
-
-
-# MixedPropertiesAndAdditionalPropertiesClass
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**uuid** | [**UUID**](UUID.md) |  |  [optional]
-**dateTime** | [**OffsetDateTime**](OffsetDateTime.md) |  |  [optional]
-**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/Model200Response.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/Model200Response.md
@@ -1,14 +0,0 @@
-
-
-# Model200Response
-
-Model for testing model name starting with number
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**name** | **Integer** |  |  [optional]
-**propertyClass** | **String** |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/ModelApiResponse.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/ModelApiResponse.md
@@ -1,14 +0,0 @@
-
-
-# ModelApiResponse
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**code** | **Integer** |  |  [optional]
-**type** | **String** |  |  [optional]
-**message** | **String** |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/ModelReturn.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/ModelReturn.md
@@ -1,13 +0,0 @@
-
-
-# ModelReturn
-
-Model for testing reserved words
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**_return** | **Integer** |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/Name.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/Name.md
@@ -1,16 +0,0 @@
-
-
-# Name
-
-Model for testing model name same as property name
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**name** | **Integer** |  | 
-**snakeCase** | **Integer** |  |  [optional] [readonly]
-**property** | **String** |  |  [optional]
-**_123number** | **Integer** |  |  [optional] [readonly]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/NullableClass.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/NullableClass.md
@@ -1,23 +0,0 @@
-
-
-# NullableClass
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**integerProp** | **Integer** |  |  [optional]
-**numberProp** | [**BigDecimal**](BigDecimal.md) |  |  [optional]
-**booleanProp** | **Boolean** |  |  [optional]
-**stringProp** | **String** |  |  [optional]
-**dateProp** | [**LocalDate**](LocalDate.md) |  |  [optional]
-**datetimeProp** | [**OffsetDateTime**](OffsetDateTime.md) |  |  [optional]
-**arrayNullableProp** | **List&lt;Object&gt;** |  |  [optional]
-**arrayAndItemsNullableProp** | **List&lt;Object&gt;** |  |  [optional]
-**arrayItemsNullable** | **List&lt;Object&gt;** |  |  [optional]
-**objectNullableProp** | **Map&lt;String, Object&gt;** |  |  [optional]
-**objectAndItemsNullableProp** | **Map&lt;String, Object&gt;** |  |  [optional]
-**objectItemsNullable** | **Map&lt;String, Object&gt;** |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/NumberOnly.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/NumberOnly.md
@@ -1,12 +0,0 @@
-
-
-# NumberOnly
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**justNumber** | [**BigDecimal**](BigDecimal.md) |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/jersey2-experimental/docs/Order.md
+++ b/samples/client/petstore/java/jersey2-experimental/docs/Order.md
@@ -1,27 +0,0 @@
-
-
-# Order
-
-## Properties
-
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**id** | **Long** |  |  [optional]
-**petId** | **Long** |  |  [optional]
-**quantity** | **Integer** |  |  [optional]
-**shipDate** | [**OffsetDateTime**](OffsetDateTime.md) |  |  [optional]
-**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional]
-**complete** | **Boolean** |  |  [optional]
-
-
-
-## Enum: StatusEnum
-
-Name | Value
---- | -----
-PLACED | &quot;placed&quot;
-APPROVED | &quot;approved&quot;
-DELIVERED | &quot;delivered&quot;
-
-
-
--- a/Show More
+++ b/Show More