remove supportJava6 option (#8514)

docs/generators/java.md

@@ -35,7 +35,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |invokerPackage|root package for generated code| |org.openapitools.client|
 |java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
 |legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
-|library|library template (sub-template) to use|<dl><dt>**jersey1**</dt><dd>HTTP client: Jersey client 1.19.x. JSON processing: Jackson 2.9.x. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'. IMPORTANT NOTE: jersey 1.x is no longer actively maintained so please upgrade to 'jersey2' or other HTTP libaries instead.</dd><dt>**jersey2**</dt><dd>HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.9.x</dd><dt>**feign**</dt><dd>HTTP client: OpenFeign 10.x. JSON processing: Jackson 2.9.x.</dd><dt>**okhttp-gson**</dt><dd>[DEFAULT] HTTP client: OkHttp 3.x. JSON processing: Gson 2.8.x. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.</dd><dt>**retrofit2**</dt><dd>HTTP client: OkHttp 3.x. JSON processing: Gson 2.x (Retrofit 2.3.0). Enable the RxJava adapter using '-DuseRxJava[2/3]=true'. (RxJava 1.x or 2.x or 3.x)</dd><dt>**resttemplate**</dt><dd>HTTP client: Spring RestTemplate 4.x. JSON processing: Jackson 2.9.x</dd><dt>**webclient**</dt><dd>HTTP client: Spring WebClient 5.x. JSON processing: Jackson 2.9.x</dd><dt>**resteasy**</dt><dd>HTTP client: Resteasy client 3.x. JSON processing: Jackson 2.9.x</dd><dt>**vertx**</dt><dd>HTTP client: VertX client 3.x. JSON processing: Jackson 2.9.x</dd><dt>**google-api-client**</dt><dd>HTTP client: Google API client 1.x. JSON processing: Jackson 2.9.x</dd><dt>**rest-assured**</dt><dd>HTTP client: rest-assured : 4.x. JSON processing: Gson 2.x or Jackson 2.10.x. Only for Java 8</dd><dt>**native**</dt><dd>HTTP client: Java native HttpClient. JSON processing: Jackson 2.9.x. Only for Java11+</dd><dt>**microprofile**</dt><dd>HTTP client: Microprofile client 1.x. JSON processing: Jackson 2.9.x</dd></dl>|okhttp-gson|
+|library|library template (sub-template) to use|<dl><dt>**jersey1**</dt><dd>HTTP client: Jersey client 1.19.x. JSON processing: Jackson 2.9.x. Enable gzip request encoding using '-DuseGzipFeature=true'. IMPORTANT NOTE: jersey 1.x is no longer actively maintained so please upgrade to 'jersey2' or other HTTP libaries instead.</dd><dt>**jersey2**</dt><dd>HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.9.x</dd><dt>**feign**</dt><dd>HTTP client: OpenFeign 10.x. JSON processing: Jackson 2.9.x.</dd><dt>**okhttp-gson**</dt><dd>[DEFAULT] HTTP client: OkHttp 3.x. JSON processing: Gson 2.8.x. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.</dd><dt>**retrofit2**</dt><dd>HTTP client: OkHttp 3.x. JSON processing: Gson 2.x (Retrofit 2.3.0). Enable the RxJava adapter using '-DuseRxJava[2/3]=true'. (RxJava 1.x or 2.x or 3.x)</dd><dt>**resttemplate**</dt><dd>HTTP client: Spring RestTemplate 4.x. JSON processing: Jackson 2.9.x</dd><dt>**webclient**</dt><dd>HTTP client: Spring WebClient 5.x. JSON processing: Jackson 2.9.x</dd><dt>**resteasy**</dt><dd>HTTP client: Resteasy client 3.x. JSON processing: Jackson 2.9.x</dd><dt>**vertx**</dt><dd>HTTP client: VertX client 3.x. JSON processing: Jackson 2.9.x</dd><dt>**google-api-client**</dt><dd>HTTP client: Google API client 1.x. JSON processing: Jackson 2.9.x</dd><dt>**rest-assured**</dt><dd>HTTP client: rest-assured : 4.x. JSON processing: Gson 2.x or Jackson 2.10.x. Only for Java 8</dd><dt>**native**</dt><dd>HTTP client: Java native HttpClient. JSON processing: Jackson 2.9.x. Only for Java11+</dd><dt>**microprofile**</dt><dd>HTTP client: Microprofile client 1.x. JSON processing: Jackson 2.9.x</dd></dl>|okhttp-gson|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|
 |microprofileFramework|Framework for microprofile. Possible values &quot;kumuluzee&quot;| |null|
@@ -57,7 +57,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
 |sourceFolder|source folder for generated code| |src/main/java|
-|supportJava6|Whether to support Java6 with the Jersey1 library. This option has been deprecated and will be removed in the 5.x release| |false|
 |useAbstractionForFiles|Use alternative types instead of java.io.File to allow passing bytes without a file on disk. Available on resttemplate library| |false|
 |useBeanValidation|Use BeanValidation API annotations| |false|
 |useGzipFeature|Send gzip-encoded requests| |false|

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

@@ -142,7 +142,6 @@ public class JavaClientCodegen extends AbstractJavaCodegen
         cliOptions.add(CliOption.newBoolean(PARCELABLE_MODEL, "Whether to generate models for Android that implement Parcelable with the okhttp-gson library."));
         cliOptions.add(CliOption.newBoolean(USE_PLAY_WS, "Use Play! Async HTTP client (Play WS API)"));
         cliOptions.add(CliOption.newString(PLAY_VERSION, "Version of Play! Framework (possible values \"play24\" (Deprecated), \"play25\" (Deprecated), \"play26\" (Default))"));
-        cliOptions.add(CliOption.newBoolean(SUPPORT_JAVA6, "Whether to support Java6 with the Jersey1 library. This option has been deprecated and will be removed in the 5.x release"));
         cliOptions.add(CliOption.newBoolean(USE_BEANVALIDATION, "Use BeanValidation API annotations"));
         cliOptions.add(CliOption.newBoolean(PERFORM_BEANVALIDATION, "Perform BeanValidation"));
         cliOptions.add(CliOption.newBoolean(USE_GZIP_FEATURE, "Send gzip-encoded requests"));
@@ -154,7 +153,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen
         cliOptions.add(CliOption.newBoolean(USE_ABSTRACTION_FOR_FILES, "Use alternative types instead of java.io.File to allow passing bytes without a file on disk. Available on " + RESTTEMPLATE + " library"));
         cliOptions.add(CliOption.newBoolean(DYNAMIC_OPERATIONS, "Generate operations dynamically at runtime from an OAS", this.dynamicOperations));
 
-        supportedLibraries.put(JERSEY1, "HTTP client: Jersey client 1.19.x. JSON processing: Jackson 2.9.x. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'. IMPORTANT NOTE: jersey 1.x is no longer actively maintained so please upgrade to 'jersey2' or other HTTP libaries instead.");
+        supportedLibraries.put(JERSEY1, "HTTP client: Jersey client 1.19.x. JSON processing: Jackson 2.9.x. Enable gzip request encoding using '-DuseGzipFeature=true'. IMPORTANT NOTE: jersey 1.x is no longer actively maintained so please upgrade to 'jersey2' or other HTTP libaries instead.");
         supportedLibraries.put(JERSEY2, "HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.9.x");
         supportedLibraries.put(FEIGN, "HTTP client: OpenFeign 10.x. JSON processing: Jackson 2.9.x.");
         supportedLibraries.put(OKHTTP_GSON, "[DEFAULT] HTTP client: OkHttp 3.x. JSON processing: Gson 2.8.x. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");

modules/openapi-generator/src/main/resources/Java/README.mustache

@@ -20,7 +20,7 @@
 
 Building the API client library requires:
 
-1. Java {{#supportJava6}}1.6{{/supportJava6}}{{^supportJava6}}{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}{{/supportJava6}}+
+1. Java {{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}+
 2. Maven/Gradle
 
 ## Installation

modules/openapi-generator/src/main/resources/Java/build.gradle.mustache

@@ -34,11 +34,6 @@ if(hasProperty('target') && target == 'android') {
         }
 
         compileOptions {
-            {{#supportJava6}}
-            sourceCompatibility JavaVersion.VERSION_1_6
-            targetCompatibility JavaVersion.VERSION_1_6
-            {{/supportJava6}}
-            {{^supportJava6}}
             {{#java8}}
             sourceCompatibility JavaVersion.VERSION_1_8
             targetCompatibility JavaVersion.VERSION_1_8
@@ -47,7 +42,6 @@ if(hasProperty('target') && target == 'android') {
             sourceCompatibility JavaVersion.VERSION_1_7
             targetCompatibility JavaVersion.VERSION_1_7
             {{/java8}}
-            {{/supportJava6}}
         }
 
         // Rename the aar correctly
@@ -92,11 +86,6 @@ if(hasProperty('target') && target == 'android') {
     apply plugin: 'java'
     apply plugin: 'maven'
 
-    {{#supportJava6}}
-    sourceCompatibility = JavaVersion.VERSION_1_6
-    targetCompatibility = JavaVersion.VERSION_1_6
-    {{/supportJava6}}
-    {{^supportJava6}}
     {{#java8}}
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
@@ -105,7 +94,6 @@ if(hasProperty('target') && target == 'android') {
     sourceCompatibility = JavaVersion.VERSION_1_7
     targetCompatibility = JavaVersion.VERSION_1_7
     {{/java8}}
-    {{/supportJava6}}
 
     install {
         repositories.mavenInstaller {

modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache

@@ -33,11 +33,6 @@ if(hasProperty('target') && target == 'android') {
             targetSdkVersion 22
         }
         compileOptions {
-            {{#supportJava6}}
-            sourceCompatibility JavaVersion.VERSION_1_6
-            targetCompatibility JavaVersion.VERSION_1_6
-            {{/supportJava6}}
-            {{^supportJava6}}
             {{#java8}}
             sourceCompatibility JavaVersion.VERSION_1_8
             targetCompatibility JavaVersion.VERSION_1_8
@@ -46,7 +41,6 @@ if(hasProperty('target') && target == 'android') {
             sourceCompatibility JavaVersion.VERSION_1_7
             targetCompatibility JavaVersion.VERSION_1_7
             {{/java8}}
-            {{/supportJava6}}
         }
     
         // Rename the aar correctly
@@ -91,11 +85,6 @@ if(hasProperty('target') && target == 'android') {
     apply plugin: 'java'
     apply plugin: 'maven'
 
-    {{#supportJava6}}
-    sourceCompatibility = JavaVersion.VERSION_1_6
-    targetCompatibility = JavaVersion.VERSION_1_6
-    {{/supportJava6}}
-    {{^supportJava6}}
     {{#java8}}
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
@@ -104,7 +93,6 @@ if(hasProperty('target') && target == 'android') {
     sourceCompatibility = JavaVersion.VERSION_1_7
     targetCompatibility = JavaVersion.VERSION_1_7
     {{/java8}}
-    {{/supportJava6}}
 
     install {
         repositories.mavenInstaller {

modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache

@@ -144,11 +144,6 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.6.1</version>
                 <configuration>
-                    {{#supportJava6}}
-                        <source>1.6</source>
-                        <target>1.6</target>
-                    {{/supportJava6}}
-                    {{^supportJava6}}
                     {{#java8}}
                         <source>1.8</source>
                         <target>1.8</target>
@@ -157,7 +152,6 @@
                         <source>1.7</source>
                         <target>1.7</target>
                     {{/java8}}
-                    {{/supportJava6}}
                 </configuration>
             </plugin>
             <plugin>
@@ -166,17 +160,12 @@
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
-                    {{#supportJava6}}
-                        <source>1.6</source>
-                    {{/supportJava6}}
-                    {{^supportJava6}}
                     {{#java8}}
                         <source>1.8</source>
                     {{/java8}}
                     {{^java8}}
                         <source>1.7</source>
                     {{/java8}}
-                    {{/supportJava6}}
                 </configuration>
                 <executions>
                     <execution>

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache

@@ -34,15 +34,9 @@ import java.security.cert.X509Certificate;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
-{{^supportJava6}}
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
 import org.glassfish.jersey.logging.LoggingFeature;
-{{/supportJava6}}
-{{#supportJava6}}
-import org.apache.commons.io.FileUtils;
-import org.glassfish.jersey.filter.LoggingFilter;
-{{/supportJava6}}
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.Collection;
@@ -997,13 +991,7 @@ public class ApiClient{{#java8}} extends JavaTimeFormatter{{/java8}} {
   public File downloadFileFromResponse(Response response) throws ApiException {
     try {
       File file = prepareDownloadFile(response);
-{{^supportJava6}}
       Files.copy(response.readEntity(InputStream.class), file.toPath(), StandardCopyOption.REPLACE_EXISTING);
-{{/supportJava6}}
-{{#supportJava6}}
-      // Java6 falls back to commons.io for file copying
-      FileUtils.copyToFile(response.readEntity(InputStream.class), file);
-{{/supportJava6}}
       return file;
     } catch (IOException e) {
       throw new ApiException(e);
@@ -1259,15 +1247,10 @@ public class ApiClient{{#java8}} extends JavaTimeFormatter{{/java8}} {
     // turn off compliance validation to be able to send payloads with DELETE calls
     clientConfig.property(ClientProperties.SUPPRESS_HTTP_COMPLIANCE_VALIDATION, true);
     if (debugging) {
-{{^supportJava6}}
       clientConfig.register(new LoggingFeature(java.util.logging.Logger.getLogger(LoggingFeature.DEFAULT_LOGGER_NAME), java.util.logging.Level.INFO, LoggingFeature.Verbosity.PAYLOAD_ANY, 1024*50 /* Log payloads up to 50K */));
       clientConfig.property(LoggingFeature.LOGGING_FEATURE_VERBOSITY, LoggingFeature.Verbosity.PAYLOAD_ANY);
       // Set logger to ALL
       java.util.logging.Logger.getLogger(LoggingFeature.DEFAULT_LOGGER_NAME).setLevel(java.util.logging.Level.ALL);
-{{/supportJava6}}
-{{#supportJava6}}
-      clientConfig.register(new LoggingFilter(java.util.logging.Logger.getLogger(LoggingFilter.class.getName()), true));
-{{/supportJava6}}
     } else {
       // suppress warnings for payloads with DELETE calls:
       java.util.logging.Logger.getLogger("org.glassfish.jersey.client").setLevel(java.util.logging.Level.SEVERE);

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache

@@ -33,11 +33,6 @@ if(hasProperty('target') && target == 'android') {
             targetSdkVersion 25
         }
         compileOptions {
-            {{#supportJava6}}
-            sourceCompatibility JavaVersion.VERSION_1_6
-            targetCompatibility JavaVersion.VERSION_1_6
-            {{/supportJava6}}
-            {{^supportJava6}}
             {{#java8}}
             sourceCompatibility JavaVersion.VERSION_1_8
             targetCompatibility JavaVersion.VERSION_1_8
@@ -46,7 +41,6 @@ if(hasProperty('target') && target == 'android') {
             sourceCompatibility JavaVersion.VERSION_1_7
             targetCompatibility JavaVersion.VERSION_1_7
             {{/java8}}
-            {{/supportJava6}}
         }
 
         // Rename the aar correctly
@@ -90,11 +84,6 @@ if(hasProperty('target') && target == 'android') {
 
     apply plugin: 'java'
     apply plugin: 'maven'
-    {{#supportJava6}}
-    sourceCompatibility = JavaVersion.VERSION_1_6
-    targetCompatibility = JavaVersion.VERSION_1_6
-    {{/supportJava6}}
-    {{^supportJava6}}
     {{#java8}}
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
@@ -103,7 +92,6 @@ if(hasProperty('target') && target == 'android') {
     sourceCompatibility = JavaVersion.VERSION_1_7
     targetCompatibility = JavaVersion.VERSION_1_7
     {{/java8}}
-    {{/supportJava6}}
 
     install {
         repositories.mavenInstaller {
@@ -124,14 +112,7 @@ ext {
     {{#openApiNullable}}
     jackson_databind_nullable_version = "0.2.1"
     {{/openApiNullable}}
-    {{#supportJava6}}
-    jersey_version = "2.6"
-    commons_io_version=2.5
-    commons_lang3_version=3.6
-    {{/supportJava6}}
-    {{^supportJava6}}
     jersey_version = "2.27"
-    {{/supportJava6}}
     junit_version = "4.13.1"
     {{#threetenbp}}
     threetenbp_version = "2.9.10"
@@ -170,10 +151,6 @@ dependencies {
     {{#hasHttpSignatureMethods}}
     implementation "org.tomitribe:tomitribe-http-signatures:$tomitribe_http_signatures_version"
     {{/hasHttpSignatureMethods}}
-    {{#supportJava6}}
-    implementation "commons-io:commons-io:$commons_io_version"
-    implementation "org.apache.commons:commons-lang3:$commons_lang3_version"
-    {{/supportJava6}}
     {{#threetenbp}}
     implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version"
     {{/threetenbp}}

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache

@@ -10,11 +10,11 @@ lazy val root = (project in file(".")).
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       "io.swagger" % "swagger-annotations" % "1.5.22",
-      "org.glassfish.jersey.core" % "jersey-client" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.27"{{/supportJava6}},{{^supportJava6}}
+      "org.glassfish.jersey.core" % "jersey-client" % "2.27",
-      "org.glassfish.jersey.inject" % "jersey-hk2" % "2.27",{{/supportJava6}}
+      "org.glassfish.jersey.inject" % "jersey-hk2" % "2.27",
-      "org.glassfish.jersey.media" % "jersey-media-multipart" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.27"{{/supportJava6}},
+      "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.27",
-      "org.glassfish.jersey.media" % "jersey-media-json-jackson" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.27"{{/supportJava6}},
+      "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.27",
-      "org.glassfish.jersey.connectors" % "jersey-apache-connector" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.27"{{/supportJava6}},
+      "org.glassfish.jersey.connectors" % "jersey-apache-connector" % "2.27",
       "com.fasterxml.jackson.core" % "jackson-core" % "2.10.4" % "compile",
       "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.4" % "compile",
       "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.4" % "compile",
@@ -36,10 +36,6 @@ lazy val root = (project in file(".")).
       {{^java8}}
       "com.brsanthu" % "migbase64" % "2.2",
       {{/java8}}
-      {{#supportJava6}}
-      "org.apache.commons" % "commons-lang3" % "3.6",
-      "commons-io" % "commons-io" % "2.5",
-      {{/supportJava6}}
       "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
       "junit" % "junit" % "4.13.1" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/model.mustache

@@ -16,15 +16,10 @@ import com.fasterxml.jackson.annotation.JsonAnySetter;
 {{/additionalPropertiesType}}
 {{/model}}
 {{/models}}
-{{^supportJava6}}
 import java.util.Objects;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.HashMap;
-{{/supportJava6}}
-{{#supportJava6}}
-import org.apache.commons.lang3.ObjectUtils;
-{{/supportJava6}}
 {{#imports}}
 import {{import}};
 {{/imports}}

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache

@@ -251,7 +251,6 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE
 
   {{/vars}}
 {{>libraries/jersey2/additional_properties}}
-{{^supportJava6}}
   /**
    * Return true if this {{name}} object is equal to o.
    */
@@ -286,30 +285,6 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE
   {{/useReflectionEqualsHashCode}}
   }
 
-{{/supportJava6}}
-{{#supportJava6}}
-  @Override
-  public boolean equals(Object o) {
-  if (this == o) {
-    return true;
-  }
-  if (o == null || getClass() != o.getClass()) {
-    return false;
-  }{{#hasVars}}
-    {{classname}} {{classVarName}} = ({{classname}}) o;
-    return {{#vars}}ObjectUtils.equals(this.{{name}}, {{classVarName}}.{{name}}){{^-last}} &&
-    {{/-last}}{{/vars}}{{#parent}} &&
-    super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}
-    return true;{{/hasVars}}
-  }
-
-  @Override
-  public int hashCode() {
-    return ObjectUtils.hashCodeMulti({{#vars}}{{name}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}});
-  }
-
-{{/supportJava6}}
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache

@@ -145,11 +145,6 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    {{#supportJava6}}
-                        <source>1.6</source>
-                        <target>1.6</target>
-                    {{/supportJava6}}
-                    {{^supportJava6}}
                     {{#java8}}
                         <source>1.8</source>
                         <target>1.8</target>
@@ -158,7 +153,6 @@
                         <source>1.7</source>
                         <target>1.7</target>
                     {{/java8}}
-                    {{/supportJava6}}
                     <fork>true</fork>
                     <meminitial>128m</meminitial>
                     <maxmem>512m</maxmem>
@@ -182,17 +176,12 @@
                 </executions>
                 <configuration>
                     <doclint>none</doclint>
-                    {{#supportJava6}}
-                        <source>1.6</source>
-                    {{/supportJava6}}
-                    {{^supportJava6}}
                     {{#java8}}
                         <source>1.8</source>
                     {{/java8}}
                     {{^java8}}
                         <source>1.7</source>
                     {{/java8}}
-                    {{/supportJava6}}
                     <tags>
                         <tag>
                             <name>http.response.details</name>
@@ -262,13 +251,11 @@
             <artifactId>jersey-client</artifactId>
             <version>${jersey-version}</version>
         </dependency>
-        {{^supportJava6}}
         <dependency>
             <groupId>org.glassfish.jersey.inject</groupId>
             <artifactId>jersey-hk2</artifactId>
             <version>${jersey-version}</version>
         </dependency>
-        {{/supportJava6}}
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-multipart</artifactId>
@@ -340,18 +327,6 @@
             <version>2.2</version>
         </dependency>
         {{/java8}}
-        {{#supportJava6}}
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons-io-version}</version>
-        </dependency>
-        {{/supportJava6}}
         {{#hasHttpSignatureMethods}}
         <dependency>
             <groupId>org.tomitribe</groupId>
@@ -397,14 +372,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <swagger-annotations-version>1.6.1</swagger-annotations-version>
-        {{^supportJava6}}
         <jersey-version>2.30.1</jersey-version>
-        {{/supportJava6}}
-        {{#supportJava6}}
-        <jersey-version>2.6</jersey-version>
-        <commons-io-version>2.5</commons-io-version>
-        <commons-lang3-version>3.6</commons-lang3-version>
-        {{/supportJava6}}
         <jackson-version>2.10.4</jackson-version>
         <jackson-databind-version>2.10.4</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>

modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/README.mustache

@@ -18,7 +18,7 @@
 ## Requirements
 
 Building the API client library requires:
-1. Java {{#supportJava6}}1.6{{/supportJava6}}{{^supportJava6}}{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}{{/supportJava6}}+
+1. Java {{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}+
 2. Maven/Gradle
 
 ## Installation

modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache

@@ -40,11 +40,6 @@ if(hasProperty('target') && target == 'android') {
             targetSdkVersion 25
         }
         compileOptions {
-            {{#supportJava6}}
-            sourceCompatibility JavaVersion.VERSION_1_6
-            targetCompatibility JavaVersion.VERSION_1_6
-            {{/supportJava6}}
-            {{^supportJava6}}
             {{#java8}}
             sourceCompatibility JavaVersion.VERSION_1_8
             targetCompatibility JavaVersion.VERSION_1_8
@@ -53,7 +48,6 @@ if(hasProperty('target') && target == 'android') {
             sourceCompatibility JavaVersion.VERSION_1_7
             targetCompatibility JavaVersion.VERSION_1_7
             {{/java8}}
-            {{/supportJava6}}
         }
 
         // Rename the aar correctly
@@ -98,11 +92,6 @@ if(hasProperty('target') && target == 'android') {
     apply plugin: 'java'
     apply plugin: 'maven'
 
-    {{#supportJava6}}
-    sourceCompatibility = JavaVersion.VERSION_1_6
-    targetCompatibility = JavaVersion.VERSION_1_6
-    {{/supportJava6}}
-    {{^supportJava6}}
     {{#java8}}
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
@@ -111,7 +100,6 @@ if(hasProperty('target') && target == 'android') {
     sourceCompatibility = JavaVersion.VERSION_1_7
     targetCompatibility = JavaVersion.VERSION_1_7
     {{/java8}}
-    {{/supportJava6}}
 
     install {
         repositories.mavenInstaller {

modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache

@@ -327,7 +327,7 @@
         </dependency>
     </dependencies>
     <properties>
-        <java.version>{{#supportJava6}}1.6{{/supportJava6}}{{^supportJava6}}{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}{{/supportJava6}}</java.version>
+        <java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <gson-fire-version>1.8.4</gson-fire-version>

modules/openapi-generator/src/main/resources/Java/libraries/resteasy/ApiClient.mustache

@@ -560,13 +560,7 @@ public class ApiClient{{#java8}} extends JavaTimeFormatter{{/java8}} {
   public File downloadFileFromResponse(Response response) throws ApiException {
     try {
       File file = prepareDownloadFile(response);
-{{^supportJava6}}
       Files.copy(response.readEntity(InputStream.class), file.toPath());
-{{/supportJava6}}
-{{#supportJava6}}
-      // Java6 falls back to commons.io for file copying
-      FileUtils.copyToFile(response.readEntity(InputStream.class), file);
-{{/supportJava6}}
       return file;
     } catch (IOException e) {
       throw new ApiException(e);

modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache

@@ -33,11 +33,6 @@ if(hasProperty('target') && target == 'android') {
             targetSdkVersion 23
         }
         compileOptions {
-            {{#supportJava6}}
-            sourceCompatibility JavaVersion.VERSION_1_6
-            targetCompatibility JavaVersion.VERSION_1_6
-            {{/supportJava6}}
-            {{^supportJava6}}
             {{#java8}}
             sourceCompatibility JavaVersion.VERSION_1_8
             targetCompatibility JavaVersion.VERSION_1_8
@@ -46,7 +41,6 @@ if(hasProperty('target') && target == 'android') {
             sourceCompatibility JavaVersion.VERSION_1_7
             targetCompatibility JavaVersion.VERSION_1_7
             {{/java8}}
-            {{/supportJava6}}
         }
 
         // Rename the aar correctly
@@ -90,11 +84,6 @@ if(hasProperty('target') && target == 'android') {
 
     apply plugin: 'java'
     apply plugin: 'maven'
-    {{#supportJava6}}
-    sourceCompatibility = JavaVersion.VERSION_1_6
-    targetCompatibility = JavaVersion.VERSION_1_6
-    {{/supportJava6}}
-    {{^supportJava6}}
     {{#java8}}
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
@@ -103,7 +92,6 @@ if(hasProperty('target') && target == 'android') {
     sourceCompatibility = JavaVersion.VERSION_1_7
     targetCompatibility = JavaVersion.VERSION_1_7
     {{/java8}}
-    {{/supportJava6}}
 
     install {
         repositories.mavenInstaller {
@@ -129,10 +117,6 @@ ext {
     {{^java8}}
     jodatime_version = "2.9.9"
     {{/java8}}
-    {{#supportJava6}}
-    commons_io_version=2.5
-    commons_lang3_version=3.5
-    {{/supportJava6}}
     junit_version = "4.13"
 }
 
@@ -157,10 +141,6 @@ dependencies {
     implementation "joda-time:joda-time:$jodatime_version"
     implementation "com.brsanthu:migbase64:2.2"
     {{/java8}}
-    {{#supportJava6}}
-    implementation "commons-io:commons-io:$commons_io_version"
-    implementation "org.apache.commons:commons-lang3:$commons_lang3_version"
-    {{/supportJava6}}
     implementation 'javax.annotation:javax.annotation-api:1.3.2'
     testImplementation "junit:junit:$junit_version"
 }

modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache

@@ -25,10 +25,6 @@ lazy val root = (project in file(".")).
       "joda-time" % "joda-time" % "2.9.9" % "compile",
       "com.brsanthu" % "migbase64" % "2.2" % "compile",
       {{/java8}}
-      {{#supportJava6}}
-      "org.apache.commons" % "commons-lang3" % "3.5" % "compile",
-      "commons-io" % "commons-io" % "2.5" % "compile",
-      {{/supportJava6}}
       "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
       "junit" % "junit" % "4.13" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"

modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache

@@ -142,11 +142,6 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.5.1</version>
                 <configuration>
-                    {{#supportJava6}}
-                        <source>1.6</source>
-                        <target>1.6</target>
-                    {{/supportJava6}}
-                    {{^supportJava6}}
                     {{#java8}}
                         <source>1.8</source>
                         <target>1.8</target>
@@ -155,7 +150,6 @@
                         <source>1.7</source>
                         <target>1.7</target>
                     {{/java8}}
-                    {{/supportJava6}}
                 </configuration>
             </plugin>
             <plugin>
@@ -164,17 +158,12 @@
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
-                    {{#supportJava6}}
-                        <source>1.6</source>
-                    {{/supportJava6}}
-                    {{^supportJava6}}
                     {{#java8}}
                         <source>1.8</source>
                     {{/java8}}
                     {{^java8}}
                         <source>1.7</source>
                     {{/java8}}
-                    {{/supportJava6}}
                 </configuration>
                 <executions>
                     <execution>
@@ -263,19 +252,6 @@
         </dependency>
         {{/java8}}
 
-        {{#supportJava6}}
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons_lang3_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons_io_version}</version>
-        </dependency>
-        {{/supportJava6}}
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jackson2-provider</artifactId>
@@ -317,10 +293,6 @@
         {{^java8}}
         <jodatime-version>2.9.9</jodatime-version>
         {{/java8}}
-        {{#supportJava6}}
-        <commons_io_version>2.5</commons_io_version>
-        <commons_lang3_version>3.6</commons_lang3_version>
-        {{/supportJava6}}
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.13</junit-version>
     </properties>

modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache

@@ -33,11 +33,6 @@ if(hasProperty('target') && target == 'android') {
             targetSdkVersion 22
         }
         compileOptions {
-            {{#supportJava6}}
-            sourceCompatibility JavaVersion.VERSION_1_6
-            targetCompatibility JavaVersion.VERSION_1_6
-            {{/supportJava6}}
-            {{^supportJava6}}
             {{#java8}}
             sourceCompatibility JavaVersion.VERSION_1_8
             targetCompatibility JavaVersion.VERSION_1_8
@@ -46,7 +41,6 @@ if(hasProperty('target') && target == 'android') {
             sourceCompatibility JavaVersion.VERSION_1_7
             targetCompatibility JavaVersion.VERSION_1_7
             {{/java8}}
-            {{/supportJava6}}
         }
 
         // Rename the aar correctly
@@ -91,11 +85,6 @@ if(hasProperty('target') && target == 'android') {
     apply plugin: 'java'
     apply plugin: 'maven'
 
-    {{#supportJava6}}
-    sourceCompatibility = JavaVersion.VERSION_1_6
-    targetCompatibility = JavaVersion.VERSION_1_6
-    {{/supportJava6}}
-    {{^supportJava6}}
     {{#java8}}
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
@@ -104,7 +93,6 @@ if(hasProperty('target') && target == 'android') {
     sourceCompatibility = JavaVersion.VERSION_1_7
     targetCompatibility = JavaVersion.VERSION_1_7
     {{/java8}}
-    {{/supportJava6}}
 
     install {
         repositories.mavenInstaller {

modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache

@@ -144,11 +144,6 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.6.1</version>
                 <configuration>
-                    {{#supportJava6}}
-                        <source>1.6</source>
-                        <target>1.6</target>
-                    {{/supportJava6}}
-                    {{^supportJava6}}
                     {{#java8}}
                         <source>1.8</source>
                         <target>1.8</target>
@@ -157,7 +152,6 @@
                         <source>1.7</source>
                         <target>1.7</target>
                     {{/java8}}
-                    {{/supportJava6}}
                 </configuration>
             </plugin>
             <plugin>

modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache

@@ -33,11 +33,6 @@ if(hasProperty('target') && target == 'android') {
             targetSdkVersion 25
         }
         compileOptions {
-            {{#supportJava6}}
-            sourceCompatibility JavaVersion.VERSION_1_6
-            targetCompatibility JavaVersion.VERSION_1_6
-            {{/supportJava6}}
-            {{^supportJava6}}
             {{#java8}}
             sourceCompatibility JavaVersion.VERSION_1_8
             targetCompatibility JavaVersion.VERSION_1_8
@@ -46,7 +41,6 @@ if(hasProperty('target') && target == 'android') {
             sourceCompatibility JavaVersion.VERSION_1_7
             targetCompatibility JavaVersion.VERSION_1_7
             {{/java8}}
-            {{/supportJava6}}
         }
 
         // Rename the aar correctly

modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache

@@ -144,11 +144,6 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.6.1</version>
                 <configuration>
-                {{#supportJava6}}
-                    <source>1.6</source>
-                    <target>1.6</target>
-                {{/supportJava6}}
-                {{^supportJava6}}
                 {{#java8}}
                     <source>1.8</source>
                     <target>1.8</target>
@@ -157,7 +152,6 @@
                     <source>1.7</source>
                     <target>1.7</target>
                 {{/java8}}
-                {{/supportJava6}}
                 </configuration>
             </plugin>
             <plugin>
@@ -166,17 +160,12 @@
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
-                    {{#supportJava6}}
-                        <source>1.6</source>
-                    {{/supportJava6}}
-                    {{^supportJava6}}
                     {{#java8}}
                         <source>1.8</source>
                     {{/java8}}
                     {{^java8}}
                         <source>1.7</source>
                     {{/java8}}
-                    {{/supportJava6}}
                 </configuration>
                 <executions>
                     <execution>

modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache

@@ -33,11 +33,6 @@ if(hasProperty('target') && target == 'android') {
             targetSdkVersion 25
         }
         compileOptions {
-            {{#supportJava6}}
-            sourceCompatibility JavaVersion.VERSION_1_6
-            targetCompatibility JavaVersion.VERSION_1_6
-            {{/supportJava6}}
-            {{^supportJava6}}
             {{#java8}}
             sourceCompatibility JavaVersion.VERSION_1_8
             targetCompatibility JavaVersion.VERSION_1_8
@@ -46,7 +41,6 @@ if(hasProperty('target') && target == 'android') {
             sourceCompatibility JavaVersion.VERSION_1_7
             targetCompatibility JavaVersion.VERSION_1_7
             {{/java8}}
-            {{/supportJava6}}
         }
 
         // Rename the aar correctly
@@ -91,11 +85,6 @@ if(hasProperty('target') && target == 'android') {
     apply plugin: 'java'
     apply plugin: 'maven'
 
-    {{#supportJava6}}
-    sourceCompatibility = JavaVersion.VERSION_1_6
-    targetCompatibility = JavaVersion.VERSION_1_6
-    {{/supportJava6}}
-    {{^supportJava6}}
     {{#java8}}
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
@@ -104,7 +93,6 @@ if(hasProperty('target') && target == 'android') {
     sourceCompatibility = JavaVersion.VERSION_1_7
     targetCompatibility = JavaVersion.VERSION_1_7
     {{/java8}}
-    {{/supportJava6}}
 
     install {
         repositories.mavenInstaller {

modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play24/ApiClient.mustache

@@ -44,7 +44,7 @@ public class ApiClient {
 
     public ApiClient() {
         // Setup authentications (key: authentication name, value: authentication).
-        authentications = new HashMap<{{#supportJava6}}String, Authentication{{/supportJava6}}>();{{#authMethods}}{{#isBasic}}{{#isBasicBasic}}
+        authentications = new HashMap<>();{{#authMethods}}{{#isBasic}}{{#isBasicBasic}}
         // authentications.put("{{name}}", new HttpBasicAuth());{{/isBasicBasic}}{{^isBasicBasic}}
         // authentications.put("{{name}}", new HttpBearerAuth("{{scheme}}"));{{/isBasicBasic}}{{/isBasic}}{{#isApiKey}}
         authentications.put("{{name}}", new ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{#isKeyInQuery}}"query"{{/isKeyInQuery}}{{#isKeyInCookie}}"cookie"{{/isKeyInCookie}}, "{{keyParamName}}"));{{/isApiKey}}{{#isOAuth}}
@@ -62,9 +62,9 @@ public class ApiClient {
             basePath = basePath + "/";
         }
 
-        Map<String, String> extraHeaders = new HashMap<{{#supportJava6}}String, String{{/supportJava6}}>();
+        Map<String, String> extraHeaders = new HashMap<>();
-        Map<String, String> extraCookies = new HashMap<{{#supportJava6}}String, String{{/supportJava6}}>();
+        Map<String, String> extraCookies = new HashMap<>();
-        List<Pair> extraQueryParams = new ArrayList<{{#supportJava6}}Pair{{/supportJava6}}>();
+        List<Pair> extraQueryParams = new ArrayList<>();
 
         for (String authName : authentications.keySet()) {
             Authentication auth = authentications.get(authName);

modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play25/ApiClient.mustache

@@ -44,7 +44,7 @@ public class ApiClient {
 
     public ApiClient() {
         // Setup authentications (key: authentication name, value: authentication).
-        authentications = new HashMap<{{#supportJava6}}String, Authentication{{/supportJava6}}>();{{#authMethods}}{{#isBasic}}
+        authentications = new HashMap<>();{{#authMethods}}{{#isBasic}}
         // authentications.put("{{name}}", new HttpBasicAuth());{{/isBasic}}{{#isApiKey}}
         authentications.put("{{name}}", new ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{#isKeyInQuery}}"query"{{/isKeyInQuery}}{{#isKeyInCookie}}"query"{{/isKeyInCookie}}, "{{keyParamName}}"));{{/isApiKey}}{{#isOAuth}}
         // authentications.put("{{name}}", new OAuth());{{/isOAuth}}{{/authMethods}}
@@ -61,9 +61,9 @@ public class ApiClient {
             basePath = basePath + "/";
         }
 
-        Map<String, String> extraHeaders = new HashMap<{{#supportJava6}}String, String{{/supportJava6}}>();
+        Map<String, String> extraHeaders = new HashMap<>();
-        Map<String, String> extraCookies = new HashMap<{{#supportJava6}}String, String{{/supportJava6}}>();
+        Map<String, String> extraCookies = new HashMap<>();
-        List<Pair> extraQueryParams = new ArrayList<{{#supportJava6}}Pair{{/supportJava6}}>();
+        List<Pair> extraQueryParams = new ArrayList<>();
 
         for (String authName : authentications.keySet()) {
             Authentication auth = authentications.get(authName);

modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache

@@ -144,11 +144,6 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.6.1</version>
                 <configuration>
-                {{#supportJava6}}
-                    <source>1.6</source>
-                    <target>1.6</target>
-                {{/supportJava6}}
-                {{^supportJava6}}
                 {{#java8}}
                     <source>1.8</source>
                     <target>1.8</target>
@@ -157,7 +152,6 @@
                     <source>1.7</source>
                     <target>1.7</target>
                 {{/java8}}
-                {{/supportJava6}}
                 </configuration>
             </plugin>
             <plugin>
@@ -166,17 +160,12 @@
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
-                    {{#supportJava6}}
-                        <source>1.6</source>
-                    {{/supportJava6}}
-                    {{^supportJava6}}
                     {{#java8}}
                         <source>1.8</source>
                     {{/java8}}
                     {{^java8}}
                         <source>1.7</source>
                     {{/java8}}
-                    {{/supportJava6}}
                 </configuration>
                 <executions>
                     <execution>
@@ -414,7 +403,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>{{#supportJava6}}1.6{{/supportJava6}}{{^supportJava6}}{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}{{/supportJava6}}</java.version>
+        <java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <gson-fire-version>1.8.3</gson-fire-version>

modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache

@@ -154,17 +154,12 @@
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
-                    {{#supportJava6}}
-                        <source>1.6</source>
-                    {{/supportJava6}}
-                    {{^supportJava6}}
                     {{#java8}}
                         <source>1.8</source>
                     {{/java8}}
                     {{^java8}}
                         <source>1.7</source>
                     {{/java8}}
-                    {{/supportJava6}}
                 </configuration>
                 <executions>
                     <execution>

modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache

@@ -34,11 +34,6 @@ if(hasProperty('target') && target == 'android') {
         }
 
         compileOptions {
-            {{#supportJava6}}
-            sourceCompatibility JavaVersion.VERSION_1_6
-            targetCompatibility JavaVersion.VERSION_1_6
-            {{/supportJava6}}
-            {{^supportJava6}}
             {{#java8}}
             sourceCompatibility JavaVersion.VERSION_1_8
             targetCompatibility JavaVersion.VERSION_1_8
@@ -47,7 +42,6 @@ if(hasProperty('target') && target == 'android') {
             sourceCompatibility JavaVersion.VERSION_1_7
             targetCompatibility JavaVersion.VERSION_1_7
             {{/java8}}
-            {{/supportJava6}}
         }
 
         // Rename the aar correctly
@@ -92,11 +86,6 @@ if(hasProperty('target') && target == 'android') {
     apply plugin: 'java'
     apply plugin: 'maven'
 
-    {{#supportJava6}}
-    sourceCompatibility = JavaVersion.VERSION_1_6
-    targetCompatibility = JavaVersion.VERSION_1_6
-    {{/supportJava6}}
-    {{^supportJava6}}
     {{#java8}}
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
@@ -105,7 +94,6 @@ if(hasProperty('target') && target == 'android') {
     sourceCompatibility = JavaVersion.VERSION_1_7
     targetCompatibility = JavaVersion.VERSION_1_7
     {{/java8}}
-    {{/supportJava6}}
 
     install {
         repositories.mavenInstaller {

modules/openapi-generator/src/main/resources/Java/model.mustache

@@ -6,13 +6,8 @@ package {{package}};
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 {{/useReflectionEqualsHashCode}}
-{{^supportJava6}}
 import java.util.Objects;
 import java.util.Arrays;
-{{/supportJava6}}
-{{#supportJava6}}
-import org.apache.commons.lang3.ObjectUtils;
-{{/supportJava6}}
 {{#imports}}
 import {{import}};
 {{/imports}}

modules/openapi-generator/src/main/resources/Java/pojo.mustache

@@ -228,7 +228,6 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE
 
   {{/vars}}
 
-{{^supportJava6}}
   @Override
   public boolean equals(Object o) {
   {{#useReflectionEqualsHashCode}}
@@ -259,30 +258,6 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE
   {{/useReflectionEqualsHashCode}}
   }
 
-{{/supportJava6}}
-{{#supportJava6}}
-  @Override
-  public boolean equals(Object o) {
-  if (this == o) {
-    return true;
-  }
-  if (o == null || getClass() != o.getClass()) {
-    return false;
-  }{{#hasVars}}
-    {{classname}} {{classVarName}} = ({{classname}}) o;
-    return {{#vars}}ObjectUtils.equals(this.{{name}}, {{classVarName}}.{{name}}){{^-last}} &&
-    {{/-last}}{{/vars}}{{#parent}} &&
-    super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}
-    return true;{{/hasVars}}
-  }
-
-  @Override
-  public int hashCode() {
-    return ObjectUtils.hashCodeMulti({{#vars}}{{name}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}});
-  }
-
-{{/supportJava6}}
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

modules/openapi-generator/src/main/resources/Java/pom.mustache

@@ -159,11 +159,6 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.6.1</version>
                 <configuration>
-                    {{#supportJava6}}
-                        <source>1.6</source>
-                        <target>1.6</target>
-                    {{/supportJava6}}
-                    {{^supportJava6}}
                     {{#java8}}
                         <source>1.8</source>
                         <target>1.8</target>
@@ -172,7 +167,6 @@
                         <source>1.7</source>
                         <target>1.7</target>
                     {{/java8}}
-                    {{/supportJava6}}
                 </configuration>
             </plugin>
             <plugin>
@@ -181,17 +175,12 @@
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
-                    {{#supportJava6}}
-                        <source>1.6</source>
-                    {{/supportJava6}}
-                    {{^supportJava6}}
                     {{#java8}}
                         <source>1.8</source>
                     {{/java8}}
                     {{^java8}}
                         <source>1.7</source>
                     {{/java8}}
-                    {{/supportJava6}}
                 </configuration>
                 <executions>
                     <execution>
@@ -329,18 +318,6 @@
                 <version>2.2</version>
             </dependency>
         {{/java8}}
-        {{#supportJava6}}
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-lang3</artifactId>
-                <version>${commons_lang3_version}</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>${commons_io_version}</version>
-            </dependency>
-        {{/supportJava6}}
         {{#useBeanValidation}}
             <!-- Bean Validation API support -->
             <dependency>
@@ -385,10 +362,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <swagger-annotations-version>1.5.21</swagger-annotations-version>
         <jersey-version>1.19.4</jersey-version>
-        {{#supportJava6}}
-        <commons_io_version>2.5</commons_io_version>
-        <commons_lang3_version>3.6</commons_lang3_version>
-        {{/supportJava6}}
         <jackson-version>2.10.3</jackson-version>
         {{#threetenbp}}
         <jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java

@@ -83,7 +83,6 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
     return Objects.hash(name, super.hashCode());
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java

@@ -84,7 +84,6 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
     return Objects.hash(name, super.hashCode());
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java

@@ -83,7 +83,6 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
     return Objects.hash(name, super.hashCode());
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java

@@ -448,7 +448,6 @@ public class AdditionalPropertiesClass {
     return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, anytype2, anytype3);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java

@@ -83,7 +83,6 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
     return Objects.hash(name, super.hashCode());
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java

@@ -84,7 +84,6 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
     return Objects.hash(name, super.hashCode());
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java

@@ -83,7 +83,6 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
     return Objects.hash(name, super.hashCode());
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java

@@ -83,7 +83,6 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
     return Objects.hash(name, super.hashCode());
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Animal.java

@@ -121,7 +121,6 @@ public class Animal {
     return Objects.hash(className, color);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java

@@ -91,7 +91,6 @@ public class ArrayOfArrayOfNumberOnly {
     return Objects.hash(arrayArrayNumber);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java

@@ -91,7 +91,6 @@ public class ArrayOfNumberOnly {
     return Objects.hash(arrayNumber);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java

@@ -167,7 +167,6 @@ public class ArrayTest {
     return Objects.hash(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/BigCat.java

@@ -126,7 +126,6 @@ public class BigCat extends Cat {
     return Objects.hash(kind, super.hashCode());
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/BigCatAllOf.java

@@ -119,7 +119,6 @@ public class BigCatAllOf {
     return Objects.hash(kind);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Capitalization.java

@@ -230,7 +230,6 @@ public class Capitalization {
     return Objects.hash(smallCamel, capitalCamel, smallSnake, capitalSnake, scAETHFlowPoints, ATT_NAME);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Cat.java

@@ -91,7 +91,6 @@ public class Cat extends Animal {
     return Objects.hash(declawed, super.hashCode());
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/CatAllOf.java

@@ -80,7 +80,6 @@ public class CatAllOf {
     return Objects.hash(declawed);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Category.java

@@ -109,7 +109,6 @@ public class Category {
     return Objects.hash(id, name);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ClassModel.java

@@ -81,7 +81,6 @@ public class ClassModel {
     return Objects.hash(propertyClass);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Client.java

@@ -80,7 +80,6 @@ public class Client {
     return Objects.hash(client);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Dog.java

@@ -87,7 +87,6 @@ public class Dog extends Animal {
     return Objects.hash(breed, super.hashCode());
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/DogAllOf.java

@@ -80,7 +80,6 @@ public class DogAllOf {
     return Objects.hash(breed);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java

@@ -190,7 +190,6 @@ public class EnumArrays {
     return Objects.hash(justSymbol, arrayEnum);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java

@@ -344,7 +344,6 @@ public class EnumTest {
     return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, outerEnum);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java

@@ -120,7 +120,6 @@ public class FileSchemaTestClass {
     return Objects.hash(file, files);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java

@@ -481,7 +481,6 @@ public class FormatTest {
     return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java

@@ -92,7 +92,6 @@ public class HasOnlyReadOnly {
     return Objects.hash(bar, foo);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MapTest.java

@@ -240,7 +240,6 @@ public class MapTest {
     return Objects.hash(mapMapOfString, mapOfEnumString, directMap, indirectMap);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -154,7 +154,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
     return Objects.hash(uuid, dateTime, map);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Model200Response.java

@@ -111,7 +111,6 @@ public class Model200Response {
     return Objects.hash(name, propertyClass);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ModelApiResponse.java

@@ -140,7 +140,6 @@ public class ModelApiResponse {
     return Objects.hash(code, type, message);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ModelReturn.java

@@ -81,7 +81,6 @@ public class ModelReturn {
     return Objects.hash(_return);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Name.java

@@ -152,7 +152,6 @@ public class Name {
     return Objects.hash(name, snakeCase, property, _123number);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/NumberOnly.java

@@ -81,7 +81,6 @@ public class NumberOnly {
     return Objects.hash(justNumber);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Order.java

@@ -268,7 +268,6 @@ public class Order {
     return Objects.hash(id, petId, quantity, shipDate, status, complete);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/OuterComposite.java

@@ -141,7 +141,6 @@ public class OuterComposite {
     return Objects.hash(myNumber, myString, myBoolean);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Pet.java

@@ -284,7 +284,6 @@ public class Pet {
     return Objects.hash(id, category, name, photoUrls, tags, status);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java

@@ -101,7 +101,6 @@ public class ReadOnlyFirst {
     return Objects.hash(bar, baz);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/SpecialModelName.java

@@ -80,7 +80,6 @@ public class SpecialModelName {
     return Objects.hash($specialPropertyName);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Tag.java

@@ -110,7 +110,6 @@ public class Tag {
     return Objects.hash(id, name);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderDefault.java

@@ -203,7 +203,6 @@ public class TypeHolderDefault {
     return Objects.hash(stringItem, numberItem, integerItem, boolItem, arrayItem);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderExample.java

@@ -232,7 +232,6 @@ public class TypeHolderExample {
     return Objects.hash(stringItem, numberItem, floatItem, integerItem, boolItem, arrayItem);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/User.java

@@ -290,7 +290,6 @@ public class User {
     return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java

@@ -995,7 +995,6 @@ public class XmlItem {
     return Objects.hash(attributeString, attributeNumber, attributeInteger, attributeBoolean, wrappedArray, nameString, nameNumber, nameInteger, nameBoolean, nameArray, nameWrappedArray, prefixString, prefixNumber, prefixInteger, prefixBoolean, prefixArray, prefixWrappedArray, namespaceString, namespaceNumber, namespaceInteger, namespaceBoolean, namespaceArray, namespaceWrappedArray, prefixNsString, prefixNsNumber, prefixNsInteger, prefixNsBoolean, prefixNsArray, prefixNsWrappedArray);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java

@@ -82,7 +82,6 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
     return Objects.hash(name, super.hashCode());
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java

@@ -83,7 +83,6 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
     return Objects.hash(name, super.hashCode());
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java

@@ -82,7 +82,6 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
     return Objects.hash(name, super.hashCode());
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java

@@ -447,7 +447,6 @@ public class AdditionalPropertiesClass {
     return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, anytype2, anytype3);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java

@@ -82,7 +82,6 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
     return Objects.hash(name, super.hashCode());
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java

@@ -83,7 +83,6 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
     return Objects.hash(name, super.hashCode());
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java

@@ -82,7 +82,6 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
     return Objects.hash(name, super.hashCode());
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java

@@ -82,7 +82,6 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
     return Objects.hash(name, super.hashCode());
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java

@@ -120,7 +120,6 @@ public class Animal {
     return Objects.hash(className, color);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java

@@ -90,7 +90,6 @@ public class ArrayOfArrayOfNumberOnly {
     return Objects.hash(arrayArrayNumber);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java

@@ -90,7 +90,6 @@ public class ArrayOfNumberOnly {
     return Objects.hash(arrayNumber);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java

@@ -166,7 +166,6 @@ public class ArrayTest {
     return Objects.hash(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/BigCat.java

@@ -125,7 +125,6 @@ public class BigCat extends Cat {
     return Objects.hash(kind, super.hashCode());
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/BigCatAllOf.java

@@ -118,7 +118,6 @@ public class BigCatAllOf {
     return Objects.hash(kind);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Capitalization.java

@@ -229,7 +229,6 @@ public class Capitalization {
     return Objects.hash(smallCamel, capitalCamel, smallSnake, capitalSnake, scAETHFlowPoints, ATT_NAME);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java

@@ -90,7 +90,6 @@ public class Cat extends Animal {
     return Objects.hash(declawed, super.hashCode());
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/CatAllOf.java

@@ -79,7 +79,6 @@ public class CatAllOf {
     return Objects.hash(declawed);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Category.java

@@ -108,7 +108,6 @@ public class Category {
     return Objects.hash(id, name);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ClassModel.java

@@ -80,7 +80,6 @@ public class ClassModel {
     return Objects.hash(propertyClass);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Client.java

@@ -79,7 +79,6 @@ public class Client {
     return Objects.hash(client);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java

@@ -86,7 +86,6 @@ public class Dog extends Animal {
     return Objects.hash(breed, super.hashCode());
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DogAllOf.java

@@ -79,7 +79,6 @@ public class DogAllOf {
     return Objects.hash(breed);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java

@@ -189,7 +189,6 @@ public class EnumArrays {
     return Objects.hash(justSymbol, arrayEnum);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java

@@ -343,7 +343,6 @@ public class EnumTest {
     return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, outerEnum);
   }
 
-
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();