diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/model.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/model.mustache
index 2c383a41a28..25e0c244ed9 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/model.mustache
@@ -4,11 +4,12 @@ package {{package}};
 {{/imports}}
 
 {{#models}}
-{{#model}}{{#description}}
-/**
- * {{description}}
- **/{{/description}}
-{{#isEnum}}{{>enumClass}}{{/isEnum}}
-{{^isEnum}}{{>pojo}}{{/isEnum}}
+{{#model}}
+{{#isEnum}}
+{{>enumClass}}
+{{/isEnum}}
+{{^isEnum}}
+{{>pojo}}
+{{/isEnum}}
 {{/model}}
 {{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/model.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/model.mustache
index b9512d2b83c..d52b90c8bec 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/model.mustache
@@ -3,14 +3,17 @@ package {{package}};
 import java.util.Objects;
 {{#imports}}import {{import}};
 {{/imports}}
+{{#serializableModel}}
+import java.io.Serializable;
+{{/serializableModel}}
 
-{{#serializableModel}}import java.io.Serializable;{{/serializableModel}}
 {{#models}}
-{{#model}}{{#description}}
-/**
- * {{description}}
- **/{{/description}}
-{{#isEnum}}{{>enumOuterClass}}{{/isEnum}}
-{{^isEnum}}{{>pojo}}{{/isEnum}}
+{{#model}}
+{{#isEnum}}
+{{>enumOuterClass}}
+{{/isEnum}}
+{{^isEnum}}
+{{>pojo}}
+{{/isEnum}}
 {{/model}}
 {{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/model.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/model.mustache
index 85d815a79c6..916d909c546 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/model.mustache
@@ -4,14 +4,17 @@ import java.util.Objects;
 import java.util.ArrayList;
 {{#imports}}import {{import}};
 {{/imports}}
+{{#serializableModel}}
+import java.io.Serializable;
+{{/serializableModel}}
 
-{{#serializableModel}}import java.io.Serializable;{{/serializableModel}}
 {{#models}}
-{{#model}}{{#description}}
-/**
- * {{description}}
- **/{{/description}}
-{{#isEnum}}{{>enumOuterClass}}{{/isEnum}}
-{{^isEnum}}{{>pojo}}{{/isEnum}}
+{{#model}}
+{{#isEnum}}
+{{>enumOuterClass}}
+{{/isEnum}}
+{{^isEnum}}
+{{>pojo}}
+{{/isEnum}}
 {{/model}}
 {{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache
index a98e1b68ad4..6c4c547d5c1 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache
@@ -107,7 +107,11 @@
             <artifactId>joda-time</artifactId>
             <version>2.7</version>
         </dependency>
-
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-jaxrs</artifactId>
+            <version>${swagger-core-version}</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -152,4 +156,4 @@
         <junit-version>4.8.1</junit-version>
         <servlet-api-version>2.5</servlet-api-version>
     </properties>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpring/model.mustache b/modules/swagger-codegen/src/main/resources/JavaSpring/model.mustache
index b9512d2b83c..d52b90c8bec 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpring/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpring/model.mustache
@@ -3,14 +3,17 @@ package {{package}};
 import java.util.Objects;
 {{#imports}}import {{import}};
 {{/imports}}
+{{#serializableModel}}
+import java.io.Serializable;
+{{/serializableModel}}
 
-{{#serializableModel}}import java.io.Serializable;{{/serializableModel}}
 {{#models}}
-{{#model}}{{#description}}
-/**
- * {{description}}
- **/{{/description}}
-{{#isEnum}}{{>enumOuterClass}}{{/isEnum}}
-{{^isEnum}}{{>pojo}}{{/isEnum}}
+{{#model}}
+{{#isEnum}}
+{{>enumOuterClass}}
+{{/isEnum}}
+{{^isEnum}}
+{{>pojo}}
+{{/isEnum}}
 {{/model}}
 {{/models}}
diff --git a/samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/Category.java b/samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/Category.java
index 658d31fe8ef..3c8cf28ec23 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/Category.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/Category.java
@@ -6,12 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-/**
- * A category for a pet
- **/
-
 /**
  * A category for a pet
  */
diff --git a/samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/ModelApiResponse.java b/samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/ModelApiResponse.java
index 019b262f3fb..6d6641bfe9a 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/ModelApiResponse.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/ModelApiResponse.java
@@ -6,12 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-/**
- * Describes the result of uploading an image resource
- **/
-
 /**
  * Describes the result of uploading an image resource
  */
diff --git a/samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/Order.java b/samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/Order.java
index c2d1850bc4b..ee99fb04426 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/Order.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/Order.java
@@ -8,12 +8,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.joda.time.DateTime;
 
-
-
-/**
- * An order for a pets from the pet store
- **/
-
 /**
  * An order for a pets from the pet store
  */
diff --git a/samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/Pet.java b/samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/Pet.java
index 6701d0d1e84..5cdfc19b38e 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/Pet.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/Pet.java
@@ -11,12 +11,6 @@ import io.swagger.model.Tag;
 import java.util.ArrayList;
 import java.util.List;
 
-
-
-/**
- * A pet for sale in the pet store
- **/
-
 /**
  * A pet for sale in the pet store
  */
diff --git a/samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/Tag.java b/samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/Tag.java
index 63c38e1ae54..7fd1757b21c 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/Tag.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/Tag.java
@@ -6,12 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-/**
- * A tag for a pet
- **/
-
 /**
  * A tag for a pet
  */
diff --git a/samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/User.java b/samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/User.java
index b5d56178593..f14694154b4 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/User.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/User.java
@@ -6,12 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-/**
- * A User who is purchasing from the pet store
- **/
-
 /**
  * A User who is purchasing from the pet store
  */
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Category.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Category.java
index 658d31fe8ef..3c8cf28ec23 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Category.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Category.java
@@ -6,12 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-/**
- * A category for a pet
- **/
-
 /**
  * A category for a pet
  */
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/ModelApiResponse.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/ModelApiResponse.java
index 019b262f3fb..6d6641bfe9a 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/ModelApiResponse.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/ModelApiResponse.java
@@ -6,12 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-/**
- * Describes the result of uploading an image resource
- **/
-
 /**
  * Describes the result of uploading an image resource
  */
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Order.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Order.java
index c2d1850bc4b..ee99fb04426 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Order.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Order.java
@@ -8,12 +8,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.joda.time.DateTime;
 
-
-
-/**
- * An order for a pets from the pet store
- **/
-
 /**
  * An order for a pets from the pet store
  */
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Pet.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Pet.java
index 6701d0d1e84..5cdfc19b38e 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Pet.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Pet.java
@@ -11,12 +11,6 @@ import io.swagger.model.Tag;
 import java.util.ArrayList;
 import java.util.List;
 
-
-
-/**
- * A pet for sale in the pet store
- **/
-
 /**
  * A pet for sale in the pet store
  */
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Tag.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Tag.java
index 63c38e1ae54..7fd1757b21c 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Tag.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Tag.java
@@ -6,12 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-/**
- * A tag for a pet
- **/
-
 /**
  * A tag for a pet
  */
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/User.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/User.java
index b5d56178593..f14694154b4 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/User.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/User.java
@@ -6,12 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-/**
- * A User who is purchasing from the pet store
- **/
-
 /**
  * A User who is purchasing from the pet store
  */
diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Category.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Category.java
index 80d4ccbfc40..c84e936b3b4 100644
--- a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Category.java
+++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Category.java
@@ -1,7 +1,6 @@
 package io.swagger.model;
 
-
-
+import io.swagger.annotations.ApiModel;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/ModelApiResponse.java
index 0628c68f184..950307540f4 100644
--- a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/ModelApiResponse.java
+++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/ModelApiResponse.java
@@ -1,7 +1,6 @@
 package io.swagger.model;
 
-
-
+import io.swagger.annotations.ApiModel;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Order.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Order.java
index ef8d3dbfb73..d3d9ffabfb5 100644
--- a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Order.java
+++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Order.java
@@ -1,7 +1,6 @@
 package io.swagger.model;
 
-
-
+import io.swagger.annotations.ApiModel;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Pet.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Pet.java
index dd008ebe5a6..3c1adb7d97f 100644
--- a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Pet.java
+++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Pet.java
@@ -1,12 +1,11 @@
 package io.swagger.model;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.model.Category;
 import io.swagger.model.Tag;
 import java.util.ArrayList;
 import java.util.List;
 
-
-
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlAccessType;
diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Tag.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Tag.java
index 25927e8d4cb..1eddc2f761f 100644
--- a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Tag.java
+++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Tag.java
@@ -1,7 +1,6 @@
 package io.swagger.model;
 
-
-
+import io.swagger.annotations.ApiModel;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/User.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/User.java
index e3e3f234123..f66d1df57e0 100644
--- a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/User.java
+++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/User.java
@@ -1,7 +1,6 @@
 package io.swagger.model;
 
-
-
+import io.swagger.annotations.ApiModel;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/samples/server/petstore/jaxrs-resteasy/default/pom.xml b/samples/server/petstore/jaxrs-resteasy/default/pom.xml
index cac0fffc5ac..0a25c0159b3 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/pom.xml
+++ b/samples/server/petstore/jaxrs-resteasy/default/pom.xml
@@ -107,7 +107,11 @@
             <artifactId>joda-time</artifactId>
             <version>2.7</version>
         </dependency>
-
+        <dependency>
+              <groupId>io.swagger</groupId>
+                <artifactId>swagger-jaxrs</artifactId>
+                <version>${swagger-core-version}</version>
+              </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -152,4 +156,4 @@
         <junit-version>4.8.1</junit-version>
         <servlet-api-version>2.5</servlet-api-version>
     </properties>
-</project>
\ No newline at end of file
+</project>
diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/PetApi.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/PetApi.java
index 3a52f62afd4..eed5979f59a 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/PetApi.java
+++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/PetApi.java
@@ -5,8 +5,8 @@ import io.swagger.api.PetApiService;
 import io.swagger.api.factories.PetApiServiceFactory;
 
 import io.swagger.model.Pet;
-import io.swagger.model.ModelApiResponse;
 import java.io.File;
+import io.swagger.model.ModelApiResponse;
 
 import java.util.List;
 import io.swagger.api.NotFoundException;
diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/PetApiService.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/PetApiService.java
index 5a9683f311e..00fb6122505 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/PetApiService.java
+++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/PetApiService.java
@@ -6,8 +6,8 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput;
 
 
 import io.swagger.model.Pet;
-import io.swagger.model.ModelApiResponse;
 import java.io.File;
+import io.swagger.model.ModelApiResponse;
 
 import java.util.List;
 import io.swagger.api.NotFoundException;
diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Category.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Category.java
index 3ba941f57f4..a551df116fc 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Category.java
+++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Category.java
@@ -3,9 +3,8 @@ package io.swagger.model;
 import java.util.Objects;
 import java.util.ArrayList;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-
-
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
 
 
 public class Category   {
diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/ModelApiResponse.java
index 80a37b57648..c8898f86971 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/ModelApiResponse.java
+++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/ModelApiResponse.java
@@ -3,9 +3,8 @@ package io.swagger.model;
 import java.util.Objects;
 import java.util.ArrayList;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-
-
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
 
 
 public class ModelApiResponse   {
diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Order.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Order.java
index 9e8529a6efd..586d4b195b3 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Order.java
+++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Order.java
@@ -3,13 +3,12 @@ package io.swagger.model;
 import java.util.Objects;
 import java.util.ArrayList;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
 import java.util.Date;
 
 
-
-
-
 public class Order   {
   
   private Long id = null;
diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Pet.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Pet.java
index 92e9f34c765..685d7ab6ee6 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Pet.java
+++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Pet.java
@@ -3,15 +3,14 @@ package io.swagger.model;
 import java.util.Objects;
 import java.util.ArrayList;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
 import io.swagger.model.Category;
 import io.swagger.model.Tag;
 import java.util.List;
 
 
-
-
-
 public class Pet   {
   
   private Long id = null;
diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Tag.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Tag.java
index 9a7d194b1ac..48a6ab94a85 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Tag.java
+++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Tag.java
@@ -3,9 +3,8 @@ package io.swagger.model;
 import java.util.Objects;
 import java.util.ArrayList;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-
-
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
 
 
 public class Tag   {
diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/User.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/User.java
index c1e17bb2cfd..e95e76c1b41 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/User.java
+++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/User.java
@@ -3,9 +3,8 @@ package io.swagger.model;
 import java.util.Objects;
 import java.util.ArrayList;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-
-
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
 
 
 public class User   {
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java
index 4cc945f4087..f74f7d3d882 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java
@@ -9,9 +9,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
-
-
 /**
  * AdditionalPropertiesClass
  */
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Animal.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Animal.java
index 0e17c866e90..de739ed501c 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Animal.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Animal.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * Animal
  */
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/AnimalFarm.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/AnimalFarm.java
index 6f35d1ecec1..c2b0084d9cd 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/AnimalFarm.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/AnimalFarm.java
@@ -5,9 +5,6 @@ import io.swagger.model.Animal;
 import java.util.ArrayList;
 import java.util.List;
 
-
-
-
 /**
  * AnimalFarm
  */
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java
index dc044068238..803eb69e16a 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java
@@ -9,9 +9,6 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-
-
-
 /**
  * ArrayOfArrayOfNumberOnly
  */
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java
index f2906007107..bebc2470927 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java
@@ -9,9 +9,6 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-
-
-
 /**
  * ArrayOfNumberOnly
  */
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ArrayTest.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ArrayTest.java
index c46fe7d9379..19464a99acd 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ArrayTest.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ArrayTest.java
@@ -9,9 +9,6 @@ import io.swagger.model.ReadOnlyFirst;
 import java.util.ArrayList;
 import java.util.List;
 
-
-
-
 /**
  * ArrayTest
  */
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Cat.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Cat.java
index c63afeb8ae1..95bea570923 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Cat.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Cat.java
@@ -7,9 +7,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.model.Animal;
 
-
-
-
 /**
  * Cat
  */
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Category.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Category.java
index 502d1c42bda..ba1ecfdb2b8 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Category.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Category.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * Category
  */
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Client.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Client.java
index bdfbb513c9e..fcb2b0a8340 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Client.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Client.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * Client
  */
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Dog.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Dog.java
index f0acafc1398..f8072688756 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Dog.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Dog.java
@@ -7,9 +7,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.model.Animal;
 
-
-
-
 /**
  * Dog
  */
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/EnumArrays.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/EnumArrays.java
index b737fb00c64..959b35e6b13 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/EnumArrays.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/EnumArrays.java
@@ -9,9 +9,6 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;
 
-
-
-
 /**
  * EnumArrays
  */
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/EnumClass.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/EnumClass.java
index ec7f34e4229..d8ac42c4872 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/EnumClass.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/EnumClass.java
@@ -3,8 +3,6 @@ package io.swagger.model;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonValue;
 
-
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 
 /**
@@ -41,4 +39,3 @@ public enum EnumClass {
   }
 }
 
-
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/EnumTest.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/EnumTest.java
index 1f1f266c740..446649217c8 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/EnumTest.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/EnumTest.java
@@ -7,9 +7,6 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * EnumTest
  */
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/FormatTest.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/FormatTest.java
index 9feaa2ffddb..7c882eb3fee 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/FormatTest.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/FormatTest.java
@@ -8,9 +8,6 @@ import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.Date;
 
-
-
-
 /**
  * FormatTest
  */
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/HasOnlyReadOnly.java
index 6574a2262dd..3f5492a2e62 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/HasOnlyReadOnly.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * HasOnlyReadOnly
  */
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/MapTest.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/MapTest.java
index 33cdfbbc65f..9ef30a045d0 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/MapTest.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/MapTest.java
@@ -10,9 +10,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
-
-
 /**
  * MapTest
  */
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java
index c9b476fa3b0..5a55ab81d68 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -11,9 +11,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
-
-
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Model200Response.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Model200Response.java
index 959f05a2d31..09ad4d0d60e 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Model200Response.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Model200Response.java
@@ -6,12 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-/**
- * Model for testing model name starting with number
- **/
-
 /**
  * Model for testing model name starting with number
  */
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ModelApiResponse.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ModelApiResponse.java
index a8375a0abba..82f447004ee 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ModelApiResponse.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ModelApiResponse.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * ModelApiResponse
  */
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ModelReturn.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ModelReturn.java
index 32df0e60bd4..884a45c598e 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ModelReturn.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ModelReturn.java
@@ -6,12 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-/**
- * Model for testing reserved words
- **/
-
 /**
  * Model for testing reserved words
  */
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Name.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Name.java
index 36ddf799706..09085fb52dc 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Name.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Name.java
@@ -6,12 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-/**
- * Model for testing model name same as property name
- **/
-
 /**
  * Model for testing model name same as property name
  */
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/NumberOnly.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/NumberOnly.java
index 5d13ab82782..9424f7a4b5e 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/NumberOnly.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/NumberOnly.java
@@ -7,9 +7,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 
-
-
-
 /**
  * NumberOnly
  */
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Order.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Order.java
index 11d16d8ed7b..1dfe20badf0 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Order.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Order.java
@@ -8,9 +8,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
 
-
-
-
 /**
  * Order
  */
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Pet.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Pet.java
index 9189a91034b..823d25e05a0 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Pet.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Pet.java
@@ -11,9 +11,6 @@ import io.swagger.model.Tag;
 import java.util.ArrayList;
 import java.util.List;
 
-
-
-
 /**
  * Pet
  */
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ReadOnlyFirst.java
index 826f7ca18c2..50a2a7e4184 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ReadOnlyFirst.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * ReadOnlyFirst
  */
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/SpecialModelName.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/SpecialModelName.java
index 01b6be46d7f..2cdc99de90e 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/SpecialModelName.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/SpecialModelName.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * SpecialModelName
  */
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Tag.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Tag.java
index e75d10df70e..846812a5031 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Tag.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Tag.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * Tag
  */
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/User.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/User.java
index 11a1a82a5cd..52c5fff826e 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/User.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/User.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * User
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/AdditionalPropertiesClass.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/AdditionalPropertiesClass.java
index 4cc945f4087..f74f7d3d882 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/AdditionalPropertiesClass.java
@@ -9,9 +9,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
-
-
 /**
  * AdditionalPropertiesClass
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Animal.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Animal.java
index 0e17c866e90..de739ed501c 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Animal.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Animal.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * Animal
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/AnimalFarm.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/AnimalFarm.java
index 6f35d1ecec1..c2b0084d9cd 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/AnimalFarm.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/AnimalFarm.java
@@ -5,9 +5,6 @@ import io.swagger.model.Animal;
 import java.util.ArrayList;
 import java.util.List;
 
-
-
-
 /**
  * AnimalFarm
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java
index dc044068238..803eb69e16a 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java
@@ -9,9 +9,6 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-
-
-
 /**
  * ArrayOfArrayOfNumberOnly
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/ArrayOfNumberOnly.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/ArrayOfNumberOnly.java
index f2906007107..bebc2470927 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/ArrayOfNumberOnly.java
@@ -9,9 +9,6 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-
-
-
 /**
  * ArrayOfNumberOnly
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/ArrayTest.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/ArrayTest.java
index c46fe7d9379..19464a99acd 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/ArrayTest.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/ArrayTest.java
@@ -9,9 +9,6 @@ import io.swagger.model.ReadOnlyFirst;
 import java.util.ArrayList;
 import java.util.List;
 
-
-
-
 /**
  * ArrayTest
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Cat.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Cat.java
index c63afeb8ae1..95bea570923 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Cat.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Cat.java
@@ -7,9 +7,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.model.Animal;
 
-
-
-
 /**
  * Cat
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Category.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Category.java
index 502d1c42bda..ba1ecfdb2b8 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Category.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Category.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * Category
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Client.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Client.java
index bdfbb513c9e..fcb2b0a8340 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Client.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Client.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * Client
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Dog.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Dog.java
index f0acafc1398..f8072688756 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Dog.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Dog.java
@@ -7,9 +7,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.model.Animal;
 
-
-
-
 /**
  * Dog
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/EnumArrays.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/EnumArrays.java
index b737fb00c64..959b35e6b13 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/EnumArrays.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/EnumArrays.java
@@ -9,9 +9,6 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;
 
-
-
-
 /**
  * EnumArrays
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/EnumClass.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/EnumClass.java
index ec7f34e4229..d8ac42c4872 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/EnumClass.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/EnumClass.java
@@ -3,8 +3,6 @@ package io.swagger.model;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonValue;
 
-
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 
 /**
@@ -41,4 +39,3 @@ public enum EnumClass {
   }
 }
 
-
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/EnumTest.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/EnumTest.java
index 1f1f266c740..446649217c8 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/EnumTest.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/EnumTest.java
@@ -7,9 +7,6 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * EnumTest
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/FormatTest.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/FormatTest.java
index 8b3c34fedb3..242a20cfc3b 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/FormatTest.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/FormatTest.java
@@ -9,9 +9,6 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 
-
-
-
 /**
  * FormatTest
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/HasOnlyReadOnly.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/HasOnlyReadOnly.java
index 6574a2262dd..3f5492a2e62 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/HasOnlyReadOnly.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * HasOnlyReadOnly
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/MapTest.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/MapTest.java
index 33cdfbbc65f..9ef30a045d0 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/MapTest.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/MapTest.java
@@ -10,9 +10,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
-
-
 /**
  * MapTest
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java
index ecffd491f3f..ea443a94338 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -11,9 +11,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
-
-
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Model200Response.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Model200Response.java
index 959f05a2d31..09ad4d0d60e 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Model200Response.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Model200Response.java
@@ -6,12 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-/**
- * Model for testing model name starting with number
- **/
-
 /**
  * Model for testing model name starting with number
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/ModelApiResponse.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/ModelApiResponse.java
index a8375a0abba..82f447004ee 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/ModelApiResponse.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/ModelApiResponse.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * ModelApiResponse
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/ModelReturn.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/ModelReturn.java
index 32df0e60bd4..884a45c598e 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/ModelReturn.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/ModelReturn.java
@@ -6,12 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-/**
- * Model for testing reserved words
- **/
-
 /**
  * Model for testing reserved words
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Name.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Name.java
index 36ddf799706..09085fb52dc 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Name.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Name.java
@@ -6,12 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-/**
- * Model for testing model name same as property name
- **/
-
 /**
  * Model for testing model name same as property name
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/NumberOnly.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/NumberOnly.java
index 5d13ab82782..9424f7a4b5e 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/NumberOnly.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/NumberOnly.java
@@ -7,9 +7,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 
-
-
-
 /**
  * NumberOnly
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Order.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Order.java
index 03279ffa28a..cee3ae6d708 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Order.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Order.java
@@ -8,9 +8,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.time.OffsetDateTime;
 
-
-
-
 /**
  * Order
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Pet.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Pet.java
index 9189a91034b..823d25e05a0 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Pet.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Pet.java
@@ -11,9 +11,6 @@ import io.swagger.model.Tag;
 import java.util.ArrayList;
 import java.util.List;
 
-
-
-
 /**
  * Pet
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/ReadOnlyFirst.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/ReadOnlyFirst.java
index 826f7ca18c2..50a2a7e4184 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/ReadOnlyFirst.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * ReadOnlyFirst
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/SpecialModelName.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/SpecialModelName.java
index 01b6be46d7f..2cdc99de90e 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/SpecialModelName.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/SpecialModelName.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * SpecialModelName
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Tag.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Tag.java
index e75d10df70e..846812a5031 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Tag.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Tag.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * Tag
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/User.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/User.java
index 11a1a82a5cd..52c5fff826e 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/User.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/User.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * User
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/AdditionalPropertiesClass.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/AdditionalPropertiesClass.java
index 4cc945f4087..f74f7d3d882 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/AdditionalPropertiesClass.java
@@ -9,9 +9,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
-
-
 /**
  * AdditionalPropertiesClass
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Animal.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Animal.java
index 0e17c866e90..de739ed501c 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Animal.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Animal.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * Animal
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/AnimalFarm.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/AnimalFarm.java
index 6f35d1ecec1..c2b0084d9cd 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/AnimalFarm.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/AnimalFarm.java
@@ -5,9 +5,6 @@ import io.swagger.model.Animal;
 import java.util.ArrayList;
 import java.util.List;
 
-
-
-
 /**
  * AnimalFarm
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java
index dc044068238..803eb69e16a 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java
@@ -9,9 +9,6 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-
-
-
 /**
  * ArrayOfArrayOfNumberOnly
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ArrayOfNumberOnly.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ArrayOfNumberOnly.java
index f2906007107..bebc2470927 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ArrayOfNumberOnly.java
@@ -9,9 +9,6 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-
-
-
 /**
  * ArrayOfNumberOnly
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ArrayTest.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ArrayTest.java
index c46fe7d9379..19464a99acd 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ArrayTest.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ArrayTest.java
@@ -9,9 +9,6 @@ import io.swagger.model.ReadOnlyFirst;
 import java.util.ArrayList;
 import java.util.List;
 
-
-
-
 /**
  * ArrayTest
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Cat.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Cat.java
index c63afeb8ae1..95bea570923 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Cat.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Cat.java
@@ -7,9 +7,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.model.Animal;
 
-
-
-
 /**
  * Cat
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Category.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Category.java
index 502d1c42bda..ba1ecfdb2b8 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Category.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Category.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * Category
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Client.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Client.java
index bdfbb513c9e..fcb2b0a8340 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Client.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Client.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * Client
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Dog.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Dog.java
index f0acafc1398..f8072688756 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Dog.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Dog.java
@@ -7,9 +7,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.model.Animal;
 
-
-
-
 /**
  * Dog
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/EnumArrays.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/EnumArrays.java
index b737fb00c64..959b35e6b13 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/EnumArrays.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/EnumArrays.java
@@ -9,9 +9,6 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;
 
-
-
-
 /**
  * EnumArrays
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/EnumClass.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/EnumClass.java
index ec7f34e4229..d8ac42c4872 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/EnumClass.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/EnumClass.java
@@ -3,8 +3,6 @@ package io.swagger.model;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonValue;
 
-
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 
 /**
@@ -41,4 +39,3 @@ public enum EnumClass {
   }
 }
 
-
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/EnumTest.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/EnumTest.java
index 1f1f266c740..446649217c8 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/EnumTest.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/EnumTest.java
@@ -7,9 +7,6 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * EnumTest
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/FormatTest.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/FormatTest.java
index db755ca5137..8d3cd2bec93 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/FormatTest.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/FormatTest.java
@@ -9,9 +9,6 @@ import java.math.BigDecimal;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
 
-
-
-
 /**
  * FormatTest
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/HasOnlyReadOnly.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/HasOnlyReadOnly.java
index 6574a2262dd..3f5492a2e62 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/HasOnlyReadOnly.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * HasOnlyReadOnly
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/MapTest.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/MapTest.java
index 33cdfbbc65f..9ef30a045d0 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/MapTest.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/MapTest.java
@@ -10,9 +10,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
-
-
 /**
  * MapTest
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 98597929ad6..36106536c7b 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -11,9 +11,6 @@ import java.util.List;
 import java.util.Map;
 import org.joda.time.DateTime;
 
-
-
-
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Model200Response.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Model200Response.java
index 959f05a2d31..09ad4d0d60e 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Model200Response.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Model200Response.java
@@ -6,12 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-/**
- * Model for testing model name starting with number
- **/
-
 /**
  * Model for testing model name starting with number
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ModelApiResponse.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ModelApiResponse.java
index a8375a0abba..82f447004ee 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ModelApiResponse.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ModelApiResponse.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * ModelApiResponse
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ModelReturn.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ModelReturn.java
index 32df0e60bd4..884a45c598e 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ModelReturn.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ModelReturn.java
@@ -6,12 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-/**
- * Model for testing reserved words
- **/
-
 /**
  * Model for testing reserved words
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Name.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Name.java
index 36ddf799706..09085fb52dc 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Name.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Name.java
@@ -6,12 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-/**
- * Model for testing model name same as property name
- **/
-
 /**
  * Model for testing model name same as property name
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/NumberOnly.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/NumberOnly.java
index 5d13ab82782..9424f7a4b5e 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/NumberOnly.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/NumberOnly.java
@@ -7,9 +7,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 
-
-
-
 /**
  * NumberOnly
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Order.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Order.java
index 09fe1ee39c3..2863c127f60 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Order.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Order.java
@@ -8,9 +8,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.joda.time.DateTime;
 
-
-
-
 /**
  * Order
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Pet.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Pet.java
index 9189a91034b..823d25e05a0 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Pet.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Pet.java
@@ -11,9 +11,6 @@ import io.swagger.model.Tag;
 import java.util.ArrayList;
 import java.util.List;
 
-
-
-
 /**
  * Pet
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ReadOnlyFirst.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ReadOnlyFirst.java
index 826f7ca18c2..50a2a7e4184 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ReadOnlyFirst.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * ReadOnlyFirst
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/SpecialModelName.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/SpecialModelName.java
index 01b6be46d7f..2cdc99de90e 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/SpecialModelName.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/SpecialModelName.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * SpecialModelName
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Tag.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Tag.java
index e75d10df70e..846812a5031 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Tag.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Tag.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * Tag
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/User.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/User.java
index 11a1a82a5cd..52c5fff826e 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/User.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/User.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * User
  */
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/AdditionalPropertiesClass.java
index 4cc945f4087..f74f7d3d882 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/AdditionalPropertiesClass.java
@@ -9,9 +9,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
-
-
 /**
  * AdditionalPropertiesClass
  */
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Animal.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Animal.java
index 0e17c866e90..de739ed501c 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Animal.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Animal.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * Animal
  */
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/AnimalFarm.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/AnimalFarm.java
index 6f35d1ecec1..c2b0084d9cd 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/AnimalFarm.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/AnimalFarm.java
@@ -5,9 +5,6 @@ import io.swagger.model.Animal;
 import java.util.ArrayList;
 import java.util.List;
 
-
-
-
 /**
  * AnimalFarm
  */
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java
index dc044068238..803eb69e16a 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java
@@ -9,9 +9,6 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-
-
-
 /**
  * ArrayOfArrayOfNumberOnly
  */
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/ArrayOfNumberOnly.java
index f2906007107..bebc2470927 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/ArrayOfNumberOnly.java
@@ -9,9 +9,6 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-
-
-
 /**
  * ArrayOfNumberOnly
  */
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/ArrayTest.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/ArrayTest.java
index c46fe7d9379..19464a99acd 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/ArrayTest.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/ArrayTest.java
@@ -9,9 +9,6 @@ import io.swagger.model.ReadOnlyFirst;
 import java.util.ArrayList;
 import java.util.List;
 
-
-
-
 /**
  * ArrayTest
  */
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Cat.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Cat.java
index c63afeb8ae1..95bea570923 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Cat.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Cat.java
@@ -7,9 +7,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.model.Animal;
 
-
-
-
 /**
  * Cat
  */
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Category.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Category.java
index 502d1c42bda..ba1ecfdb2b8 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Category.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Category.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * Category
  */
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Client.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Client.java
index bdfbb513c9e..fcb2b0a8340 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Client.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Client.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * Client
  */
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Dog.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Dog.java
index f0acafc1398..f8072688756 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Dog.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Dog.java
@@ -7,9 +7,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.model.Animal;
 
-
-
-
 /**
  * Dog
  */
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/EnumArrays.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/EnumArrays.java
index b737fb00c64..959b35e6b13 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/EnumArrays.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/EnumArrays.java
@@ -9,9 +9,6 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;
 
-
-
-
 /**
  * EnumArrays
  */
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/EnumClass.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/EnumClass.java
index ec7f34e4229..d8ac42c4872 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/EnumClass.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/EnumClass.java
@@ -3,8 +3,6 @@ package io.swagger.model;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonValue;
 
-
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 
 /**
@@ -41,4 +39,3 @@ public enum EnumClass {
   }
 }
 
-
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/EnumTest.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/EnumTest.java
index 1f1f266c740..446649217c8 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/EnumTest.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/EnumTest.java
@@ -7,9 +7,6 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * EnumTest
  */
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/FormatTest.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/FormatTest.java
index db755ca5137..8d3cd2bec93 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/FormatTest.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/FormatTest.java
@@ -9,9 +9,6 @@ import java.math.BigDecimal;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
 
-
-
-
 /**
  * FormatTest
  */
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/HasOnlyReadOnly.java
index 6574a2262dd..3f5492a2e62 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/HasOnlyReadOnly.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * HasOnlyReadOnly
  */
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/MapTest.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/MapTest.java
index 33cdfbbc65f..9ef30a045d0 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/MapTest.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/MapTest.java
@@ -10,9 +10,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
-
-
 /**
  * MapTest
  */
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 98597929ad6..36106536c7b 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -11,9 +11,6 @@ import java.util.List;
 import java.util.Map;
 import org.joda.time.DateTime;
 
-
-
-
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Model200Response.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Model200Response.java
index 959f05a2d31..09ad4d0d60e 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Model200Response.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Model200Response.java
@@ -6,12 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-/**
- * Model for testing model name starting with number
- **/
-
 /**
  * Model for testing model name starting with number
  */
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/ModelApiResponse.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/ModelApiResponse.java
index a8375a0abba..82f447004ee 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/ModelApiResponse.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * ModelApiResponse
  */
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/ModelReturn.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/ModelReturn.java
index 32df0e60bd4..884a45c598e 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/ModelReturn.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/ModelReturn.java
@@ -6,12 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-/**
- * Model for testing reserved words
- **/
-
 /**
  * Model for testing reserved words
  */
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Name.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Name.java
index 36ddf799706..09085fb52dc 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Name.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Name.java
@@ -6,12 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-/**
- * Model for testing model name same as property name
- **/
-
 /**
  * Model for testing model name same as property name
  */
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/NumberOnly.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/NumberOnly.java
index 5d13ab82782..9424f7a4b5e 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/NumberOnly.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/NumberOnly.java
@@ -7,9 +7,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 
-
-
-
 /**
  * NumberOnly
  */
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Order.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Order.java
index 09fe1ee39c3..2863c127f60 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Order.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Order.java
@@ -8,9 +8,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.joda.time.DateTime;
 
-
-
-
 /**
  * Order
  */
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Pet.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Pet.java
index 9189a91034b..823d25e05a0 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Pet.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Pet.java
@@ -11,9 +11,6 @@ import io.swagger.model.Tag;
 import java.util.ArrayList;
 import java.util.List;
 
-
-
-
 /**
  * Pet
  */
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/ReadOnlyFirst.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/ReadOnlyFirst.java
index 826f7ca18c2..50a2a7e4184 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/ReadOnlyFirst.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * ReadOnlyFirst
  */
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/SpecialModelName.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/SpecialModelName.java
index 01b6be46d7f..2cdc99de90e 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/SpecialModelName.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * SpecialModelName
  */
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Tag.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Tag.java
index e75d10df70e..846812a5031 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Tag.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Tag.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * Tag
  */
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/User.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/User.java
index 11a1a82a5cd..52c5fff826e 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/User.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/User.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
-
-
 /**
  * User
  */