Replace ^M with new line (\r) in mustache template (#3865)

* fix jaxrs line break

* fix java gradle bat line break

* fix scala gradle line break

* fix undertow crt line break

* fix spring line break

* fix undertow line break in pom

* rollback undertwo petstore to use petstore.yaml

bin/java-undertow-petstore-server.sh

@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/undertow -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l undertow -o samples/server/petstore/undertow"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/undertow -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l undertow -o samples/server/petstore/undertow"
 
 java $JAVA_OPTS -jar $executable $ags

samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/Category.java

@@ -8,10 +8,14 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
+/**
+ * A category for a pet
+ **/
 
 /**
- * Category
+ * A category for a pet
  */
+@ApiModel(description = "A category for a pet")
 
 public class Category   {
   @JsonProperty("id")

samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/ModelApiResponse.java

@@ -8,10 +8,14 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
+/**
+ * Describes the result of uploading an image resource
+ **/
 
 /**
- * ModelApiResponse
+ * Describes the result of uploading an image resource
  */
+@ApiModel(description = "Describes the result of uploading an image resource")
 
 public class ModelApiResponse   {
   @JsonProperty("code")

samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/Order.java

@@ -10,10 +10,14 @@ import org.joda.time.DateTime;
 
 
 
+/**
+ * An order for a pets from the pet store
+ **/
 
 /**
- * Order
+ * An order for a pets from the pet store
  */
+@ApiModel(description = "An order for a pets from the pet store")
 
 public class Order   {
   @JsonProperty("id")

samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/Pet.java

@@ -13,10 +13,14 @@ import java.util.List;
 
 
 
+/**
+ * A pet for sale in the pet store
+ **/
 
 /**
- * Pet
+ * A pet for sale in the pet store
  */
+@ApiModel(description = "A pet for sale in the pet store")
 
 public class Pet   {
   @JsonProperty("id")

samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/Tag.java

@@ -8,10 +8,14 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
+/**
+ * A tag for a pet
+ **/
 
 /**
- * Tag
+ * A tag for a pet
  */
+@ApiModel(description = "A tag for a pet")
 
 public class Tag   {
   @JsonProperty("id")

samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/User.java

@@ -8,10 +8,14 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
+/**
+ * A User who is purchasing from the pet store
+ **/
 
 /**
- * User
+ * A User who is purchasing from the pet store
  */
+@ApiModel(description = "A User who is purchasing from the pet store")
 
 public class User   {
   @JsonProperty("id")

samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Category.java

@@ -8,10 +8,14 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
+/**
+ * A category for a pet
+ **/
 
 /**
- * Category
+ * A category for a pet
  */
+@ApiModel(description = "A category for a pet")
 
 public class Category   {
   @JsonProperty("id")

samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/ModelApiResponse.java

@@ -8,10 +8,14 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
+/**
+ * Describes the result of uploading an image resource
+ **/
 
 /**
- * ModelApiResponse
+ * Describes the result of uploading an image resource
  */
+@ApiModel(description = "Describes the result of uploading an image resource")
 
 public class ModelApiResponse   {
   @JsonProperty("code")

samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Order.java

@@ -10,10 +10,14 @@ import org.joda.time.DateTime;
 
 
 
+/**
+ * An order for a pets from the pet store
+ **/
 
 /**
- * Order
+ * An order for a pets from the pet store
  */
+@ApiModel(description = "An order for a pets from the pet store")
 
 public class Order   {
   @JsonProperty("id")

samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Pet.java

@@ -13,10 +13,14 @@ import java.util.List;
 
 
 
+/**
+ * A pet for sale in the pet store
+ **/
 
 /**
- * Pet
+ * A pet for sale in the pet store
  */
+@ApiModel(description = "A pet for sale in the pet store")
 
 public class Pet   {
   @JsonProperty("id")

samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Tag.java

@@ -8,10 +8,14 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
+/**
+ * A tag for a pet
+ **/
 
 /**
- * Tag
+ * A tag for a pet
  */
+@ApiModel(description = "A tag for a pet")
 
 public class Tag   {
   @JsonProperty("id")

samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/User.java

@@ -8,10 +8,14 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
+/**
+ * A User who is purchasing from the pet store
+ **/
 
 /**
- * User
+ * A User who is purchasing from the pet store
  */
+@ApiModel(description = "A User who is purchasing from the pet store")
 
 public class User   {
   @JsonProperty("id")

samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/FakeApi.java

@@ -60,19 +60,20 @@ public class FakeApi  {
     public Response testEndpointParameters(
         @ApiParam(value = "None", required=true)  @FormParam("number")  BigDecimal number,
         @ApiParam(value = "None", required=true)  @FormParam("double")  Double _double,
-        @ApiParam(value = "None", required=true)  @FormParam("string")  String string,
+        @ApiParam(value = "None", required=true)  @FormParam("pattern_without_delimiter")  String patternWithoutDelimiter,
         @ApiParam(value = "None", required=true)  @FormParam("byte")  byte[] _byte,
         @ApiParam(value = "None")  @FormParam("integer")  Integer integer,
         @ApiParam(value = "None")  @FormParam("int32")  Integer int32,
         @ApiParam(value = "None")  @FormParam("int64")  Long int64,
         @ApiParam(value = "None")  @FormParam("float")  Float _float,
+        @ApiParam(value = "None")  @FormParam("string")  String string,
         @ApiParam(value = "None")  @FormParam("binary")  byte[] binary,
         @ApiParam(value = "None")  @FormParam("date")  Date date,
         @ApiParam(value = "None")  @FormParam("dateTime")  Date dateTime,
         @ApiParam(value = "None")  @FormParam("password")  String password,
         @Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.testEndpointParameters(number,_double,string,_byte,integer,int32,int64,_float,binary,date,dateTime,password,securityContext);
+        return delegate.testEndpointParameters(number,_double,patternWithoutDelimiter,_byte,integer,int32,int64,_float,string,binary,date,dateTime,password,securityContext);
     }
     @GET
     
@@ -83,9 +84,9 @@ public class FakeApi  {
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid request", response = void.class),
         @io.swagger.annotations.ApiResponse(code = 404, message = "Not found", response = void.class) })
     public Response testEnumParameters(
-        @ApiParam(value = "Form parameter enum test (string array)")  @FormParam("enum_form_string_array")  List<String> enumFormStringArray,
+        @ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $")  @FormParam("enum_form_string_array")  List<String> enumFormStringArray,
         @ApiParam(value = "Form parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg")  @DefaultValue("-efg") @FormParam("enum_form_string")  String enumFormString,
-        @ApiParam(value = "Header parameter enum test (string array)" )@HeaderParam("enum_header_string_array") List<String> enumHeaderStringArray,
+        @ApiParam(value = "Header parameter enum test (string array)" , allowableValues=">, $")@HeaderParam("enum_header_string_array") List<String> enumHeaderStringArray,
         @ApiParam(value = "Header parameter enum test (string)" , allowableValues="_abc, -efg, (xyz)", defaultValue="-efg")@HeaderParam("enum_header_string") String enumHeaderString,
         @ApiParam(value = "Query parameter enum test (string array)", allowableValues=">, $") @QueryParam("enum_query_string_array") List<String> enumQueryStringArray,
         @ApiParam(value = "Query parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @DefaultValue("-efg") @QueryParam("enum_query_string") String enumQueryString,

samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/FakeApiService.java

@@ -24,7 +24,7 @@ import javax.ws.rs.core.SecurityContext;
 public abstract class FakeApiService {
       public abstract Response testClientModel(Client body,SecurityContext securityContext)
       throws NotFoundException;
-      public abstract Response testEndpointParameters(BigDecimal number,Double _double,String string,byte[] _byte,Integer integer,Integer int32,Long int64,Float _float,byte[] binary,Date date,Date dateTime,String password,SecurityContext securityContext)
+      public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer integer,Integer int32,Long int64,Float _float,String string,byte[] binary,Date date,Date dateTime,String password,SecurityContext securityContext)
       throws NotFoundException;
       public abstract Response testEnumParameters(List<String> enumFormStringArray,String enumFormString,List<String> enumHeaderStringArray,String enumHeaderString,List<String> enumQueryStringArray,String enumQueryString,BigDecimal enumQueryInteger,Double enumQueryDouble,SecurityContext securityContext)
       throws NotFoundException;

samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Model200Response.java

@@ -22,7 +22,7 @@ public class Model200Response   {
   private Integer name = null;
 
   @JsonProperty("class")
-  private String PropertyClass = null;
+  private String propertyClass = null;
 
   public Model200Response name(Integer name) {
     this.name = name;
@@ -42,22 +42,22 @@ public class Model200Response   {
     this.name = name;
   }
 
-  public Model200Response PropertyClass(String PropertyClass) {
+  public Model200Response propertyClass(String propertyClass) {
-    this.PropertyClass = PropertyClass;
+    this.propertyClass = propertyClass;
     return this;
   }
 
    /**
-   * Get PropertyClass
+   * Get propertyClass
-   * @return PropertyClass
+   * @return propertyClass
   **/
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
-    return PropertyClass;
+    return propertyClass;
   }
 
-  public void setPropertyClass(String PropertyClass) {
+  public void setPropertyClass(String propertyClass) {
-    this.PropertyClass = PropertyClass;
+    this.propertyClass = propertyClass;
   }
 
 
@@ -71,12 +71,12 @@ public class Model200Response   {
     }
     Model200Response _200Response = (Model200Response) o;
     return Objects.equals(this.name, _200Response.name) &&
-        Objects.equals(this.PropertyClass, _200Response.PropertyClass);
+        Objects.equals(this.propertyClass, _200Response.propertyClass);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(name, PropertyClass);
+    return Objects.hash(name, propertyClass);
   }
 
   @Override
@@ -85,7 +85,7 @@ public class Model200Response   {
     sb.append("class Model200Response {\n");
     
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    PropertyClass: ").append(toIndentedString(PropertyClass)).append("\n");
+    sb.append("    propertyClass: ").append(toIndentedString(propertyClass)).append("\n");
     sb.append("}");
     return sb.toString();
   }

samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java

@@ -29,7 +29,7 @@ public class FakeApiServiceImpl extends FakeApiService {
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
     @Override
-    public Response testEndpointParameters(BigDecimal number, Double _double, String string, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, byte[] binary, Date date, Date dateTime, String password, SecurityContext securityContext)
+    public Response testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, byte[] binary, Date date, Date dateTime, String password, SecurityContext securityContext)
     throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();

samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/FakeApi.java

@@ -8,8 +8,8 @@ import io.swagger.annotations.ApiParam;
 import io.swagger.jaxrs.*;
 
 import io.swagger.model.Client;
-import java.math.BigDecimal;
 import java.util.Date;
+import java.math.BigDecimal;
 
 import java.util.List;
 import io.swagger.api.NotFoundException;

samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/FakeApiService.java

@@ -6,8 +6,8 @@ import io.swagger.model.*;
 import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 
 import io.swagger.model.Client;
-import java.math.BigDecimal;
 import java.util.Date;
+import java.math.BigDecimal;
 
 import java.util.List;
 import io.swagger.api.NotFoundException;

samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/PetApi.java

@@ -8,8 +8,8 @@ import io.swagger.annotations.ApiParam;
 import io.swagger.jaxrs.*;
 
 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;

samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/PetApiService.java

@@ -6,8 +6,8 @@ import io.swagger.model.*;
 import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 
 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;

samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java

@@ -4,8 +4,8 @@ import io.swagger.api.*;
 import io.swagger.model.*;
 
 import io.swagger.model.Client;
-import java.math.BigDecimal;
 import java.util.Date;
+import java.math.BigDecimal;
 
 import java.util.List;
 import io.swagger.api.NotFoundException;

samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java

@@ -4,8 +4,8 @@ import io.swagger.api.*;
 import io.swagger.model.*;
 
 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;

samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/FakeApi.java

@@ -62,7 +62,7 @@ public interface FakeApi {
 ,
 
 
-@ApiParam(value = "None", required=true ) @RequestPart(value="string", required=true)  String string
+@ApiParam(value = "None", required=true ) @RequestPart(value="patternWithoutDelimiter", required=true)  String patternWithoutDelimiter
 ,
 
 
@@ -86,6 +86,10 @@ public interface FakeApi {
 ,
 
 
+@ApiParam(value = "None" ) @RequestPart(value="string", required=false)  String string
+,
+
+
 @ApiParam(value = "None" ) @RequestPart(value="binary", required=false)  byte[] binary
 ,
 
@@ -116,13 +120,13 @@ public interface FakeApi {
     default CompletableFuture<ResponseEntity<Void>> testEnumParameters(
 
 
-@ApiParam(value = "Form parameter enum test (string array)" ) @RequestPart(value="enumFormStringArray", required=false)  List<String> enumFormStringArray
+@ApiParam(value = "Form parameter enum test (string array)" , allowableValues="GREATER_THAN, DOLLAR") @RequestPart(value="enumFormStringArray", required=false)  List<String> enumFormStringArray
 ,
 
 
 @ApiParam(value = "Form parameter enum test (string)" , allowableValues="_ABC, _EFG, _XYZ_", defaultValue="-efg") @RequestPart(value="enumFormString", required=false)  String enumFormString
 ,
-@ApiParam(value = "Header parameter enum test (string array)"  ) @RequestHeader(value="enum_header_string_array", required=false) List<String> enumHeaderStringArray
+@ApiParam(value = "Header parameter enum test (string array)"  , allowableValues="GREATER_THAN, DOLLAR") @RequestHeader(value="enum_header_string_array", required=false) List<String> enumHeaderStringArray
 
 
 ,

samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Model200Response.java

@@ -22,7 +22,7 @@ public class Model200Response   {
   private Integer name = null;
 
   @JsonProperty("class")
-  private String PropertyClass = null;
+  private String propertyClass = null;
 
   public Model200Response name(Integer name) {
     this.name = name;
@@ -42,22 +42,22 @@ public class Model200Response   {
     this.name = name;
   }
 
-  public Model200Response PropertyClass(String PropertyClass) {
+  public Model200Response propertyClass(String propertyClass) {
-    this.PropertyClass = PropertyClass;
+    this.propertyClass = propertyClass;
     return this;
   }
 
    /**
-   * Get PropertyClass
+   * Get propertyClass
-   * @return PropertyClass
+   * @return propertyClass
   **/
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
-    return PropertyClass;
+    return propertyClass;
   }
 
-  public void setPropertyClass(String PropertyClass) {
+  public void setPropertyClass(String propertyClass) {
-    this.PropertyClass = PropertyClass;
+    this.propertyClass = propertyClass;
   }
 
 
@@ -71,12 +71,12 @@ public class Model200Response   {
     }
     Model200Response _200Response = (Model200Response) o;
     return Objects.equals(this.name, _200Response.name) &&
-        Objects.equals(this.PropertyClass, _200Response.PropertyClass);
+        Objects.equals(this.propertyClass, _200Response.propertyClass);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(name, PropertyClass);
+    return Objects.hash(name, propertyClass);
   }
 
   @Override
@@ -85,7 +85,7 @@ public class Model200Response   {
     sb.append("class Model200Response {\n");
     
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    PropertyClass: ").append(toIndentedString(PropertyClass)).append("\n");
+    sb.append("    propertyClass: ").append(toIndentedString(propertyClass)).append("\n");
     sb.append("}");
     return sb.toString();
   }

samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApi.java

@@ -57,7 +57,7 @@ public interface FakeApi {
 ,
 
 
-@ApiParam(value = "None", required=true ) @RequestPart(value="string", required=true)  String string
+@ApiParam(value = "None", required=true ) @RequestPart(value="patternWithoutDelimiter", required=true)  String patternWithoutDelimiter
 ,
 
 
@@ -81,6 +81,10 @@ public interface FakeApi {
 ,
 
 
+@ApiParam(value = "None" ) @RequestPart(value="string", required=false)  String string
+,
+
+
 @ApiParam(value = "None" ) @RequestPart(value="binary", required=false)  byte[] binary
 ,
 
@@ -108,13 +112,13 @@ public interface FakeApi {
     ResponseEntity<Void> testEnumParameters(
 
 
-@ApiParam(value = "Form parameter enum test (string array)" ) @RequestPart(value="enumFormStringArray", required=false)  List<String> enumFormStringArray
+@ApiParam(value = "Form parameter enum test (string array)" , allowableValues="GREATER_THAN, DOLLAR") @RequestPart(value="enumFormStringArray", required=false)  List<String> enumFormStringArray
 ,
 
 
 @ApiParam(value = "Form parameter enum test (string)" , allowableValues="_ABC, _EFG, _XYZ_", defaultValue="-efg") @RequestPart(value="enumFormString", required=false)  String enumFormString
 ,
-@ApiParam(value = "Header parameter enum test (string array)"  ) @RequestHeader(value="enum_header_string_array", required=false) List<String> enumHeaderStringArray
+@ApiParam(value = "Header parameter enum test (string array)"  , allowableValues="GREATER_THAN, DOLLAR") @RequestHeader(value="enum_header_string_array", required=false) List<String> enumHeaderStringArray
 
 
 ,

samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApiController.java

@@ -46,7 +46,7 @@ public class FakeApiController implements FakeApi {
         
 
 
-@ApiParam(value = "None", required=true ) @RequestPart(value="string", required=true)  String string
+@ApiParam(value = "None", required=true ) @RequestPart(value="patternWithoutDelimiter", required=true)  String patternWithoutDelimiter
 ,
         
 
@@ -76,6 +76,11 @@ public class FakeApiController implements FakeApi {
         
 
 
+@ApiParam(value = "None" ) @RequestPart(value="string", required=false)  String string
+,
+        
+
+
 @ApiParam(value = "None" ) @RequestPart(value="binary", required=false)  byte[] binary
 ,
         
@@ -100,7 +105,7 @@ public class FakeApiController implements FakeApi {
     public ResponseEntity<Void> testEnumParameters(
 
 
-@ApiParam(value = "Form parameter enum test (string array)" ) @RequestPart(value="enumFormStringArray", required=false)  List<String> enumFormStringArray
+@ApiParam(value = "Form parameter enum test (string array)" , allowableValues="GREATER_THAN, DOLLAR") @RequestPart(value="enumFormStringArray", required=false)  List<String> enumFormStringArray
 ,
         
 
@@ -108,7 +113,7 @@ public class FakeApiController implements FakeApi {
 @ApiParam(value = "Form parameter enum test (string)" , allowableValues="_ABC, _EFG, _XYZ_", defaultValue="-efg") @RequestPart(value="enumFormString", required=false)  String enumFormString
 ,
         
-@ApiParam(value = "Header parameter enum test (string array)"  ) @RequestHeader(value="enum_header_string_array", required=false) List<String> enumHeaderStringArray
+@ApiParam(value = "Header parameter enum test (string array)"  , allowableValues="GREATER_THAN, DOLLAR") @RequestHeader(value="enum_header_string_array", required=false) List<String> enumHeaderStringArray
 
 
 ,

samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Model200Response.java

@@ -22,7 +22,7 @@ public class Model200Response   {
   private Integer name = null;
 
   @JsonProperty("class")
-  private String PropertyClass = null;
+  private String propertyClass = null;
 
   public Model200Response name(Integer name) {
     this.name = name;
@@ -42,22 +42,22 @@ public class Model200Response   {
     this.name = name;
   }
 
-  public Model200Response PropertyClass(String PropertyClass) {
+  public Model200Response propertyClass(String propertyClass) {
-    this.PropertyClass = PropertyClass;
+    this.propertyClass = propertyClass;
     return this;
   }
 
    /**
-   * Get PropertyClass
+   * Get propertyClass
-   * @return PropertyClass
+   * @return propertyClass
   **/
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
-    return PropertyClass;
+    return propertyClass;
   }
 
-  public void setPropertyClass(String PropertyClass) {
+  public void setPropertyClass(String propertyClass) {
-    this.PropertyClass = PropertyClass;
+    this.propertyClass = propertyClass;
   }
 
 
@@ -71,12 +71,12 @@ public class Model200Response   {
     }
     Model200Response _200Response = (Model200Response) o;
     return Objects.equals(this.name, _200Response.name) &&
-        Objects.equals(this.PropertyClass, _200Response.PropertyClass);
+        Objects.equals(this.propertyClass, _200Response.propertyClass);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(name, PropertyClass);
+    return Objects.hash(name, propertyClass);
   }
 
   @Override
@@ -85,7 +85,7 @@ public class Model200Response   {
     sb.append("class Model200Response {\n");
     
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    PropertyClass: ").append(toIndentedString(PropertyClass)).append("\n");
+    sb.append("    propertyClass: ").append(toIndentedString(propertyClass)).append("\n");
     sb.append("}");
     return sb.toString();
   }

samples/server/petstore/springboot/src/main/java/io/swagger/api/FakeApi.java

@@ -57,7 +57,7 @@ public interface FakeApi {
 ,
 
 
-@ApiParam(value = "None", required=true ) @RequestPart(value="string", required=true)  String string
+@ApiParam(value = "None", required=true ) @RequestPart(value="patternWithoutDelimiter", required=true)  String patternWithoutDelimiter
 ,
 
 
@@ -81,6 +81,10 @@ public interface FakeApi {
 ,
 
 
+@ApiParam(value = "None" ) @RequestPart(value="string", required=false)  String string
+,
+
+
 @ApiParam(value = "None" ) @RequestPart(value="binary", required=false)  byte[] binary
 ,
 
@@ -108,13 +112,13 @@ public interface FakeApi {
     ResponseEntity<Void> testEnumParameters(
 
 
-@ApiParam(value = "Form parameter enum test (string array)" ) @RequestPart(value="enumFormStringArray", required=false)  List<String> enumFormStringArray
+@ApiParam(value = "Form parameter enum test (string array)" , allowableValues="GREATER_THAN, DOLLAR") @RequestPart(value="enumFormStringArray", required=false)  List<String> enumFormStringArray
 ,
 
 
 @ApiParam(value = "Form parameter enum test (string)" , allowableValues="_ABC, _EFG, _XYZ_", defaultValue="-efg") @RequestPart(value="enumFormString", required=false)  String enumFormString
 ,
-@ApiParam(value = "Header parameter enum test (string array)"  ) @RequestHeader(value="enum_header_string_array", required=false) List<String> enumHeaderStringArray
+@ApiParam(value = "Header parameter enum test (string array)"  , allowableValues="GREATER_THAN, DOLLAR") @RequestHeader(value="enum_header_string_array", required=false) List<String> enumHeaderStringArray
 
 
 ,

samples/server/petstore/springboot/src/main/java/io/swagger/api/FakeApiController.java

@@ -46,7 +46,7 @@ public class FakeApiController implements FakeApi {
         
 
 
-@ApiParam(value = "None", required=true ) @RequestPart(value="string", required=true)  String string
+@ApiParam(value = "None", required=true ) @RequestPart(value="patternWithoutDelimiter", required=true)  String patternWithoutDelimiter
 ,
         
 
@@ -76,6 +76,11 @@ public class FakeApiController implements FakeApi {
         
 
 
+@ApiParam(value = "None" ) @RequestPart(value="string", required=false)  String string
+,
+        
+
+
 @ApiParam(value = "None" ) @RequestPart(value="binary", required=false)  byte[] binary
 ,
         
@@ -100,7 +105,7 @@ public class FakeApiController implements FakeApi {
     public ResponseEntity<Void> testEnumParameters(
 
 
-@ApiParam(value = "Form parameter enum test (string array)" ) @RequestPart(value="enumFormStringArray", required=false)  List<String> enumFormStringArray
+@ApiParam(value = "Form parameter enum test (string array)" , allowableValues="GREATER_THAN, DOLLAR") @RequestPart(value="enumFormStringArray", required=false)  List<String> enumFormStringArray
 ,
         
 
@@ -108,7 +113,7 @@ public class FakeApiController implements FakeApi {
 @ApiParam(value = "Form parameter enum test (string)" , allowableValues="_ABC, _EFG, _XYZ_", defaultValue="-efg") @RequestPart(value="enumFormString", required=false)  String enumFormString
 ,
         
-@ApiParam(value = "Header parameter enum test (string array)"  ) @RequestHeader(value="enum_header_string_array", required=false) List<String> enumHeaderStringArray
+@ApiParam(value = "Header parameter enum test (string array)"  , allowableValues="GREATER_THAN, DOLLAR") @RequestHeader(value="enum_header_string_array", required=false) List<String> enumHeaderStringArray
 
 
 ,

samples/server/petstore/springboot/src/main/java/io/swagger/model/Model200Response.java

@@ -22,7 +22,7 @@ public class Model200Response   {
   private Integer name = null;
 
   @JsonProperty("class")
-  private String PropertyClass = null;
+  private String propertyClass = null;
 
   public Model200Response name(Integer name) {
     this.name = name;
@@ -42,22 +42,22 @@ public class Model200Response   {
     this.name = name;
   }
 
-  public Model200Response PropertyClass(String PropertyClass) {
+  public Model200Response propertyClass(String propertyClass) {
-    this.PropertyClass = PropertyClass;
+    this.propertyClass = propertyClass;
     return this;
   }
 
    /**
-   * Get PropertyClass
+   * Get propertyClass
-   * @return PropertyClass
+   * @return propertyClass
   **/
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
-    return PropertyClass;
+    return propertyClass;
   }
 
-  public void setPropertyClass(String PropertyClass) {
+  public void setPropertyClass(String propertyClass) {
-    this.PropertyClass = PropertyClass;
+    this.propertyClass = propertyClass;
   }
 
 
@@ -71,12 +71,12 @@ public class Model200Response   {
     }
     Model200Response _200Response = (Model200Response) o;
     return Objects.equals(this.name, _200Response.name) &&
-        Objects.equals(this.PropertyClass, _200Response.PropertyClass);
+        Objects.equals(this.propertyClass, _200Response.propertyClass);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(name, PropertyClass);
+    return Objects.hash(name, propertyClass);
   }
 
   @Override
@@ -85,7 +85,7 @@ public class Model200Response   {
     sb.append("class Model200Response {\n");
     
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    PropertyClass: ").append(toIndentedString(PropertyClass)).append("\n");
+    sb.append("    propertyClass: ").append(toIndentedString(propertyClass)).append("\n");
     sb.append("}");
     return sb.toString();
   }

samples/server/petstore/undertow/src/main/java/io/swagger/model/Category.java

@@ -8,9 +8,12 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
+/**
+ * A category for a pet
+ **/
 
-
+@ApiModel(description = "A category for a pet")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-09-19T05:56:00.864-04:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-09-26T16:15:27.984+08:00")
 public class Category   {
   
   private Long id = null;

samples/server/petstore/undertow/src/main/java/io/swagger/model/ModelApiResponse.java

@@ -8,9 +8,12 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
+/**
+ * Describes the result of uploading an image resource
+ **/
 
-
+@ApiModel(description = "Describes the result of uploading an image resource")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-09-19T05:56:00.864-04:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-09-26T16:15:27.984+08:00")
 public class ModelApiResponse   {
   
   private Integer code = null;

samples/server/petstore/undertow/src/main/java/io/swagger/model/Order.java

@@ -10,9 +10,12 @@ import java.util.Date;
 
 
 
+/**
+ * An order for a pets from the pet store
+ **/
 
-
+@ApiModel(description = "An order for a pets from the pet store")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-09-19T05:56:00.864-04:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-09-26T16:15:27.984+08:00")
 public class Order   {
   
   private Long id = null;

samples/server/petstore/undertow/src/main/java/io/swagger/model/Pet.java

@@ -13,9 +13,12 @@ import java.util.List;
 
 
 
+/**
+ * A pet for sale in the pet store
+ **/
 
-
+@ApiModel(description = "A pet for sale in the pet store")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-09-19T05:56:00.864-04:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-09-26T16:15:27.984+08:00")
 public class Pet   {
   
   private Long id = null;

samples/server/petstore/undertow/src/main/java/io/swagger/model/Tag.java

@@ -8,9 +8,12 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
+/**
+ * A tag for a pet
+ **/
 
-
+@ApiModel(description = "A tag for a pet")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-09-19T05:56:00.864-04:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-09-26T16:15:27.984+08:00")
 public class Tag   {
   
   private Long id = null;

samples/server/petstore/undertow/src/main/java/io/swagger/model/User.java

@@ -8,9 +8,12 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
+/**
+ * A User who is purchasing from the pet store
+ **/
 
-
+@ApiModel(description = "A User who is purchasing from the pet store")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-09-19T05:56:00.864-04:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-09-26T16:15:27.984+08:00")
 public class User   {
   
   private Long id = null;

samples/server/petstore/undertow/src/main/resources/config/swagger.json

@@ -60,8 +60,8 @@
         "security" : [ {
           "petstore_auth" : [ "write:pets", "read:pets" ]
         } ],
-        "x-accepts" : "application/json",
+        "x-contentType" : "application/json",
-        "x-contentType" : "application/json"
+        "x-accepts" : "application/json"
       },
       "put" : {
         "tags" : [ "pet" ],
@@ -93,8 +93,8 @@
         "security" : [ {
           "petstore_auth" : [ "write:pets", "read:pets" ]
         } ],
-        "x-accepts" : "application/json",
+        "x-contentType" : "application/json",
-        "x-contentType" : "application/json"
+        "x-accepts" : "application/json"
       }
     },
     "/pet/findByStatus" : {
@@ -112,10 +112,10 @@
           "type" : "array",
           "items" : {
             "type" : "string",
-            "enum" : [ "available", "pending", "sold" ],
+            "default" : "available",
-            "default" : "available"
+            "enum" : [ "available", "pending", "sold" ]
           },
-          "collectionFormat" : "multi"
+          "collectionFormat" : "csv"
         } ],
         "responses" : {
           "200" : {
@@ -134,15 +134,15 @@
         "security" : [ {
           "petstore_auth" : [ "write:pets", "read:pets" ]
         } ],
-        "x-accepts" : "application/json",
+        "x-contentType" : "application/json",
-        "x-contentType" : "application/json"
+        "x-accepts" : "application/json"
       }
     },
     "/pet/findByTags" : {
       "get" : {
         "tags" : [ "pet" ],
         "summary" : "Finds Pets by tags",
-        "description" : "Muliple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.",
+        "description" : "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.",
         "operationId" : "findPetsByTags",
         "produces" : [ "application/xml", "application/json" ],
         "parameters" : [ {
@@ -154,7 +154,7 @@
           "items" : {
             "type" : "string"
           },
-          "collectionFormat" : "multi"
+          "collectionFormat" : "csv"
         } ],
         "responses" : {
           "200" : {
@@ -173,9 +173,8 @@
         "security" : [ {
           "petstore_auth" : [ "write:pets", "read:pets" ]
         } ],
-        "deprecated" : true,
+        "x-contentType" : "application/json",
-        "x-accepts" : "application/json",
+        "x-accepts" : "application/json"
-        "x-contentType" : "application/json"
       }
     },
     "/pet/{petId}" : {
@@ -210,8 +209,8 @@
         "security" : [ {
           "api_key" : [ ]
         } ],
-        "x-accepts" : "application/json",
+        "x-contentType" : "application/json",
-        "x-contentType" : "application/json"
+        "x-accepts" : "application/json"
       },
       "post" : {
         "tags" : [ "pet" ],
@@ -248,8 +247,8 @@
         "security" : [ {
           "petstore_auth" : [ "write:pets", "read:pets" ]
         } ],
-        "x-accepts" : "application/json",
+        "x-contentType" : "application/x-www-form-urlencoded",
-        "x-contentType" : "application/x-www-form-urlencoded"
+        "x-accepts" : "application/json"
       },
       "delete" : {
         "tags" : [ "pet" ],
@@ -272,17 +271,14 @@
         } ],
         "responses" : {
           "400" : {
-            "description" : "Invalid ID supplied"
+            "description" : "Invalid pet value"
-          },
-          "404" : {
-            "description" : "Pet not found"
           }
         },
         "security" : [ {
           "petstore_auth" : [ "write:pets", "read:pets" ]
         } ],
-        "x-accepts" : "application/json",
+        "x-contentType" : "application/json",
-        "x-contentType" : "application/json"
+        "x-accepts" : "application/json"
       }
     },
     "/pet/{petId}/uploadImage" : {
@@ -324,8 +320,8 @@
         "security" : [ {
           "petstore_auth" : [ "write:pets", "read:pets" ]
         } ],
-        "x-accepts" : "application/json",
+        "x-contentType" : "multipart/form-data",
-        "x-contentType" : "multipart/form-data"
+        "x-accepts" : "application/json"
       }
     },
     "/store/inventory" : {
@@ -351,8 +347,8 @@
         "security" : [ {
           "api_key" : [ ]
         } ],
-        "x-accepts" : "application/json",
+        "x-contentType" : "application/json",
-        "x-contentType" : "application/json"
+        "x-accepts" : "application/json"
       }
     },
     "/store/order" : {
@@ -382,15 +378,15 @@
             "description" : "Invalid Order"
           }
         },
-        "x-accepts" : "application/json",
+        "x-contentType" : "application/json",
-        "x-contentType" : "application/json"
+        "x-accepts" : "application/json"
       }
     },
     "/store/order/{orderId}" : {
       "get" : {
         "tags" : [ "store" ],
         "summary" : "Find purchase order by ID",
-        "description" : "For valid response try integer IDs with value >= 1 and <= 10. Other values will generated exceptions",
+        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
         "operationId" : "getOrderById",
         "produces" : [ "application/xml", "application/json" ],
         "parameters" : [ {
@@ -399,7 +395,7 @@
           "description" : "ID of pet that needs to be fetched",
           "required" : true,
           "type" : "integer",
-          "maximum" : 10.0,
+          "maximum" : 5.0,
           "minimum" : 1.0,
           "format" : "int64"
         } ],
@@ -417,13 +413,13 @@
             "description" : "Order not found"
           }
         },
-        "x-accepts" : "application/json",
+        "x-contentType" : "application/json",
-        "x-contentType" : "application/json"
+        "x-accepts" : "application/json"
       },
       "delete" : {
         "tags" : [ "store" ],
         "summary" : "Delete purchase order by ID",
-        "description" : "For valid response try integer IDs with positive integer value. Negative or non-integer values will generate API errors",
+        "description" : "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors",
         "operationId" : "deleteOrder",
         "produces" : [ "application/xml", "application/json" ],
         "parameters" : [ {
@@ -431,9 +427,8 @@
           "in" : "path",
           "description" : "ID of the order that needs to be deleted",
           "required" : true,
-          "type" : "integer",
+          "type" : "string",
-          "minimum" : 1.0,
+          "minimum" : 1.0
-          "format" : "int64"
         } ],
         "responses" : {
           "400" : {
@@ -443,8 +438,8 @@
             "description" : "Order not found"
           }
         },
-        "x-accepts" : "application/json",
+        "x-contentType" : "application/json",
-        "x-contentType" : "application/json"
+        "x-accepts" : "application/json"
       }
     },
     "/user" : {
@@ -468,8 +463,8 @@
             "description" : "successful operation"
           }
         },
-        "x-accepts" : "application/json",
+        "x-contentType" : "application/json",
-        "x-contentType" : "application/json"
+        "x-accepts" : "application/json"
       }
     },
     "/user/createWithArray" : {
@@ -496,8 +491,8 @@
             "description" : "successful operation"
           }
         },
-        "x-accepts" : "application/json",
+        "x-contentType" : "application/json",
-        "x-contentType" : "application/json"
+        "x-accepts" : "application/json"
       }
     },
     "/user/createWithList" : {
@@ -524,8 +519,8 @@
             "description" : "successful operation"
           }
         },
-        "x-accepts" : "application/json",
+        "x-contentType" : "application/json",
-        "x-contentType" : "application/json"
+        "x-accepts" : "application/json"
       }
     },
     "/user/login" : {
@@ -563,7 +558,7 @@
               "X-Expires-After" : {
                 "type" : "string",
                 "format" : "date-time",
-                "description" : "date in UTC when token expires"
+                "description" : "date in UTC when toekn expires"
               }
             }
           },
@@ -571,8 +566,8 @@
             "description" : "Invalid username/password supplied"
           }
         },
-        "x-accepts" : "application/json",
+        "x-contentType" : "application/json",
-        "x-contentType" : "application/json"
+        "x-accepts" : "application/json"
       }
     },
     "/user/logout" : {
@@ -588,8 +583,8 @@
             "description" : "successful operation"
           }
         },
-        "x-accepts" : "application/json",
+        "x-contentType" : "application/json",
-        "x-contentType" : "application/json"
+        "x-accepts" : "application/json"
       }
     },
     "/user/{username}" : {
@@ -620,8 +615,8 @@
             "description" : "User not found"
           }
         },
-        "x-accepts" : "application/json",
+        "x-contentType" : "application/json",
-        "x-contentType" : "application/json"
+        "x-accepts" : "application/json"
       },
       "put" : {
         "tags" : [ "user" ],
@@ -632,7 +627,7 @@
         "parameters" : [ {
           "name" : "username",
           "in" : "path",
-          "description" : "name that need to be updated",
+          "description" : "name that need to be deleted",
           "required" : true,
           "type" : "string"
         }, {
@@ -652,8 +647,8 @@
             "description" : "User not found"
           }
         },
-        "x-accepts" : "application/json",
+        "x-contentType" : "application/json",
-        "x-contentType" : "application/json"
+        "x-accepts" : "application/json"
       },
       "delete" : {
         "tags" : [ "user" ],
@@ -676,25 +671,25 @@
             "description" : "User not found"
           }
         },
-        "x-accepts" : "application/json",
+        "x-contentType" : "application/json",
-        "x-contentType" : "application/json"
+        "x-accepts" : "application/json"
       }
     }
   },
   "securityDefinitions" : {
+    "api_key" : {
+      "type" : "apiKey",
+      "name" : "api_key",
+      "in" : "header"
+    },
     "petstore_auth" : {
       "type" : "oauth2",
-      "authorizationUrl" : "http://petstore.swagger.io/oauth/dialog",
+      "authorizationUrl" : "http://petstore.swagger.io/api/oauth/dialog",
       "flow" : "implicit",
       "scopes" : {
         "write:pets" : "modify pets in your account",
         "read:pets" : "read your pets"
       }
-    },
-    "api_key" : {
-      "type" : "apiKey",
-      "name" : "api_key",
-      "in" : "header"
     }
   },
   "definitions" : {
@@ -727,6 +722,8 @@
           "default" : false
         }
       },
+      "title" : "Pet Order",
+      "description" : "An order for a pets from the pet store",
       "xml" : {
         "name" : "Order"
       }
@@ -742,6 +739,8 @@
           "type" : "string"
         }
       },
+      "title" : "Pet catehgry",
+      "description" : "A category for a pet",
       "xml" : {
         "name" : "Category"
       }
@@ -777,6 +776,8 @@
           "description" : "User Status"
         }
       },
+      "title" : "a User",
+      "description" : "A User who is purchasing from the pet store",
       "xml" : {
         "name" : "User"
       }
@@ -792,25 +793,12 @@
           "type" : "string"
         }
       },
+      "title" : "Pet Tag",
+      "description" : "A tag for a pet",
       "xml" : {
         "name" : "Tag"
       }
     },
-    "ApiResponse" : {
-      "type" : "object",
-      "properties" : {
-        "code" : {
-          "type" : "integer",
-          "format" : "int32"
-        },
-        "type" : {
-          "type" : "string"
-        },
-        "message" : {
-          "type" : "string"
-        }
-      }
-    },
     "Pet" : {
       "type" : "object",
       "required" : [ "name", "photoUrls" ],
@@ -852,9 +840,28 @@
           "enum" : [ "available", "pending", "sold" ]
         }
       },
+      "title" : "a Pet",
+      "description" : "A pet for sale in the pet store",
       "xml" : {
         "name" : "Pet"
       }
+    },
+    "ApiResponse" : {
+      "type" : "object",
+      "properties" : {
+        "code" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "type" : {
+          "type" : "string"
+        },
+        "message" : {
+          "type" : "string"
+        }
+      },
+      "title" : "An uploaded response",
+      "description" : "Describes the result of uploading an image resource"
     }
   },
   "externalDocs" : {