Update samples for java/jersey2-java6 (and fix artifact ID) (#5118)

* Update samples for java/jersey2-java6. * Let the sample generation script set the right name for jersey2-java6. This is the equivalent change to #5095, for jersey2-java6. * Update samples for Java/Jersey2-java6.
2017-03-23 08:22:14 +01:00 · 2017-03-23 08:22:14 +01:00 · 9dc8cf3fa6
commit 9dc8cf3fa6
parent 5f27fcab18
61 changed files with 707 additions and 1059 deletions
--- a/bin/java-petstore-jersey2-java6.sh
+++ b/bin/java-petstore-jersey2-java6.sh
@ -26,7 +26,7 @@ fi
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-jersey2.json -o samples/client/petstore/java/jersey2-java6 -DhideGenerationTimestamp=true,supportJava6=true"
+ags="$@ generate --artifact-id swagger-petstore-jersey2-java6 -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-jersey2.json -o samples/client/petstore/java/jersey2-java6 -DhideGenerationTimestamp=true,supportJava6=true"
 echo "Removing files and folders under samples/client/petstore/java/jersey2/src/main"
 rm -rf samples/client/petstore/java/jersey2-java6/src/main
--- a/samples/client/petstore/java/jersey2-java6/.travis.yml
+++ b/samples/client/petstore/java/jersey2-java6/.travis.yml
@ -1,18 +1,6 @@
 #
 # Generated by: https://github.com/swagger-api/swagger-codegen.git
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
 language: java
 jdk:
  - oraclejdk8
--- a/samples/client/petstore/java/jersey2-java6/build.gradle
+++ b/samples/client/petstore/java/jersey2-java6/build.gradle
@ -82,7 +82,7 @@ if(hasProperty('target') && target == 'android') {
    install {
        repositories.mavenInstaller {
-            pom.artifactId = 'swagger-petstore-jersey2'
+            pom.artifactId = 'swagger-petstore-jersey2-java6'
        }
    }
--- a/samples/client/petstore/java/jersey2-java6/build.sbt
+++ b/samples/client/petstore/java/jersey2-java6/build.sbt
@ -1,7 +1,7 @@
 lazy val root = (project in file(".")).
  settings(
    organization := "io.swagger",
-    name := "swagger-petstore-jersey2",
+    name := "swagger-petstore-jersey2-java6",
    version := "1.0.0",
    scalaVersion := "2.11.4",
    scalacOptions ++= Seq("-feature"),
--- a/samples/client/petstore/java/jersey2-java6/docs/Capitalization.md
+++ b/samples/client/petstore/java/jersey2-java6/docs/Capitalization.md
@ -0,0 +1,15 @@
 # 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-java6/docs/ClassModel.md
+++ b/samples/client/petstore/java/jersey2-java6/docs/ClassModel.md
@ -0,0 +1,10 @@
 # ClassModel
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **propertyClass** | **String** |  |  [optional]
--- a/samples/client/petstore/java/jersey2-java6/docs/EnumTest.md
+++ b/samples/client/petstore/java/jersey2-java6/docs/EnumTest.md
@ -7,6 +7,7 @@ Name | Type | Description | Notes
 **enumString** | [**EnumStringEnum**](#EnumStringEnum) |  |  [optional]
 **enumInteger** | [**EnumIntegerEnum**](#EnumIntegerEnum) |  |  [optional]
 **enumNumber** | [**EnumNumberEnum**](#EnumNumberEnum) |  |  [optional]
 **outerEnum** | [**OuterEnum**](OuterEnum.md) |  |  [optional]
 <a name="EnumStringEnum"></a>
--- a/samples/client/petstore/java/jersey2-java6/docs/FakeApi.md
+++ b/samples/client/petstore/java/jersey2-java6/docs/FakeApi.md
@ -15,6 +15,8 @@ Method | HTTP request | Description
 To test \&quot;client\&quot; model
 To test \&quot;client\&quot; model
 ### Example
 ```java
 // Import classes:
@ -137,6 +139,8 @@ null (empty response body)
 To test enum parameters
 To test enum parameters
 ### Example
 ```java
 // Import classes:
@ -151,7 +155,7 @@ List<String> enumHeaderStringArray = Arrays.asList("enumHeaderStringArray_exampl
 String enumHeaderString = "-efg"; // String | Header parameter enum test (string)
 List<String> enumQueryStringArray = Arrays.asList("enumQueryStringArray_example"); // List<String> | Query parameter enum test (string array)
 String enumQueryString = "-efg"; // String | Query parameter enum test (string)
-BigDecimal enumQueryInteger = new BigDecimal(); // BigDecimal | Query parameter enum test (double)
+Integer enumQueryInteger = 56; // Integer | Query parameter enum test (double)
 Double enumQueryDouble = 3.4D; // Double | Query parameter enum test (double)
 try {
    apiInstance.testEnumParameters(enumFormStringArray, enumFormString, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble);
@ -171,8 +175,8 @@ Name | Type | Description  | Notes
 **enumHeaderString** | **String**| Header parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
 **enumQueryStringArray** | [**List&lt;String&gt;**](String.md)| Query parameter enum test (string array) | [optional] [enum: >, $]
 **enumQueryString** | **String**| Query parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
- **enumQueryInteger** | **BigDecimal**| Query parameter enum test (double) | [optional]
+ **enumQueryInteger** | **Integer**| Query parameter enum test (double) | [optional] [enum: 1, -2]
- **enumQueryDouble** | **Double**| Query parameter enum test (double) | [optional]
+ **enumQueryDouble** | **Double**| Query parameter enum test (double) | [optional] [enum: 1.1, -1.2]
 ### Return type
@ -184,6 +188,6 @@ No authorization required
 ### HTTP request headers
- - **Content-Type**: application/json
+ - **Content-Type**: */*
- - **Accept**: application/json
+ - **Accept**: */*
--- a/samples/client/petstore/java/jersey2-java6/docs/FormatTest.md
+++ b/samples/client/petstore/java/jersey2-java6/docs/FormatTest.md
@ -15,7 +15,7 @@ Name | Type | Description | Notes
 **binary** | **byte[]** |  |  [optional]
 **date** | [**LocalDate**](LocalDate.md) |  | 
 **dateTime** | [**DateTime**](DateTime.md) |  |  [optional]
-**uuid** | **String** |  |  [optional]
+**uuid** | [**UUID**](UUID.md) |  |  [optional]
 **password** | **String** |  | 
--- a/samples/client/petstore/java/jersey2-java6/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/jersey2-java6/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@ -4,7 +4,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**uuid** | **String** |  |  [optional]
+**uuid** | [**UUID**](UUID.md) |  |  [optional]
 **dateTime** | [**DateTime**](DateTime.md) |  |  [optional]
 **map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional]
--- a/samples/client/petstore/java/jersey2-java6/docs/OuterEnum.md
+++ b/samples/client/petstore/java/jersey2-java6/docs/OuterEnum.md
@ -0,0 +1,14 @@
 # OuterEnum
 ## Enum
 * `PLACED` (value: `"placed"`)
 * `APPROVED` (value: `"approved"`)
 * `DELIVERED` (value: `"delivered"`)
--- a/samples/client/petstore/java/jersey2-java6/effective.pom
+++ b/samples/client/petstore/java/jersey2-java6/effective.pom
@ -1,431 +0,0 @@
 <!-- ====================================================================== -->
 <!--                                                                        -->
 <!-- Generated by Maven Help Plugin on 2017-01-21T07:16:42                  -->
 <!-- See: http://maven.apache.org/plugins/maven-help-plugin/                -->
 <!--                                                                        -->
 <!-- ====================================================================== -->
 <!-- ====================================================================== -->
 <!--                                                                        -->
 <!-- Effective POM for project                                              -->
 <!-- 'io.swagger:swagger-petstore-jersey2-java6:jar:1.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/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
  <groupId>io.swagger</groupId>
  <artifactId>swagger-petstore-jersey2-java6</artifactId>
  <version>1.0.0</version>
  <name>swagger-petstore-jersey2-java6</name>
  <prerequisites>
    <maven>2.2.0</maven>
  </prerequisites>
  <scm>
    <connection>scm:git:git@github.com:swagger-api/swagger-mustache.git</connection>
    <developerConnection>scm:git:git@github.com:swagger-api/swagger-codegen.git</developerConnection>
    <url>https://github.com/swagger-api/swagger-codegen</url>
  </scm>
  <properties>
    <commons_io_version>2.5</commons_io_version>
    <commons_lang3_version>3.5</commons_lang3_version>
    <jackson-version>2.7.5</jackson-version>
    <jersey-version>2.22.2</jersey-version>
    <jodatime-version>2.9.4</jodatime-version>
    <junit-version>4.12</junit-version>
    <maven-plugin-version>1.0.0</maven-plugin-version>
    <swagger-core-version>1.5.9</swagger-core-version>
  </properties>
  <dependencies>
    <dependency>
      <groupId>io.swagger</groupId>
      <artifactId>swagger-annotations</artifactId>
      <version>1.5.9</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.glassfish.jersey.core</groupId>
      <artifactId>jersey-client</artifactId>
      <version>2.22.2</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.glassfish.jersey.media</groupId>
      <artifactId>jersey-media-multipart</artifactId>
      <version>2.22.2</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.glassfish.jersey.media</groupId>
      <artifactId>jersey-media-json-jackson</artifactId>
      <version>2.22.2</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>com.fasterxml.jackson.core</groupId>
      <artifactId>jackson-core</artifactId>
      <version>2.7.5</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>com.fasterxml.jackson.core</groupId>
      <artifactId>jackson-annotations</artifactId>
      <version>2.7.5</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>com.fasterxml.jackson.core</groupId>
      <artifactId>jackson-databind</artifactId>
      <version>2.7.5</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>com.fasterxml.jackson.datatype</groupId>
      <artifactId>jackson-datatype-joda</artifactId>
      <version>2.7.5</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>joda-time</groupId>
      <artifactId>joda-time</artifactId>
      <version>2.9.4</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>com.brsanthu</groupId>
      <artifactId>migbase64</artifactId>
      <version>2.2</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.apache.commons</groupId>
      <artifactId>commons-lang3</artifactId>
      <version>3.5</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>commons-io</groupId>
      <artifactId>commons-io</artifactId>
      <version>2.5</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>junit</groupId>
      <artifactId>junit</artifactId>
      <version>4.12</version>
      <scope>test</scope>
    </dependency>
  </dependencies>
  <repositories>
    <repository>
      <snapshots>
        <enabled>false</enabled>
      </snapshots>
      <id>central</id>
      <name>Central Repository</name>
      <url>https://repo.maven.apache.org/maven2</url>
    </repository>
  </repositories>
  <pluginRepositories>
    <pluginRepository>
      <releases>
        <updatePolicy>never</updatePolicy>
      </releases>
      <snapshots>
        <enabled>false</enabled>
      </snapshots>
      <id>central</id>
      <name>Central Repository</name>
      <url>https://repo.maven.apache.org/maven2</url>
    </pluginRepository>
  </pluginRepositories>
  <build>
    <sourceDirectory>/Users/williamcheng/Code/jan2017/swagger-codegen/samples/client/petstore/java/jersey2-java6/src/main/java</sourceDirectory>
    <scriptSourceDirectory>/Users/williamcheng/Code/jan2017/swagger-codegen/samples/client/petstore/java/jersey2-java6/src/main/scripts</scriptSourceDirectory>
    <testSourceDirectory>/Users/williamcheng/Code/jan2017/swagger-codegen/samples/client/petstore/java/jersey2-java6/src/test/java</testSourceDirectory>
    <outputDirectory>/Users/williamcheng/Code/jan2017/swagger-codegen/samples/client/petstore/java/jersey2-java6/target/classes</outputDirectory>
    <testOutputDirectory>/Users/williamcheng/Code/jan2017/swagger-codegen/samples/client/petstore/java/jersey2-java6/target/test-classes</testOutputDirectory>
    <resources>
      <resource>
        <directory>/Users/williamcheng/Code/jan2017/swagger-codegen/samples/client/petstore/java/jersey2-java6/src/main/resources</directory>
      </resource>
    </resources>
    <testResources>
      <testResource>
        <directory>/Users/williamcheng/Code/jan2017/swagger-codegen/samples/client/petstore/java/jersey2-java6/src/test/resources</directory>
      </testResource>
    </testResources>
    <directory>/Users/williamcheng/Code/jan2017/swagger-codegen/samples/client/petstore/java/jersey2-java6/target</directory>
    <finalName>swagger-petstore-jersey2-java6-1.0.0</finalName>
    <pluginManagement>
      <plugins>
        <plugin>
          <artifactId>maven-antrun-plugin</artifactId>
          <version>1.3</version>
        </plugin>
        <plugin>
          <artifactId>maven-assembly-plugin</artifactId>
          <version>2.2-beta-5</version>
        </plugin>
        <plugin>
          <artifactId>maven-dependency-plugin</artifactId>
          <version>2.8</version>
        </plugin>
        <plugin>
          <artifactId>maven-release-plugin</artifactId>
          <version>2.3.2</version>
        </plugin>
      </plugins>
    </pluginManagement>
    <plugins>
      <plugin>
        <artifactId>maven-surefire-plugin</artifactId>
        <version>2.12</version>
        <executions>
          <execution>
            <id>default-test</id>
            <phase>test</phase>
            <goals>
              <goal>test</goal>
            </goals>
            <configuration>
              <systemProperties>
                <property>
                  <name>loggerPath</name>
                  <value>conf/log4j.properties</value>
                </property>
              </systemProperties>
              <argLine>-Xms512m -Xmx1500m</argLine>
              <parallel>methods</parallel>
              <forkMode>pertest</forkMode>
            </configuration>
          </execution>
        </executions>
        <configuration>
          <systemProperties>
            <property>
              <name>loggerPath</name>
              <value>conf/log4j.properties</value>
            </property>
          </systemProperties>
          <argLine>-Xms512m -Xmx1500m</argLine>
          <parallel>methods</parallel>
          <forkMode>pertest</forkMode>
        </configuration>
      </plugin>
      <plugin>
        <artifactId>maven-dependency-plugin</artifactId>
        <version>2.8</version>
        <executions>
          <execution>
            <phase>package</phase>
            <goals>
              <goal>copy-dependencies</goal>
            </goals>
            <configuration>
              <outputDirectory>/Users/williamcheng/Code/jan2017/swagger-codegen/samples/client/petstore/java/jersey2-java6/target/lib</outputDirectory>
            </configuration>
          </execution>
        </executions>
      </plugin>
      <plugin>
        <artifactId>maven-jar-plugin</artifactId>
        <version>2.6</version>
        <executions>
          <execution>
            <id>default-jar</id>
            <phase>package</phase>
            <goals>
              <goal>jar</goal>
            </goals>
            <configuration />
          </execution>
          <execution>
            <goals>
              <goal>jar</goal>
              <goal>test-jar</goal>
            </goals>
            <configuration />
          </execution>
        </executions>
        <configuration />
      </plugin>
      <plugin>
        <groupId>org.codehaus.mojo</groupId>
        <artifactId>build-helper-maven-plugin</artifactId>
        <version>1.12</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>
        <artifactId>maven-compiler-plugin</artifactId>
        <version>2.5.1</version>
        <executions>
          <execution>
            <id>default-compile</id>
            <phase>compile</phase>
            <goals>
              <goal>compile</goal>
            </goals>
            <configuration>
              <source>1.7</source>
              <target>1.7</target>
            </configuration>
          </execution>
          <execution>
            <id>default-testCompile</id>
            <phase>test-compile</phase>
            <goals>
              <goal>testCompile</goal>
            </goals>
            <configuration>
              <source>1.7</source>
              <target>1.7</target>
            </configuration>
          </execution>
        </executions>
        <configuration>
          <source>1.7</source>
          <target>1.7</target>
        </configuration>
      </plugin>
      <plugin>
        <artifactId>maven-javadoc-plugin</artifactId>
        <version>2.10.4</version>
      </plugin>
      <plugin>
        <artifactId>maven-clean-plugin</artifactId>
        <version>2.5</version>
        <executions>
          <execution>
            <id>default-clean</id>
            <phase>clean</phase>
            <goals>
              <goal>clean</goal>
            </goals>
          </execution>
        </executions>
      </plugin>
      <plugin>
        <artifactId>maven-resources-plugin</artifactId>
        <version>2.6</version>
        <executions>
          <execution>
            <id>default-testResources</id>
            <phase>process-test-resources</phase>
            <goals>
              <goal>testResources</goal>
            </goals>
          </execution>
          <execution>
            <id>default-resources</id>
            <phase>process-resources</phase>
            <goals>
              <goal>resources</goal>
            </goals>
          </execution>
        </executions>
      </plugin>
      <plugin>
        <artifactId>maven-install-plugin</artifactId>
        <version>2.4</version>
        <executions>
          <execution>
            <id>default-install</id>
            <phase>install</phase>
            <goals>
              <goal>install</goal>
            </goals>
          </execution>
        </executions>
      </plugin>
      <plugin>
        <artifactId>maven-deploy-plugin</artifactId>
        <version>2.7</version>
        <executions>
          <execution>
            <id>default-deploy</id>
            <phase>deploy</phase>
            <goals>
              <goal>deploy</goal>
            </goals>
          </execution>
        </executions>
      </plugin>
      <plugin>
        <artifactId>maven-site-plugin</artifactId>
        <version>3.3</version>
        <executions>
          <execution>
            <id>default-site</id>
            <phase>site</phase>
            <goals>
              <goal>site</goal>
            </goals>
            <configuration>
              <outputDirectory>/Users/williamcheng/Code/jan2017/swagger-codegen/samples/client/petstore/java/jersey2-java6/target/site</outputDirectory>
              <reportPlugins>
                <reportPlugin>
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-project-info-reports-plugin</artifactId>
                </reportPlugin>
              </reportPlugins>
            </configuration>
          </execution>
          <execution>
            <id>default-deploy</id>
            <phase>site-deploy</phase>
            <goals>
              <goal>deploy</goal>
            </goals>
            <configuration>
              <outputDirectory>/Users/williamcheng/Code/jan2017/swagger-codegen/samples/client/petstore/java/jersey2-java6/target/site</outputDirectory>
              <reportPlugins>
                <reportPlugin>
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-project-info-reports-plugin</artifactId>
                </reportPlugin>
              </reportPlugins>
            </configuration>
          </execution>
        </executions>
        <configuration>
          <outputDirectory>/Users/williamcheng/Code/jan2017/swagger-codegen/samples/client/petstore/java/jersey2-java6/target/site</outputDirectory>
          <reportPlugins>
            <reportPlugin>
              <groupId>org.apache.maven.plugins</groupId>
              <artifactId>maven-project-info-reports-plugin</artifactId>
            </reportPlugin>
          </reportPlugins>
        </configuration>
      </plugin>
    </plugins>
  </build>
  <reporting>
    <outputDirectory>/Users/williamcheng/Code/jan2017/swagger-codegen/samples/client/petstore/java/jersey2-java6/target/site</outputDirectory>
  </reporting>
 </project>
--- a/samples/client/petstore/java/jersey2-java6/pom.xml
+++ b/samples/client/petstore/java/jersey2-java6/pom.xml
@ -6,8 +6,10 @@
  <packaging>jar</packaging>
  <name>swagger-petstore-jersey2-java6</name>
  <version>1.0.0</version>
  <url>https://github.com/swagger-api/swagger-codegen</url>
  <description>Swagger Java</description>
  <scm>
-    <connection>scm:git:git@github.com:swagger-api/swagger-mustache.git</connection>
+    <connection>scm:git:git@github.com:swagger-api/swagger-codegen.git</connection>
    <developerConnection>scm:git:git@github.com:swagger-api/swagger-codegen.git</developerConnection>
    <url>https://github.com/swagger-api/swagger-codegen</url>
  </scm>
@ -15,6 +17,23 @@
    <maven>2.2.0</maven>
  </prerequisites>
  <licenses>
    <license>
      <name>Unlicense</name>
      <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
      <distribution>repo</distribution>
    </license>
  </licenses>
  <developers>
    <developer>
      <name>Swagger</name>
      <email>apiteam@swagger.io</email>
      <organization>Swagger</organization>
      <organizationUrl>http://swagger.io</organizationUrl>
    </developer>
  </developers>
  <build>
    <plugins>
      <plugin>
@ -108,9 +127,55 @@
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-javadoc-plugin</artifactId>
        <version>2.10.4</version>
        <executions>
          <execution>
            <id>attach-javadocs</id>
            <goals>
              <goal>jar</goal>
            </goals>
          </execution>
        </executions>
      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-source-plugin</artifactId>
        <version>2.2.1</version>
        <executions>
          <execution>
            <id>attach-sources</id>
            <goals>
              <goal>jar-no-fork</goal>
            </goals>
          </execution>
        </executions>
      </plugin>
    </plugins>
  </build>
  <profiles>
    <profile>
      <id>sign-artifacts</id>
      <build>
        <plugins>
          <plugin>
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-gpg-plugin</artifactId>
            <version>1.5</version>
            <executions>
              <execution>
                <id>sign-artifacts</id>
                <phase>verify</phase>
                <goals>
                  <goal>sign</goal>
                </goals>
              </execution>
            </executions>
          </plugin>
        </plugins>
      </build>
    </profile>
  </profiles>
  <dependencies>
    <dependency>
      <groupId>io.swagger</groupId>
@ -189,7 +254,7 @@
    </dependency>
  </dependencies>
  <properties>
-    <swagger-core-version>1.5.9</swagger-core-version>
+    <swagger-core-version>1.5.12</swagger-core-version>
    <jersey-version>2.22.2</jersey-version>
    <jackson-version>2.7.5</jackson-version>
    <jodatime-version>2.9.4</jodatime-version>
--- a/samples/client/petstore/java/jersey2-java6/settings.gradle
+++ b/samples/client/petstore/java/jersey2-java6/settings.gradle
@ -1 +1 @@
-rootProject.name = "swagger-petstore-jersey2"
+rootProject.name = "swagger-petstore-jersey2-java6"
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/ApiClient.java
@ -86,6 +86,7 @@ public class ApiClient {
  /**
   * Gets the JSON instance to do JSON serialization and deserialization.
   * @return JSON
   */
  public JSON getJSON() {
    return json;
@ -111,6 +112,7 @@ public class ApiClient {
  /**
   * Gets the status code of the previous request
   * @return Status code
   */
  public int getStatusCode() {
    return statusCode;
@ -118,6 +120,7 @@ public class ApiClient {
  /**
   * Gets the response headers of the previous request
   * @return Response headers
   */
  public Map<String, List<String>> getResponseHeaders() {
    return responseHeaders;
@ -125,6 +128,7 @@ public class ApiClient {
  /**
   * Get authentications (key: authentication name, value: authentication).
   * @return Map of authentication object
   */
  public Map<String, Authentication> getAuthentications() {
    return authentications;
@ -142,6 +146,7 @@ public class ApiClient {
  /**
   * Helper method to set username for the first HTTP basic authentication.
   * @param username Username
   */
  public void setUsername(String username) {
    for (Authentication auth : authentications.values()) {
@ -155,6 +160,7 @@ public class ApiClient {
  /**
   * Helper method to set password for the first HTTP basic authentication.
   * @param password Password
   */
  public void setPassword(String password) {
    for (Authentication auth : authentications.values()) {
@ -168,6 +174,7 @@ 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) {
    for (Authentication auth : authentications.values()) {
@ -181,6 +188,7 @@ public class ApiClient {
  /**
   * Helper method to set API key prefix for the first API key authentication.
   * @param apiKeyPrefix API key prefix
   */
  public void setApiKeyPrefix(String apiKeyPrefix) {
    for (Authentication auth : authentications.values()) {
@ -194,6 +202,7 @@ public class ApiClient {
  /**
   * Helper method to set access token for the first OAuth2 authentication.
   * @param accessToken Access token
   */
  public void setAccessToken(String accessToken) {
    for (Authentication auth : authentications.values()) {
@ -207,6 +216,8 @@ public class ApiClient {
  /**
   * Set the User-Agent header's value (by adding to the default header map).
   * @param userAgent Http user agent
   * @return API client
   */
  public ApiClient setUserAgent(String userAgent) {
    addDefaultHeader("User-Agent", userAgent);
@ -218,6 +229,7 @@ public class ApiClient {
   *
   * @param key The header's key
   * @param value The header's value
   * @return API client
   */
  public ApiClient addDefaultHeader(String key, String value) {
    defaultHeaderMap.put(key, value);
@ -226,6 +238,7 @@ public class ApiClient {
  /**
   * Check that whether debugging is enabled for this API client.
   * @return True if debugging is switched on
   */
  public boolean isDebugging() {
    return debugging;
@ -235,6 +248,7 @@ public class ApiClient {
   * Enable/disable debugging for this API client.
   *
   * @param debugging To enable (true) or disable (false) debugging
   * @return API client
   */
  public ApiClient setDebugging(boolean debugging) {
    this.debugging = debugging;
@ -248,12 +262,17 @@ public class ApiClient {
   * with file response. The default value is <code>null</code>, i.e. using
   * the system's default tempopary folder.
   *
-   * @see https://docs.oracle.com/javase/7/docs/api/java/io/File.html#createTempFile(java.lang.String,%20java.lang.String,%20java.io.File)
+   * @return Temp folder path
   */
  public String getTempFolderPath() {
    return tempFolderPath;
  }
  /**
   * Set temp folder path
   * @param tempFolderPath Temp folder path
   * @return API client
   */
  public ApiClient setTempFolderPath(String tempFolderPath) {
    this.tempFolderPath = tempFolderPath;
    return this;
@ -261,6 +280,7 @@ public class ApiClient {
  /**
   * Connect timeout (in milliseconds).
   * @return Connection timeout
   */
  public int getConnectTimeout() {
    return connectionTimeout;
@ -270,6 +290,8 @@ public class ApiClient {
   * Set the connect timeout (in milliseconds).
   * A value of 0 means no timeout, otherwise values must be between 1 and
   * {@link Integer#MAX_VALUE}.
   * @param connectionTimeout Connection timeout in milliseconds
   * @return API client
   */
  public ApiClient setConnectTimeout(int connectionTimeout) {
    this.connectionTimeout = connectionTimeout;
@ -279,6 +301,7 @@ public class ApiClient {
  /**
   * Get the date format used to parse/format date parameters.
   * @return Date format
   */
  public DateFormat getDateFormat() {
    return dateFormat;
@ -286,6 +309,8 @@ public class ApiClient {
  /**
   * Set the date format used to parse/format date parameters.
   * @param dateFormat Date format
   * @return API client
   */
  public ApiClient setDateFormat(DateFormat dateFormat) {
    this.dateFormat = dateFormat;
@ -296,6 +321,8 @@ public class ApiClient {
  /**
   * Parse the given string into Date object.
   * @param str String
   * @return Date
   */
  public Date parseDate(String str) {
    try {
@ -307,6 +334,8 @@ public class ApiClient {
  /**
   * Format the given Date object into string.
   * @param date Date
   * @return Date in string format
   */
  public String formatDate(Date date) {
    return dateFormat.format(date);
@ -314,6 +343,8 @@ public class ApiClient {
  /**
   * Format the given parameter object into string.
   * @param param Object
   * @return Object in string format
   */
  public String parameterToString(Object param) {
    if (param == null) {
@ -324,7 +355,7 @@ public class ApiClient {
      StringBuilder b = new StringBuilder();
      for(Object o : (Collection)param) {
        if(b.length() > 0) {
-          b.append(",");
+          b.append(',');
        }
        b.append(String.valueOf(o));
      }
@ -335,15 +366,19 @@ public class ApiClient {
  }
  /*
-    Format to {@code Pair} objects.
+   * Format to {@code Pair} objects.
-  */
+   * @param collectionFormat Collection format
   * @param name Name
   * @param value Value
   * @return List of pairs
   */
  public List<Pair> parameterToPairs(String collectionFormat, String name, Object value){
    List<Pair> params = new ArrayList<Pair>();
    // preconditions
    if (name == null || name.isEmpty() || value == null) return params;
-    Collection valueCollection = null;
+    Collection valueCollection;
    if (value instanceof Collection) {
      valueCollection = (Collection) value;
    } else {
@ -355,11 +390,11 @@ public class ApiClient {
      return params;
    }
-    // get the collection format
+    // get the collection format (default: csv)
-    collectionFormat = (collectionFormat == null || collectionFormat.isEmpty() ? "csv" : collectionFormat); // default: csv
+    String format = (collectionFormat == null || collectionFormat.isEmpty() ? "csv" : collectionFormat);
    // create the params based on the collection format
-    if (collectionFormat.equals("multi")) {
+    if ("multi".equals(format)) {
      for (Object item : valueCollection) {
        params.add(new Pair(name, parameterToString(item)));
      }
@ -369,13 +404,13 @@ public class ApiClient {
    String delimiter = ",";
-    if (collectionFormat.equals("csv")) {
+    if ("csv".equals(format)) {
      delimiter = ",";
-    } else if (collectionFormat.equals("ssv")) {
+    } else if ("ssv".equals(format)) {
      delimiter = " ";
-    } else if (collectionFormat.equals("tsv")) {
+    } else if ("tsv".equals(format)) {
      delimiter = "\t";
-    } else if (collectionFormat.equals("pipes")) {
+    } else if ("pipes".equals(format)) {
      delimiter = "|";
    }
@ -396,6 +431,8 @@ public class ApiClient {
   *   application/json
   *   application/json; charset=UTF8
   *   APPLICATION/JSON
   * @param mime MIME
   * @return True if the MIME type is JSON
   */
  public boolean isJsonMime(String mime) {
    return mime != null && mime.matches("(?i)application\\/json(;.*)?");
@ -445,6 +482,8 @@ public class ApiClient {
  /**
   * Escape the given string to be used as URL query value.
   * @param str String
   * @return Escaped string
   */
  public String escapeString(String str) {
    try {
@ -457,9 +496,14 @@ public class ApiClient {
  /**
   * Serialize the given Java object into string entity according the given
   * Content-Type (only JSON is supported for now).
   * @param obj Object
   * @param formParams Form parameters
   * @param contentType Context type
   * @return Entity
   * @throws ApiException API exception
   */
  public Entity<?> serialize(Object obj, Map<String, Object> formParams, String contentType) throws ApiException {
-    Entity<?> entity = null;
+    Entity<?> entity;
    if (contentType.startsWith("multipart/form-data")) {
      MultiPart multiPart = new MultiPart();
      for (Entry<String, Object> param: formParams.entrySet()) {
@ -489,7 +533,13 @@ public class ApiClient {
  /**
   * Deserialize response body to Java object according to the Content-Type.
   * @param <T> Type
   * @param response Response
   * @param returnType Return type
   * @return Deserialize object
   * @throws ApiException API exception
   */
  @SuppressWarnings("unchecked")
  public <T> T deserialize(Response response, GenericType<T> returnType) throws ApiException {
    if (response == null || returnType == null) {
      return null;
@ -498,9 +548,8 @@ public class ApiClient {
    if ("byte[]".equals(returnType.toString())) {
      // Handle binary response (byte array).
      return (T) response.readEntity(byte[].class);
-    } else if (returnType.equals(File.class)) {
+    } else if (returnType.getRawType() == File.class) {
      // Handle file downloading.
      @SuppressWarnings("unchecked")
      T file = (T) downloadFileFromResponse(response);
      return file;
    }
@ -517,6 +566,8 @@ public class ApiClient {
  /**
   * Download file from the given response.
   * @param response Response
   * @return File
   * @throws ApiException If fail to read file content from response and write to disk
   */
  public File downloadFileFromResponse(Response response) throws ApiException {
@ -541,13 +592,13 @@ public class ApiClient {
        filename = matcher.group(1);
    }
-    String prefix = null;
+    String prefix;
    String suffix = null;
    if (filename == null) {
      prefix = "download-";
      suffix = "";
    } else {
-      int pos = filename.lastIndexOf(".");
+      int pos = filename.lastIndexOf('.');
      if (pos == -1) {
        prefix = filename + "-";
      } else {
@ -568,6 +619,7 @@ public class ApiClient {
  /**
   * Invoke API by sending HTTP request with the given options.
   *
   * @param <T> Type
   * @param path The sub-path of the HTTP URL
   * @param method The request method, one of "GET", "POST", "PUT", and "DELETE"
   * @param queryParams The query parameters
@ -579,6 +631,7 @@ public class ApiClient {
   * @param authNames The authentications to apply
   * @param returnType The return type into which to deserialize the response
   * @return The response body in type of string
   * @throws ApiException API exception
   */
  public <T> T invokeAPI(String path, String method, List<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, Object> formParams, String accept, String contentType, String[] authNames, GenericType<T> returnType) throws ApiException {
    updateParamsForAuth(authNames, queryParams, headerParams);
@ -597,16 +650,17 @@ public class ApiClient {
    Invocation.Builder invocationBuilder = target.request().accept(accept);
-    for (String key : headerParams.keySet()) {
+    for (Entry<String, String> entry : headerParams.entrySet()) {
-      String value = headerParams.get(key);
+      String value = entry.getValue();
      if (value != null) {
-        invocationBuilder = invocationBuilder.header(key, value);
+        invocationBuilder = invocationBuilder.header(entry.getKey(), value);
      }
    }
-    for (String key : defaultHeaderMap.keySet()) {
+    for (Entry<String, String> entry : defaultHeaderMap.entrySet()) {
      String key = entry.getKey();
      if (!headerParams.containsKey(key)) {
-        String value = defaultHeaderMap.get(key);
+        String value = entry.getValue();
        if (value != null) {
          invocationBuilder = invocationBuilder.header(key, value);
        }
@ -615,7 +669,7 @@ public class ApiClient {
    Entity<?> entity = serialize(body, formParams, contentType);
-    Response response = null;
+    Response response;
    if ("GET".equals(method)) {
      response = invocationBuilder.get();
@ -625,6 +679,8 @@ public class ApiClient {
      response = invocationBuilder.put(entity);
    } else if ("DELETE".equals(method)) {
      response = invocationBuilder.delete();
    } else if ("PATCH".equals(method)) {
      response = invocationBuilder.header("X-HTTP-Method-Override", "PATCH").post(entity);
    } else {
      throw new ApiException(500, "unknown method type " + method);
    }
@ -634,7 +690,7 @@ public class ApiClient {
    if (response.getStatus() == Status.NO_CONTENT.getStatusCode()) {
      return null;
-    } else if (response.getStatusInfo().getFamily().equals(Status.Family.SUCCESSFUL)) {
+    } else if (response.getStatusInfo().getFamily() == Status.Family.SUCCESSFUL) {
      if (returnType == null)
        return null;
      else
@ -660,6 +716,8 @@ public class ApiClient {
  /**
   * Build the Client used to make HTTP requests.
   * @param debugging Debug setting
   * @return Client
   */
  private Client buildHttpClient(boolean debugging) {
    final ClientConfig clientConfig = new ClientConfig();
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/ApiException.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/ApiException.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/Configuration.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/Configuration.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/JSON.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/JSON.java
@ -25,6 +25,7 @@ public class JSON implements ContextResolver<ObjectMapper> {
  /**
   * Set the date format for JSON (de)serialization with Date properties.
   * @param dateFormat Date format
   */
  public void setDateFormat(DateFormat dateFormat) {
    mapper.setDateFormat(dateFormat);
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/Pair.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/Pair.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/RFC3339DateFormat.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/RFC3339DateFormat.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package io.swagger.client;
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/StringUtil.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/StringUtil.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/api/FakeApi.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/api/FakeApi.java
@ -7,10 +7,10 @@ import io.swagger.client.Pair;
 import javax.ws.rs.core.GenericType;
 import io.swagger.client.model.Client;
 import org.joda.time.LocalDate;
 import org.joda.time.DateTime;
 import java.math.BigDecimal;
 import io.swagger.client.model.Client;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
 import java.util.ArrayList;
 import java.util.HashMap;
@ -39,7 +39,7 @@ public class FakeApi {
  /**
   * To test \&quot;client\&quot; model
-   * 
+   * To test \&quot;client\&quot; model
   * @param body client model (required)
   * @return Client
   * @throws ApiException if fails to make API call
@ -53,7 +53,7 @@ public class FakeApi {
    }
    // create path and map variables
-    String localVarPath = "/fake".replaceAll("\\{format\\}","json");
+    String localVarPath = "/fake";
    // query params
    List<Pair> localVarQueryParams = new ArrayList<Pair>();
@ -121,7 +121,7 @@ public class FakeApi {
    }
    // create path and map variables
-    String localVarPath = "/fake".replaceAll("\\{format\\}","json");
+    String localVarPath = "/fake";
    // query params
    List<Pair> localVarQueryParams = new ArrayList<Pair>();
@ -176,7 +176,7 @@ if (paramCallback != null)
  }
  /**
   * To test enum parameters
-   * 
+   * To test enum parameters
   * @param enumFormStringArray Form parameter enum test (string array) (optional)
   * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
   * @param enumHeaderStringArray Header parameter enum test (string array) (optional)
@ -187,11 +187,11 @@ if (paramCallback != null)
   * @param enumQueryDouble Query parameter enum test (double) (optional)
   * @throws ApiException if fails to make API call
   */
-  public void testEnumParameters(List<String> enumFormStringArray, String enumFormString, List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, BigDecimal enumQueryInteger, Double enumQueryDouble) throws ApiException {
+  public void testEnumParameters(List<String> enumFormStringArray, String enumFormString, List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble) throws ApiException {
    Object localVarPostBody = null;
    // create path and map variables
-    String localVarPath = "/fake".replaceAll("\\{format\\}","json");
+    String localVarPath = "/fake";
    // query params
    List<Pair> localVarQueryParams = new ArrayList<Pair>();
@ -215,12 +215,12 @@ if (enumQueryDouble != null)
      localVarFormParams.put("enum_query_double", enumQueryDouble);
    final String[] localVarAccepts = {
-      "application/json"
+      "*/*"
    };
    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
    final String[] localVarContentTypes = {
-      "application/json"
+      "*/*"
    };
    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/api/PetApi.java
@ -7,9 +7,9 @@ import io.swagger.client.Pair;
 import javax.ws.rs.core.GenericType;
 import io.swagger.client.model.Pet;
 import java.io.File;
 import io.swagger.client.model.ModelApiResponse;
 import io.swagger.client.model.Pet;
 import java.util.ArrayList;
 import java.util.HashMap;
@ -51,7 +51,7 @@ public class PetApi {
    }
    // create path and map variables
-    String localVarPath = "/pet".replaceAll("\\{format\\}","json");
+    String localVarPath = "/pet";
    // query params
    List<Pair> localVarQueryParams = new ArrayList<Pair>();
@ -92,7 +92,7 @@ public class PetApi {
    }
    // create path and map variables
-    String localVarPath = "/pet/{petId}".replaceAll("\\{format\\}","json")
+    String localVarPath = "/pet/{petId}"
      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
    // query params
@ -124,7 +124,7 @@ public class PetApi {
   * Finds Pets by status
   * Multiple status values can be provided with comma separated strings
   * @param status Status values that need to be considered for filter (required)
-   * @return List<Pet>
+   * @return List&lt;Pet&gt;
   * @throws ApiException if fails to make API call
   */
  public List<Pet> findPetsByStatus(List<String> status) throws ApiException {
@ -136,7 +136,7 @@ public class PetApi {
    }
    // create path and map variables
-    String localVarPath = "/pet/findByStatus".replaceAll("\\{format\\}","json");
+    String localVarPath = "/pet/findByStatus";
    // query params
    List<Pair> localVarQueryParams = new ArrayList<Pair>();
@ -166,7 +166,7 @@ public class PetApi {
   * Finds Pets by tags
   * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
   * @param tags Tags to filter by (required)
-   * @return List<Pet>
+   * @return List&lt;Pet&gt;
   * @throws ApiException if fails to make API call
   */
  public List<Pet> findPetsByTags(List<String> tags) throws ApiException {
@ -178,7 +178,7 @@ public class PetApi {
    }
    // create path and map variables
-    String localVarPath = "/pet/findByTags".replaceAll("\\{format\\}","json");
+    String localVarPath = "/pet/findByTags";
    // query params
    List<Pair> localVarQueryParams = new ArrayList<Pair>();
@ -220,7 +220,7 @@ public class PetApi {
    }
    // create path and map variables
-    String localVarPath = "/pet/{petId}".replaceAll("\\{format\\}","json")
+    String localVarPath = "/pet/{petId}"
      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
    // query params
@ -261,7 +261,7 @@ public class PetApi {
    }
    // create path and map variables
-    String localVarPath = "/pet".replaceAll("\\{format\\}","json");
+    String localVarPath = "/pet";
    // query params
    List<Pair> localVarQueryParams = new ArrayList<Pair>();
@ -303,7 +303,7 @@ public class PetApi {
    }
    // create path and map variables
-    String localVarPath = "/pet/{petId}".replaceAll("\\{format\\}","json")
+    String localVarPath = "/pet/{petId}"
      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
    // query params
@ -351,7 +351,7 @@ if (status != null)
    }
    // create path and map variables
-    String localVarPath = "/pet/{petId}/uploadImage".replaceAll("\\{format\\}","json")
+    String localVarPath = "/pet/{petId}/uploadImage"
      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
    // query params
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/api/StoreApi.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/api/StoreApi.java
@ -49,7 +49,7 @@ public class StoreApi {
    }
    // create path and map variables
-    String localVarPath = "/store/order/{orderId}".replaceAll("\\{format\\}","json")
+    String localVarPath = "/store/order/{orderId}"
      .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString()));
    // query params
@ -78,14 +78,14 @@ public class StoreApi {
  /**
   * Returns pet inventories by status
   * Returns a map of status codes to quantities
-   * @return Map<String, Integer>
+   * @return Map&lt;String, Integer&gt;
   * @throws ApiException if fails to make API call
   */
  public Map<String, Integer> getInventory() throws ApiException {
    Object localVarPostBody = null;
    // create path and map variables
-    String localVarPath = "/store/inventory".replaceAll("\\{format\\}","json");
+    String localVarPath = "/store/inventory";
    // query params
    List<Pair> localVarQueryParams = new ArrayList<Pair>();
@ -126,7 +126,7 @@ public class StoreApi {
    }
    // create path and map variables
-    String localVarPath = "/store/order/{orderId}".replaceAll("\\{format\\}","json")
+    String localVarPath = "/store/order/{orderId}"
      .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString()));
    // query params
@ -168,7 +168,7 @@ public class StoreApi {
    }
    // create path and map variables
-    String localVarPath = "/store/order".replaceAll("\\{format\\}","json");
+    String localVarPath = "/store/order";
    // query params
    List<Pair> localVarQueryParams = new ArrayList<Pair>();
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/api/UserApi.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/api/UserApi.java
@ -49,7 +49,7 @@ public class UserApi {
    }
    // create path and map variables
-    String localVarPath = "/user".replaceAll("\\{format\\}","json");
+    String localVarPath = "/user";
    // query params
    List<Pair> localVarQueryParams = new ArrayList<Pair>();
@ -89,7 +89,7 @@ public class UserApi {
    }
    // create path and map variables
-    String localVarPath = "/user/createWithArray".replaceAll("\\{format\\}","json");
+    String localVarPath = "/user/createWithArray";
    // query params
    List<Pair> localVarQueryParams = new ArrayList<Pair>();
@ -129,7 +129,7 @@ public class UserApi {
    }
    // create path and map variables
-    String localVarPath = "/user/createWithList".replaceAll("\\{format\\}","json");
+    String localVarPath = "/user/createWithList";
    // query params
    List<Pair> localVarQueryParams = new ArrayList<Pair>();
@ -169,7 +169,7 @@ public class UserApi {
    }
    // create path and map variables
-    String localVarPath = "/user/{username}".replaceAll("\\{format\\}","json")
+    String localVarPath = "/user/{username}"
      .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
    // query params
@ -211,7 +211,7 @@ public class UserApi {
    }
    // create path and map variables
-    String localVarPath = "/user/{username}".replaceAll("\\{format\\}","json")
+    String localVarPath = "/user/{username}"
      .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
    // query params
@ -259,7 +259,7 @@ public class UserApi {
    }
    // create path and map variables
-    String localVarPath = "/user/login".replaceAll("\\{format\\}","json");
+    String localVarPath = "/user/login";
    // query params
    List<Pair> localVarQueryParams = new ArrayList<Pair>();
@ -295,7 +295,7 @@ public class UserApi {
    Object localVarPostBody = null;
    // create path and map variables
-    String localVarPath = "/user/logout".replaceAll("\\{format\\}","json");
+    String localVarPath = "/user/logout";
    // query params
    List<Pair> localVarQueryParams = new ArrayList<Pair>();
@ -341,7 +341,7 @@ public class UserApi {
    }
    // create path and map variables
-    String localVarPath = "/user/{username}".replaceAll("\\{format\\}","json")
+    String localVarPath = "/user/{username}"
      .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
    // query params
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/auth/Authentication.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/auth/Authentication.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/auth/OAuth.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/auth/OAuth.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/auth/OAuthFlow.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/auth/OAuthFlow.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
@ -59,7 +47,7 @@ public class AdditionalPropertiesClass {
   * Get mapProperty
   * @return mapProperty
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public Map<String, String> getMapProperty() {
    return mapProperty;
  }
@ -82,7 +70,7 @@ public class AdditionalPropertiesClass {
   * Get mapOfMapProperty
   * @return mapOfMapProperty
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public Map<String, Map<String, String>> getMapOfMapProperty() {
    return mapOfMapProperty;
  }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/Animal.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/Animal.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
@ -28,12 +16,19 @@ package io.swagger.client.model;
 import org.apache.commons.lang3.ObjectUtils;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 /**
 * Animal
 */
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true )
@JsonSubTypes({
  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
  @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
 })
 public class Animal {
  @JsonProperty("className")
@ -51,7 +46,7 @@ public class Animal {
   * Get className
   * @return className
  **/
-  @ApiModelProperty(example = "null", required = true, value = "")
+  @ApiModelProperty(required = true, value = "")
  public String getClassName() {
    return className;
  }
@ -69,7 +64,7 @@ public class Animal {
   * Get color
   * @return color
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public String getColor() {
    return color;
  }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/AnimalFarm.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/AnimalFarm.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
@ -56,7 +44,7 @@ public class ArrayOfArrayOfNumberOnly {
   * Get arrayArrayNumber
   * @return arrayArrayNumber
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public List<List<BigDecimal>> getArrayArrayNumber() {
    return arrayArrayNumber;
  }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
@ -56,7 +44,7 @@ public class ArrayOfNumberOnly {
   * Get arrayNumber
   * @return arrayNumber
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public List<BigDecimal> getArrayNumber() {
    return arrayNumber;
  }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/ArrayTest.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
@ -62,7 +50,7 @@ public class ArrayTest {
   * Get arrayOfString
   * @return arrayOfString
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public List<String> getArrayOfString() {
    return arrayOfString;
  }
@ -85,7 +73,7 @@ public class ArrayTest {
   * Get arrayArrayOfInteger
   * @return arrayArrayOfInteger
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public List<List<Long>> getArrayArrayOfInteger() {
    return arrayArrayOfInteger;
  }
@ -108,7 +96,7 @@ public class ArrayTest {
   * Get arrayArrayOfModel
   * @return arrayArrayOfModel
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
    return arrayArrayOfModel;
  }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/Capitalization.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/Capitalization.java
@ -0,0 +1,204 @@
 /*
 * Swagger Petstore
 * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 *
 * OpenAPI spec version: 1.0.0
 * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 */
 package io.swagger.client.model;
 import org.apache.commons.lang3.ObjectUtils;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 /**
 * Capitalization
 */
 public class Capitalization {
  @JsonProperty("smallCamel")
  private String smallCamel = null;
  @JsonProperty("CapitalCamel")
  private String capitalCamel = null;
  @JsonProperty("small_Snake")
  private String smallSnake = null;
  @JsonProperty("Capital_Snake")
  private String capitalSnake = null;
  @JsonProperty("SCA_ETH_Flow_Points")
  private String scAETHFlowPoints = null;
  @JsonProperty("ATT_NAME")
  private String ATT_NAME = null;
  public Capitalization smallCamel(String smallCamel) {
    this.smallCamel = smallCamel;
    return this;
  }
   /**
   * Get smallCamel
   * @return smallCamel
  **/
  @ApiModelProperty(value = "")
  public String getSmallCamel() {
    return smallCamel;
  }
  public void setSmallCamel(String smallCamel) {
    this.smallCamel = smallCamel;
  }
  public Capitalization capitalCamel(String capitalCamel) {
    this.capitalCamel = capitalCamel;
    return this;
  }
   /**
   * Get capitalCamel
   * @return capitalCamel
  **/
  @ApiModelProperty(value = "")
  public String getCapitalCamel() {
    return capitalCamel;
  }
  public void setCapitalCamel(String capitalCamel) {
    this.capitalCamel = capitalCamel;
  }
  public Capitalization smallSnake(String smallSnake) {
    this.smallSnake = smallSnake;
    return this;
  }
   /**
   * Get smallSnake
   * @return smallSnake
  **/
  @ApiModelProperty(value = "")
  public String getSmallSnake() {
    return smallSnake;
  }
  public void setSmallSnake(String smallSnake) {
    this.smallSnake = smallSnake;
  }
  public Capitalization capitalSnake(String capitalSnake) {
    this.capitalSnake = capitalSnake;
    return this;
  }
   /**
   * Get capitalSnake
   * @return capitalSnake
  **/
  @ApiModelProperty(value = "")
  public String getCapitalSnake() {
    return capitalSnake;
  }
  public void setCapitalSnake(String capitalSnake) {
    this.capitalSnake = capitalSnake;
  }
  public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
    this.scAETHFlowPoints = scAETHFlowPoints;
    return this;
  }
   /**
   * Get scAETHFlowPoints
   * @return scAETHFlowPoints
  **/
  @ApiModelProperty(value = "")
  public String getScAETHFlowPoints() {
    return scAETHFlowPoints;
  }
  public void setScAETHFlowPoints(String scAETHFlowPoints) {
    this.scAETHFlowPoints = scAETHFlowPoints;
  }
  public Capitalization ATT_NAME(String ATT_NAME) {
    this.ATT_NAME = ATT_NAME;
    return this;
  }
   /**
   * Name of the pet 
   * @return ATT_NAME
  **/
  @ApiModelProperty(value = "Name of the pet ")
  public String getATTNAME() {
    return ATT_NAME;
  }
  public void setATTNAME(String ATT_NAME) {
    this.ATT_NAME = ATT_NAME;
  }
  @Override
  public boolean equals(java.lang.Object o) {
  if (this == o) {
    return true;
  }
  if (o == null || getClass() != o.getClass()) {
    return false;
  }
    Capitalization capitalization = (Capitalization) o;
    return ObjectUtils.equals(this.smallCamel, capitalization.smallCamel) &&
    ObjectUtils.equals(this.capitalCamel, capitalization.capitalCamel) &&
    ObjectUtils.equals(this.smallSnake, capitalization.smallSnake) &&
    ObjectUtils.equals(this.capitalSnake, capitalization.capitalSnake) &&
    ObjectUtils.equals(this.scAETHFlowPoints, capitalization.scAETHFlowPoints) &&
    ObjectUtils.equals(this.ATT_NAME, capitalization.ATT_NAME);
  }
  @Override
  public int hashCode() {
    return ObjectUtils.hashCodeMulti(smallCamel, capitalCamel, smallSnake, capitalSnake, scAETHFlowPoints, ATT_NAME);
  }
  @Override
  public String toString() {
    StringBuilder sb = new StringBuilder();
    sb.append("class Capitalization {\n");
    sb.append("    smallCamel: ").append(toIndentedString(smallCamel)).append("\n");
    sb.append("    capitalCamel: ").append(toIndentedString(capitalCamel)).append("\n");
    sb.append("    smallSnake: ").append(toIndentedString(smallSnake)).append("\n");
    sb.append("    capitalSnake: ").append(toIndentedString(capitalSnake)).append("\n");
    sb.append("    scAETHFlowPoints: ").append(toIndentedString(scAETHFlowPoints)).append("\n");
    sb.append("    ATT_NAME: ").append(toIndentedString(ATT_NAME)).append("\n");
    sb.append("}");
    return sb.toString();
  }
  /**
   * Convert the given object to string with each line indented by 4 spaces
   * (except the first line).
   */
  private String toIndentedString(java.lang.Object o) {
    if (o == null) {
      return "null";
    }
    return o.toString().replace("\n", "\n    ");
  }
 }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/Cat.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/Cat.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
@ -49,7 +37,7 @@ public class Cat extends Animal {
   * Get declawed
   * @return declawed
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public Boolean getDeclawed() {
    return declawed;
  }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/Category.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
@ -51,7 +39,7 @@ public class Category {
   * Get id
   * @return id
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public Long getId() {
    return id;
  }
@ -69,7 +57,7 @@ public class Category {
   * Get name
   * @return name
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public String getName() {
    return name;
  }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/ClassModel.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/ClassModel.java
@ -0,0 +1,90 @@
 /*
 * Swagger Petstore
 * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 *
 * OpenAPI spec version: 1.0.0
 * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 */
 package io.swagger.client.model;
 import org.apache.commons.lang3.ObjectUtils;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 /**
 * Model for testing model with \&quot;_class\&quot; property
 */
@ApiModel(description = "Model for testing model with \"_class\" property")
 public class ClassModel {
  @JsonProperty("_class")
  private String propertyClass = null;
  public ClassModel propertyClass(String propertyClass) {
    this.propertyClass = propertyClass;
    return this;
  }
   /**
   * Get propertyClass
   * @return propertyClass
  **/
  @ApiModelProperty(value = "")
  public String getPropertyClass() {
    return propertyClass;
  }
  public void setPropertyClass(String propertyClass) {
    this.propertyClass = propertyClass;
  }
  @Override
  public boolean equals(java.lang.Object o) {
  if (this == o) {
    return true;
  }
  if (o == null || getClass() != o.getClass()) {
    return false;
  }
    ClassModel classModel = (ClassModel) o;
    return ObjectUtils.equals(this.propertyClass, classModel.propertyClass);
  }
  @Override
  public int hashCode() {
    return ObjectUtils.hashCodeMulti(propertyClass);
  }
  @Override
  public String toString() {
    StringBuilder sb = new StringBuilder();
    sb.append("class ClassModel {\n");
    sb.append("    propertyClass: ").append(toIndentedString(propertyClass)).append("\n");
    sb.append("}");
    return sb.toString();
  }
  /**
   * Convert the given object to string with each line indented by 4 spaces
   * (except the first line).
   */
  private String toIndentedString(java.lang.Object o) {
    if (o == null) {
      return "null";
    }
    return o.toString().replace("\n", "\n    ");
  }
 }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/Client.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/Client.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
@ -48,7 +36,7 @@ public class Client {
   * Get client
   * @return client
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public String getClient() {
    return client;
  }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/Dog.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/Dog.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
@ -49,7 +37,7 @@ public class Dog extends Animal {
   * Get breed
   * @return breed
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public String getBreed() {
    return breed;
  }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/EnumArrays.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
@ -113,7 +101,7 @@ public class EnumArrays {
   * Get justSymbol
   * @return justSymbol
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public JustSymbolEnum getJustSymbol() {
    return justSymbol;
  }
@ -136,7 +124,7 @@ public class EnumArrays {
   * Get arrayEnum
   * @return arrayEnum
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public List<ArrayEnumEnum> getArrayEnum() {
    return arrayEnum;
  }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/EnumClass.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/EnumClass.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/EnumTest.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
@ -30,6 +18,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.client.model.OuterEnum;
 /**
 * EnumTest
@ -137,6 +126,9 @@ public class EnumTest {
  @JsonProperty("enum_number")
  private EnumNumberEnum enumNumber = null;
  @JsonProperty("outerEnum")
  private OuterEnum outerEnum = null;
  public EnumTest enumString(EnumStringEnum enumString) {
    this.enumString = enumString;
    return this;
@ -146,7 +138,7 @@ public class EnumTest {
   * Get enumString
   * @return enumString
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public EnumStringEnum getEnumString() {
    return enumString;
  }
@ -164,7 +156,7 @@ public class EnumTest {
   * Get enumInteger
   * @return enumInteger
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public EnumIntegerEnum getEnumInteger() {
    return enumInteger;
  }
@ -182,7 +174,7 @@ public class EnumTest {
   * Get enumNumber
   * @return enumNumber
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public EnumNumberEnum getEnumNumber() {
    return enumNumber;
  }
@ -191,6 +183,24 @@ public class EnumTest {
    this.enumNumber = enumNumber;
  }
  public EnumTest outerEnum(OuterEnum outerEnum) {
    this.outerEnum = outerEnum;
    return this;
  }
   /**
   * Get outerEnum
   * @return outerEnum
  **/
  @ApiModelProperty(value = "")
  public OuterEnum getOuterEnum() {
    return outerEnum;
  }
  public void setOuterEnum(OuterEnum outerEnum) {
    this.outerEnum = outerEnum;
  }
  @Override
  public boolean equals(java.lang.Object o) {
@ -203,12 +213,13 @@ public class EnumTest {
    EnumTest enumTest = (EnumTest) o;
    return ObjectUtils.equals(this.enumString, enumTest.enumString) &&
    ObjectUtils.equals(this.enumInteger, enumTest.enumInteger) &&
-    ObjectUtils.equals(this.enumNumber, enumTest.enumNumber);
+    ObjectUtils.equals(this.enumNumber, enumTest.enumNumber) &&
    ObjectUtils.equals(this.outerEnum, enumTest.outerEnum);
  }
  @Override
  public int hashCode() {
-    return ObjectUtils.hashCodeMulti(enumString, enumInteger, enumNumber);
+    return ObjectUtils.hashCodeMulti(enumString, enumInteger, enumNumber, outerEnum);
  }
@ -220,6 +231,7 @@ public class EnumTest {
    sb.append("    enumString: ").append(toIndentedString(enumString)).append("\n");
    sb.append("    enumInteger: ").append(toIndentedString(enumInteger)).append("\n");
    sb.append("    enumNumber: ").append(toIndentedString(enumNumber)).append("\n");
    sb.append("    outerEnum: ").append(toIndentedString(outerEnum)).append("\n");
    sb.append("}");
    return sb.toString();
  }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/FormatTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/FormatTest.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
@ -31,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.UUID;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
@ -73,7 +62,7 @@ public class FormatTest {
  private DateTime dateTime = null;
  @JsonProperty("uuid")
-  private String uuid = null;
+  private UUID uuid = null;
  @JsonProperty("password")
  private String password = null;
@ -85,11 +74,11 @@ public class FormatTest {
   /**
   * Get integer
-   * minimum: 10.0
+   * minimum: 10
-   * maximum: 100.0
+   * maximum: 100
   * @return integer
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public Integer getInteger() {
    return integer;
  }
@ -105,11 +94,11 @@ public class FormatTest {
   /**
   * Get int32
-   * minimum: 20.0
+   * minimum: 20
-   * maximum: 200.0
+   * maximum: 200
   * @return int32
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public Integer getInt32() {
    return int32;
  }
@ -127,7 +116,7 @@ public class FormatTest {
   * Get int64
   * @return int64
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public Long getInt64() {
    return int64;
  }
@ -147,7 +136,7 @@ public class FormatTest {
   * maximum: 543.2
   * @return number
  **/
-  @ApiModelProperty(example = "null", required = true, value = "")
+  @ApiModelProperty(required = true, value = "")
  public BigDecimal getNumber() {
    return number;
  }
@ -167,7 +156,7 @@ public class FormatTest {
   * maximum: 987.6
   * @return _float
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public Float getFloat() {
    return _float;
  }
@ -187,7 +176,7 @@ public class FormatTest {
   * maximum: 123.4
   * @return _double
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public Double getDouble() {
    return _double;
  }
@ -205,7 +194,7 @@ public class FormatTest {
   * Get string
   * @return string
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public String getString() {
    return string;
  }
@ -223,7 +212,7 @@ public class FormatTest {
   * Get _byte
   * @return _byte
  **/
-  @ApiModelProperty(example = "null", required = true, value = "")
+  @ApiModelProperty(required = true, value = "")
  public byte[] getByte() {
    return _byte;
  }
@ -241,7 +230,7 @@ public class FormatTest {
   * Get binary
   * @return binary
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public byte[] getBinary() {
    return binary;
  }
@ -259,7 +248,7 @@ public class FormatTest {
   * Get date
   * @return date
  **/
-  @ApiModelProperty(example = "null", required = true, value = "")
+  @ApiModelProperty(required = true, value = "")
  public LocalDate getDate() {
    return date;
  }
@ -277,7 +266,7 @@ public class FormatTest {
   * Get dateTime
   * @return dateTime
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public DateTime getDateTime() {
    return dateTime;
  }
@ -286,7 +275,7 @@ public class FormatTest {
    this.dateTime = dateTime;
  }
-  public FormatTest uuid(String uuid) {
+  public FormatTest uuid(UUID uuid) {
    this.uuid = uuid;
    return this;
  }
@ -295,12 +284,12 @@ public class FormatTest {
   * Get uuid
   * @return uuid
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
-  public String getUuid() {
+  public UUID getUuid() {
    return uuid;
  }
-  public void setUuid(String uuid) {
+  public void setUuid(UUID uuid) {
    this.uuid = uuid;
  }
@ -313,7 +302,7 @@ public class FormatTest {
   * Get password
   * @return password
  **/
-  @ApiModelProperty(example = "null", required = true, value = "")
+  @ApiModelProperty(required = true, value = "")
  public String getPassword() {
    return password;
  }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
@ -46,7 +34,7 @@ public class HasOnlyReadOnly {
   * Get bar
   * @return bar
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public String getBar() {
    return bar;
  }
@ -55,7 +43,7 @@ public class HasOnlyReadOnly {
   * Get foo
   * @return foo
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public String getFoo() {
    return foo;
  }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/MapTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/MapTest.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
@ -89,7 +77,7 @@ public class MapTest {
   * Get mapMapOfString
   * @return mapMapOfString
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public Map<String, Map<String, String>> getMapMapOfString() {
    return mapMapOfString;
  }
@ -112,7 +100,7 @@ public class MapTest {
   * Get mapOfEnumString
   * @return mapOfEnumString
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public Map<String, InnerEnum> getMapOfEnumString() {
    return mapOfEnumString;
  }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
@ -34,6 +22,7 @@ import io.swagger.client.model.Animal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import org.joda.time.DateTime;
 /**
@ -42,7 +31,7 @@ import org.joda.time.DateTime;
 public class MixedPropertiesAndAdditionalPropertiesClass {
  @JsonProperty("uuid")
-  private String uuid = null;
+  private UUID uuid = null;
  @JsonProperty("dateTime")
  private DateTime dateTime = null;
@ -50,7 +39,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
  @JsonProperty("map")
  private Map<String, Animal> map = new HashMap<String, Animal>();
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(String uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
    this.uuid = uuid;
    return this;
  }
@ -59,12 +48,12 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
   * Get uuid
   * @return uuid
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
-  public String getUuid() {
+  public UUID getUuid() {
    return uuid;
  }
-  public void setUuid(String uuid) {
+  public void setUuid(UUID uuid) {
    this.uuid = uuid;
  }
@ -77,7 +66,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
   * Get dateTime
   * @return dateTime
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public DateTime getDateTime() {
    return dateTime;
  }
@ -100,7 +89,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
   * Get map
   * @return map
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public Map<String, Animal> getMap() {
    return map;
  }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/Model200Response.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/Model200Response.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
@ -52,7 +40,7 @@ public class Model200Response {
   * Get name
   * @return name
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public Integer getName() {
    return name;
  }
@ -70,7 +58,7 @@ public class Model200Response {
   * Get propertyClass
   * @return propertyClass
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public String getPropertyClass() {
    return propertyClass;
  }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/ModelApiResponse.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
@ -54,7 +42,7 @@ public class ModelApiResponse {
   * Get code
   * @return code
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public Integer getCode() {
    return code;
  }
@ -72,7 +60,7 @@ public class ModelApiResponse {
   * Get type
   * @return type
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public String getType() {
    return type;
  }
@ -90,7 +78,7 @@ public class ModelApiResponse {
   * Get message
   * @return message
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public String getMessage() {
    return message;
  }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/ModelReturn.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
@ -49,7 +37,7 @@ public class ModelReturn {
   * Get _return
   * @return _return
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public Integer getReturn() {
    return _return;
  }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/Name.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/Name.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
@ -58,7 +46,7 @@ public class Name {
   * Get name
   * @return name
  **/
-  @ApiModelProperty(example = "null", required = true, value = "")
+  @ApiModelProperty(required = true, value = "")
  public Integer getName() {
    return name;
  }
@ -71,7 +59,7 @@ public class Name {
   * Get snakeCase
   * @return snakeCase
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public Integer getSnakeCase() {
    return snakeCase;
  }
@ -85,7 +73,7 @@ public class Name {
   * Get property
   * @return property
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public String getProperty() {
    return property;
  }
@ -98,7 +86,7 @@ public class Name {
   * Get _123Number
   * @return _123Number
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public Integer get123Number() {
    return _123Number;
  }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/NumberOnly.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
@ -49,7 +37,7 @@ public class NumberOnly {
   * Get justNumber
   * @return justNumber
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public BigDecimal getJustNumber() {
    return justNumber;
  }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/Order.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
@ -96,7 +84,7 @@ public class Order {
   * Get id
   * @return id
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public Long getId() {
    return id;
  }
@ -114,7 +102,7 @@ public class Order {
   * Get petId
   * @return petId
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public Long getPetId() {
    return petId;
  }
@ -132,7 +120,7 @@ public class Order {
   * Get quantity
   * @return quantity
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public Integer getQuantity() {
    return quantity;
  }
@ -150,7 +138,7 @@ public class Order {
   * Get shipDate
   * @return shipDate
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public DateTime getShipDate() {
    return shipDate;
  }
@ -168,7 +156,7 @@ public class Order {
   * Order Status
   * @return status
  **/
-  @ApiModelProperty(example = "null", value = "Order Status")
+  @ApiModelProperty(value = "Order Status")
  public StatusEnum getStatus() {
    return status;
  }
@ -186,7 +174,7 @@ public class Order {
   * Get complete
   * @return complete
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public Boolean getComplete() {
    return complete;
  }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/OuterEnum.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/OuterEnum.java
@ -0,0 +1,52 @@
 /*
 * Swagger Petstore
 * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 *
 * OpenAPI spec version: 1.0.0
 * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 */
 package io.swagger.client.model;
 import org.apache.commons.lang3.ObjectUtils;
 import com.fasterxml.jackson.annotation.JsonCreator;
 /**
 * Gets or Sets OuterEnum
 */
 public enum OuterEnum {
  PLACED("placed"),
  APPROVED("approved"),
  DELIVERED("delivered");
  private String value;
  OuterEnum(String value) {
    this.value = value;
  }
  @Override
  public String toString() {
    return String.valueOf(value);
  }
  @JsonCreator
  public static OuterEnum fromValue(String text) {
    for (OuterEnum b : OuterEnum.values()) {
      if (String.valueOf(b.value).equals(text)) {
        return b;
      }
    }
    return null;
  }
 }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/Pet.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
@ -99,7 +87,7 @@ public class Pet {
   * Get id
   * @return id
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public Long getId() {
    return id;
  }
@ -117,7 +105,7 @@ public class Pet {
   * Get category
   * @return category
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public Category getCategory() {
    return category;
  }
@ -158,7 +146,7 @@ public class Pet {
   * Get photoUrls
   * @return photoUrls
  **/
-  @ApiModelProperty(example = "null", required = true, value = "")
+  @ApiModelProperty(required = true, value = "")
  public List<String> getPhotoUrls() {
    return photoUrls;
  }
@ -181,7 +169,7 @@ public class Pet {
   * Get tags
   * @return tags
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public List<Tag> getTags() {
    return tags;
  }
@ -199,7 +187,7 @@ public class Pet {
   * pet status in the store
   * @return status
  **/
-  @ApiModelProperty(example = "null", value = "pet status in the store")
+  @ApiModelProperty(value = "pet status in the store")
  public StatusEnum getStatus() {
    return status;
  }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
@ -46,7 +34,7 @@ public class ReadOnlyFirst {
   * Get bar
   * @return bar
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public String getBar() {
    return bar;
  }
@ -60,7 +48,7 @@ public class ReadOnlyFirst {
   * Get baz
   * @return baz
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public String getBaz() {
    return baz;
  }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/SpecialModelName.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
@ -48,7 +36,7 @@ public class SpecialModelName {
   * Get specialPropertyName
   * @return specialPropertyName
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public Long getSpecialPropertyName() {
    return specialPropertyName;
  }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/Tag.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
@ -51,7 +39,7 @@ public class Tag {
   * Get id
   * @return id
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public Long getId() {
    return id;
  }
@ -69,7 +57,7 @@ public class Tag {
   * Get name
   * @return name
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public String getName() {
    return name;
  }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/User.java
@ -8,18 +8,6 @@
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
 * Do not edit the class manually.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
@ -69,7 +57,7 @@ public class User {
   * Get id
   * @return id
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public Long getId() {
    return id;
  }
@ -87,7 +75,7 @@ public class User {
   * Get username
   * @return username
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public String getUsername() {
    return username;
  }
@ -105,7 +93,7 @@ public class User {
   * Get firstName
   * @return firstName
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public String getFirstName() {
    return firstName;
  }
@ -123,7 +111,7 @@ public class User {
   * Get lastName
   * @return lastName
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public String getLastName() {
    return lastName;
  }
@ -141,7 +129,7 @@ public class User {
   * Get email
   * @return email
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public String getEmail() {
    return email;
  }
@ -159,7 +147,7 @@ public class User {
   * Get password
   * @return password
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public String getPassword() {
    return password;
  }
@ -177,7 +165,7 @@ public class User {
   * Get phone
   * @return phone
  **/
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(value = "")
  public String getPhone() {
    return phone;
  }
@ -195,7 +183,7 @@ public class User {
   * User Status
   * @return userStatus
  **/
-  @ApiModelProperty(example = "null", value = "User Status")
+  @ApiModelProperty(value = "User Status")
  public Integer getUserStatus() {
    return userStatus;
  }
		`@ -1 +1 @@`
			`rootProject.name = "swagger-petstore-jersey2"`				`rootProject.name = "swagger-petstore-jersey2-java6"`