diff --git a/pom.xml.circleci b/pom.xml.circleci
index d5b0cfa077d4..cb08af71d346 100644
--- a/pom.xml.circleci
+++ b/pom.xml.circleci
@@ -833,7 +833,8 @@
                 <module>samples/client/petstore/java/retrofit2rx</module>
                 <module>samples/client/petstore/jaxrs-cxf-client</module>
                 <module>samples/client/petstore/java/resttemplate</module>
-                <!--<module>samples/client/petstore/java/resttemplate-withXml</module>-->
+                <module>samples/client/petstore/java/resttemplate-withXml</module>
+                <module>samples/client/petstore/java/vertx</module>
                 <module>samples/client/petstore/ruby</module>
                 <module>samples/client/petstore/kotlin/</module>
                 <!-- comment out bash as it's failing after switching to CircleCI
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/ApiClient.java
index 9c646d6e8f01..8fea4ac0ad92 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/ApiClient.java
@@ -45,6 +45,8 @@ public class ApiClient {
       RequestInterceptor auth;
       if ("api_key".equals(authName)) {
         auth = new ApiKeyAuth("header", "api_key");
+      } else if ("api_key_query".equals(authName)) {
+        auth = new ApiKeyAuth("query", "api_key_query");
       } else if ("http_basic_test".equals(authName)) {
         auth = new HttpBasicAuth();
       } else if ("petstore_auth".equals(authName)) {
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
index 88490c60da12..7fe69e168fd3 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@@ -127,6 +127,6 @@ public class AdditionalPropertiesClass {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Animal.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Animal.java
index 639ae9868b15..590f36c0ae07 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Animal.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Animal.java
@@ -115,6 +115,6 @@ public class Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java
index af905454860e..0b1d6a74cc6f 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java
@@ -60,6 +60,6 @@ public class AnimalFarm extends ArrayList<Animal> {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
index bb07ca990bff..b7e59a030a41 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
@@ -96,6 +96,6 @@ public class ArrayOfArrayOfNumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
index 45567259b111..fdfeb6856f31 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
@@ -96,6 +96,6 @@ public class ArrayOfNumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java
index 7f4e90a8e5f4..62665c2536a5 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java
@@ -158,6 +158,6 @@ public class ArrayTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Capitalization.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Capitalization.java
index 50363d32e7bc..a72b0a72f46b 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Capitalization.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Capitalization.java
@@ -200,6 +200,6 @@ public class Capitalization {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Cat.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Cat.java
index 6713ec2c1084..b882da0ad908 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Cat.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Cat.java
@@ -87,6 +87,6 @@ public class Cat extends Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Category.java
index 94a415b53371..464f4375c4b9 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Category.java
@@ -108,6 +108,6 @@ public class Category {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ClassModel.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ClassModel.java
index 91f7b71c7eeb..4f764fde68d7 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ClassModel.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ClassModel.java
@@ -86,6 +86,6 @@ public class ClassModel {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Client.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Client.java
index 322f094f0665..a7c4253499c3 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Client.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Client.java
@@ -85,6 +85,6 @@ public class Client {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Dog.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Dog.java
index 82ff0bf28bf5..7de179b2adea 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Dog.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Dog.java
@@ -87,6 +87,6 @@ public class Dog extends Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumArrays.java
index ba5b4727176b..12caa4802856 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumArrays.java
@@ -188,6 +188,6 @@ public class EnumArrays {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java
index 39ea674e9d83..93d0da037b62 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java
@@ -262,6 +262,6 @@ public class EnumTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/FormatTest.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/FormatTest.java
index 3897095d8402..4118656d29ee 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/FormatTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/FormatTest.java
@@ -375,6 +375,6 @@ public class FormatTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
index 5f3409317667..6dc9f12c4b80 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
@@ -90,6 +90,6 @@ public class HasOnlyReadOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MapTest.java
index ab6ae7b27f2f..e6344a1df0fb 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MapTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MapTest.java
@@ -162,6 +162,6 @@ public class MapTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 229669da93c8..29bfc7e8c084 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -145,6 +145,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Model200Response.java
index c7437cd4bd59..58624475e430 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Model200Response.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Model200Response.java
@@ -109,6 +109,6 @@ public class Model200Response {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java
index 3dc02cbefe6a..b010e53b48cd 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java
@@ -131,6 +131,6 @@ public class ModelApiResponse {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelReturn.java
index 5d7ae14f6c4b..27d085572487 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -86,6 +86,6 @@ public class ModelReturn {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Name.java
index 368dc4d6d893..f2b9b1703bd2 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Name.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Name.java
@@ -137,6 +137,6 @@ public class Name {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/NumberOnly.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/NumberOnly.java
index ab790ac11e03..ec93aba05314 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/NumberOnly.java
@@ -86,6 +86,6 @@ public class NumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Order.java
index adcd2b0d8217..6976ceb8fbaa 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Order.java
@@ -238,6 +238,6 @@ public class Order {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/OuterComposite.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/OuterComposite.java
index 7b1786ea96d8..02c16a99b70a 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/OuterComposite.java
@@ -132,6 +132,6 @@ public class OuterComposite {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java
index baab18e69426..4c351dec3e4c 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java
@@ -254,6 +254,6 @@ public class Pet {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
index 2bea40f1c2e7..76f8a912f36f 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@@ -99,6 +99,6 @@ public class ReadOnlyFirst {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SpecialModelName.java
index 561e8bd9a962..784eb8baca8d 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -85,6 +85,6 @@ public class SpecialModelName {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Tag.java
index 205eb6fef177..1cf2f5bc5e69 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Tag.java
@@ -108,6 +108,6 @@ public class Tag {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java
index b739854d867b..de5bc439c5ad 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java
@@ -246,6 +246,6 @@ public class User {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/ApiClient.java
index febb5a58c215..af34d8582673 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/ApiClient.java
@@ -661,8 +661,9 @@ public class ApiClient {
       response = builder.type(contentType).delete(ClientResponse.class, serialize(body, contentType, formParams));
     } else if ("PATCH".equals(method)) {
       response = builder.type(contentType).header("X-HTTP-Method-Override", "PATCH").post(ClientResponse.class, serialize(body, contentType, formParams));
-    }
-    else {
+    } else if ("HEAD".equals(method)) {
+      response = builder.head();
+    } else {
       throw new ApiException(500, "unknown method type " + method);
     }
     return response;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
index 88490c60da12..7fe69e168fd3 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@@ -127,6 +127,6 @@ public class AdditionalPropertiesClass {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Animal.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Animal.java
index 639ae9868b15..590f36c0ae07 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Animal.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Animal.java
@@ -115,6 +115,6 @@ public class Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/AnimalFarm.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/AnimalFarm.java
index af905454860e..0b1d6a74cc6f 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/AnimalFarm.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/AnimalFarm.java
@@ -60,6 +60,6 @@ public class AnimalFarm extends ArrayList<Animal> {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
index bb07ca990bff..b7e59a030a41 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
@@ -96,6 +96,6 @@ public class ArrayOfArrayOfNumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
index 45567259b111..fdfeb6856f31 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
@@ -96,6 +96,6 @@ public class ArrayOfNumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/ArrayTest.java
index 7f4e90a8e5f4..62665c2536a5 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/ArrayTest.java
@@ -158,6 +158,6 @@ public class ArrayTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Capitalization.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Capitalization.java
index 50363d32e7bc..a72b0a72f46b 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Capitalization.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Capitalization.java
@@ -200,6 +200,6 @@ public class Capitalization {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Cat.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Cat.java
index 6713ec2c1084..b882da0ad908 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Cat.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Cat.java
@@ -87,6 +87,6 @@ public class Cat extends Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Category.java
index 94a415b53371..464f4375c4b9 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Category.java
@@ -108,6 +108,6 @@ public class Category {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/ClassModel.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/ClassModel.java
index 91f7b71c7eeb..4f764fde68d7 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/ClassModel.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/ClassModel.java
@@ -86,6 +86,6 @@ public class ClassModel {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Client.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Client.java
index 322f094f0665..a7c4253499c3 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Client.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Client.java
@@ -85,6 +85,6 @@ public class Client {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Dog.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Dog.java
index 82ff0bf28bf5..7de179b2adea 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Dog.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Dog.java
@@ -87,6 +87,6 @@ public class Dog extends Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/EnumArrays.java
index ba5b4727176b..12caa4802856 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/EnumArrays.java
@@ -188,6 +188,6 @@ public class EnumArrays {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/EnumTest.java
index 39ea674e9d83..93d0da037b62 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/EnumTest.java
@@ -262,6 +262,6 @@ public class EnumTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/FormatTest.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/FormatTest.java
index 3897095d8402..4118656d29ee 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/FormatTest.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/FormatTest.java
@@ -375,6 +375,6 @@ public class FormatTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
index 5f3409317667..6dc9f12c4b80 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
@@ -90,6 +90,6 @@ public class HasOnlyReadOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/MapTest.java
index ab6ae7b27f2f..e6344a1df0fb 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/MapTest.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/MapTest.java
@@ -162,6 +162,6 @@ public class MapTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 229669da93c8..29bfc7e8c084 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -145,6 +145,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Model200Response.java
index c7437cd4bd59..58624475e430 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Model200Response.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Model200Response.java
@@ -109,6 +109,6 @@ public class Model200Response {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/ModelApiResponse.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/ModelApiResponse.java
index 3dc02cbefe6a..b010e53b48cd 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/ModelApiResponse.java
@@ -131,6 +131,6 @@ public class ModelApiResponse {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/ModelReturn.java
index 5d7ae14f6c4b..27d085572487 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -86,6 +86,6 @@ public class ModelReturn {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Name.java
index 368dc4d6d893..f2b9b1703bd2 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Name.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Name.java
@@ -137,6 +137,6 @@ public class Name {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/NumberOnly.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/NumberOnly.java
index ab790ac11e03..ec93aba05314 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/NumberOnly.java
@@ -86,6 +86,6 @@ public class NumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Order.java
index adcd2b0d8217..6976ceb8fbaa 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Order.java
@@ -238,6 +238,6 @@ public class Order {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/OuterComposite.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/OuterComposite.java
index 7b1786ea96d8..02c16a99b70a 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/OuterComposite.java
@@ -132,6 +132,6 @@ public class OuterComposite {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Pet.java
index baab18e69426..4c351dec3e4c 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Pet.java
@@ -254,6 +254,6 @@ public class Pet {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
index 2bea40f1c2e7..76f8a912f36f 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@@ -99,6 +99,6 @@ public class ReadOnlyFirst {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/SpecialModelName.java
index 561e8bd9a962..784eb8baca8d 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -85,6 +85,6 @@ public class SpecialModelName {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Tag.java
index 205eb6fef177..1cf2f5bc5e69 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Tag.java
@@ -108,6 +108,6 @@ public class Tag {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/User.java
index b739854d867b..de5bc439c5ad 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/User.java
@@ -246,6 +246,6 @@ public class User {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git 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
index 042178a3e4a7..3dcfc2b61954 100644
--- 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
@@ -626,7 +626,7 @@ public class ApiClient {
    *
    * @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 method The request method, one of "GET", "POST", "PUT", "HEAD" and "DELETE"
    * @param queryParams The query parameters
    * @param body The request body object
    * @param headerParams The header parameters
@@ -687,6 +687,8 @@ public class ApiClient {
         response = invocationBuilder.delete();
       } else if ("PATCH".equals(method)) {
         response = invocationBuilder.method("PATCH", entity);
+      } else if ("HEAD".equals(method)) {
+        response = invocationBuilder.head();
       } else {
         throw new ApiException(500, "unknown method type " + method);
       }
diff --git 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
index 7c0587d3882a..2be1838838c4 100644
--- 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
@@ -127,6 +127,6 @@ public class AdditionalPropertiesClass {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git 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
index 8600ef9ed803..b64a9d4388d5 100644
--- 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
@@ -115,6 +115,6 @@ public class Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git 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
index ac4c22a76d72..382a9368aa0d 100644
--- 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
@@ -60,6 +60,6 @@ public class AnimalFarm extends ArrayList<Animal> {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git 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
index a95f356f6aa6..f4b8c8c9fb3b 100644
--- 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
@@ -96,6 +96,6 @@ public class ArrayOfArrayOfNumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git 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
index efbf7672c533..7eb9c03fc79f 100644
--- 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
@@ -96,6 +96,6 @@ public class ArrayOfNumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git 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
index 83f997503f5b..11505132cd98 100644
--- 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
@@ -158,6 +158,6 @@ public class ArrayTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git 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
index 36436805be6c..8bf2311949e0 100644
--- 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
@@ -200,6 +200,6 @@ public class Capitalization {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git 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
index fe1f0ce994bd..958c985cb92a 100644
--- 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
@@ -87,6 +87,6 @@ public class Cat extends Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git 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
index 301e2e034606..1853e6d1589a 100644
--- 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
@@ -108,6 +108,6 @@ public class Category {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git 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
index 5e62322e0209..4f3a3145863d 100644
--- 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
@@ -86,6 +86,6 @@ public class ClassModel {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git 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
index 010409d01c6b..d85880077b5b 100644
--- 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
@@ -85,6 +85,6 @@ public class Client {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git 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
index 9289e985bdc1..8c67027ad963 100644
--- 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
@@ -87,6 +87,6 @@ public class Dog extends Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git 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
index 86f3e1f63c47..fa58bb72b8c1 100644
--- 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
@@ -188,6 +188,6 @@ public class EnumArrays {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git 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
index d5a5152c8737..1ff3b541245e 100644
--- 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
@@ -262,6 +262,6 @@ public class EnumTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git 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
index 0ed06c2934ed..1eac24d55c6e 100644
--- 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
@@ -375,6 +375,6 @@ public class FormatTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git 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
index e80ea1c7a79c..cbf3cb3f9555 100644
--- 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
@@ -90,6 +90,6 @@ public class HasOnlyReadOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git 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
index 0ccb9aec6146..6e0a97bbc726 100644
--- 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
@@ -162,6 +162,6 @@ public class MapTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git 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
index 06ff5b6287f4..5ff907a79000 100644
--- 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
@@ -145,6 +145,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git 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
index 357df5d3b975..b32ea0a16c42 100644
--- 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
@@ -109,6 +109,6 @@ public class Model200Response {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git 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
index 3dbb49b4160c..764534696b77 100644
--- 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
@@ -131,6 +131,6 @@ public class ModelApiResponse {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git 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
index 0ad6febfb6df..f8c0979d43c2 100644
--- 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
@@ -86,6 +86,6 @@ public class ModelReturn {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git 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
index 169565dc2b93..a3c678b021f9 100644
--- 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
@@ -137,6 +137,6 @@ public class Name {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git 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
index 8a440a83cda8..a4fffd86805c 100644
--- 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
@@ -86,6 +86,6 @@ public class NumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git 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
index 7db40bf27579..fba033c63b94 100644
--- 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
@@ -238,6 +238,6 @@ public class Order {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/OuterComposite.java b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/OuterComposite.java
index 0b80c71974a8..0f84b926a5b2 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/OuterComposite.java
@@ -132,6 +132,6 @@ public class OuterComposite {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git 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
index cd742a6496f4..be3b82347e40 100644
--- 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
@@ -254,6 +254,6 @@ public class Pet {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git 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
index b9c02c943283..8aa0c00583e3 100644
--- 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
@@ -99,6 +99,6 @@ public class ReadOnlyFirst {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git 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
index d193875218c3..6c750b2d75d3 100644
--- 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
@@ -85,6 +85,6 @@ public class SpecialModelName {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git 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
index 8dde6195eb40..c1d2ba92ee2f 100644
--- 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
@@ -108,6 +108,6 @@ public class Tag {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git 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
index 8b75cbc63637..04bfc454d258 100644
--- 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
@@ -246,6 +246,6 @@ public class User {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/docs/FakeClassnameTags123Api.md b/samples/client/petstore/java/jersey2-java8/docs/FakeClassnameTags123Api.md
index 468108b748ae..bc728bfce5b8 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/FakeClassnameTags123Api.md
@@ -16,9 +16,19 @@ To test class name in snake case
 ### Example
 ```java
 // Import classes:
+//import io.swagger.client.ApiClient;
 //import io.swagger.client.ApiException;
+//import io.swagger.client.Configuration;
+//import io.swagger.client.auth.*;
 //import io.swagger.client.api.FakeClassnameTags123Api;
 
+ApiClient defaultClient = Configuration.getDefaultApiClient();
+
+// Configure API key authorization: api_key_query
+ApiKeyAuth api_key_query = (ApiKeyAuth) defaultClient.getAuthentication("api_key_query");
+api_key_query.setApiKey("YOUR API KEY");
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//api_key_query.setApiKeyPrefix("Token");
 
 FakeClassnameTags123Api apiInstance = new FakeClassnameTags123Api();
 Client body = new Client(); // Client | client model
@@ -43,7 +53,7 @@ Name | Type | Description  | Notes
 
 ### Authorization
 
-No authorization required
+[api_key_query](../README.md#api_key_query)
 
 ### HTTP request headers
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/ApiClient.java
index c9b0a51e0d9b..badad2664546 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/ApiClient.java
@@ -13,6 +13,7 @@ import javax.ws.rs.core.Response.Status;
 
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.client.ClientProperties;
+import org.glassfish.jersey.client.HttpUrlConnectorProvider;
 import org.glassfish.jersey.jackson.JacksonFeature;
 import org.glassfish.jersey.logging.LoggingFeature;
 import org.glassfish.jersey.media.multipart.FormDataBodyPart;
@@ -79,6 +80,7 @@ public class ApiClient {
     // Setup authentications (key: authentication name, value: authentication).
     authentications = new HashMap<String, Authentication>();
     authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
+    authentications.put("api_key_query", new ApiKeyAuth("query", "api_key_query"));
     authentications.put("http_basic_test", new HttpBasicAuth());
     authentications.put("petstore_auth", new OAuth());
     // Prevent the authentications from being modified.
@@ -624,7 +626,7 @@ public class ApiClient {
    *
    * @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 method The request method, one of "GET", "POST", "PUT", "HEAD" and "DELETE"
    * @param queryParams The query parameters
    * @param body The request body object
    * @param headerParams The header parameters
@@ -684,7 +686,9 @@ public class ApiClient {
       } else if ("DELETE".equals(method)) {
         response = invocationBuilder.delete();
       } else if ("PATCH".equals(method)) {
-        response = invocationBuilder.header("X-HTTP-Method-Override", "PATCH").post(entity);
+        response = invocationBuilder.method("PATCH", entity);
+      } else if ("HEAD".equals(method)) {
+        response = invocationBuilder.head();
       } else {
         throw new ApiException(500, "unknown method type " + method);
       }
@@ -735,6 +739,7 @@ public class ApiClient {
     clientConfig.register(MultiPartFeature.class);
     clientConfig.register(json);
     clientConfig.register(JacksonFeature.class);
+    clientConfig.property(HttpUrlConnectorProvider.SET_METHOD_WORKAROUND, true);
     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);
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java
index 08b909ba04b4..41b78ca6524c 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java
@@ -70,7 +70,7 @@ public class FakeClassnameTags123Api {
     };
     final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
 
-    String[] localVarAuthNames = new String[] {  };
+    String[] localVarAuthNames = new String[] { "api_key_query" };
 
     GenericType<Client> localVarReturnType = new GenericType<Client>() {};
     return apiClient.invokeAPI(localVarPath, "PATCH", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
index 88490c60da12..7fe69e168fd3 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@@ -127,6 +127,6 @@ public class AdditionalPropertiesClass {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Animal.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Animal.java
index 639ae9868b15..590f36c0ae07 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Animal.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Animal.java
@@ -115,6 +115,6 @@ public class Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/AnimalFarm.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/AnimalFarm.java
index af905454860e..0b1d6a74cc6f 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/AnimalFarm.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/AnimalFarm.java
@@ -60,6 +60,6 @@ public class AnimalFarm extends ArrayList<Animal> {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
index bb07ca990bff..b7e59a030a41 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
@@ -96,6 +96,6 @@ public class ArrayOfArrayOfNumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
index 45567259b111..fdfeb6856f31 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
@@ -96,6 +96,6 @@ public class ArrayOfNumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/ArrayTest.java
index 7f4e90a8e5f4..62665c2536a5 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/ArrayTest.java
@@ -158,6 +158,6 @@ public class ArrayTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Capitalization.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Capitalization.java
index 50363d32e7bc..a72b0a72f46b 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Capitalization.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Capitalization.java
@@ -200,6 +200,6 @@ public class Capitalization {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Cat.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Cat.java
index 6713ec2c1084..b882da0ad908 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Cat.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Cat.java
@@ -87,6 +87,6 @@ public class Cat extends Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Category.java
index 94a415b53371..464f4375c4b9 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Category.java
@@ -108,6 +108,6 @@ public class Category {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/ClassModel.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/ClassModel.java
index 91f7b71c7eeb..4f764fde68d7 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/ClassModel.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/ClassModel.java
@@ -86,6 +86,6 @@ public class ClassModel {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Client.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Client.java
index 322f094f0665..a7c4253499c3 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Client.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Client.java
@@ -85,6 +85,6 @@ public class Client {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Dog.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Dog.java
index 82ff0bf28bf5..7de179b2adea 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Dog.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Dog.java
@@ -87,6 +87,6 @@ public class Dog extends Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/EnumArrays.java
index ba5b4727176b..12caa4802856 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/EnumArrays.java
@@ -188,6 +188,6 @@ public class EnumArrays {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/EnumTest.java
index 39ea674e9d83..93d0da037b62 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/EnumTest.java
@@ -262,6 +262,6 @@ public class EnumTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/FormatTest.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/FormatTest.java
index ca0e256bd4af..3fba5124727a 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/FormatTest.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/FormatTest.java
@@ -375,6 +375,6 @@ public class FormatTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
index 5f3409317667..6dc9f12c4b80 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
@@ -90,6 +90,6 @@ public class HasOnlyReadOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/MapTest.java
index ab6ae7b27f2f..e6344a1df0fb 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/MapTest.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/MapTest.java
@@ -162,6 +162,6 @@ public class MapTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 7552863e525d..b0736f316e39 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -145,6 +145,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Model200Response.java
index c7437cd4bd59..58624475e430 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Model200Response.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Model200Response.java
@@ -109,6 +109,6 @@ public class Model200Response {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/ModelApiResponse.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/ModelApiResponse.java
index 3dc02cbefe6a..b010e53b48cd 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/ModelApiResponse.java
@@ -131,6 +131,6 @@ public class ModelApiResponse {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/ModelReturn.java
index 5d7ae14f6c4b..27d085572487 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -86,6 +86,6 @@ public class ModelReturn {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Name.java
index 368dc4d6d893..f2b9b1703bd2 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Name.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Name.java
@@ -137,6 +137,6 @@ public class Name {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/NumberOnly.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/NumberOnly.java
index ab790ac11e03..ec93aba05314 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/NumberOnly.java
@@ -86,6 +86,6 @@ public class NumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Order.java
index 2df787c40ac9..55f9a8dba21c 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Order.java
@@ -238,6 +238,6 @@ public class Order {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/OuterComposite.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/OuterComposite.java
index 7b1786ea96d8..02c16a99b70a 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/OuterComposite.java
@@ -132,6 +132,6 @@ public class OuterComposite {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Pet.java
index baab18e69426..4c351dec3e4c 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Pet.java
@@ -254,6 +254,6 @@ public class Pet {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
index 2bea40f1c2e7..76f8a912f36f 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@@ -99,6 +99,6 @@ public class ReadOnlyFirst {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/SpecialModelName.java
index 561e8bd9a962..784eb8baca8d 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -85,6 +85,6 @@ public class SpecialModelName {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Tag.java
index 205eb6fef177..1cf2f5bc5e69 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Tag.java
@@ -108,6 +108,6 @@ public class Tag {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/User.java
index b739854d867b..de5bc439c5ad 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/User.java
@@ -246,6 +246,6 @@ public class User {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java
index 1421f40d4a7d..badad2664546 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java
@@ -626,7 +626,7 @@ public class ApiClient {
    *
    * @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 method The request method, one of "GET", "POST", "PUT", "HEAD" and "DELETE"
    * @param queryParams The query parameters
    * @param body The request body object
    * @param headerParams The header parameters
@@ -687,6 +687,8 @@ public class ApiClient {
         response = invocationBuilder.delete();
       } else if ("PATCH".equals(method)) {
         response = invocationBuilder.method("PATCH", entity);
+      } else if ("HEAD".equals(method)) {
+        response = invocationBuilder.head();
       } else {
         throw new ApiException(500, "unknown method type " + method);
       }
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
index 88490c60da12..7fe69e168fd3 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@@ -127,6 +127,6 @@ public class AdditionalPropertiesClass {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Animal.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Animal.java
index 639ae9868b15..590f36c0ae07 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Animal.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Animal.java
@@ -115,6 +115,6 @@ public class Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/AnimalFarm.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/AnimalFarm.java
index af905454860e..0b1d6a74cc6f 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/AnimalFarm.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/AnimalFarm.java
@@ -60,6 +60,6 @@ public class AnimalFarm extends ArrayList<Animal> {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
index bb07ca990bff..b7e59a030a41 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
@@ -96,6 +96,6 @@ public class ArrayOfArrayOfNumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
index 45567259b111..fdfeb6856f31 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
@@ -96,6 +96,6 @@ public class ArrayOfNumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ArrayTest.java
index 7f4e90a8e5f4..62665c2536a5 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ArrayTest.java
@@ -158,6 +158,6 @@ public class ArrayTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Capitalization.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Capitalization.java
index 50363d32e7bc..a72b0a72f46b 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Capitalization.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Capitalization.java
@@ -200,6 +200,6 @@ public class Capitalization {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Cat.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Cat.java
index 6713ec2c1084..b882da0ad908 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Cat.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Cat.java
@@ -87,6 +87,6 @@ public class Cat extends Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Category.java
index 94a415b53371..464f4375c4b9 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Category.java
@@ -108,6 +108,6 @@ public class Category {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ClassModel.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ClassModel.java
index 91f7b71c7eeb..4f764fde68d7 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ClassModel.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ClassModel.java
@@ -86,6 +86,6 @@ public class ClassModel {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Client.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Client.java
index 322f094f0665..a7c4253499c3 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Client.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Client.java
@@ -85,6 +85,6 @@ public class Client {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Dog.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Dog.java
index 82ff0bf28bf5..7de179b2adea 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Dog.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Dog.java
@@ -87,6 +87,6 @@ public class Dog extends Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumArrays.java
index ba5b4727176b..12caa4802856 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumArrays.java
@@ -188,6 +188,6 @@ public class EnumArrays {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumTest.java
index 39ea674e9d83..93d0da037b62 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumTest.java
@@ -262,6 +262,6 @@ public class EnumTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/FormatTest.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/FormatTest.java
index 3897095d8402..4118656d29ee 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/FormatTest.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/FormatTest.java
@@ -375,6 +375,6 @@ public class FormatTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
index 5f3409317667..6dc9f12c4b80 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
@@ -90,6 +90,6 @@ public class HasOnlyReadOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/MapTest.java
index ab6ae7b27f2f..e6344a1df0fb 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/MapTest.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/MapTest.java
@@ -162,6 +162,6 @@ public class MapTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 229669da93c8..29bfc7e8c084 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -145,6 +145,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Model200Response.java
index c7437cd4bd59..58624475e430 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Model200Response.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Model200Response.java
@@ -109,6 +109,6 @@ public class Model200Response {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelApiResponse.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelApiResponse.java
index 3dc02cbefe6a..b010e53b48cd 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelApiResponse.java
@@ -131,6 +131,6 @@ public class ModelApiResponse {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelReturn.java
index 5d7ae14f6c4b..27d085572487 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -86,6 +86,6 @@ public class ModelReturn {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Name.java
index 368dc4d6d893..f2b9b1703bd2 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Name.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Name.java
@@ -137,6 +137,6 @@ public class Name {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/NumberOnly.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/NumberOnly.java
index ab790ac11e03..ec93aba05314 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/NumberOnly.java
@@ -86,6 +86,6 @@ public class NumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java
index adcd2b0d8217..6976ceb8fbaa 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java
@@ -238,6 +238,6 @@ public class Order {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/OuterComposite.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/OuterComposite.java
index 7b1786ea96d8..02c16a99b70a 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/OuterComposite.java
@@ -132,6 +132,6 @@ public class OuterComposite {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java
index baab18e69426..4c351dec3e4c 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java
@@ -254,6 +254,6 @@ public class Pet {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
index 2bea40f1c2e7..76f8a912f36f 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@@ -99,6 +99,6 @@ public class ReadOnlyFirst {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/SpecialModelName.java
index 561e8bd9a962..784eb8baca8d 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -85,6 +85,6 @@ public class SpecialModelName {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Tag.java
index 205eb6fef177..1cf2f5bc5e69 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Tag.java
@@ -108,6 +108,6 @@ public class Tag {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/User.java
index b739854d867b..de5bc439c5ad 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/User.java
@@ -246,6 +246,6 @@ public class User {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FakeClassnameTags123Api.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FakeClassnameTags123Api.md
index 468108b748ae..bc728bfce5b8 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FakeClassnameTags123Api.md
@@ -16,9 +16,19 @@ To test class name in snake case
 ### Example
 ```java
 // Import classes:
+//import io.swagger.client.ApiClient;
 //import io.swagger.client.ApiException;
+//import io.swagger.client.Configuration;
+//import io.swagger.client.auth.*;
 //import io.swagger.client.api.FakeClassnameTags123Api;
 
+ApiClient defaultClient = Configuration.getDefaultApiClient();
+
+// Configure API key authorization: api_key_query
+ApiKeyAuth api_key_query = (ApiKeyAuth) defaultClient.getAuthentication("api_key_query");
+api_key_query.setApiKey("YOUR API KEY");
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//api_key_query.setApiKeyPrefix("Token");
 
 FakeClassnameTags123Api apiInstance = new FakeClassnameTags123Api();
 Client body = new Client(); // Client | client model
@@ -43,7 +53,7 @@ Name | Type | Description  | Notes
 
 ### Authorization
 
-No authorization required
+[api_key_query](../README.md#api_key_query)
 
 ### HTTP request headers
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/ApiClient.java
index 90bc07435ca3..60d49acd4ab6 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/ApiClient.java
@@ -90,6 +90,7 @@ public class ApiClient {
         // Setup authentications (key: authentication name, value: authentication).
         authentications = new HashMap<String, Authentication>();
         authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
+        authentications.put("api_key_query", new ApiKeyAuth("query", "api_key_query"));
         authentications.put("http_basic_test", new HttpBasicAuth());
         authentications.put("petstore_auth", new OAuth());
         // Prevent the authentications from being modified.
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java
index 99d4beeaf430..da29f1c830c5 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java
@@ -99,7 +99,7 @@ public class FakeClassnameTags123Api {
             });
         }
 
-        String[] localVarAuthNames = new String[] {  };
+        String[] localVarAuthNames = new String[] { "api_key_query" };
         return apiClient.buildCall(localVarPath, "PATCH", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
     }
     
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
index 4b5443698a98..b6ccfc439026 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@@ -132,7 +132,7 @@ public class AdditionalPropertiesClass implements Parcelable {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
   public void writeToParcel(Parcel out, int flags) {
      
     out.writeValue(mapProperty);
@@ -149,7 +149,7 @@ public class AdditionalPropertiesClass implements Parcelable {
     mapProperty = (Map<String, String>)in.readValue(null);
     mapOfMapProperty = (Map<String, Map<String, String>>)in.readValue(Map.class.getClassLoader());
   }
-  
+
   public int describeContents() {
     return 0;
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Animal.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Animal.java
index 4892a9b6f29e..89ddcdc99ec8 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Animal.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Animal.java
@@ -114,7 +114,7 @@ public class Animal implements Parcelable {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
   public void writeToParcel(Parcel out, int flags) {
      
     out.writeValue(className);
@@ -131,7 +131,7 @@ public class Animal implements Parcelable {
     className = (String)in.readValue(null);
     color = (String)in.readValue(null);
   }
-  
+
   public int describeContents() {
     return 0;
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/AnimalFarm.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/AnimalFarm.java
index 20d4c0d25866..a844db02e091 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/AnimalFarm.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/AnimalFarm.java
@@ -62,7 +62,7 @@ public class AnimalFarm extends ArrayList<Animal> implements Parcelable {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
   public void writeToParcel(Parcel out, int flags) {
      super.writeToParcel(out, flags);    }
 
@@ -73,7 +73,7 @@ public class AnimalFarm extends ArrayList<Animal> implements Parcelable {
   AnimalFarm(Parcel in) {
      super(in); 
   }
-  
+
   public int describeContents() {
     return 0;
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
index d1e59b11c184..cdaf9bf9d114 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
@@ -101,7 +101,7 @@ public class ArrayOfArrayOfNumberOnly implements Parcelable {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
   public void writeToParcel(Parcel out, int flags) {
      
     out.writeValue(arrayArrayNumber);
@@ -115,7 +115,7 @@ public class ArrayOfArrayOfNumberOnly implements Parcelable {
     
     arrayArrayNumber = (List<List<BigDecimal>>)in.readValue(List.class.getClassLoader());
   }
-  
+
   public int describeContents() {
     return 0;
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
index e4e6e5ee2b54..31235c82a668 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
@@ -101,7 +101,7 @@ public class ArrayOfNumberOnly implements Parcelable {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
   public void writeToParcel(Parcel out, int flags) {
      
     out.writeValue(arrayNumber);
@@ -115,7 +115,7 @@ public class ArrayOfNumberOnly implements Parcelable {
     
     arrayNumber = (List<BigDecimal>)in.readValue(BigDecimal.class.getClassLoader());
   }
-  
+
   public int describeContents() {
     return 0;
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/ArrayTest.java
index faf429ff0b8a..a8a208ede459 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/ArrayTest.java
@@ -163,7 +163,7 @@ public class ArrayTest implements Parcelable {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
   public void writeToParcel(Parcel out, int flags) {
      
     out.writeValue(arrayOfString);
@@ -183,7 +183,7 @@ public class ArrayTest implements Parcelable {
     arrayArrayOfInteger = (List<List<Long>>)in.readValue(List.class.getClassLoader());
     arrayArrayOfModel = (List<List<ReadOnlyFirst>>)in.readValue(List.class.getClassLoader());
   }
-  
+
   public int describeContents() {
     return 0;
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Capitalization.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Capitalization.java
index 83c13530fd40..01fdd9ca9631 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Capitalization.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Capitalization.java
@@ -205,7 +205,7 @@ public class Capitalization implements Parcelable {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
   public void writeToParcel(Parcel out, int flags) {
      
     out.writeValue(smallCamel);
@@ -234,7 +234,7 @@ public class Capitalization implements Parcelable {
     scAETHFlowPoints = (String)in.readValue(null);
     ATT_NAME = (String)in.readValue(null);
   }
-  
+
   public int describeContents() {
     return 0;
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Cat.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Cat.java
index 8b05666d75b2..5fdb74cbd1e7 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Cat.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Cat.java
@@ -92,7 +92,7 @@ public class Cat extends Animal implements Parcelable {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
   public void writeToParcel(Parcel out, int flags) {
      super.writeToParcel(out, flags);  
     out.writeValue(declawed);
@@ -106,7 +106,7 @@ public class Cat extends Animal implements Parcelable {
      super(in); 
     declawed = (Boolean)in.readValue(null);
   }
-  
+
   public int describeContents() {
     return 0;
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Category.java
index 6aea3311b228..9a604aa8227f 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Category.java
@@ -113,7 +113,7 @@ public class Category implements Parcelable {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
   public void writeToParcel(Parcel out, int flags) {
      
     out.writeValue(id);
@@ -130,7 +130,7 @@ public class Category implements Parcelable {
     id = (Long)in.readValue(null);
     name = (String)in.readValue(null);
   }
-  
+
   public int describeContents() {
     return 0;
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/ClassModel.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/ClassModel.java
index dcba71299011..6cc1bac7b54f 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/ClassModel.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/ClassModel.java
@@ -91,7 +91,7 @@ public class ClassModel implements Parcelable {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
   public void writeToParcel(Parcel out, int flags) {
      
     out.writeValue(propertyClass);
@@ -105,7 +105,7 @@ public class ClassModel implements Parcelable {
     
     propertyClass = (String)in.readValue(null);
   }
-  
+
   public int describeContents() {
     return 0;
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Client.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Client.java
index 1418d6837ab2..1b73505df83f 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Client.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Client.java
@@ -90,7 +90,7 @@ public class Client implements Parcelable {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
   public void writeToParcel(Parcel out, int flags) {
      
     out.writeValue(client);
@@ -104,7 +104,7 @@ public class Client implements Parcelable {
     
     client = (String)in.readValue(null);
   }
-  
+
   public int describeContents() {
     return 0;
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Dog.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Dog.java
index f2c2799f7e42..e6afcc17e57f 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Dog.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Dog.java
@@ -92,7 +92,7 @@ public class Dog extends Animal implements Parcelable {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
   public void writeToParcel(Parcel out, int flags) {
      super.writeToParcel(out, flags);  
     out.writeValue(breed);
@@ -106,7 +106,7 @@ public class Dog extends Animal implements Parcelable {
      super(in); 
     breed = (String)in.readValue(null);
   }
-  
+
   public int describeContents() {
     return 0;
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/EnumArrays.java
index bd199d078bf4..0bf8c81509be 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/EnumArrays.java
@@ -217,7 +217,7 @@ public class EnumArrays implements Parcelable {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
   public void writeToParcel(Parcel out, int flags) {
      
     out.writeValue(justSymbol);
@@ -234,7 +234,7 @@ public class EnumArrays implements Parcelable {
     justSymbol = (JustSymbolEnum)in.readValue(null);
     arrayEnum = (List<ArrayEnumEnum>)in.readValue(null);
   }
-  
+
   public int describeContents() {
     return 0;
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/EnumTest.java
index e8434e1db4ed..7740669efa2b 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/EnumTest.java
@@ -303,7 +303,7 @@ public class EnumTest implements Parcelable {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
   public void writeToParcel(Parcel out, int flags) {
      
     out.writeValue(enumString);
@@ -326,7 +326,7 @@ public class EnumTest implements Parcelable {
     enumNumber = (EnumNumberEnum)in.readValue(null);
     outerEnum = (OuterEnum)in.readValue(OuterEnum.class.getClassLoader());
   }
-  
+
   public int describeContents() {
     return 0;
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/FormatTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/FormatTest.java
index 2c7916197a0e..c9128a2a52b7 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/FormatTest.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/FormatTest.java
@@ -380,7 +380,7 @@ public class FormatTest implements Parcelable {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
   public void writeToParcel(Parcel out, int flags) {
      
     out.writeValue(integer);
@@ -430,7 +430,7 @@ public class FormatTest implements Parcelable {
     uuid = (UUID)in.readValue(UUID.class.getClassLoader());
     password = (String)in.readValue(null);
   }
-  
+
   public int describeContents() {
     return 0;
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
index 6e163b1e4f4d..f95ff9951f9b 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
@@ -95,7 +95,7 @@ public class HasOnlyReadOnly implements Parcelable {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
   public void writeToParcel(Parcel out, int flags) {
      
     out.writeValue(bar);
@@ -112,7 +112,7 @@ public class HasOnlyReadOnly implements Parcelable {
     bar = (String)in.readValue(null);
     foo = (String)in.readValue(null);
   }
-  
+
   public int describeContents() {
     return 0;
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/MapTest.java
index 3b31a79c9c40..079daa6d717c 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/MapTest.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/MapTest.java
@@ -179,7 +179,7 @@ public class MapTest implements Parcelable {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
   public void writeToParcel(Parcel out, int flags) {
      
     out.writeValue(mapMapOfString);
@@ -196,7 +196,7 @@ public class MapTest implements Parcelable {
     mapMapOfString = (Map<String, Map<String, String>>)in.readValue(Map.class.getClassLoader());
     mapOfEnumString = (Map<String, InnerEnum>)in.readValue(null);
   }
-  
+
   public int describeContents() {
     return 0;
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 5fb3022b0127..345de3875430 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -150,7 +150,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Parcelable {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
   public void writeToParcel(Parcel out, int flags) {
      
     out.writeValue(uuid);
@@ -170,7 +170,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Parcelable {
     dateTime = (OffsetDateTime)in.readValue(OffsetDateTime.class.getClassLoader());
     map = (Map<String, Animal>)in.readValue(Animal.class.getClassLoader());
   }
-  
+
   public int describeContents() {
     return 0;
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Model200Response.java
index 8b345e0b9abf..fee0bdffb900 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Model200Response.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Model200Response.java
@@ -114,7 +114,7 @@ public class Model200Response implements Parcelable {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
   public void writeToParcel(Parcel out, int flags) {
      
     out.writeValue(name);
@@ -131,7 +131,7 @@ public class Model200Response implements Parcelable {
     name = (Integer)in.readValue(null);
     propertyClass = (String)in.readValue(null);
   }
-  
+
   public int describeContents() {
     return 0;
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/ModelApiResponse.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/ModelApiResponse.java
index 9faf8dca2d8a..80bad00f37b1 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/ModelApiResponse.java
@@ -136,7 +136,7 @@ public class ModelApiResponse implements Parcelable {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
   public void writeToParcel(Parcel out, int flags) {
      
     out.writeValue(code);
@@ -156,7 +156,7 @@ public class ModelApiResponse implements Parcelable {
     type = (String)in.readValue(null);
     message = (String)in.readValue(null);
   }
-  
+
   public int describeContents() {
     return 0;
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/ModelReturn.java
index e03e73c8971d..d1cb38fd7cb7 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -91,7 +91,7 @@ public class ModelReturn implements Parcelable {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
   public void writeToParcel(Parcel out, int flags) {
      
     out.writeValue(_return);
@@ -105,7 +105,7 @@ public class ModelReturn implements Parcelable {
     
     _return = (Integer)in.readValue(null);
   }
-  
+
   public int describeContents() {
     return 0;
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Name.java
index edca51506cc0..60cbdc3aa5de 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Name.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Name.java
@@ -142,7 +142,7 @@ public class Name implements Parcelable {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
   public void writeToParcel(Parcel out, int flags) {
      
     out.writeValue(name);
@@ -165,7 +165,7 @@ public class Name implements Parcelable {
     property = (String)in.readValue(null);
     _123Number = (Integer)in.readValue(null);
   }
-  
+
   public int describeContents() {
     return 0;
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/NumberOnly.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/NumberOnly.java
index 8246ad30efe2..2b28fe9bf57f 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/NumberOnly.java
@@ -91,7 +91,7 @@ public class NumberOnly implements Parcelable {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
   public void writeToParcel(Parcel out, int flags) {
      
     out.writeValue(justNumber);
@@ -105,7 +105,7 @@ public class NumberOnly implements Parcelable {
     
     justNumber = (BigDecimal)in.readValue(BigDecimal.class.getClassLoader());
   }
-  
+
   public int describeContents() {
     return 0;
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Order.java
index 530643ab4e5a..008233f13a90 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Order.java
@@ -255,7 +255,7 @@ public class Order implements Parcelable {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
   public void writeToParcel(Parcel out, int flags) {
      
     out.writeValue(id);
@@ -284,7 +284,7 @@ public class Order implements Parcelable {
     status = (StatusEnum)in.readValue(null);
     complete = (Boolean)in.readValue(null);
   }
-  
+
   public int describeContents() {
     return 0;
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/OuterComposite.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/OuterComposite.java
index 950d5fa98c6b..cf9f2f1fc782 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/OuterComposite.java
@@ -137,7 +137,7 @@ public class OuterComposite implements Parcelable {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
   public void writeToParcel(Parcel out, int flags) {
      
     out.writeValue(myNumber);
@@ -157,7 +157,7 @@ public class OuterComposite implements Parcelable {
     myString = (String)in.readValue(null);
     myBoolean = (Boolean)in.readValue(null);
   }
-  
+
   public int describeContents() {
     return 0;
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Pet.java
index 3ef2da0334c1..37bbf49875f4 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Pet.java
@@ -271,7 +271,7 @@ public class Pet implements Parcelable {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
   public void writeToParcel(Parcel out, int flags) {
      
     out.writeValue(id);
@@ -300,7 +300,7 @@ public class Pet implements Parcelable {
     tags = (List<Tag>)in.readValue(Tag.class.getClassLoader());
     status = (StatusEnum)in.readValue(null);
   }
-  
+
   public int describeContents() {
     return 0;
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
index c9a17a94a7a8..d79499f240bd 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@@ -104,7 +104,7 @@ public class ReadOnlyFirst implements Parcelable {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
   public void writeToParcel(Parcel out, int flags) {
      
     out.writeValue(bar);
@@ -121,7 +121,7 @@ public class ReadOnlyFirst implements Parcelable {
     bar = (String)in.readValue(null);
     baz = (String)in.readValue(null);
   }
-  
+
   public int describeContents() {
     return 0;
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/SpecialModelName.java
index 66ddd00b8ebe..c04c8185f206 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -90,7 +90,7 @@ public class SpecialModelName implements Parcelable {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
   public void writeToParcel(Parcel out, int flags) {
      
     out.writeValue(specialPropertyName);
@@ -104,7 +104,7 @@ public class SpecialModelName implements Parcelable {
     
     specialPropertyName = (Long)in.readValue(null);
   }
-  
+
   public int describeContents() {
     return 0;
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Tag.java
index e8afd20f33e9..7557a6fbf347 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Tag.java
@@ -113,7 +113,7 @@ public class Tag implements Parcelable {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
   public void writeToParcel(Parcel out, int flags) {
      
     out.writeValue(id);
@@ -130,7 +130,7 @@ public class Tag implements Parcelable {
     id = (Long)in.readValue(null);
     name = (String)in.readValue(null);
   }
-  
+
   public int describeContents() {
     return 0;
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/User.java
index d6a2b9a38dae..0853d0673be8 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/User.java
@@ -251,7 +251,7 @@ public class User implements Parcelable {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
   public void writeToParcel(Parcel out, int flags) {
      
     out.writeValue(id);
@@ -286,7 +286,7 @@ public class User implements Parcelable {
     phone = (String)in.readValue(null);
     userStatus = (Integer)in.readValue(null);
   }
-  
+
   public int describeContents() {
     return 0;
   }
diff --git a/samples/client/petstore/java/okhttp-gson/docs/FakeClassnameTags123Api.md b/samples/client/petstore/java/okhttp-gson/docs/FakeClassnameTags123Api.md
index 468108b748ae..bc728bfce5b8 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/FakeClassnameTags123Api.md
@@ -16,9 +16,19 @@ To test class name in snake case
 ### Example
 ```java
 // Import classes:
+//import io.swagger.client.ApiClient;
 //import io.swagger.client.ApiException;
+//import io.swagger.client.Configuration;
+//import io.swagger.client.auth.*;
 //import io.swagger.client.api.FakeClassnameTags123Api;
 
+ApiClient defaultClient = Configuration.getDefaultApiClient();
+
+// Configure API key authorization: api_key_query
+ApiKeyAuth api_key_query = (ApiKeyAuth) defaultClient.getAuthentication("api_key_query");
+api_key_query.setApiKey("YOUR API KEY");
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//api_key_query.setApiKeyPrefix("Token");
 
 FakeClassnameTags123Api apiInstance = new FakeClassnameTags123Api();
 Client body = new Client(); // Client | client model
@@ -43,7 +53,7 @@ Name | Type | Description  | Notes
 
 ### Authorization
 
-No authorization required
+[api_key_query](../README.md#api_key_query)
 
 ### HTTP request headers
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java
index 90bc07435ca3..60d49acd4ab6 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java
@@ -90,6 +90,7 @@ public class ApiClient {
         // Setup authentications (key: authentication name, value: authentication).
         authentications = new HashMap<String, Authentication>();
         authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
+        authentications.put("api_key_query", new ApiKeyAuth("query", "api_key_query"));
         authentications.put("http_basic_test", new HttpBasicAuth());
         authentications.put("petstore_auth", new OAuth());
         // Prevent the authentications from being modified.
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java
index 99d4beeaf430..da29f1c830c5 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java
@@ -99,7 +99,7 @@ public class FakeClassnameTags123Api {
             });
         }
 
-        String[] localVarAuthNames = new String[] {  };
+        String[] localVarAuthNames = new String[] { "api_key_query" };
         return apiClient.buildCall(localVarPath, "PATCH", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
     }
     
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
index 862e4f0362a0..b302fdf6012a 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@@ -130,6 +130,6 @@ public class AdditionalPropertiesClass {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Animal.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Animal.java
index eb256ecc892a..f65c5bffcb38 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Animal.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Animal.java
@@ -112,6 +112,6 @@ public class Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AnimalFarm.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AnimalFarm.java
index af905454860e..0b1d6a74cc6f 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AnimalFarm.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AnimalFarm.java
@@ -60,6 +60,6 @@ public class AnimalFarm extends ArrayList<Animal> {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
index 90d55522c94e..f9956fe46d84 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
@@ -99,6 +99,6 @@ public class ArrayOfArrayOfNumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
index 4a3d820deea0..c79610d1c667 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
@@ -99,6 +99,6 @@ public class ArrayOfNumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ArrayTest.java
index 651065ac5c9f..747182e792ea 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ArrayTest.java
@@ -161,6 +161,6 @@ public class ArrayTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Capitalization.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Capitalization.java
index a7689d83e624..00c564ab7279 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Capitalization.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Capitalization.java
@@ -203,6 +203,6 @@ public class Capitalization {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Cat.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Cat.java
index c792aabac2d1..64d3fbdc7fee 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Cat.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Cat.java
@@ -90,6 +90,6 @@ public class Cat extends Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Category.java
index b6777f60ee18..4e9f8f56e5ec 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Category.java
@@ -111,6 +111,6 @@ public class Category {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ClassModel.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ClassModel.java
index b8003421bf0d..4cf0a053250d 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ClassModel.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ClassModel.java
@@ -89,6 +89,6 @@ public class ClassModel {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Client.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Client.java
index 819384de7f89..43b20dce8da8 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Client.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Client.java
@@ -88,6 +88,6 @@ public class Client {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Dog.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Dog.java
index f0a8b2faed36..8fad06d9835f 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Dog.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Dog.java
@@ -90,6 +90,6 @@ public class Dog extends Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumArrays.java
index 030170307d6d..5f063c2ec38c 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumArrays.java
@@ -215,6 +215,6 @@ public class EnumArrays {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumTest.java
index 0164ccb1abdb..fb20599a85c7 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumTest.java
@@ -301,6 +301,6 @@ public class EnumTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/FormatTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/FormatTest.java
index bd87692a36c2..ddb80771fdaf 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/FormatTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/FormatTest.java
@@ -378,6 +378,6 @@ public class FormatTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
index f1de7c53c40e..1b7ff1819411 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
@@ -93,6 +93,6 @@ public class HasOnlyReadOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MapTest.java
index f548e9d59579..a791e68d8fbc 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MapTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MapTest.java
@@ -177,6 +177,6 @@ public class MapTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 9c92756e1669..7c99abe53eb8 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -148,6 +148,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Model200Response.java
index 5452e427c884..0d39eb7eff54 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Model200Response.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Model200Response.java
@@ -112,6 +112,6 @@ public class Model200Response {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelApiResponse.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelApiResponse.java
index 1bf3188ad633..3d9352c50aa8 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelApiResponse.java
@@ -134,6 +134,6 @@ public class ModelApiResponse {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelReturn.java
index 21cd4f0911d9..ab6333ff86da 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -89,6 +89,6 @@ public class ModelReturn {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Name.java
index 649c215f379d..1492add29520 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Name.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Name.java
@@ -140,6 +140,6 @@ public class Name {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/NumberOnly.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/NumberOnly.java
index 27d586716d26..b13c0536a135 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/NumberOnly.java
@@ -89,6 +89,6 @@ public class NumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Order.java
index cab388bc2af3..4dcf75a7cd0c 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Order.java
@@ -253,6 +253,6 @@ public class Order {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/OuterComposite.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/OuterComposite.java
index 370be22413d2..56159fe5d93c 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/OuterComposite.java
@@ -135,6 +135,6 @@ public class OuterComposite {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Pet.java
index 1dc4bc65ccb5..dac1250ac075 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Pet.java
@@ -269,6 +269,6 @@ public class Pet {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
index 8d6dce19226e..f6e025412deb 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@@ -102,6 +102,6 @@ public class ReadOnlyFirst {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/SpecialModelName.java
index f56a026cdf8b..e743292100b3 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -88,6 +88,6 @@ public class SpecialModelName {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Tag.java
index 59e8aebe64ca..bb6de58c8a1d 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Tag.java
@@ -111,6 +111,6 @@ public class Tag {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/User.java
index 99f62e87defd..4ccb8a1c147e 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/User.java
@@ -249,6 +249,6 @@ public class User {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resteasy/docs/FakeClassnameTags123Api.md b/samples/client/petstore/java/resteasy/docs/FakeClassnameTags123Api.md
index 468108b748ae..bc728bfce5b8 100644
--- a/samples/client/petstore/java/resteasy/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/java/resteasy/docs/FakeClassnameTags123Api.md
@@ -16,9 +16,19 @@ To test class name in snake case
 ### Example
 ```java
 // Import classes:
+//import io.swagger.client.ApiClient;
 //import io.swagger.client.ApiException;
+//import io.swagger.client.Configuration;
+//import io.swagger.client.auth.*;
 //import io.swagger.client.api.FakeClassnameTags123Api;
 
+ApiClient defaultClient = Configuration.getDefaultApiClient();
+
+// Configure API key authorization: api_key_query
+ApiKeyAuth api_key_query = (ApiKeyAuth) defaultClient.getAuthentication("api_key_query");
+api_key_query.setApiKey("YOUR API KEY");
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//api_key_query.setApiKeyPrefix("Token");
 
 FakeClassnameTags123Api apiInstance = new FakeClassnameTags123Api();
 Client body = new Client(); // Client | client model
@@ -43,7 +53,7 @@ Name | Type | Description  | Notes
 
 ### Authorization
 
-No authorization required
+[api_key_query](../README.md#api_key_query)
 
 ### HTTP request headers
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/ApiClient.java
index 88478cfaa846..3fb6b3947b85 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/ApiClient.java
@@ -77,6 +77,7 @@ public class ApiClient {
     // Setup authentications (key: authentication name, value: authentication).
     authentications = new HashMap<String, Authentication>();
     authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
+    authentications.put("api_key_query", new ApiKeyAuth("query", "api_key_query"));
     authentications.put("http_basic_test", new HttpBasicAuth());
     authentications.put("petstore_auth", new OAuth());
     // Prevent the authentications from being modified.
@@ -555,7 +556,7 @@ public class ApiClient {
    * Invoke API by sending HTTP request with the given options.
    *
    * @param path The sub-path of the HTTP URL
-   * @param method The request method, one of "GET", "POST", "PUT", and "DELETE"
+   * @param method The request method, one of "GET", "POST", "PUT", "HEAD" and "DELETE"
    * @param queryParams The query parameters
    * @param body The request body object
    * @param headerParams The header parameters
@@ -613,6 +614,8 @@ public class ApiClient {
       response = invocationBuilder.delete();
     } else if ("PATCH".equals(method)) {
       response = invocationBuilder.header("X-HTTP-Method-Override", "PATCH").post(entity);
+    } else if ("HEAD".equals(method)) {
+      response = invocationBuilder.head();
     } else {
       throw new ApiException(500, "unknown method type " + method);
     }
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java
index f51298081fe2..af5706903769 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java
@@ -70,7 +70,7 @@ public class FakeClassnameTags123Api {
     };
     final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
 
-    String[] localVarAuthNames = new String[] {  };
+    String[] localVarAuthNames = new String[] { "api_key_query" };
 
     GenericType<Client> localVarReturnType = new GenericType<Client>() {};
     return apiClient.invokeAPI(localVarPath, "PATCH", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
index 88490c60da12..7fe69e168fd3 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@@ -127,6 +127,6 @@ public class AdditionalPropertiesClass {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Animal.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Animal.java
index 639ae9868b15..590f36c0ae07 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Animal.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Animal.java
@@ -115,6 +115,6 @@ public class Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/AnimalFarm.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/AnimalFarm.java
index af905454860e..0b1d6a74cc6f 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/AnimalFarm.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/AnimalFarm.java
@@ -60,6 +60,6 @@ public class AnimalFarm extends ArrayList<Animal> {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
index bb07ca990bff..b7e59a030a41 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
@@ -96,6 +96,6 @@ public class ArrayOfArrayOfNumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
index 45567259b111..fdfeb6856f31 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
@@ -96,6 +96,6 @@ public class ArrayOfNumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/ArrayTest.java
index 7f4e90a8e5f4..62665c2536a5 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/ArrayTest.java
@@ -158,6 +158,6 @@ public class ArrayTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Capitalization.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Capitalization.java
index 50363d32e7bc..a72b0a72f46b 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Capitalization.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Capitalization.java
@@ -200,6 +200,6 @@ public class Capitalization {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Cat.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Cat.java
index 6713ec2c1084..b882da0ad908 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Cat.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Cat.java
@@ -87,6 +87,6 @@ public class Cat extends Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Category.java
index 94a415b53371..464f4375c4b9 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Category.java
@@ -108,6 +108,6 @@ public class Category {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/ClassModel.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/ClassModel.java
index 91f7b71c7eeb..4f764fde68d7 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/ClassModel.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/ClassModel.java
@@ -86,6 +86,6 @@ public class ClassModel {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Client.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Client.java
index 322f094f0665..a7c4253499c3 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Client.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Client.java
@@ -85,6 +85,6 @@ public class Client {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Dog.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Dog.java
index 82ff0bf28bf5..7de179b2adea 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Dog.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Dog.java
@@ -87,6 +87,6 @@ public class Dog extends Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/EnumArrays.java
index ba5b4727176b..12caa4802856 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/EnumArrays.java
@@ -188,6 +188,6 @@ public class EnumArrays {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/EnumTest.java
index 39ea674e9d83..93d0da037b62 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/EnumTest.java
@@ -262,6 +262,6 @@ public class EnumTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/FormatTest.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/FormatTest.java
index 3897095d8402..4118656d29ee 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/FormatTest.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/FormatTest.java
@@ -375,6 +375,6 @@ public class FormatTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
index 5f3409317667..6dc9f12c4b80 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
@@ -90,6 +90,6 @@ public class HasOnlyReadOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/MapTest.java
index ab6ae7b27f2f..e6344a1df0fb 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/MapTest.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/MapTest.java
@@ -162,6 +162,6 @@ public class MapTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 229669da93c8..29bfc7e8c084 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -145,6 +145,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Model200Response.java
index c7437cd4bd59..58624475e430 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Model200Response.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Model200Response.java
@@ -109,6 +109,6 @@ public class Model200Response {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/ModelApiResponse.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/ModelApiResponse.java
index 3dc02cbefe6a..b010e53b48cd 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/ModelApiResponse.java
@@ -131,6 +131,6 @@ public class ModelApiResponse {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/ModelReturn.java
index 5d7ae14f6c4b..27d085572487 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -86,6 +86,6 @@ public class ModelReturn {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Name.java
index 368dc4d6d893..f2b9b1703bd2 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Name.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Name.java
@@ -137,6 +137,6 @@ public class Name {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/NumberOnly.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/NumberOnly.java
index ab790ac11e03..ec93aba05314 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/NumberOnly.java
@@ -86,6 +86,6 @@ public class NumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Order.java
index adcd2b0d8217..6976ceb8fbaa 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Order.java
@@ -238,6 +238,6 @@ public class Order {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/OuterComposite.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/OuterComposite.java
index 7b1786ea96d8..02c16a99b70a 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/OuterComposite.java
@@ -132,6 +132,6 @@ public class OuterComposite {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Pet.java
index baab18e69426..4c351dec3e4c 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Pet.java
@@ -254,6 +254,6 @@ public class Pet {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
index 2bea40f1c2e7..76f8a912f36f 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@@ -99,6 +99,6 @@ public class ReadOnlyFirst {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/SpecialModelName.java
index 561e8bd9a962..784eb8baca8d 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -85,6 +85,6 @@ public class SpecialModelName {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Tag.java
index 205eb6fef177..1cf2f5bc5e69 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Tag.java
@@ -108,6 +108,6 @@ public class Tag {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/User.java
index b739854d867b..de5bc439c5ad 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/User.java
@@ -246,6 +246,6 @@ public class User {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/FakeClassnameTags123Api.md b/samples/client/petstore/java/resttemplate-withXml/docs/FakeClassnameTags123Api.md
index 468108b748ae..bc728bfce5b8 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/FakeClassnameTags123Api.md
@@ -16,9 +16,19 @@ To test class name in snake case
 ### Example
 ```java
 // Import classes:
+//import io.swagger.client.ApiClient;
 //import io.swagger.client.ApiException;
+//import io.swagger.client.Configuration;
+//import io.swagger.client.auth.*;
 //import io.swagger.client.api.FakeClassnameTags123Api;
 
+ApiClient defaultClient = Configuration.getDefaultApiClient();
+
+// Configure API key authorization: api_key_query
+ApiKeyAuth api_key_query = (ApiKeyAuth) defaultClient.getAuthentication("api_key_query");
+api_key_query.setApiKey("YOUR API KEY");
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//api_key_query.setApiKeyPrefix("Token");
 
 FakeClassnameTags123Api apiInstance = new FakeClassnameTags123Api();
 Client body = new Client(); // Client | client model
@@ -43,7 +53,7 @@ Name | Type | Description  | Notes
 
 ### Authorization
 
-No authorization required
+[api_key_query](../README.md#api_key_query)
 
 ### HTTP request headers
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/gradlew b/samples/client/petstore/java/resttemplate-withXml/gradlew
old mode 100755
new mode 100644
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/ApiClient.java
index 2eda4e0e1a22..cf28fc5a47d0 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/ApiClient.java
@@ -116,6 +116,7 @@ public class ApiClient {
         // Setup authentications (key: authentication name, value: authentication).
         authentications = new HashMap<String, Authentication>();
         authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
+        authentications.put("api_key_query", new ApiKeyAuth("query", "api_key_query"));
         authentications.put("http_basic_test", new HttpBasicAuth());
         authentications.put("petstore_auth", new OAuth());
         // Prevent the authentications from being modified.
@@ -416,6 +417,11 @@ public class ApiClient {
     * @return boolean true if the MediaType represents JSON, false otherwise
     */
     public boolean isJsonMime(String mediaType) {
+        // "* / *" is default to JSON
+        if ("*/*".equals(mediaType)) {
+            return true;
+        }
+
         try {
             return isJsonMime(MediaType.parseMediaType(mediaType));
         } catch (InvalidMediaTypeException e) {
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java
index 272bcc563c6a..59eaddcedbeb 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java
@@ -76,7 +76,7 @@ public class FakeClassnameTags123Api {
         };
         final MediaType contentType = apiClient.selectHeaderContentType(contentTypes);
 
-        String[] authNames = new String[] {  };
+        String[] authNames = new String[] { "api_key_query" };
 
         ParameterizedTypeReference<Client> returnType = new ParameterizedTypeReference<Client>() {};
         return apiClient.invokeAPI(path, HttpMethod.PATCH, queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType);
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
index 216c14c71a5e..498232b10f35 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@@ -22,25 +22,29 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
 /**
  * AdditionalPropertiesClass
  */
-@JacksonXmlRootElement(localName = "AdditionalPropertiesClass")
+
 @XmlRootElement(name = "AdditionalPropertiesClass")
 @XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "AdditionalPropertiesClass")
 public class AdditionalPropertiesClass {
   @JsonProperty("map_property")
-  @JacksonXmlProperty(localName = "map_property")
-  @XmlElement(name = "map_property")
+  // Is a container wrapped=false
+  // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
+  // items.example= items.type=String
+  @XmlElement(name = "inner")
   private Map<String, String> mapProperty = null;
 
   @JsonProperty("map_of_map_property")
-  @JacksonXmlProperty(localName = "map_of_map_property")
-  @XmlElement(name = "map_of_map_property")
+  // Is a container wrapped=false
+  // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
+  // items.example= items.type=Map&lt;String, String&gt;
+  @XmlElement(name = "inner")
   private Map<String, Map<String, String>> mapOfMapProperty = null;
 
   public AdditionalPropertiesClass mapProperty(Map<String, String> mapProperty) {
@@ -136,6 +140,6 @@ public class AdditionalPropertiesClass {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Animal.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Animal.java
index 4c3544bd4ae2..8bf17b5aa20a 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Animal.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Animal.java
@@ -21,8 +21,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
 /**
@@ -33,9 +32,10 @@ import javax.xml.bind.annotation.*;
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
 })
-@JacksonXmlRootElement(localName = "Animal")
+
 @XmlRootElement(name = "Animal")
 @XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "Animal")
 public class Animal {
   @JsonProperty("className")
   @JacksonXmlProperty(localName = "className")
@@ -124,6 +124,6 @@ public class Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/AnimalFarm.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/AnimalFarm.java
index 04900deced31..4211624eadb3 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/AnimalFarm.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/AnimalFarm.java
@@ -17,16 +17,16 @@ import java.util.Objects;
 import io.swagger.client.model.Animal;
 import java.util.ArrayList;
 import java.util.List;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
 /**
  * AnimalFarm
  */
-@JacksonXmlRootElement(localName = "AnimalFarm")
+
 @XmlRootElement(name = "AnimalFarm")
 @XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "AnimalFarm")
 public class AnimalFarm extends ArrayList<Animal> {
 
   @Override
@@ -65,6 +65,6 @@ public class AnimalFarm extends ArrayList<Animal> {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
index bb0246405513..3b8060ade59e 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
@@ -22,20 +22,22 @@ import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
 /**
  * ArrayOfArrayOfNumberOnly
  */
-@JacksonXmlRootElement(localName = "ArrayOfArrayOfNumberOnly")
+
 @XmlRootElement(name = "ArrayOfArrayOfNumberOnly")
 @XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "ArrayOfArrayOfNumberOnly")
 public class ArrayOfArrayOfNumberOnly {
   @JsonProperty("ArrayArrayNumber")
-  @JacksonXmlProperty(localName = "ArrayArrayNumber")
-  @XmlElement(name = "ArrayArrayNumber")
+  // Is a container wrapped=false
+  // items.name=arrayArrayNumber items.baseName=arrayArrayNumber items.xmlName= items.xmlNamespace=
+  // items.example= items.type=List&lt;BigDecimal&gt;
+  @XmlElement(name = "arrayArrayNumber")
   private List<List<BigDecimal>> arrayArrayNumber = null;
 
   public ArrayOfArrayOfNumberOnly arrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {
@@ -103,6 +105,6 @@ public class ArrayOfArrayOfNumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
index de981c5e3d3d..35ac9d8f82f4 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
@@ -22,20 +22,22 @@ import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
 /**
  * ArrayOfNumberOnly
  */
-@JacksonXmlRootElement(localName = "ArrayOfNumberOnly")
+
 @XmlRootElement(name = "ArrayOfNumberOnly")
 @XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "ArrayOfNumberOnly")
 public class ArrayOfNumberOnly {
   @JsonProperty("ArrayNumber")
-  @JacksonXmlProperty(localName = "ArrayNumber")
-  @XmlElement(name = "ArrayNumber")
+  // Is a container wrapped=false
+  // items.name=arrayNumber items.baseName=arrayNumber items.xmlName= items.xmlNamespace=
+  // items.example= items.type=BigDecimal
+  @XmlElement(name = "arrayNumber")
   private List<BigDecimal> arrayNumber = null;
 
   public ArrayOfNumberOnly arrayNumber(List<BigDecimal> arrayNumber) {
@@ -103,6 +105,6 @@ public class ArrayOfNumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/ArrayTest.java
index fca6aa80f4e9..1d87c79cf230 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/ArrayTest.java
@@ -22,30 +22,36 @@ import io.swagger.annotations.ApiModelProperty;
 import io.swagger.client.model.ReadOnlyFirst;
 import java.util.ArrayList;
 import java.util.List;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
 /**
  * ArrayTest
  */
-@JacksonXmlRootElement(localName = "ArrayTest")
+
 @XmlRootElement(name = "ArrayTest")
 @XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "ArrayTest")
 public class ArrayTest {
   @JsonProperty("array_of_string")
-  @JacksonXmlProperty(localName = "array_of_string")
-  @XmlElement(name = "array_of_string")
+  // Is a container wrapped=false
+  // items.name=arrayOfString items.baseName=arrayOfString items.xmlName= items.xmlNamespace=
+  // items.example= items.type=String
+  @XmlElement(name = "arrayOfString")
   private List<String> arrayOfString = null;
 
   @JsonProperty("array_array_of_integer")
-  @JacksonXmlProperty(localName = "array_array_of_integer")
-  @XmlElement(name = "array_array_of_integer")
+  // Is a container wrapped=false
+  // items.name=arrayArrayOfInteger items.baseName=arrayArrayOfInteger items.xmlName= items.xmlNamespace=
+  // items.example= items.type=List&lt;Long&gt;
+  @XmlElement(name = "arrayArrayOfInteger")
   private List<List<Long>> arrayArrayOfInteger = null;
 
   @JsonProperty("array_array_of_model")
-  @JacksonXmlProperty(localName = "array_array_of_model")
-  @XmlElement(name = "array_array_of_model")
+  // Is a container wrapped=false
+  // items.name=arrayArrayOfModel items.baseName=arrayArrayOfModel items.xmlName= items.xmlNamespace=
+  // items.example= items.type=List&lt;ReadOnlyFirst&gt;
+  @XmlElement(name = "arrayArrayOfModel")
   private List<List<ReadOnlyFirst>> arrayArrayOfModel = null;
 
   public ArrayTest arrayOfString(List<String> arrayOfString) {
@@ -169,6 +175,6 @@ public class ArrayTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Capitalization.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Capitalization.java
index ec46d0b400a3..e615819e615e 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Capitalization.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Capitalization.java
@@ -19,16 +19,16 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
 /**
  * Capitalization
  */
-@JacksonXmlRootElement(localName = "Capitalization")
+
 @XmlRootElement(name = "Capitalization")
 @XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "Capitalization")
 public class Capitalization {
   @JsonProperty("smallCamel")
   @JacksonXmlProperty(localName = "smallCamel")
@@ -217,6 +217,6 @@ public class Capitalization {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Cat.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Cat.java
index eeff7d5a1fa4..2c3754590a12 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Cat.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Cat.java
@@ -20,16 +20,16 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.client.model.Animal;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
 /**
  * Cat
  */
-@JacksonXmlRootElement(localName = "Cat")
+
 @XmlRootElement(name = "Cat")
 @XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "Cat")
 public class Cat extends Animal {
   @JsonProperty("declawed")
   @JacksonXmlProperty(localName = "declawed")
@@ -46,7 +46,7 @@ public class Cat extends Animal {
    * @return declawed
   **/
   @ApiModelProperty(value = "")
-  public Boolean getDeclawed() {
+  public Boolean isDeclawed() {
     return declawed;
   }
 
@@ -94,6 +94,6 @@ public class Cat extends Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Category.java
index 95d5678302e8..9b1a6831a5ed 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Category.java
@@ -19,16 +19,16 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
 /**
  * Category
  */
-@JacksonXmlRootElement(localName = "Category")
+
 @XmlRootElement(name = "Category")
 @XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "Category")
 public class Category {
   @JsonProperty("id")
   @JacksonXmlProperty(localName = "id")
@@ -117,6 +117,6 @@ public class Category {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/ClassModel.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/ClassModel.java
index b70942f4a497..ff47df4679a6 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/ClassModel.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/ClassModel.java
@@ -19,17 +19,17 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
 /**
  * Model for testing model with \&quot;_class\&quot; property
  */
 @ApiModel(description = "Model for testing model with \"_class\" property")
-@JacksonXmlRootElement(localName = "ClassModel")
+
 @XmlRootElement(name = "ClassModel")
 @XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "ClassModel")
 public class ClassModel {
   @JsonProperty("_class")
   @JacksonXmlProperty(localName = "_class")
@@ -93,6 +93,6 @@ public class ClassModel {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Client.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Client.java
index f8618bcb6b17..6abf4ded9436 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Client.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Client.java
@@ -19,16 +19,16 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
 /**
  * Client
  */
-@JacksonXmlRootElement(localName = "Client")
+
 @XmlRootElement(name = "Client")
 @XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "Client")
 public class Client {
   @JsonProperty("client")
   @JacksonXmlProperty(localName = "client")
@@ -92,6 +92,6 @@ public class Client {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Dog.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Dog.java
index 5d381e4a5ee7..3a1c69148bc5 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Dog.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Dog.java
@@ -20,16 +20,16 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.client.model.Animal;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
 /**
  * Dog
  */
-@JacksonXmlRootElement(localName = "Dog")
+
 @XmlRootElement(name = "Dog")
 @XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "Dog")
 public class Dog extends Animal {
   @JsonProperty("breed")
   @JacksonXmlProperty(localName = "breed")
@@ -94,6 +94,6 @@ public class Dog extends Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/EnumArrays.java
index 49b7b144a110..826a8c7dc570 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/EnumArrays.java
@@ -21,16 +21,16 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
 /**
  * EnumArrays
  */
-@JacksonXmlRootElement(localName = "EnumArrays")
+
 @XmlRootElement(name = "EnumArrays")
 @XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "EnumArrays")
 public class EnumArrays {
   /**
    * Gets or Sets justSymbol
@@ -108,8 +108,10 @@ public class EnumArrays {
   }
 
   @JsonProperty("array_enum")
-  @JacksonXmlProperty(localName = "array_enum")
-  @XmlElement(name = "array_enum")
+  // Is a container wrapped=false
+  // items.name=arrayEnum items.baseName=arrayEnum items.xmlName= items.xmlNamespace=
+  // items.example= items.type=String
+  @XmlElement(name = "arrayEnum")
   private List<ArrayEnumEnum> arrayEnum = null;
 
   public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
@@ -197,6 +199,6 @@ public class EnumArrays {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/EnumClass.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/EnumClass.java
index cde1e5de2b8f..a9ae3e13dbd8 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/EnumClass.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/EnumClass.java
@@ -14,8 +14,7 @@
 package io.swagger.client.model;
 
 import java.util.Objects;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/EnumTest.java
index ac3f6a97509d..5eed460c5f78 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/EnumTest.java
@@ -20,16 +20,16 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.client.model.OuterEnum;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
 /**
  * EnumTest
  */
-@JacksonXmlRootElement(localName = "EnumTest")
+
 @XmlRootElement(name = "EnumTest")
 @XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "EnumTest")
 public class EnumTest {
   /**
    * Gets or Sets enumString
@@ -275,6 +275,6 @@ public class EnumTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/FormatTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/FormatTest.java
index 9edfaf405b78..d0860fabab4d 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/FormatTest.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/FormatTest.java
@@ -23,16 +23,16 @@ import java.math.BigDecimal;
 import java.util.UUID;
 import org.threeten.bp.LocalDate;
 import org.threeten.bp.OffsetDateTime;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
 /**
  * FormatTest
  */
-@JacksonXmlRootElement(localName = "FormatTest")
+
 @XmlRootElement(name = "FormatTest")
 @XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "FormatTest")
 public class FormatTest {
   @JsonProperty("integer")
   @JacksonXmlProperty(localName = "integer")
@@ -406,6 +406,6 @@ public class FormatTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
index 341bf6095679..9d54eca095a6 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
@@ -19,16 +19,16 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
 /**
  * HasOnlyReadOnly
  */
-@JacksonXmlRootElement(localName = "HasOnlyReadOnly")
+
 @XmlRootElement(name = "HasOnlyReadOnly")
 @XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "HasOnlyReadOnly")
 public class HasOnlyReadOnly {
   @JsonProperty("bar")
   @JacksonXmlProperty(localName = "bar")
@@ -99,6 +99,6 @@ public class HasOnlyReadOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/MapTest.java
index c054d5cbff92..72a58a1ee683 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/MapTest.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/MapTest.java
@@ -22,20 +22,22 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
 /**
  * MapTest
  */
-@JacksonXmlRootElement(localName = "MapTest")
+
 @XmlRootElement(name = "MapTest")
 @XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "MapTest")
 public class MapTest {
   @JsonProperty("map_map_of_string")
-  @JacksonXmlProperty(localName = "map_map_of_string")
-  @XmlElement(name = "map_map_of_string")
+  // Is a container wrapped=false
+  // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
+  // items.example= items.type=Map&lt;String, String&gt;
+  @XmlElement(name = "inner")
   private Map<String, Map<String, String>> mapMapOfString = null;
 
   /**
@@ -74,8 +76,10 @@ public class MapTest {
   }
 
   @JsonProperty("map_of_enum_string")
-  @JacksonXmlProperty(localName = "map_of_enum_string")
-  @XmlElement(name = "map_of_enum_string")
+  // Is a container wrapped=false
+  // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
+  // items.example= items.type=String
+  @XmlElement(name = "inner")
   private Map<String, InnerEnum> mapOfEnumString = null;
 
   public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
@@ -171,6 +175,6 @@ public class MapTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 972712ce3f47..2819b08e715e 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -25,16 +25,16 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import org.threeten.bp.OffsetDateTime;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
-@JacksonXmlRootElement(localName = "MixedPropertiesAndAdditionalPropertiesClass")
+
 @XmlRootElement(name = "MixedPropertiesAndAdditionalPropertiesClass")
 @XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "MixedPropertiesAndAdditionalPropertiesClass")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   @JsonProperty("uuid")
   @JacksonXmlProperty(localName = "uuid")
@@ -47,8 +47,10 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
   private OffsetDateTime dateTime = null;
 
   @JsonProperty("map")
-  @JacksonXmlProperty(localName = "map")
-  @XmlElement(name = "map")
+  // Is a container wrapped=false
+  // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
+  // items.example= items.type=Animal
+  @XmlElement(name = "inner")
   private Map<String, Animal> map = null;
 
   public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
@@ -156,6 +158,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Model200Response.java
index 82656df32f35..fe0f079c0948 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Model200Response.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Model200Response.java
@@ -19,17 +19,17 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
 /**
  * Model for testing model name starting with number
  */
 @ApiModel(description = "Model for testing model name starting with number")
-@JacksonXmlRootElement(localName = "Name")
+
 @XmlRootElement(name = "Name")
 @XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "Name")
 public class Model200Response {
   @JsonProperty("name")
   @JacksonXmlProperty(localName = "name")
@@ -118,6 +118,6 @@ public class Model200Response {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/ModelApiResponse.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/ModelApiResponse.java
index f193f3fe8bc8..4fd7b7ec649e 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/ModelApiResponse.java
@@ -19,16 +19,16 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
 /**
  * ModelApiResponse
  */
-@JacksonXmlRootElement(localName = "ModelApiResponse")
+
 @XmlRootElement(name = "ModelApiResponse")
 @XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "ModelApiResponse")
 public class ModelApiResponse {
   @JsonProperty("code")
   @JacksonXmlProperty(localName = "code")
@@ -142,6 +142,6 @@ public class ModelApiResponse {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/ModelReturn.java
index cf9d36985add..01db1577d569 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -19,17 +19,17 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
 /**
  * Model for testing reserved words
  */
 @ApiModel(description = "Model for testing reserved words")
-@JacksonXmlRootElement(localName = "Return")
+
 @XmlRootElement(name = "Return")
 @XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "Return")
 public class ModelReturn {
   @JsonProperty("return")
   @JacksonXmlProperty(localName = "return")
@@ -93,6 +93,6 @@ public class ModelReturn {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Name.java
index 76f8c509a127..546adf743d4b 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Name.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Name.java
@@ -19,17 +19,17 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
 /**
  * Model for testing model name same as property name
  */
 @ApiModel(description = "Model for testing model name same as property name")
-@JacksonXmlRootElement(localName = "Name")
+
 @XmlRootElement(name = "Name")
 @XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "Name")
 public class Name {
   @JsonProperty("name")
   @JacksonXmlProperty(localName = "name")
@@ -150,6 +150,6 @@ public class Name {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/NumberOnly.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/NumberOnly.java
index cb558df6313a..657647cd2e3d 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/NumberOnly.java
@@ -20,16 +20,16 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
 /**
  * NumberOnly
  */
-@JacksonXmlRootElement(localName = "NumberOnly")
+
 @XmlRootElement(name = "NumberOnly")
 @XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "NumberOnly")
 public class NumberOnly {
   @JsonProperty("JustNumber")
   @JacksonXmlProperty(localName = "JustNumber")
@@ -93,6 +93,6 @@ public class NumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Order.java
index 6521e98e0d9c..de1b90ef6a54 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Order.java
@@ -20,16 +20,16 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.threeten.bp.OffsetDateTime;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
 /**
  * Order
  */
-@JacksonXmlRootElement(localName = "Order")
+
 @XmlRootElement(name = "Order")
 @XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "Order")
 public class Order {
   @JsonProperty("id")
   @JacksonXmlProperty(localName = "id")
@@ -198,7 +198,7 @@ public class Order {
    * @return complete
   **/
   @ApiModelProperty(value = "")
-  public Boolean getComplete() {
+  public Boolean isComplete() {
     return complete;
   }
 
@@ -255,6 +255,6 @@ public class Order {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/OuterComposite.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/OuterComposite.java
index 665aaf5ad38d..1690010ca8c4 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/OuterComposite.java
@@ -20,16 +20,16 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
 /**
  * OuterComposite
  */
-@JacksonXmlRootElement(localName = "OuterComposite")
+
 @XmlRootElement(name = "OuterComposite")
 @XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "OuterComposite")
 public class OuterComposite {
   @JsonProperty("my_number")
   @JacksonXmlProperty(localName = "my_number")
@@ -143,6 +143,6 @@ public class OuterComposite {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/OuterEnum.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/OuterEnum.java
index 9a4cd6bdf3c1..ec2ccbf98876 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/OuterEnum.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/OuterEnum.java
@@ -14,8 +14,7 @@
 package io.swagger.client.model;
 
 import java.util.Objects;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Pet.java
index 3015e8525c9e..0e43949b872c 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Pet.java
@@ -23,16 +23,16 @@ import io.swagger.client.model.Category;
 import io.swagger.client.model.Tag;
 import java.util.ArrayList;
 import java.util.List;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
 /**
  * Pet
  */
-@JacksonXmlRootElement(localName = "Pet")
+
 @XmlRootElement(name = "Pet")
 @XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "Pet")
 public class Pet {
   @JsonProperty("id")
   @JacksonXmlProperty(localName = "id")
@@ -50,13 +50,23 @@ public class Pet {
   private String name = null;
 
   @JsonProperty("photoUrls")
-  @JacksonXmlProperty(localName = "photoUrl")
-  @XmlElement(name = "photoUrl")
+  // items.xmlName=
+  @JacksonXmlElementWrapper(useWrapping = true, localName = "photoUrls")
+  // Is a container wrapped=true
+  // items.name=photoUrls items.baseName=photoUrls items.xmlName= items.xmlNamespace=
+  // items.example= items.type=String
+  @XmlElement(name = "photoUrls")
+  @XmlElementWrapper(name = "photoUrl")
   private List<String> photoUrls = new ArrayList<String>();
 
   @JsonProperty("tags")
-  @JacksonXmlProperty(localName = "tag")
-  @XmlElement(name = "tag")
+  // items.xmlName=
+  @JacksonXmlElementWrapper(useWrapping = true, localName = "tags")
+  // Is a container wrapped=true
+  // items.name=tags items.baseName=tags items.xmlName= items.xmlNamespace=
+  // items.example= items.type=Tag
+  @XmlElement(name = "tags")
+  @XmlElementWrapper(name = "tag")
   private List<Tag> tags = null;
 
   /**
@@ -271,6 +281,6 @@ public class Pet {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
index 8d64a5fa8e30..0b09758c5eaa 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@@ -19,16 +19,16 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
 /**
  * ReadOnlyFirst
  */
-@JacksonXmlRootElement(localName = "ReadOnlyFirst")
+
 @XmlRootElement(name = "ReadOnlyFirst")
 @XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "ReadOnlyFirst")
 public class ReadOnlyFirst {
   @JsonProperty("bar")
   @JacksonXmlProperty(localName = "bar")
@@ -108,6 +108,6 @@ public class ReadOnlyFirst {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/SpecialModelName.java
index 5ac1731e5ccc..b599c58ffdba 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -19,16 +19,16 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
 /**
  * SpecialModelName
  */
-@JacksonXmlRootElement(localName = "$special[model.name]")
+
 @XmlRootElement(name = "$special[model.name]")
 @XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "$special[model.name]")
 public class SpecialModelName {
   @JsonProperty("$special[property.name]")
   @JacksonXmlProperty(localName = "$special[property.name]")
@@ -92,6 +92,6 @@ public class SpecialModelName {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Tag.java
index db8d30ce1582..624044bc22ad 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/Tag.java
@@ -19,16 +19,16 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
 /**
  * Tag
  */
-@JacksonXmlRootElement(localName = "Tag")
+
 @XmlRootElement(name = "Tag")
 @XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "Tag")
 public class Tag {
   @JsonProperty("id")
   @JacksonXmlProperty(localName = "id")
@@ -117,6 +117,6 @@ public class Tag {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/User.java
index 6566c3f92aa9..af41ec704470 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/io/swagger/client/model/User.java
@@ -19,16 +19,16 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
 /**
  * User
  */
-@JacksonXmlRootElement(localName = "User")
+
 @XmlRootElement(name = "User")
 @XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "User")
 public class User {
   @JsonProperty("id")
   @JacksonXmlProperty(localName = "id")
@@ -267,6 +267,6 @@ public class User {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/test/java/io/swagger/client/api/FakeApiTest.java b/samples/client/petstore/java/resttemplate-withXml/src/test/java/io/swagger/client/api/FakeApiTest.java
index a9b758f2ce1f..65b341a3c524 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/test/java/io/swagger/client/api/FakeApiTest.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/test/java/io/swagger/client/api/FakeApiTest.java
@@ -15,8 +15,8 @@ package io.swagger.client.api;
 
 import java.math.BigDecimal;
 import io.swagger.client.model.Client;
-import org.joda.time.DateTime;
-import org.joda.time.LocalDate;
+import org.threeten.bp.LocalDate;
+import org.threeten.bp.OffsetDateTime;
 import io.swagger.client.model.OuterComposite;
 import org.junit.Test;
 import org.junit.Ignore;
@@ -136,7 +136,7 @@ public class FakeApiTest {
         String string = null;
         byte[] binary = null;
         LocalDate date = null;
-        DateTime dateTime = null;
+        OffsetDateTime dateTime = null;
         String password = null;
         String paramCallback = null;
         api.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
@@ -167,4 +167,21 @@ public class FakeApiTest {
         // TODO: test validations
     }
     
+    /**
+     * test json serialization of form data
+     *
+     * 
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void testJsonFormDataTest() {
+        String param = null;
+        String param2 = null;
+        api.testJsonFormData(param, param2);
+
+        // TODO: test validations
+    }
+    
 }
diff --git a/samples/client/petstore/java/resttemplate/docs/FakeClassnameTags123Api.md b/samples/client/petstore/java/resttemplate/docs/FakeClassnameTags123Api.md
index 468108b748ae..bc728bfce5b8 100644
--- a/samples/client/petstore/java/resttemplate/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/java/resttemplate/docs/FakeClassnameTags123Api.md
@@ -16,9 +16,19 @@ To test class name in snake case
 ### Example
 ```java
 // Import classes:
+//import io.swagger.client.ApiClient;
 //import io.swagger.client.ApiException;
+//import io.swagger.client.Configuration;
+//import io.swagger.client.auth.*;
 //import io.swagger.client.api.FakeClassnameTags123Api;
 
+ApiClient defaultClient = Configuration.getDefaultApiClient();
+
+// Configure API key authorization: api_key_query
+ApiKeyAuth api_key_query = (ApiKeyAuth) defaultClient.getAuthentication("api_key_query");
+api_key_query.setApiKey("YOUR API KEY");
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//api_key_query.setApiKeyPrefix("Token");
 
 FakeClassnameTags123Api apiInstance = new FakeClassnameTags123Api();
 Client body = new Client(); // Client | client model
@@ -43,7 +53,7 @@ Name | Type | Description  | Notes
 
 ### Authorization
 
-No authorization required
+[api_key_query](../README.md#api_key_query)
 
 ### HTTP request headers
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/ApiClient.java
index dec5e466970c..75b19b6d9fa5 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/ApiClient.java
@@ -111,6 +111,7 @@ public class ApiClient {
         // Setup authentications (key: authentication name, value: authentication).
         authentications = new HashMap<String, Authentication>();
         authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
+        authentications.put("api_key_query", new ApiKeyAuth("query", "api_key_query"));
         authentications.put("http_basic_test", new HttpBasicAuth());
         authentications.put("petstore_auth", new OAuth());
         // Prevent the authentications from being modified.
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java
index 272bcc563c6a..59eaddcedbeb 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java
@@ -76,7 +76,7 @@ public class FakeClassnameTags123Api {
         };
         final MediaType contentType = apiClient.selectHeaderContentType(contentTypes);
 
-        String[] authNames = new String[] {  };
+        String[] authNames = new String[] { "api_key_query" };
 
         ParameterizedTypeReference<Client> returnType = new ParameterizedTypeReference<Client>() {};
         return apiClient.invokeAPI(path, HttpMethod.PATCH, queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType);
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
index 88490c60da12..7fe69e168fd3 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@@ -127,6 +127,6 @@ public class AdditionalPropertiesClass {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Animal.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Animal.java
index 639ae9868b15..590f36c0ae07 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Animal.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Animal.java
@@ -115,6 +115,6 @@ public class Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/AnimalFarm.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/AnimalFarm.java
index af905454860e..0b1d6a74cc6f 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/AnimalFarm.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/AnimalFarm.java
@@ -60,6 +60,6 @@ public class AnimalFarm extends ArrayList<Animal> {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
index bb07ca990bff..b7e59a030a41 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
@@ -96,6 +96,6 @@ public class ArrayOfArrayOfNumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
index 45567259b111..fdfeb6856f31 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
@@ -96,6 +96,6 @@ public class ArrayOfNumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/ArrayTest.java
index 7f4e90a8e5f4..62665c2536a5 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/ArrayTest.java
@@ -158,6 +158,6 @@ public class ArrayTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Capitalization.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Capitalization.java
index 50363d32e7bc..a72b0a72f46b 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Capitalization.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Capitalization.java
@@ -200,6 +200,6 @@ public class Capitalization {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Cat.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Cat.java
index 6713ec2c1084..b882da0ad908 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Cat.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Cat.java
@@ -87,6 +87,6 @@ public class Cat extends Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Category.java
index 94a415b53371..464f4375c4b9 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Category.java
@@ -108,6 +108,6 @@ public class Category {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/ClassModel.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/ClassModel.java
index 91f7b71c7eeb..4f764fde68d7 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/ClassModel.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/ClassModel.java
@@ -86,6 +86,6 @@ public class ClassModel {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Client.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Client.java
index 322f094f0665..a7c4253499c3 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Client.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Client.java
@@ -85,6 +85,6 @@ public class Client {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Dog.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Dog.java
index 82ff0bf28bf5..7de179b2adea 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Dog.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Dog.java
@@ -87,6 +87,6 @@ public class Dog extends Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/EnumArrays.java
index ba5b4727176b..12caa4802856 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/EnumArrays.java
@@ -188,6 +188,6 @@ public class EnumArrays {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/EnumTest.java
index 39ea674e9d83..93d0da037b62 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/EnumTest.java
@@ -262,6 +262,6 @@ public class EnumTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/FormatTest.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/FormatTest.java
index 3897095d8402..4118656d29ee 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/FormatTest.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/FormatTest.java
@@ -375,6 +375,6 @@ public class FormatTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
index 5f3409317667..6dc9f12c4b80 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
@@ -90,6 +90,6 @@ public class HasOnlyReadOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/MapTest.java
index ab6ae7b27f2f..e6344a1df0fb 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/MapTest.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/MapTest.java
@@ -162,6 +162,6 @@ public class MapTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 229669da93c8..29bfc7e8c084 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -145,6 +145,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Model200Response.java
index c7437cd4bd59..58624475e430 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Model200Response.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Model200Response.java
@@ -109,6 +109,6 @@ public class Model200Response {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/ModelApiResponse.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/ModelApiResponse.java
index 3dc02cbefe6a..b010e53b48cd 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/ModelApiResponse.java
@@ -131,6 +131,6 @@ public class ModelApiResponse {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/ModelReturn.java
index 5d7ae14f6c4b..27d085572487 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -86,6 +86,6 @@ public class ModelReturn {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Name.java
index 368dc4d6d893..f2b9b1703bd2 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Name.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Name.java
@@ -137,6 +137,6 @@ public class Name {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/NumberOnly.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/NumberOnly.java
index ab790ac11e03..ec93aba05314 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/NumberOnly.java
@@ -86,6 +86,6 @@ public class NumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Order.java
index adcd2b0d8217..6976ceb8fbaa 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Order.java
@@ -238,6 +238,6 @@ public class Order {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/OuterComposite.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/OuterComposite.java
index 7b1786ea96d8..02c16a99b70a 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/OuterComposite.java
@@ -132,6 +132,6 @@ public class OuterComposite {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Pet.java
index baab18e69426..4c351dec3e4c 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Pet.java
@@ -254,6 +254,6 @@ public class Pet {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
index 2bea40f1c2e7..76f8a912f36f 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@@ -99,6 +99,6 @@ public class ReadOnlyFirst {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/SpecialModelName.java
index 561e8bd9a962..784eb8baca8d 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -85,6 +85,6 @@ public class SpecialModelName {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Tag.java
index 205eb6fef177..1cf2f5bc5e69 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Tag.java
@@ -108,6 +108,6 @@ public class Tag {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/User.java
index b739854d867b..de5bc439c5ad 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/User.java
@@ -246,6 +246,6 @@ public class User {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/ApiClient.java
index 5cb5a55060ce..19ed094161f8 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/ApiClient.java
@@ -56,6 +56,8 @@ public class ApiClient {
             Interceptor auth;
             if ("api_key".equals(authName)) {
                 auth = new ApiKeyAuth("header", "api_key");
+            } else if ("api_key_query".equals(authName)) {
+                auth = new ApiKeyAuth("query", "api_key_query");
             } else if ("http_basic_test".equals(authName)) {
                 auth = new HttpBasicAuth();
 
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
index 862e4f0362a0..b302fdf6012a 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@@ -130,6 +130,6 @@ public class AdditionalPropertiesClass {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Animal.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Animal.java
index eb256ecc892a..f65c5bffcb38 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Animal.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Animal.java
@@ -112,6 +112,6 @@ public class Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/AnimalFarm.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/AnimalFarm.java
index af905454860e..0b1d6a74cc6f 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/AnimalFarm.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/AnimalFarm.java
@@ -60,6 +60,6 @@ public class AnimalFarm extends ArrayList<Animal> {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
index 90d55522c94e..f9956fe46d84 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
@@ -99,6 +99,6 @@ public class ArrayOfArrayOfNumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
index 4a3d820deea0..c79610d1c667 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
@@ -99,6 +99,6 @@ public class ArrayOfNumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ArrayTest.java
index 651065ac5c9f..747182e792ea 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ArrayTest.java
@@ -161,6 +161,6 @@ public class ArrayTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Capitalization.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Capitalization.java
index a7689d83e624..00c564ab7279 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Capitalization.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Capitalization.java
@@ -203,6 +203,6 @@ public class Capitalization {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Cat.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Cat.java
index c792aabac2d1..64d3fbdc7fee 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Cat.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Cat.java
@@ -90,6 +90,6 @@ public class Cat extends Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Category.java
index b6777f60ee18..4e9f8f56e5ec 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Category.java
@@ -111,6 +111,6 @@ public class Category {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ClassModel.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ClassModel.java
index b8003421bf0d..4cf0a053250d 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ClassModel.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ClassModel.java
@@ -89,6 +89,6 @@ public class ClassModel {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Client.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Client.java
index 819384de7f89..43b20dce8da8 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Client.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Client.java
@@ -88,6 +88,6 @@ public class Client {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Dog.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Dog.java
index f0a8b2faed36..8fad06d9835f 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Dog.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Dog.java
@@ -90,6 +90,6 @@ public class Dog extends Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumArrays.java
index 030170307d6d..5f063c2ec38c 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumArrays.java
@@ -215,6 +215,6 @@ public class EnumArrays {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumTest.java
index 0164ccb1abdb..fb20599a85c7 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumTest.java
@@ -301,6 +301,6 @@ public class EnumTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/FormatTest.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/FormatTest.java
index 8ec80fccb78b..5c0f01dd86b4 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/FormatTest.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/FormatTest.java
@@ -378,6 +378,6 @@ public class FormatTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
index f1de7c53c40e..1b7ff1819411 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
@@ -93,6 +93,6 @@ public class HasOnlyReadOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MapTest.java
index f548e9d59579..a791e68d8fbc 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MapTest.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MapTest.java
@@ -177,6 +177,6 @@ public class MapTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 447501906da7..d023144f7681 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -148,6 +148,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Model200Response.java
index 5452e427c884..0d39eb7eff54 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Model200Response.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Model200Response.java
@@ -112,6 +112,6 @@ public class Model200Response {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ModelApiResponse.java
index 1bf3188ad633..3d9352c50aa8 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ModelApiResponse.java
@@ -134,6 +134,6 @@ public class ModelApiResponse {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ModelReturn.java
index 21cd4f0911d9..ab6333ff86da 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -89,6 +89,6 @@ public class ModelReturn {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Name.java
index 649c215f379d..1492add29520 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Name.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Name.java
@@ -140,6 +140,6 @@ public class Name {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/NumberOnly.java
index 27d586716d26..b13c0536a135 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/NumberOnly.java
@@ -89,6 +89,6 @@ public class NumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Order.java
index b37783e576c7..bea33fc7fb31 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Order.java
@@ -253,6 +253,6 @@ public class Order {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/OuterComposite.java
index 370be22413d2..56159fe5d93c 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/OuterComposite.java
@@ -135,6 +135,6 @@ public class OuterComposite {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Pet.java
index 1dc4bc65ccb5..dac1250ac075 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Pet.java
@@ -269,6 +269,6 @@ public class Pet {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
index 8d6dce19226e..f6e025412deb 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@@ -102,6 +102,6 @@ public class ReadOnlyFirst {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/SpecialModelName.java
index f56a026cdf8b..e743292100b3 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -88,6 +88,6 @@ public class SpecialModelName {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Tag.java
index 59e8aebe64ca..bb6de58c8a1d 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Tag.java
@@ -111,6 +111,6 @@ public class Tag {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/User.java
index 99f62e87defd..4ccb8a1c147e 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/User.java
@@ -249,6 +249,6 @@ public class User {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/FakeClassnameTags123Api.md b/samples/client/petstore/java/retrofit2-play24/docs/FakeClassnameTags123Api.md
index eabe324cc73b..715fed0dc0b0 100644
--- a/samples/client/petstore/java/retrofit2-play24/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/java/retrofit2-play24/docs/FakeClassnameTags123Api.md
@@ -16,9 +16,19 @@ To test class name in snake case
 ### Example
 ```java
 // Import classes:
+//import io.swagger.client.ApiClient;
 //import io.swagger.client.ApiException;
+//import io.swagger.client.Configuration;
+//import io.swagger.client.auth.*;
 //import io.swagger.client.api.FakeClassnameTags123Api;
 
+ApiClient defaultClient = Configuration.getDefaultApiClient();
+
+// Configure API key authorization: api_key_query
+ApiKeyAuth api_key_query = (ApiKeyAuth) defaultClient.getAuthentication("api_key_query");
+api_key_query.setApiKey("YOUR API KEY");
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//api_key_query.setApiKeyPrefix("Token");
 
 FakeClassnameTags123Api apiInstance = new FakeClassnameTags123Api();
 Client body = new Client(); // Client | client model
@@ -43,7 +53,7 @@ Name | Type | Description  | Notes
 
 ### Authorization
 
-No authorization required
+[api_key_query](../README.md#api_key_query)
 
 ### HTTP request headers
 
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/ApiClient.java
index 5d53666a6caf..50f66e3c1b77 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/ApiClient.java
@@ -42,6 +42,7 @@ public class ApiClient {
         // Setup authentications (key: authentication name, value: authentication).
         authentications = new HashMap<>();
         authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
+        authentications.put("api_key_query", new ApiKeyAuth("query", "api_key_query"));
         // authentications.put("http_basic_test", new HttpBasicAuth());
         // authentications.put("petstore_auth", new OAuth());
         // Prevent the authentications from being modified.
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
index 9a983f958b5f..e2bb686e9354 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@@ -130,6 +130,6 @@ public class AdditionalPropertiesClass {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Animal.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Animal.java
index af7c2daf6697..023cb11b7eb4 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Animal.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Animal.java
@@ -118,6 +118,6 @@ public class Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/AnimalFarm.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/AnimalFarm.java
index 9c8a3a7fdb09..fc38d86a0aa8 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/AnimalFarm.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/AnimalFarm.java
@@ -62,6 +62,6 @@ public class AnimalFarm extends ArrayList<Animal> {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
index e51d17e3c56e..87d66e0750d8 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
@@ -99,6 +99,6 @@ public class ArrayOfArrayOfNumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
index 7b0448e17a2b..50e094682194 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
@@ -99,6 +99,6 @@ public class ArrayOfNumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/ArrayTest.java
index c8e6c34fad46..b944839bc471 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/ArrayTest.java
@@ -162,6 +162,6 @@ public class ArrayTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Capitalization.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Capitalization.java
index b7c0586ae696..e7a0b0ac935f 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Capitalization.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Capitalization.java
@@ -202,6 +202,6 @@ public class Capitalization {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Cat.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Cat.java
index 0694cba6dc7e..7c513d6d6ddf 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Cat.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Cat.java
@@ -89,6 +89,6 @@ public class Cat extends Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Category.java
index 838968d352d3..bf8840d5fcfa 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Category.java
@@ -110,6 +110,6 @@ public class Category {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/ClassModel.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/ClassModel.java
index a2ea2c326926..f3d9160e3db8 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/ClassModel.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/ClassModel.java
@@ -88,6 +88,6 @@ public class ClassModel {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Client.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Client.java
index e046f364f08a..a09f13e7a2c1 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Client.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Client.java
@@ -87,6 +87,6 @@ public class Client {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Dog.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Dog.java
index 414aa6a13272..3835e2aca372 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Dog.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Dog.java
@@ -89,6 +89,6 @@ public class Dog extends Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/EnumArrays.java
index 4ec949bcf7e3..2019cbae634b 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/EnumArrays.java
@@ -190,6 +190,6 @@ public class EnumArrays {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/EnumTest.java
index f4230ba9831f..779c3abcc1b1 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/EnumTest.java
@@ -265,6 +265,6 @@ public class EnumTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/FormatTest.java
index 7794ee056578..adf0a66ceeb9 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/FormatTest.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/FormatTest.java
@@ -385,6 +385,6 @@ public class FormatTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
index b1988c06f2c1..5f86fb84a96c 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
@@ -92,6 +92,6 @@ public class HasOnlyReadOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/MapTest.java
index 3beabd39ff51..7c013ad8e69c 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/MapTest.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/MapTest.java
@@ -165,6 +165,6 @@ public class MapTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index d4d344023cb6..d484a14f09c7 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -150,6 +150,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Model200Response.java
index 05d5391c0da7..89ed29eca5dc 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Model200Response.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Model200Response.java
@@ -111,6 +111,6 @@ public class Model200Response {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/ModelApiResponse.java
index fa0a45515c62..acfb194d9d70 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/ModelApiResponse.java
@@ -133,6 +133,6 @@ public class ModelApiResponse {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/ModelReturn.java
index 16c2823e2aed..d372354eb7e5 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -88,6 +88,6 @@ public class ModelReturn {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Name.java
index da596d304f48..c09048cce396 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Name.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Name.java
@@ -140,6 +140,6 @@ public class Name {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/NumberOnly.java
index 76c50d3d9aa1..91ab4497dc24 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/NumberOnly.java
@@ -89,6 +89,6 @@ public class NumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Order.java
index 164cd408702d..35d1f3e67e13 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Order.java
@@ -241,6 +241,6 @@ public class Order {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/OuterComposite.java
index 1fb8683f555f..5b0e216eaa20 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/OuterComposite.java
@@ -135,6 +135,6 @@ public class OuterComposite {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Pet.java
index 97341efa514e..145360c48a9d 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Pet.java
@@ -260,6 +260,6 @@ public class Pet {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
index 22983092858b..dc2373a365d4 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@@ -101,6 +101,6 @@ public class ReadOnlyFirst {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/SpecialModelName.java
index 28dff8436805..f01a06d4c785 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -87,6 +87,6 @@ public class SpecialModelName {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Tag.java
index 1d15abd5a1e5..71ff1bfcf67c 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Tag.java
@@ -110,6 +110,6 @@ public class Tag {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/User.java
index 72ea3a8e7fcb..82c6be534ec7 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/User.java
@@ -248,6 +248,6 @@ public class User {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2/docs/FakeClassnameTags123Api.md b/samples/client/petstore/java/retrofit2/docs/FakeClassnameTags123Api.md
index eabe324cc73b..715fed0dc0b0 100644
--- a/samples/client/petstore/java/retrofit2/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/java/retrofit2/docs/FakeClassnameTags123Api.md
@@ -16,9 +16,19 @@ To test class name in snake case
 ### Example
 ```java
 // Import classes:
+//import io.swagger.client.ApiClient;
 //import io.swagger.client.ApiException;
+//import io.swagger.client.Configuration;
+//import io.swagger.client.auth.*;
 //import io.swagger.client.api.FakeClassnameTags123Api;
 
+ApiClient defaultClient = Configuration.getDefaultApiClient();
+
+// Configure API key authorization: api_key_query
+ApiKeyAuth api_key_query = (ApiKeyAuth) defaultClient.getAuthentication("api_key_query");
+api_key_query.setApiKey("YOUR API KEY");
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//api_key_query.setApiKeyPrefix("Token");
 
 FakeClassnameTags123Api apiInstance = new FakeClassnameTags123Api();
 Client body = new Client(); // Client | client model
@@ -43,7 +53,7 @@ Name | Type | Description  | Notes
 
 ### Authorization
 
-No authorization required
+[api_key_query](../README.md#api_key_query)
 
 ### HTTP request headers
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java
index ccd98428077f..9de69dde1e86 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java
@@ -44,6 +44,8 @@ public class ApiClient {
       Interceptor auth;
       if ("api_key".equals(authName)) {
         auth = new ApiKeyAuth("header", "api_key");
+      } else if ("api_key_query".equals(authName)) {
+        auth = new ApiKeyAuth("query", "api_key_query");
       } else if ("http_basic_test".equals(authName)) {
         auth = new HttpBasicAuth();
       } else if ("petstore_auth".equals(authName)) {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
index 862e4f0362a0..b302fdf6012a 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@@ -130,6 +130,6 @@ public class AdditionalPropertiesClass {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Animal.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Animal.java
index eb256ecc892a..f65c5bffcb38 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Animal.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Animal.java
@@ -112,6 +112,6 @@ public class Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/AnimalFarm.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/AnimalFarm.java
index af905454860e..0b1d6a74cc6f 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/AnimalFarm.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/AnimalFarm.java
@@ -60,6 +60,6 @@ public class AnimalFarm extends ArrayList<Animal> {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
index 90d55522c94e..f9956fe46d84 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
@@ -99,6 +99,6 @@ public class ArrayOfArrayOfNumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
index 4a3d820deea0..c79610d1c667 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
@@ -99,6 +99,6 @@ public class ArrayOfNumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ArrayTest.java
index 651065ac5c9f..747182e792ea 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ArrayTest.java
@@ -161,6 +161,6 @@ public class ArrayTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Capitalization.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Capitalization.java
index a7689d83e624..00c564ab7279 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Capitalization.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Capitalization.java
@@ -203,6 +203,6 @@ public class Capitalization {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Cat.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Cat.java
index c792aabac2d1..64d3fbdc7fee 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Cat.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Cat.java
@@ -90,6 +90,6 @@ public class Cat extends Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Category.java
index b6777f60ee18..4e9f8f56e5ec 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Category.java
@@ -111,6 +111,6 @@ public class Category {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ClassModel.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ClassModel.java
index b8003421bf0d..4cf0a053250d 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ClassModel.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ClassModel.java
@@ -89,6 +89,6 @@ public class ClassModel {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Client.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Client.java
index 819384de7f89..43b20dce8da8 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Client.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Client.java
@@ -88,6 +88,6 @@ public class Client {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Dog.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Dog.java
index f0a8b2faed36..8fad06d9835f 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Dog.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Dog.java
@@ -90,6 +90,6 @@ public class Dog extends Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumArrays.java
index 030170307d6d..5f063c2ec38c 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumArrays.java
@@ -215,6 +215,6 @@ public class EnumArrays {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumTest.java
index 0164ccb1abdb..fb20599a85c7 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumTest.java
@@ -301,6 +301,6 @@ public class EnumTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/FormatTest.java
index bd87692a36c2..ddb80771fdaf 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/FormatTest.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/FormatTest.java
@@ -378,6 +378,6 @@ public class FormatTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
index f1de7c53c40e..1b7ff1819411 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
@@ -93,6 +93,6 @@ public class HasOnlyReadOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/MapTest.java
index f548e9d59579..a791e68d8fbc 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/MapTest.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/MapTest.java
@@ -177,6 +177,6 @@ public class MapTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 9c92756e1669..7c99abe53eb8 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -148,6 +148,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Model200Response.java
index 5452e427c884..0d39eb7eff54 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Model200Response.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Model200Response.java
@@ -112,6 +112,6 @@ public class Model200Response {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ModelApiResponse.java
index 1bf3188ad633..3d9352c50aa8 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ModelApiResponse.java
@@ -134,6 +134,6 @@ public class ModelApiResponse {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ModelReturn.java
index 21cd4f0911d9..ab6333ff86da 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -89,6 +89,6 @@ public class ModelReturn {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Name.java
index 649c215f379d..1492add29520 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Name.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Name.java
@@ -140,6 +140,6 @@ public class Name {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/NumberOnly.java
index 27d586716d26..b13c0536a135 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/NumberOnly.java
@@ -89,6 +89,6 @@ public class NumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Order.java
index cab388bc2af3..4dcf75a7cd0c 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Order.java
@@ -253,6 +253,6 @@ public class Order {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/OuterComposite.java
index 370be22413d2..56159fe5d93c 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/OuterComposite.java
@@ -135,6 +135,6 @@ public class OuterComposite {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Pet.java
index 1dc4bc65ccb5..dac1250ac075 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Pet.java
@@ -269,6 +269,6 @@ public class Pet {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
index 8d6dce19226e..f6e025412deb 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@@ -102,6 +102,6 @@ public class ReadOnlyFirst {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/SpecialModelName.java
index f56a026cdf8b..e743292100b3 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -88,6 +88,6 @@ public class SpecialModelName {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Tag.java
index 59e8aebe64ca..bb6de58c8a1d 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Tag.java
@@ -111,6 +111,6 @@ public class Tag {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/User.java
index 99f62e87defd..4ccb8a1c147e 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/User.java
@@ -249,6 +249,6 @@ public class User {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx/docs/FakeClassnameTags123Api.md b/samples/client/petstore/java/retrofit2rx/docs/FakeClassnameTags123Api.md
index eabe324cc73b..715fed0dc0b0 100644
--- a/samples/client/petstore/java/retrofit2rx/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/java/retrofit2rx/docs/FakeClassnameTags123Api.md
@@ -16,9 +16,19 @@ To test class name in snake case
 ### Example
 ```java
 // Import classes:
+//import io.swagger.client.ApiClient;
 //import io.swagger.client.ApiException;
+//import io.swagger.client.Configuration;
+//import io.swagger.client.auth.*;
 //import io.swagger.client.api.FakeClassnameTags123Api;
 
+ApiClient defaultClient = Configuration.getDefaultApiClient();
+
+// Configure API key authorization: api_key_query
+ApiKeyAuth api_key_query = (ApiKeyAuth) defaultClient.getAuthentication("api_key_query");
+api_key_query.setApiKey("YOUR API KEY");
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//api_key_query.setApiKeyPrefix("Token");
 
 FakeClassnameTags123Api apiInstance = new FakeClassnameTags123Api();
 Client body = new Client(); // Client | client model
@@ -43,7 +53,7 @@ Name | Type | Description  | Notes
 
 ### Authorization
 
-No authorization required
+[api_key_query](../README.md#api_key_query)
 
 ### HTTP request headers
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/ApiClient.java
index c5fc0a0872b0..dfdf92060ad2 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/ApiClient.java
@@ -45,6 +45,8 @@ public class ApiClient {
       Interceptor auth;
       if ("api_key".equals(authName)) {
         auth = new ApiKeyAuth("header", "api_key");
+      } else if ("api_key_query".equals(authName)) {
+        auth = new ApiKeyAuth("query", "api_key_query");
       } else if ("http_basic_test".equals(authName)) {
         auth = new HttpBasicAuth();
       } else if ("petstore_auth".equals(authName)) {
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
index 862e4f0362a0..b302fdf6012a 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@@ -130,6 +130,6 @@ public class AdditionalPropertiesClass {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Animal.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Animal.java
index eb256ecc892a..f65c5bffcb38 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Animal.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Animal.java
@@ -112,6 +112,6 @@ public class Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/AnimalFarm.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/AnimalFarm.java
index af905454860e..0b1d6a74cc6f 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/AnimalFarm.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/AnimalFarm.java
@@ -60,6 +60,6 @@ public class AnimalFarm extends ArrayList<Animal> {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
index 90d55522c94e..f9956fe46d84 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
@@ -99,6 +99,6 @@ public class ArrayOfArrayOfNumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
index 4a3d820deea0..c79610d1c667 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
@@ -99,6 +99,6 @@ public class ArrayOfNumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ArrayTest.java
index 651065ac5c9f..747182e792ea 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ArrayTest.java
@@ -161,6 +161,6 @@ public class ArrayTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Capitalization.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Capitalization.java
index a7689d83e624..00c564ab7279 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Capitalization.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Capitalization.java
@@ -203,6 +203,6 @@ public class Capitalization {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Cat.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Cat.java
index c792aabac2d1..64d3fbdc7fee 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Cat.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Cat.java
@@ -90,6 +90,6 @@ public class Cat extends Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Category.java
index b6777f60ee18..4e9f8f56e5ec 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Category.java
@@ -111,6 +111,6 @@ public class Category {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ClassModel.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ClassModel.java
index b8003421bf0d..4cf0a053250d 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ClassModel.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ClassModel.java
@@ -89,6 +89,6 @@ public class ClassModel {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Client.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Client.java
index 819384de7f89..43b20dce8da8 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Client.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Client.java
@@ -88,6 +88,6 @@ public class Client {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Dog.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Dog.java
index f0a8b2faed36..8fad06d9835f 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Dog.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Dog.java
@@ -90,6 +90,6 @@ public class Dog extends Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumArrays.java
index 030170307d6d..5f063c2ec38c 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumArrays.java
@@ -215,6 +215,6 @@ public class EnumArrays {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumTest.java
index 0164ccb1abdb..fb20599a85c7 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumTest.java
@@ -301,6 +301,6 @@ public class EnumTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/FormatTest.java
index bd87692a36c2..ddb80771fdaf 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/FormatTest.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/FormatTest.java
@@ -378,6 +378,6 @@ public class FormatTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
index f1de7c53c40e..1b7ff1819411 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
@@ -93,6 +93,6 @@ public class HasOnlyReadOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/MapTest.java
index f548e9d59579..a791e68d8fbc 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/MapTest.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/MapTest.java
@@ -177,6 +177,6 @@ public class MapTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 9c92756e1669..7c99abe53eb8 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -148,6 +148,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Model200Response.java
index 5452e427c884..0d39eb7eff54 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Model200Response.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Model200Response.java
@@ -112,6 +112,6 @@ public class Model200Response {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ModelApiResponse.java
index 1bf3188ad633..3d9352c50aa8 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ModelApiResponse.java
@@ -134,6 +134,6 @@ public class ModelApiResponse {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ModelReturn.java
index 21cd4f0911d9..ab6333ff86da 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -89,6 +89,6 @@ public class ModelReturn {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Name.java
index 649c215f379d..1492add29520 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Name.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Name.java
@@ -140,6 +140,6 @@ public class Name {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/NumberOnly.java
index 27d586716d26..b13c0536a135 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/NumberOnly.java
@@ -89,6 +89,6 @@ public class NumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Order.java
index cab388bc2af3..4dcf75a7cd0c 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Order.java
@@ -253,6 +253,6 @@ public class Order {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/OuterComposite.java
index 370be22413d2..56159fe5d93c 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/OuterComposite.java
@@ -135,6 +135,6 @@ public class OuterComposite {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Pet.java
index 1dc4bc65ccb5..dac1250ac075 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Pet.java
@@ -269,6 +269,6 @@ public class Pet {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
index 8d6dce19226e..f6e025412deb 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@@ -102,6 +102,6 @@ public class ReadOnlyFirst {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/SpecialModelName.java
index f56a026cdf8b..e743292100b3 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -88,6 +88,6 @@ public class SpecialModelName {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Tag.java
index 59e8aebe64ca..bb6de58c8a1d 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Tag.java
@@ -111,6 +111,6 @@ public class Tag {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/User.java
index 99f62e87defd..4ccb8a1c147e 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/User.java
@@ -249,6 +249,6 @@ public class User {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/FakeClassnameTags123Api.md b/samples/client/petstore/java/retrofit2rx2/docs/FakeClassnameTags123Api.md
index eabe324cc73b..715fed0dc0b0 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/FakeClassnameTags123Api.md
@@ -16,9 +16,19 @@ To test class name in snake case
 ### Example
 ```java
 // Import classes:
+//import io.swagger.client.ApiClient;
 //import io.swagger.client.ApiException;
+//import io.swagger.client.Configuration;
+//import io.swagger.client.auth.*;
 //import io.swagger.client.api.FakeClassnameTags123Api;
 
+ApiClient defaultClient = Configuration.getDefaultApiClient();
+
+// Configure API key authorization: api_key_query
+ApiKeyAuth api_key_query = (ApiKeyAuth) defaultClient.getAuthentication("api_key_query");
+api_key_query.setApiKey("YOUR API KEY");
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//api_key_query.setApiKeyPrefix("Token");
 
 FakeClassnameTags123Api apiInstance = new FakeClassnameTags123Api();
 Client body = new Client(); // Client | client model
@@ -43,7 +53,7 @@ Name | Type | Description  | Notes
 
 ### Authorization
 
-No authorization required
+[api_key_query](../README.md#api_key_query)
 
 ### HTTP request headers
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/ApiClient.java
index c348b2a162cf..a6e2d1c9f451 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/ApiClient.java
@@ -45,6 +45,8 @@ public class ApiClient {
       Interceptor auth;
       if ("api_key".equals(authName)) {
         auth = new ApiKeyAuth("header", "api_key");
+      } else if ("api_key_query".equals(authName)) {
+        auth = new ApiKeyAuth("query", "api_key_query");
       } else if ("http_basic_test".equals(authName)) {
         auth = new HttpBasicAuth();
       } else if ("petstore_auth".equals(authName)) {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
index 862e4f0362a0..b302fdf6012a 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@@ -130,6 +130,6 @@ public class AdditionalPropertiesClass {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Animal.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Animal.java
index eb256ecc892a..f65c5bffcb38 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Animal.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Animal.java
@@ -112,6 +112,6 @@ public class Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/AnimalFarm.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/AnimalFarm.java
index af905454860e..0b1d6a74cc6f 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/AnimalFarm.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/AnimalFarm.java
@@ -60,6 +60,6 @@ public class AnimalFarm extends ArrayList<Animal> {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
index 90d55522c94e..f9956fe46d84 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
@@ -99,6 +99,6 @@ public class ArrayOfArrayOfNumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
index 4a3d820deea0..c79610d1c667 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
@@ -99,6 +99,6 @@ public class ArrayOfNumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/ArrayTest.java
index 651065ac5c9f..747182e792ea 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/ArrayTest.java
@@ -161,6 +161,6 @@ public class ArrayTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Capitalization.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Capitalization.java
index a7689d83e624..00c564ab7279 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Capitalization.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Capitalization.java
@@ -203,6 +203,6 @@ public class Capitalization {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Cat.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Cat.java
index c792aabac2d1..64d3fbdc7fee 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Cat.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Cat.java
@@ -90,6 +90,6 @@ public class Cat extends Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Category.java
index b6777f60ee18..4e9f8f56e5ec 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Category.java
@@ -111,6 +111,6 @@ public class Category {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/ClassModel.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/ClassModel.java
index b8003421bf0d..4cf0a053250d 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/ClassModel.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/ClassModel.java
@@ -89,6 +89,6 @@ public class ClassModel {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Client.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Client.java
index 819384de7f89..43b20dce8da8 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Client.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Client.java
@@ -88,6 +88,6 @@ public class Client {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Dog.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Dog.java
index f0a8b2faed36..8fad06d9835f 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Dog.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Dog.java
@@ -90,6 +90,6 @@ public class Dog extends Animal {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/EnumArrays.java
index 030170307d6d..5f063c2ec38c 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/EnumArrays.java
@@ -215,6 +215,6 @@ public class EnumArrays {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/EnumTest.java
index 0164ccb1abdb..fb20599a85c7 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/EnumTest.java
@@ -301,6 +301,6 @@ public class EnumTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/FormatTest.java
index bd87692a36c2..ddb80771fdaf 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/FormatTest.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/FormatTest.java
@@ -378,6 +378,6 @@ public class FormatTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
index f1de7c53c40e..1b7ff1819411 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
@@ -93,6 +93,6 @@ public class HasOnlyReadOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/MapTest.java
index f548e9d59579..a791e68d8fbc 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/MapTest.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/MapTest.java
@@ -177,6 +177,6 @@ public class MapTest {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 9c92756e1669..7c99abe53eb8 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -148,6 +148,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Model200Response.java
index 5452e427c884..0d39eb7eff54 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Model200Response.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Model200Response.java
@@ -112,6 +112,6 @@ public class Model200Response {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/ModelApiResponse.java
index 1bf3188ad633..3d9352c50aa8 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/ModelApiResponse.java
@@ -134,6 +134,6 @@ public class ModelApiResponse {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/ModelReturn.java
index 21cd4f0911d9..ab6333ff86da 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -89,6 +89,6 @@ public class ModelReturn {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Name.java
index 649c215f379d..1492add29520 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Name.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Name.java
@@ -140,6 +140,6 @@ public class Name {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/NumberOnly.java
index 27d586716d26..b13c0536a135 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/NumberOnly.java
@@ -89,6 +89,6 @@ public class NumberOnly {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Order.java
index cab388bc2af3..4dcf75a7cd0c 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Order.java
@@ -253,6 +253,6 @@ public class Order {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/OuterComposite.java
index 370be22413d2..56159fe5d93c 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/OuterComposite.java
@@ -135,6 +135,6 @@ public class OuterComposite {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Pet.java
index 1dc4bc65ccb5..dac1250ac075 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Pet.java
@@ -269,6 +269,6 @@ public class Pet {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
index 8d6dce19226e..f6e025412deb 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@@ -102,6 +102,6 @@ public class ReadOnlyFirst {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/SpecialModelName.java
index f56a026cdf8b..e743292100b3 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -88,6 +88,6 @@ public class SpecialModelName {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Tag.java
index 59e8aebe64ca..bb6de58c8a1d 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Tag.java
@@ -111,6 +111,6 @@ public class Tag {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/User.java
index 99f62e87defd..4ccb8a1c147e 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/User.java
@@ -249,6 +249,6 @@ public class User {
     }
     return o.toString().replace("\n", "\n    ");
   }
-  
+
 }