Merge branch 'MatanRubin-uuid-type'

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java

@@ -120,7 +120,6 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
         instantiationTypes.put("map", "HashMap");
         typeMapping.put("date", "Date");
         typeMapping.put("file", "File");
-        typeMapping.put("UUID", "String");
 
         cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC));
         cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC));

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/FormatTest.java

@@ -19,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
+import java.util.UUID;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
 
@@ -61,7 +62,7 @@ public class FormatTest {
   private DateTime dateTime = null;
 
   @JsonProperty("uuid")
-  private String uuid = null;
+  private UUID uuid = null;
 
   @JsonProperty("password")
   private String password = null;
@@ -274,7 +275,7 @@ public class FormatTest {
     this.dateTime = dateTime;
   }
 
-  public FormatTest uuid(String uuid) {
+  public FormatTest uuid(UUID uuid) {
     this.uuid = uuid;
     return this;
   }
@@ -284,11 +285,11 @@ public class FormatTest {
    * @return uuid
   **/
   @ApiModelProperty(example = "null", value = "")
-  public String getUuid() {
+  public UUID getUuid() {
     return uuid;
   }
 
-  public void setUuid(String uuid) {
+  public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -22,6 +22,7 @@ import io.swagger.client.model.Animal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import org.joda.time.DateTime;
 
 /**
@@ -30,7 +31,7 @@ import org.joda.time.DateTime;
 
 public class MixedPropertiesAndAdditionalPropertiesClass {
   @JsonProperty("uuid")
-  private String uuid = null;
+  private UUID uuid = null;
 
   @JsonProperty("dateTime")
   private DateTime dateTime = null;
@@ -38,7 +39,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
   @JsonProperty("map")
   private Map<String, Animal> map = new HashMap<String, Animal>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(String uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     this.uuid = uuid;
     return this;
   }
@@ -48,11 +49,11 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * @return uuid
   **/
   @ApiModelProperty(example = "null", value = "")
-  public String getUuid() {
+  public UUID getUuid() {
     return uuid;
   }
 
-  public void setUuid(String uuid) {
+  public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 

samples/client/petstore/java/jersey1/docs/FormatTest.md

@@ -15,7 +15,7 @@ Name | Type | Description | Notes
 **binary** | **byte[]** |  |  [optional]
 **date** | [**LocalDate**](LocalDate.md) |  | 
 **dateTime** | [**DateTime**](DateTime.md) |  |  [optional]
-**uuid** | **String** |  |  [optional]
+**uuid** | [**UUID**](UUID.md) |  |  [optional]
 **password** | **String** |  | 
 
 

samples/client/petstore/java/jersey1/docs/MixedPropertiesAndAdditionalPropertiesClass.md

@@ -4,7 +4,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**uuid** | **String** |  |  [optional]
+**uuid** | [**UUID**](UUID.md) |  |  [optional]
 **dateTime** | [**DateTime**](DateTime.md) |  |  [optional]
 **map** | [**Map<String, Animal>**](Animal.md) |  |  [optional]
 

samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/FormatTest.java

@@ -19,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
+import java.util.UUID;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
 
@@ -61,7 +62,7 @@ public class FormatTest {
   private DateTime dateTime = null;
 
   @JsonProperty("uuid")
-  private String uuid = null;
+  private UUID uuid = null;
 
   @JsonProperty("password")
   private String password = null;
@@ -274,7 +275,7 @@ public class FormatTest {
     this.dateTime = dateTime;
   }
 
-  public FormatTest uuid(String uuid) {
+  public FormatTest uuid(UUID uuid) {
     this.uuid = uuid;
     return this;
   }
@@ -284,11 +285,11 @@ public class FormatTest {
    * @return uuid
   **/
   @ApiModelProperty(example = "null", value = "")
-  public String getUuid() {
+  public UUID getUuid() {
     return uuid;
   }
 
-  public void setUuid(String uuid) {
+  public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 

samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -22,6 +22,7 @@ import io.swagger.client.model.Animal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import org.joda.time.DateTime;
 
 /**
@@ -30,7 +31,7 @@ import org.joda.time.DateTime;
 
 public class MixedPropertiesAndAdditionalPropertiesClass {
   @JsonProperty("uuid")
-  private String uuid = null;
+  private UUID uuid = null;
 
   @JsonProperty("dateTime")
   private DateTime dateTime = null;
@@ -38,7 +39,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
   @JsonProperty("map")
   private Map<String, Animal> map = new HashMap<String, Animal>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(String uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     this.uuid = uuid;
     return this;
   }
@@ -48,11 +49,11 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * @return uuid
   **/
   @ApiModelProperty(example = "null", value = "")
-  public String getUuid() {
+  public UUID getUuid() {
     return uuid;
   }
 
-  public void setUuid(String uuid) {
+  public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 

samples/client/petstore/java/jersey2-java8/docs/FormatTest.md

@@ -15,7 +15,7 @@ Name | Type | Description | Notes
 **binary** | **byte[]** |  |  [optional]
 **date** | [**LocalDate**](LocalDate.md) |  | 
 **dateTime** | [**OffsetDateTime**](OffsetDateTime.md) |  |  [optional]
-**uuid** | **String** |  |  [optional]
+**uuid** | [**UUID**](UUID.md) |  |  [optional]
 **password** | **String** |  | 
 
 

samples/client/petstore/java/jersey2-java8/docs/MixedPropertiesAndAdditionalPropertiesClass.md

@@ -4,7 +4,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**uuid** | **String** |  |  [optional]
+**uuid** | [**UUID**](UUID.md) |  |  [optional]
 **dateTime** | [**OffsetDateTime**](OffsetDateTime.md) |  |  [optional]
 **map** | [**Map<String, Animal>**](Animal.md) |  |  [optional]
 

samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/FormatTest.java

@@ -21,6 +21,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
+import java.util.UUID;
 
 /**
  * FormatTest
@@ -61,7 +62,7 @@ public class FormatTest {
   private OffsetDateTime dateTime = null;
 
   @JsonProperty("uuid")
-  private String uuid = null;
+  private UUID uuid = null;
 
   @JsonProperty("password")
   private String password = null;
@@ -274,7 +275,7 @@ public class FormatTest {
     this.dateTime = dateTime;
   }
 
-  public FormatTest uuid(String uuid) {
+  public FormatTest uuid(UUID uuid) {
     this.uuid = uuid;
     return this;
   }
@@ -284,11 +285,11 @@ public class FormatTest {
    * @return uuid
   **/
   @ApiModelProperty(example = "null", value = "")
-  public String getUuid() {
+  public UUID getUuid() {
     return uuid;
   }
 
-  public void setUuid(String uuid) {
+  public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 

samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -23,6 +23,7 @@ import java.time.OffsetDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
@@ -30,7 +31,7 @@ import java.util.Map;
 
 public class MixedPropertiesAndAdditionalPropertiesClass {
   @JsonProperty("uuid")
-  private String uuid = null;
+  private UUID uuid = null;
 
   @JsonProperty("dateTime")
   private OffsetDateTime dateTime = null;
@@ -38,7 +39,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
   @JsonProperty("map")
   private Map<String, Animal> map = new HashMap<String, Animal>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(String uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     this.uuid = uuid;
     return this;
   }
@@ -48,11 +49,11 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * @return uuid
   **/
   @ApiModelProperty(example = "null", value = "")
-  public String getUuid() {
+  public UUID getUuid() {
     return uuid;
   }
 
-  public void setUuid(String uuid) {
+  public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 

samples/client/petstore/java/jersey2/docs/FormatTest.md

@@ -15,7 +15,7 @@ Name | Type | Description | Notes
 **binary** | **byte[]** |  |  [optional]
 **date** | [**LocalDate**](LocalDate.md) |  | 
 **dateTime** | [**DateTime**](DateTime.md) |  |  [optional]
-**uuid** | **String** |  |  [optional]
+**uuid** | [**UUID**](UUID.md) |  |  [optional]
 **password** | **String** |  | 
 
 

samples/client/petstore/java/jersey2/docs/MixedPropertiesAndAdditionalPropertiesClass.md

@@ -4,7 +4,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**uuid** | **String** |  |  [optional]
+**uuid** | [**UUID**](UUID.md) |  |  [optional]
 **dateTime** | [**DateTime**](DateTime.md) |  |  [optional]
 **map** | [**Map<String, Animal>**](Animal.md) |  |  [optional]
 

samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/FormatTest.java

@@ -19,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
+import java.util.UUID;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
 
@@ -61,7 +62,7 @@ public class FormatTest {
   private DateTime dateTime = null;
 
   @JsonProperty("uuid")
-  private String uuid = null;
+  private UUID uuid = null;
 
   @JsonProperty("password")
   private String password = null;
@@ -274,7 +275,7 @@ public class FormatTest {
     this.dateTime = dateTime;
   }
 
-  public FormatTest uuid(String uuid) {
+  public FormatTest uuid(UUID uuid) {
     this.uuid = uuid;
     return this;
   }
@@ -284,11 +285,11 @@ public class FormatTest {
    * @return uuid
   **/
   @ApiModelProperty(example = "null", value = "")
-  public String getUuid() {
+  public UUID getUuid() {
     return uuid;
   }
 
-  public void setUuid(String uuid) {
+  public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 

samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -22,6 +22,7 @@ import io.swagger.client.model.Animal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import org.joda.time.DateTime;
 
 /**
@@ -30,7 +31,7 @@ import org.joda.time.DateTime;
 
 public class MixedPropertiesAndAdditionalPropertiesClass {
   @JsonProperty("uuid")
-  private String uuid = null;
+  private UUID uuid = null;
 
   @JsonProperty("dateTime")
   private DateTime dateTime = null;
@@ -38,7 +39,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
   @JsonProperty("map")
   private Map<String, Animal> map = new HashMap<String, Animal>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(String uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     this.uuid = uuid;
     return this;
   }
@@ -48,11 +49,11 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * @return uuid
   **/
   @ApiModelProperty(example = "null", value = "")
-  public String getUuid() {
+  public UUID getUuid() {
     return uuid;
   }
 
-  public void setUuid(String uuid) {
+  public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 

samples/client/petstore/java/okhttp-gson/docs/FormatTest.md

@@ -15,7 +15,7 @@ Name | Type | Description | Notes
 **binary** | **byte[]** |  |  [optional]
 **date** | [**LocalDate**](LocalDate.md) |  | 
 **dateTime** | [**DateTime**](DateTime.md) |  |  [optional]
-**uuid** | **String** |  |  [optional]
+**uuid** | [**UUID**](UUID.md) |  |  [optional]
 **password** | **String** |  | 
 
 

samples/client/petstore/java/okhttp-gson/docs/MixedPropertiesAndAdditionalPropertiesClass.md

@@ -4,7 +4,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**uuid** | **String** |  |  [optional]
+**uuid** | [**UUID**](UUID.md) |  |  [optional]
 **dateTime** | [**DateTime**](DateTime.md) |  |  [optional]
 **map** | [**Map<String, Animal>**](Animal.md) |  |  [optional]
 

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/FormatTest.java

@@ -18,6 +18,7 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
+import java.util.UUID;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
 
@@ -60,7 +61,7 @@ public class FormatTest {
   private DateTime dateTime = null;
 
   @SerializedName("uuid")
-  private String uuid = null;
+  private UUID uuid = null;
 
   @SerializedName("password")
   private String password = null;
@@ -273,7 +274,7 @@ public class FormatTest {
     this.dateTime = dateTime;
   }
 
-  public FormatTest uuid(String uuid) {
+  public FormatTest uuid(UUID uuid) {
     this.uuid = uuid;
     return this;
   }
@@ -283,11 +284,11 @@ public class FormatTest {
    * @return uuid
   **/
   @ApiModelProperty(example = "null", value = "")
-  public String getUuid() {
+  public UUID getUuid() {
     return uuid;
   }
 
-  public void setUuid(String uuid) {
+  public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -21,6 +21,7 @@ import io.swagger.client.model.Animal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import org.joda.time.DateTime;
 
 /**
@@ -29,7 +30,7 @@ import org.joda.time.DateTime;
 
 public class MixedPropertiesAndAdditionalPropertiesClass {
   @SerializedName("uuid")
-  private String uuid = null;
+  private UUID uuid = null;
 
   @SerializedName("dateTime")
   private DateTime dateTime = null;
@@ -37,7 +38,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
   @SerializedName("map")
   private Map<String, Animal> map = new HashMap<String, Animal>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(String uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     this.uuid = uuid;
     return this;
   }
@@ -47,11 +48,11 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * @return uuid
   **/
   @ApiModelProperty(example = "null", value = "")
-  public String getUuid() {
+  public UUID getUuid() {
     return uuid;
   }
 
-  public void setUuid(String uuid) {
+  public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 

samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/FormatTest.java

@@ -18,6 +18,7 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
+import java.util.UUID;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
 
@@ -60,7 +61,7 @@ public class FormatTest {
   private DateTime dateTime = null;
 
   @SerializedName("uuid")
-  private String uuid = null;
+  private UUID uuid = null;
 
   @SerializedName("password")
   private String password = null;
@@ -273,7 +274,7 @@ public class FormatTest {
     this.dateTime = dateTime;
   }
 
-  public FormatTest uuid(String uuid) {
+  public FormatTest uuid(UUID uuid) {
     this.uuid = uuid;
     return this;
   }
@@ -283,11 +284,11 @@ public class FormatTest {
    * @return uuid
   **/
   @ApiModelProperty(example = "null", value = "")
-  public String getUuid() {
+  public UUID getUuid() {
     return uuid;
   }
 
-  public void setUuid(String uuid) {
+  public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 

samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -21,6 +21,7 @@ import io.swagger.client.model.Animal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import org.joda.time.DateTime;
 
 /**
@@ -29,7 +30,7 @@ import org.joda.time.DateTime;
 
 public class MixedPropertiesAndAdditionalPropertiesClass {
   @SerializedName("uuid")
-  private String uuid = null;
+  private UUID uuid = null;
 
   @SerializedName("dateTime")
   private DateTime dateTime = null;
@@ -37,7 +38,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
   @SerializedName("map")
   private Map<String, Animal> map = new HashMap<String, Animal>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(String uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     this.uuid = uuid;
     return this;
   }
@@ -47,11 +48,11 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * @return uuid
   **/
   @ApiModelProperty(example = "null", value = "")
-  public String getUuid() {
+  public UUID getUuid() {
     return uuid;
   }
 
-  public void setUuid(String uuid) {
+  public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 

samples/client/petstore/java/retrofit2-play24/docs/FormatTest.md

@@ -15,7 +15,7 @@ Name | Type | Description | Notes
 **binary** | **byte[]** |  |  [optional]
 **date** | [**LocalDate**](LocalDate.md) |  | 
 **dateTime** | [**DateTime**](DateTime.md) |  |  [optional]
-**uuid** | **String** |  |  [optional]
+**uuid** | [**UUID**](UUID.md) |  |  [optional]
 **password** | **String** |  | 
 
 

samples/client/petstore/java/retrofit2-play24/docs/MixedPropertiesAndAdditionalPropertiesClass.md

@@ -4,7 +4,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**uuid** | **String** |  |  [optional]
+**uuid** | [**UUID**](UUID.md) |  |  [optional]
 **dateTime** | [**DateTime**](DateTime.md) |  |  [optional]
 **map** | [**Map<String, Animal>**](Animal.md) |  |  [optional]
 

samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/FormatTest.java

@@ -19,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
+import java.util.UUID;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
 import javax.validation.constraints.*;
@@ -62,7 +63,7 @@ public class FormatTest {
   private DateTime dateTime = null;
 
   @JsonProperty("uuid")
-  private String uuid = null;
+  private UUID uuid = null;
 
   @JsonProperty("password")
   private String password = null;
@@ -141,6 +142,8 @@ public class FormatTest {
    * @return number
   **/
   @NotNull
+  @DecimalMin("32.1")
+  @DecimalMax("543.2")
   @ApiModelProperty(example = "null", required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -161,6 +164,8 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
+  @DecimalMin("54.3")
+  @DecimalMax("987.6")
   @ApiModelProperty(example = "null", value = "")
   public Float getFloat() {
     return _float;
@@ -181,6 +186,8 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
+  @DecimalMin("67.8")
+  @DecimalMax("123.4")
   @ApiModelProperty(example = "null", value = "")
   public Double getDouble() {
     return _double;
@@ -283,7 +290,7 @@ public class FormatTest {
     this.dateTime = dateTime;
   }
 
-  public FormatTest uuid(String uuid) {
+  public FormatTest uuid(UUID uuid) {
     this.uuid = uuid;
     return this;
   }
@@ -293,11 +300,11 @@ public class FormatTest {
    * @return uuid
   **/
   @ApiModelProperty(example = "null", value = "")
-  public String getUuid() {
+  public UUID getUuid() {
     return uuid;
   }
 
-  public void setUuid(String uuid) {
+  public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 

samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -22,6 +22,7 @@ import io.swagger.client.model.Animal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import org.joda.time.DateTime;
 import javax.validation.constraints.*;
 
@@ -31,7 +32,7 @@ import javax.validation.constraints.*;
 
 public class MixedPropertiesAndAdditionalPropertiesClass {
   @JsonProperty("uuid")
-  private String uuid = null;
+  private UUID uuid = null;
 
   @JsonProperty("dateTime")
   private DateTime dateTime = null;
@@ -39,7 +40,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
   @JsonProperty("map")
   private Map<String, Animal> map = new HashMap<String, Animal>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(String uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     this.uuid = uuid;
     return this;
   }
@@ -49,11 +50,11 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * @return uuid
   **/
   @ApiModelProperty(example = "null", value = "")
-  public String getUuid() {
+  public UUID getUuid() {
     return uuid;
   }
 
-  public void setUuid(String uuid) {
+  public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 

samples/client/petstore/java/retrofit2/docs/FormatTest.md

@@ -15,7 +15,7 @@ Name | Type | Description | Notes
 **binary** | **byte[]** |  |  [optional]
 **date** | [**LocalDate**](LocalDate.md) |  | 
 **dateTime** | [**DateTime**](DateTime.md) |  |  [optional]
-**uuid** | **String** |  |  [optional]
+**uuid** | [**UUID**](UUID.md) |  |  [optional]
 **password** | **String** |  | 
 
 

samples/client/petstore/java/retrofit2/docs/MixedPropertiesAndAdditionalPropertiesClass.md

@@ -4,7 +4,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**uuid** | **String** |  |  [optional]
+**uuid** | [**UUID**](UUID.md) |  |  [optional]
 **dateTime** | [**DateTime**](DateTime.md) |  |  [optional]
 **map** | [**Map<String, Animal>**](Animal.md) |  |  [optional]
 

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/FormatTest.java

@@ -18,6 +18,7 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
+import java.util.UUID;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
 
@@ -60,7 +61,7 @@ public class FormatTest {
   private DateTime dateTime = null;
 
   @SerializedName("uuid")
-  private String uuid = null;
+  private UUID uuid = null;
 
   @SerializedName("password")
   private String password = null;
@@ -273,7 +274,7 @@ public class FormatTest {
     this.dateTime = dateTime;
   }
 
-  public FormatTest uuid(String uuid) {
+  public FormatTest uuid(UUID uuid) {
     this.uuid = uuid;
     return this;
   }
@@ -283,11 +284,11 @@ public class FormatTest {
    * @return uuid
   **/
   @ApiModelProperty(example = "null", value = "")
-  public String getUuid() {
+  public UUID getUuid() {
     return uuid;
   }
 
-  public void setUuid(String uuid) {
+  public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -21,6 +21,7 @@ import io.swagger.client.model.Animal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import org.joda.time.DateTime;
 
 /**
@@ -29,7 +30,7 @@ import org.joda.time.DateTime;
 
 public class MixedPropertiesAndAdditionalPropertiesClass {
   @SerializedName("uuid")
-  private String uuid = null;
+  private UUID uuid = null;
 
   @SerializedName("dateTime")
   private DateTime dateTime = null;
@@ -37,7 +38,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
   @SerializedName("map")
   private Map<String, Animal> map = new HashMap<String, Animal>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(String uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     this.uuid = uuid;
     return this;
   }
@@ -47,11 +48,11 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * @return uuid
   **/
   @ApiModelProperty(example = "null", value = "")
-  public String getUuid() {
+  public UUID getUuid() {
     return uuid;
   }
 
-  public void setUuid(String uuid) {
+  public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 

samples/client/petstore/java/retrofit2rx/docs/FormatTest.md

@@ -15,7 +15,7 @@ Name | Type | Description | Notes
 **binary** | **byte[]** |  |  [optional]
 **date** | [**LocalDate**](LocalDate.md) |  | 
 **dateTime** | [**DateTime**](DateTime.md) |  |  [optional]
-**uuid** | **String** |  |  [optional]
+**uuid** | [**UUID**](UUID.md) |  |  [optional]
 **password** | **String** |  | 
 
 

samples/client/petstore/java/retrofit2rx/docs/MixedPropertiesAndAdditionalPropertiesClass.md

@@ -4,7 +4,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**uuid** | **String** |  |  [optional]
+**uuid** | [**UUID**](UUID.md) |  |  [optional]
 **dateTime** | [**DateTime**](DateTime.md) |  |  [optional]
 **map** | [**Map<String, Animal>**](Animal.md) |  |  [optional]
 

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/FormatTest.java

@@ -18,6 +18,7 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
+import java.util.UUID;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
 
@@ -60,7 +61,7 @@ public class FormatTest {
   private DateTime dateTime = null;
 
   @SerializedName("uuid")
-  private String uuid = null;
+  private UUID uuid = null;
 
   @SerializedName("password")
   private String password = null;
@@ -273,7 +274,7 @@ public class FormatTest {
     this.dateTime = dateTime;
   }
 
-  public FormatTest uuid(String uuid) {
+  public FormatTest uuid(UUID uuid) {
     this.uuid = uuid;
     return this;
   }
@@ -283,11 +284,11 @@ public class FormatTest {
    * @return uuid
   **/
   @ApiModelProperty(example = "null", value = "")
-  public String getUuid() {
+  public UUID getUuid() {
     return uuid;
   }
 
-  public void setUuid(String uuid) {
+  public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -21,6 +21,7 @@ import io.swagger.client.model.Animal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import org.joda.time.DateTime;
 
 /**
@@ -29,7 +30,7 @@ import org.joda.time.DateTime;
 
 public class MixedPropertiesAndAdditionalPropertiesClass {
   @SerializedName("uuid")
-  private String uuid = null;
+  private UUID uuid = null;
 
   @SerializedName("dateTime")
   private DateTime dateTime = null;
@@ -37,7 +38,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
   @SerializedName("map")
   private Map<String, Animal> map = new HashMap<String, Animal>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(String uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     this.uuid = uuid;
     return this;
   }
@@ -47,11 +48,11 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * @return uuid
   **/
   @ApiModelProperty(example = "null", value = "")
-  public String getUuid() {
+  public UUID getUuid() {
     return uuid;
   }
 
-  public void setUuid(String uuid) {
+  public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 

samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/FormatTest.java

@@ -1,6 +1,7 @@
 package io.swagger.model;
 
 import java.math.BigDecimal;
+import java.util.UUID;
 import org.joda.time.LocalDate;
 import javax.validation.constraints.*;
 
@@ -38,7 +39,7 @@ public class FormatTest  {
   @ApiModelProperty(example = "null", value = "")
   private javax.xml.datatype.XMLGregorianCalendar dateTime = null;
   @ApiModelProperty(example = "null", value = "")
-  private String uuid = null;
+  private UUID uuid = null;
   @ApiModelProperty(example = "null", required = true, value = "")
   private String password = null;
 
@@ -257,15 +258,15 @@ public class FormatTest  {
    * Get uuid
    * @return uuid
   **/
-  public String getUuid() {
+  public UUID getUuid() {
     return uuid;
   }
 
-  public void setUuid(String uuid) {
+  public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 
-  public FormatTest uuid(String uuid) {
+  public FormatTest uuid(UUID uuid) {
     this.uuid = uuid;
     return this;
   }

samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -4,6 +4,7 @@ import io.swagger.model.Animal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import javax.validation.constraints.*;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -18,7 +19,7 @@ import javax.xml.bind.annotation.XmlEnumValue;
 public class MixedPropertiesAndAdditionalPropertiesClass  {
   
   @ApiModelProperty(example = "null", value = "")
-  private String uuid = null;
+  private UUID uuid = null;
   @ApiModelProperty(example = "null", value = "")
   private javax.xml.datatype.XMLGregorianCalendar dateTime = null;
   @ApiModelProperty(example = "null", value = "")
@@ -28,15 +29,15 @@ public class MixedPropertiesAndAdditionalPropertiesClass  {
    * Get uuid
    * @return uuid
   **/
-  public String getUuid() {
+  public UUID getUuid() {
     return uuid;
   }
 
-  public void setUuid(String uuid) {
+  public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(String uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     this.uuid = uuid;
     return this;
   }

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/FormatTest.java

@@ -1,6 +1,7 @@
 package io.swagger.model;
 
 import java.math.BigDecimal;
+import java.util.UUID;
 import org.joda.time.LocalDate;
 import javax.validation.constraints.*;
 
@@ -22,7 +23,7 @@ public class FormatTest   {
   private byte[] binary = null;
   private LocalDate date = null;
   private javax.xml.datatype.XMLGregorianCalendar dateTime = null;
-  private String uuid = null;
+  private UUID uuid = null;
   private String password = null;
 
   /**
@@ -227,17 +228,17 @@ public class FormatTest   {
 
   /**
    **/
-  public FormatTest uuid(String uuid) {
+  public FormatTest uuid(UUID uuid) {
     this.uuid = uuid;
     return this;
   }
 
   
   @ApiModelProperty(example = "null", value = "")
-  public String getUuid() {
+  public UUID getUuid() {
     return uuid;
   }
-  public void setUuid(String uuid) {
+  public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -4,6 +4,7 @@ import io.swagger.model.Animal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import javax.validation.constraints.*;
 
 
@@ -13,23 +14,23 @@ import java.util.Objects;
 
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   
-  private String uuid = null;
+  private UUID uuid = null;
   private javax.xml.datatype.XMLGregorianCalendar dateTime = null;
   private Map<String, Animal> map = new HashMap<String, Animal>();
 
   /**
    **/
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(String uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     this.uuid = uuid;
     return this;
   }
 
   
   @ApiModelProperty(example = "null", value = "")
-  public String getUuid() {
+  public UUID getUuid() {
     return uuid;
   }
-  public void setUuid(String uuid) {
+  public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 

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

@@ -20,6 +20,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.UUID;
 import javax.validation.constraints.*;
 
 /**
@@ -61,7 +62,7 @@ public class FormatTest   {
   private Date dateTime = null;
 
   @JsonProperty("uuid")
-  private String uuid = null;
+  private UUID uuid = null;
 
   @JsonProperty("password")
   private String password = null;
@@ -299,7 +300,7 @@ public class FormatTest   {
     this.dateTime = dateTime;
   }
 
-  public FormatTest uuid(String uuid) {
+  public FormatTest uuid(UUID uuid) {
     this.uuid = uuid;
     return this;
   }
@@ -310,11 +311,11 @@ public class FormatTest   {
   **/
   @JsonProperty("uuid")
   @ApiModelProperty(value = "")
-  public String getUuid() {
+  public UUID getUuid() {
     return uuid;
   }
 
-  public void setUuid(String uuid) {
+  public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 

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

@@ -23,6 +23,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import javax.validation.constraints.*;
 
 /**
@@ -31,7 +32,7 @@ import javax.validation.constraints.*;
 
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   @JsonProperty("uuid")
-  private String uuid = null;
+  private UUID uuid = null;
 
   @JsonProperty("dateTime")
   private Date dateTime = null;
@@ -39,7 +40,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
   @JsonProperty("map")
   private Map<String, Animal> map = new HashMap<String, Animal>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(String uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     this.uuid = uuid;
     return this;
   }
@@ -50,11 +51,11 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
   **/
   @JsonProperty("uuid")
   @ApiModelProperty(value = "")
-  public String getUuid() {
+  public UUID getUuid() {
     return uuid;
   }
 
-  public void setUuid(String uuid) {
+  public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 

samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/FormatTest.java

@@ -20,6 +20,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.UUID;
 import javax.validation.constraints.*;
 
 /**
@@ -61,7 +62,7 @@ public class FormatTest   {
   private Date dateTime = null;
 
   @JsonProperty("uuid")
-  private String uuid = null;
+  private UUID uuid = null;
 
   @JsonProperty("password")
   private String password = null;
@@ -299,7 +300,7 @@ public class FormatTest   {
     this.dateTime = dateTime;
   }
 
-  public FormatTest uuid(String uuid) {
+  public FormatTest uuid(UUID uuid) {
     this.uuid = uuid;
     return this;
   }
@@ -310,11 +311,11 @@ public class FormatTest   {
   **/
   @JsonProperty("uuid")
   @ApiModelProperty(value = "")
-  public String getUuid() {
+  public UUID getUuid() {
     return uuid;
   }
 
-  public void setUuid(String uuid) {
+  public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 

samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -23,6 +23,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import javax.validation.constraints.*;
 
 /**
@@ -31,7 +32,7 @@ import javax.validation.constraints.*;
 
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   @JsonProperty("uuid")
-  private String uuid = null;
+  private UUID uuid = null;
 
   @JsonProperty("dateTime")
   private Date dateTime = null;
@@ -39,7 +40,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
   @JsonProperty("map")
   private Map<String, Animal> map = new HashMap<String, Animal>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(String uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     this.uuid = uuid;
     return this;
   }
@@ -50,11 +51,11 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
   **/
   @JsonProperty("uuid")
   @ApiModelProperty(value = "")
-  public String getUuid() {
+  public UUID getUuid() {
     return uuid;
   }
 
-  public void setUuid(String uuid) {
+  public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 

samples/server/petstore/spring-mvc-j8-async/pom.xml

@@ -117,6 +117,13 @@
             <artifactId>servlet-api</artifactId>
             <version>${servlet-api-version}</version>
         </dependency>
+    <!-- Bean Validation API support -->
+    <dependency>
+        <groupId>javax.validation</groupId>
+        <artifactId>validation-api</artifactId>
+        <version>1.1.0.Final</version>
+        <scope>provided</scope>
+    </dependency>
     </dependencies>
     <properties>
         <java.version>1.8</java.version>

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

@@ -19,7 +19,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
-
+import javax.validation.constraints.*;
 
 @Api(value = "fake", description = "the fake API")
 public interface FakeApi {

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

@@ -2,7 +2,7 @@ package io.swagger.api;
 
 import org.springframework.stereotype.Controller;
 
-
+import javax.validation.constraints.*;
 
 @Controller
 public class FakeApiController implements FakeApi {

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

@@ -18,7 +18,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
-
+import javax.validation.constraints.*;
 
 @Api(value = "pet", description = "the pet API")
 public interface PetApi {
@@ -71,7 +71,7 @@ public interface PetApi {
     @RequestMapping(value = "/pet/findByStatus",
         produces = { "application/xml", "application/json" }, 
         method = RequestMethod.GET)
-    default CompletableFuture<ResponseEntity<List<Pet>>> findPetsByStatus(@ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "AVAILABLE, PENDING, SOLD") @RequestParam(value = "status", required = true) List<String> status) {
+    default CompletableFuture<ResponseEntity<List<Pet>>> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "AVAILABLE, PENDING, SOLD") @RequestParam(value = "status", required = true) List<String> status) {
         // do some magic!
         return CompletableFuture.completedFuture(new ResponseEntity<List<Pet>>(HttpStatus.OK));
     }
@@ -89,7 +89,7 @@ public interface PetApi {
     @RequestMapping(value = "/pet/findByTags",
         produces = { "application/xml", "application/json" }, 
         method = RequestMethod.GET)
-    default CompletableFuture<ResponseEntity<List<Pet>>> findPetsByTags(@ApiParam(value = "Tags to filter by", required = true) @RequestParam(value = "tags", required = true) List<String> tags) {
+    default CompletableFuture<ResponseEntity<List<Pet>>> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @RequestParam(value = "tags", required = true) List<String> tags) {
         // do some magic!
         return CompletableFuture.completedFuture(new ResponseEntity<List<Pet>>(HttpStatus.OK));
     }

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

@@ -2,7 +2,7 @@ package io.swagger.api;
 
 import org.springframework.stereotype.Controller;
 
-
+import javax.validation.constraints.*;
 
 @Controller
 public class PetApiController implements PetApi {

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

@@ -17,7 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
-
+import javax.validation.constraints.*;
 
 @Api(value = "store", description = "the store API")
 public interface StoreApi {
@@ -57,7 +57,7 @@ public interface StoreApi {
     @RequestMapping(value = "/store/order/{orderId}",
         produces = { "application/xml", "application/json" }, 
         method = RequestMethod.GET)
-    default CompletableFuture<ResponseEntity<Order>> getOrderById(@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathVariable("orderId") Long orderId) {
+    default CompletableFuture<ResponseEntity<Order>> getOrderById( @Min(1) @Max(5)@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathVariable("orderId") Long orderId) {
         // do some magic!
         return CompletableFuture.completedFuture(new ResponseEntity<Order>(HttpStatus.OK));
     }

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

@@ -2,7 +2,7 @@ package io.swagger.api;
 
 import org.springframework.stereotype.Controller;
 
-
+import javax.validation.constraints.*;
 
 @Controller
 public class StoreApiController implements StoreApi {

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

@@ -17,7 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
-
+import javax.validation.constraints.*;
 
 @Api(value = "user", description = "the user API")
 public interface UserApi {
@@ -92,8 +92,8 @@ public interface UserApi {
     @RequestMapping(value = "/user/login",
         produces = { "application/xml", "application/json" }, 
         method = RequestMethod.GET)
-    default CompletableFuture<ResponseEntity<String>> loginUser(@ApiParam(value = "The user name for login", required = true) @RequestParam(value = "username", required = true) String username,
+    default CompletableFuture<ResponseEntity<String>> loginUser( @NotNull @ApiParam(value = "The user name for login", required = true) @RequestParam(value = "username", required = true) String username,
-        @ApiParam(value = "The password for login in clear text", required = true) @RequestParam(value = "password", required = true) String password) {
+         @NotNull @ApiParam(value = "The password for login in clear text", required = true) @RequestParam(value = "password", required = true) String password) {
         // do some magic!
         return CompletableFuture.completedFuture(new ResponseEntity<String>(HttpStatus.OK));
     }

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

@@ -2,7 +2,7 @@ package io.swagger.api;
 
 import org.springframework.stereotype.Controller;
 
-
+import javax.validation.constraints.*;
 
 @Controller
 public class UserApiController implements UserApi {

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

@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
+import javax.validation.constraints.*;
 /**
  * AdditionalPropertiesClass
  */

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

@@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
+import javax.validation.constraints.*;
 /**
  * Animal
  */
@@ -34,6 +34,7 @@ public class Animal   {
    * @return className
   **/
   @ApiModelProperty(required = true, value = "")
+  @NotNull
   public String getClassName() {
     return className;
   }

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

@@ -4,7 +4,7 @@ import java.util.Objects;
 import io.swagger.model.Animal;
 import java.util.ArrayList;
 import java.util.List;
-
+import javax.validation.constraints.*;
 /**
  * AnimalFarm
  */

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

@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
-
+import javax.validation.constraints.*;
 /**
  * ArrayOfArrayOfNumberOnly
  */

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

@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
-
+import javax.validation.constraints.*;
 /**
  * ArrayOfNumberOnly
  */

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

@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import io.swagger.model.ReadOnlyFirst;
 import java.util.ArrayList;
 import java.util.List;
-
+import javax.validation.constraints.*;
 /**
  * ArrayTest
  */

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

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
+import javax.validation.constraints.*;
 /**
  * Capitalization
  */

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

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.model.Animal;
-
+import javax.validation.constraints.*;
 /**
  * Cat
  */

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

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
+import javax.validation.constraints.*;
 /**
  * Category
  */

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

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
+import javax.validation.constraints.*;
 /**
  * Model for testing model with \"_class\" property
  */

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

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
+import javax.validation.constraints.*;
 /**
  * Client
  */

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

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.model.Animal;
-
+import javax.validation.constraints.*;
 /**
  * Dog
  */

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

@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;
-
+import javax.validation.constraints.*;
 /**
  * EnumArrays
  */

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

@@ -2,7 +2,7 @@ package io.swagger.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonValue;
-
+import javax.validation.constraints.*;
 import com.fasterxml.jackson.annotation.JsonCreator;
 
 /**

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

@@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.model.OuterEnum;
-
+import javax.validation.constraints.*;
 /**
  * EnumTest
  */

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

@@ -8,7 +8,8 @@ import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
-
+import java.util.UUID;
+import javax.validation.constraints.*;
 /**
  * FormatTest
  */
@@ -48,7 +49,7 @@ public class FormatTest   {
   private OffsetDateTime dateTime = null;
 
   @JsonProperty("uuid")
-  private String uuid = null;
+  private UUID uuid = null;
 
   @JsonProperty("password")
   private String password = null;
@@ -65,6 +66,8 @@ public class FormatTest   {
    * @return integer
   **/
   @ApiModelProperty(value = "")
+  @Min(10)
+  @Max(100)
   public Integer getInteger() {
     return integer;
   }
@@ -85,6 +88,8 @@ public class FormatTest   {
    * @return int32
   **/
   @ApiModelProperty(value = "")
+  @Min(20)
+  @Max(200)
   public Integer getInt32() {
     return int32;
   }
@@ -123,6 +128,9 @@ public class FormatTest   {
    * @return number
   **/
   @ApiModelProperty(required = true, value = "")
+  @NotNull
+  @DecimalMin("32.1")
+  @DecimalMax("543.2")
   public BigDecimal getNumber() {
     return number;
   }
@@ -143,6 +151,8 @@ public class FormatTest   {
    * @return _float
   **/
   @ApiModelProperty(value = "")
+  @DecimalMin("54.3")
+  @DecimalMax("987.6")
   public Float getFloat() {
     return _float;
   }
@@ -163,6 +173,8 @@ public class FormatTest   {
    * @return _double
   **/
   @ApiModelProperty(value = "")
+  @DecimalMin("67.8")
+  @DecimalMax("123.4")
   public Double getDouble() {
     return _double;
   }
@@ -181,6 +193,7 @@ public class FormatTest   {
    * @return string
   **/
   @ApiModelProperty(value = "")
+  @Pattern(regexp="/[a-z]/i")
   public String getString() {
     return string;
   }
@@ -199,6 +212,7 @@ public class FormatTest   {
    * @return _byte
   **/
   @ApiModelProperty(required = true, value = "")
+  @NotNull
   public byte[] getByte() {
     return _byte;
   }
@@ -235,6 +249,7 @@ public class FormatTest   {
    * @return date
   **/
   @ApiModelProperty(required = true, value = "")
+  @NotNull
   public LocalDate getDate() {
     return date;
   }
@@ -261,7 +276,7 @@ public class FormatTest   {
     this.dateTime = dateTime;
   }
 
-  public FormatTest uuid(String uuid) {
+  public FormatTest uuid(UUID uuid) {
     this.uuid = uuid;
     return this;
   }
@@ -271,11 +286,11 @@ public class FormatTest   {
    * @return uuid
   **/
   @ApiModelProperty(value = "")
-  public String getUuid() {
+  public UUID getUuid() {
     return uuid;
   }
 
-  public void setUuid(String uuid) {
+  public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 
@@ -289,6 +304,8 @@ public class FormatTest   {
    * @return password
   **/
   @ApiModelProperty(required = true, value = "")
+  @NotNull
+  @Size(min=10,max=64)
   public String getPassword() {
     return password;
   }

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

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
+import javax.validation.constraints.*;
 /**
  * HasOnlyReadOnly
  */

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

@@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
+import javax.validation.constraints.*;
 /**
  * MapTest
  */

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

@@ -10,14 +10,15 @@ import java.time.OffsetDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
+import java.util.UUID;
+import javax.validation.constraints.*;
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
 
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   @JsonProperty("uuid")
-  private String uuid = null;
+  private UUID uuid = null;
 
   @JsonProperty("dateTime")
   private OffsetDateTime dateTime = null;
@@ -25,7 +26,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
   @JsonProperty("map")
   private Map<String, Animal> map = new HashMap<String, Animal>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(String uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     this.uuid = uuid;
     return this;
   }
@@ -35,11 +36,11 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
    * @return uuid
   **/
   @ApiModelProperty(value = "")
-  public String getUuid() {
+  public UUID getUuid() {
     return uuid;
   }
 
-  public void setUuid(String uuid) {
+  public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 

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

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
+import javax.validation.constraints.*;
 /**
  * Model for testing model name starting with number
  */

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

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
+import javax.validation.constraints.*;
 /**
  * ModelApiResponse
  */

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

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
+import javax.validation.constraints.*;
 /**
  * Model for testing reserved words
  */

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

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
+import javax.validation.constraints.*;
 /**
  * Model for testing model name same as property name
  */
@@ -34,6 +34,7 @@ public class Name   {
    * @return name
   **/
   @ApiModelProperty(required = true, value = "")
+  @NotNull
   public Integer getName() {
     return name;
   }

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

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
-
+import javax.validation.constraints.*;
 /**
  * NumberOnly
  */

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

@@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.time.OffsetDateTime;
-
+import javax.validation.constraints.*;
 /**
  * Order
  */

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

@@ -2,7 +2,7 @@ package io.swagger.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonValue;
-
+import javax.validation.constraints.*;
 import com.fasterxml.jackson.annotation.JsonCreator;
 
 /**

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

@@ -10,7 +10,7 @@ import io.swagger.model.Category;
 import io.swagger.model.Tag;
 import java.util.ArrayList;
 import java.util.List;
-
+import javax.validation.constraints.*;
 /**
  * Pet
  */
@@ -113,6 +113,7 @@ public class Pet   {
    * @return name
   **/
   @ApiModelProperty(example = "doggie", required = true, value = "")
+  @NotNull
   public String getName() {
     return name;
   }
@@ -136,6 +137,7 @@ public class Pet   {
    * @return photoUrls
   **/
   @ApiModelProperty(required = true, value = "")
+  @NotNull
   public List<String> getPhotoUrls() {
     return photoUrls;
   }

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

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
+import javax.validation.constraints.*;
 /**
  * ReadOnlyFirst
  */

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

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
+import javax.validation.constraints.*;
 /**
  * SpecialModelName
  */

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

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
+import javax.validation.constraints.*;
 /**
  * Tag
  */

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

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
+import javax.validation.constraints.*;
 /**
  * User
  */

samples/server/petstore/spring-mvc/pom.xml

@@ -1,9 +1,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.swagger</groupId>
-    <artifactId>swagger-spring</artifactId>
+    <artifactId>swagger-spring-mvc-server</artifactId>
     <packaging>jar</packaging>
-    <name>swagger-spring</name>
+    <name>swagger-spring-mvc-server</name>
     <version>1.0.0</version>
     <build>
         <sourceDirectory>src/main/java</sourceDirectory>

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

@@ -27,7 +27,7 @@ public interface StoreApi {
     @RequestMapping(value = "/store/order/{orderId}",
         produces = { "application/xml", "application/json" }, 
         method = RequestMethod.DELETE)
-    ResponseEntity<Void> deleteOrder( @Min(1)@ApiParam(value = "ID of the order that needs to be deleted",required=true ) @PathVariable("orderId") String orderId);
+    ResponseEntity<Void> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true ) @PathVariable("orderId") String orderId);
 
 
     @ApiOperation(value = "Returns pet inventories by status", notes = "Returns a map of status codes to quantities", response = Integer.class, responseContainer = "Map", authorizations = {

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

@@ -22,7 +22,9 @@ import javax.validation.constraints.*;
 @Controller
 public class StoreApiController implements StoreApi {
 
-    public ResponseEntity<Void> deleteOrder( @Min(1)@ApiParam(value = "ID of the order that needs to be deleted",required=true ) @PathVariable("orderId") String orderId) {
+
+
+    public ResponseEntity<Void> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true ) @PathVariable("orderId") String orderId) {
         // do some magic!
         return new ResponseEntity<Void>(HttpStatus.OK);
     }

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

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
+import javax.validation.constraints.*;
 /**
  * Capitalization
  */

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

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
+import java.util.UUID;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
 import javax.validation.constraints.*;
@@ -48,7 +49,7 @@ public class FormatTest   {
   private DateTime dateTime = null;
 
   @JsonProperty("uuid")
-  private String uuid = null;
+  private UUID uuid = null;
 
   @JsonProperty("password")
   private String password = null;
@@ -275,7 +276,7 @@ public class FormatTest   {
     this.dateTime = dateTime;
   }
 
-  public FormatTest uuid(String uuid) {
+  public FormatTest uuid(UUID uuid) {
     this.uuid = uuid;
     return this;
   }
@@ -285,11 +286,11 @@ public class FormatTest   {
    * @return uuid
   **/
   @ApiModelProperty(value = "")
-  public String getUuid() {
+  public UUID getUuid() {
     return uuid;
   }
 
-  public void setUuid(String uuid) {
+  public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 

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

@@ -9,6 +9,7 @@ import io.swagger.model.Animal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import org.joda.time.DateTime;
 import javax.validation.constraints.*;
 /**
@@ -17,7 +18,7 @@ import javax.validation.constraints.*;
 
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   @JsonProperty("uuid")
-  private String uuid = null;
+  private UUID uuid = null;
 
   @JsonProperty("dateTime")
   private DateTime dateTime = null;
@@ -25,7 +26,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
   @JsonProperty("map")
   private Map<String, Animal> map = new HashMap<String, Animal>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(String uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     this.uuid = uuid;
     return this;
   }
@@ -35,11 +36,11 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
    * @return uuid
   **/
   @ApiModelProperty(value = "")
-  public String getUuid() {
+  public UUID getUuid() {
     return uuid;
   }
 
-  public void setUuid(String uuid) {
+  public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 

samples/server/petstore/springboot-delegate-j8/pom.xml

@@ -58,5 +58,12 @@
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jsr310</artifactId>
         </dependency>
+    <!-- Bean Validation API support -->
+    <dependency>
+        <groupId>javax.validation</groupId>
+        <artifactId>validation-api</artifactId>
+        <version>1.1.0.Final</version>
+        <scope>provided</scope>
+    </dependency>
     </dependencies>
 </project>

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

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
-
+import javax.validation.constraints.*;
 
 @Api(value = "fake", description = "the fake API")
 public interface FakeApi {

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

@@ -19,7 +19,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
-
+import javax.validation.constraints.*;
 
 @Controller
 public class FakeApiController implements FakeApi {

samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/PetApi.java

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
-
+import javax.validation.constraints.*;
 
 @Api(value = "pet", description = "the pet API")
 public interface PetApi {
@@ -70,7 +70,7 @@ public interface PetApi {
     @RequestMapping(value = "/pet/findByStatus",
         produces = { "application/xml", "application/json" }, 
         method = RequestMethod.GET)
-    default ResponseEntity<List<Pet>> findPetsByStatus(@ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "AVAILABLE, PENDING, SOLD") @RequestParam(value = "status", required = true) List<String> status) {
+    default ResponseEntity<List<Pet>> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "AVAILABLE, PENDING, SOLD") @RequestParam(value = "status", required = true) List<String> status) {
         // do some magic!
         return new ResponseEntity<List<Pet>>(HttpStatus.OK);
     }
@@ -88,7 +88,7 @@ public interface PetApi {
     @RequestMapping(value = "/pet/findByTags",
         produces = { "application/xml", "application/json" }, 
         method = RequestMethod.GET)
-    default ResponseEntity<List<Pet>> findPetsByTags(@ApiParam(value = "Tags to filter by", required = true) @RequestParam(value = "tags", required = true) List<String> tags) {
+    default ResponseEntity<List<Pet>> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @RequestParam(value = "tags", required = true) List<String> tags) {
         // do some magic!
         return new ResponseEntity<List<Pet>>(HttpStatus.OK);
     }

samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/PetApiController.java

@@ -18,7 +18,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
-
+import javax.validation.constraints.*;
 
 @Controller
 public class PetApiController implements PetApi {
@@ -41,12 +41,12 @@ public class PetApiController implements PetApi {
         return delegate.deletePet(petId, apiKey);
     }
 
-    public ResponseEntity<List<Pet>> findPetsByStatus(@ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "AVAILABLE, PENDING, SOLD") @RequestParam(value = "status", required = true) List<String> status) {
+    public ResponseEntity<List<Pet>> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "AVAILABLE, PENDING, SOLD") @RequestParam(value = "status", required = true) List<String> status) {
         // do some magic!
         return delegate.findPetsByStatus(status);
     }
 
-    public ResponseEntity<List<Pet>> findPetsByTags(@ApiParam(value = "Tags to filter by", required = true) @RequestParam(value = "tags", required = true) List<String> tags) {
+    public ResponseEntity<List<Pet>> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @RequestParam(value = "tags", required = true) List<String> tags) {
         // do some magic!
         return delegate.findPetsByTags(tags);
     }

samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/StoreApi.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
-
+import javax.validation.constraints.*;
 
 @Api(value = "store", description = "the store API")
 public interface StoreApi {
@@ -56,7 +56,7 @@ public interface StoreApi {
     @RequestMapping(value = "/store/order/{orderId}",
         produces = { "application/xml", "application/json" }, 
         method = RequestMethod.GET)
-    default ResponseEntity<Order> getOrderById(@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathVariable("orderId") Long orderId) {
+    default ResponseEntity<Order> getOrderById( @Min(1) @Max(5)@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathVariable("orderId") Long orderId) {
         // do some magic!
         return new ResponseEntity<Order>(HttpStatus.OK);
     }

samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/StoreApiController.java

@@ -17,7 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
-
+import javax.validation.constraints.*;
 
 @Controller
 public class StoreApiController implements StoreApi {
@@ -39,7 +39,7 @@ public class StoreApiController implements StoreApi {
         return delegate.getInventory();
     }
 
-    public ResponseEntity<Order> getOrderById(@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathVariable("orderId") Long orderId) {
+    public ResponseEntity<Order> getOrderById( @Min(1) @Max(5)@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathVariable("orderId") Long orderId) {
         // do some magic!
         return delegate.getOrderById(orderId);
     }

samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/UserApi.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
-
+import javax.validation.constraints.*;
 
 @Api(value = "user", description = "the user API")
 public interface UserApi {
@@ -91,8 +91,8 @@ public interface UserApi {
     @RequestMapping(value = "/user/login",
         produces = { "application/xml", "application/json" }, 
         method = RequestMethod.GET)
-    default ResponseEntity<String> loginUser(@ApiParam(value = "The user name for login", required = true) @RequestParam(value = "username", required = true) String username,
+    default ResponseEntity<String> loginUser( @NotNull @ApiParam(value = "The user name for login", required = true) @RequestParam(value = "username", required = true) String username,
-        @ApiParam(value = "The password for login in clear text", required = true) @RequestParam(value = "password", required = true) String password) {
+         @NotNull @ApiParam(value = "The password for login in clear text", required = true) @RequestParam(value = "password", required = true) String password) {
         // do some magic!
         return new ResponseEntity<String>(HttpStatus.OK);
     }

samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/UserApiController.java

@@ -17,7 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
-
+import javax.validation.constraints.*;
 
 @Controller
 public class UserApiController implements UserApi {
@@ -54,8 +54,8 @@ public class UserApiController implements UserApi {
         return delegate.getUserByName(username);
     }
 
-    public ResponseEntity<String> loginUser(@ApiParam(value = "The user name for login", required = true) @RequestParam(value = "username", required = true) String username,
+    public ResponseEntity<String> loginUser( @NotNull @ApiParam(value = "The user name for login", required = true) @RequestParam(value = "username", required = true) String username,
-        @ApiParam(value = "The password for login in clear text", required = true) @RequestParam(value = "password", required = true) String password) {
+         @NotNull @ApiParam(value = "The password for login in clear text", required = true) @RequestParam(value = "password", required = true) String password) {
         // do some magic!
         return delegate.loginUser(username, password);
     }

samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/model/AdditionalPropertiesClass.java

@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
+import javax.validation.constraints.*;
 /**
  * AdditionalPropertiesClass
  */

samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/model/Animal.java

@@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
+import javax.validation.constraints.*;
 /**
  * Animal
  */
@@ -34,6 +34,7 @@ public class Animal   {
    * @return className
   **/
   @ApiModelProperty(required = true, value = "")
+  @NotNull
   public String getClassName() {
     return className;
   }

samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/model/AnimalFarm.java

@@ -4,7 +4,7 @@ import java.util.Objects;
 import io.swagger.model.Animal;
 import java.util.ArrayList;
 import java.util.List;
-
+import javax.validation.constraints.*;
 /**
  * AnimalFarm
  */

samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java

@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
-
+import javax.validation.constraints.*;
 /**
  * ArrayOfArrayOfNumberOnly
  */