diff --git a/src/main/resources/v2/Java/libraries/jersey2/ApiClient.mustache b/src/main/resources/v2/Java/libraries/jersey2/ApiClient.mustache
index dfa9b534eb..25be535bb8 100644
--- a/src/main/resources/v2/Java/libraries/jersey2/ApiClient.mustache
+++ b/src/main/resources/v2/Java/libraries/jersey2/ApiClient.mustache
@@ -15,7 +15,9 @@ import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.client.ClientProperties;
 import org.glassfish.jersey.client.HttpUrlConnectorProvider;
 import org.glassfish.jersey.jackson.JacksonFeature;
+{{^supportJava6}}
 import org.glassfish.jersey.logging.LoggingFeature;
+{{/supportJava6}}
 import org.glassfish.jersey.media.multipart.FormDataBodyPart;
 import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import org.glassfish.jersey.media.multipart.MultiPart;
@@ -750,12 +752,14 @@ public class ApiClient {
     clientConfig.register(json);
     clientConfig.register(JacksonFeature.class);
     clientConfig.property(HttpUrlConnectorProvider.SET_METHOD_WORKAROUND, true);
+    {{^supportJava6}}
     if (debugging) {
       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}}
     performAdditionalClientConfiguration(clientConfig);
     return ClientBuilder.newClient(clientConfig);
   }
diff --git a/src/main/resources/v2/Java/libraries/okhttp-gson/pom.mustache b/src/main/resources/v2/Java/libraries/okhttp-gson/pom.mustache
index f58a28269b..9e50e79923 100644
--- a/src/main/resources/v2/Java/libraries/okhttp-gson/pom.mustache
+++ b/src/main/resources/v2/Java/libraries/okhttp-gson/pom.mustache
@@ -203,6 +203,18 @@
       <version>${threetenbp-version}</version>
     </dependency>
     {{/threetenbp}}
+    {{#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>
@@ -249,6 +261,10 @@
     <swagger-core-version>1.5.15</swagger-core-version>
     <okhttp-version>2.7.5</okhttp-version>
     <gson-version>2.8.1</gson-version>
+    {{#supportJava6}}
+    <commons_io_version>2.5</commons_io_version>
+    <commons_lang3_version>3.6</commons_lang3_version>
+    {{/supportJava6}}
     {{#joda}}
     <jodatime-version>2.9.9</jodatime-version>
     {{/joda}}
diff --git a/src/main/resources/v2/Java/pojo.mustache b/src/main/resources/v2/Java/pojo.mustache
index 0510661279..39da0534dc 100644
--- a/src/main/resources/v2/Java/pojo.mustache
+++ b/src/main/resources/v2/Java/pojo.mustache
@@ -123,13 +123,13 @@ public class {{{getClassDefinition}}} {
   {{/supportJava6~}}
   {{#supportJava6~}}
   @Override
-  public boolean equals(java.lang.Object obj) {
+  public boolean equals(java.lang.Object o) {
   if (this == o) {
     return true;
   }
   if (o == null || getClass() != o.getClass()) {
     return false;
-  }{{#has this 'more'}}
+  }{{#has this 'vars'}}
     {{classname}} {{classVarName}} = ({{classname}}) o;
     return {{#vars}}ObjectUtils.equals(this.{{name}}, {{classVarName}}.{{name}}){{#has this 'more'}} &&
     {{/has}}{{/vars}}{{#parent}} &&
@@ -139,7 +139,7 @@ public class {{{getClassDefinition}}} {
 
   @Override
   public int hashCode() {
-    return ObjectUtils.hashCodeMulti({{#vars}}{{name}}{{#has this 'more'}}, {{/has}}{{/vars}}{{#parent}}{{#has this 'vars'}}, {{/has}}super.hashCode(){{/parent}});
+    return ObjectUtils.hashCodeMulti({{#vars}}{{name}}{{#has this 'more'}}, {{/has}}{{/vars}}{{#if parent}}{{#has this 'vars'}}, {{/has}}super.hashCode(){{/if}});
   }
   {{/supportJava6~}}