Feature: Enable validation (#5391)

When useBeanValidation is enabled make sure the annotation @Valid
is added to the attributes of the model.

modules/swagger-codegen/src/main/resources/JavaSpring/beanValidation.mustache

@@ -1,4 +1,5 @@
 {{#required}}
   @NotNull
 {{/required}}
-{{>beanValidationCore}}
+{{>beanValidationCore}}
+  @Valid

modules/swagger-codegen/src/main/resources/JavaSpring/beanValidationCore.mustache

@@ -5,16 +5,16 @@ minLength set, maxLength not
 }}{{#minLength}}{{^maxLength}} @Size(min={{minLength}}){{/maxLength}}{{/minLength}}{{!
 minLength not set, maxLength set
 }}{{^minLength}}{{#maxLength}} @Size(max={{maxLength}}){{/maxLength}}{{/minLength}}{{!
-@Size: minItems && maxItems set 
+@Size: minItems && maxItems set
 }}{{#minItems}}{{#maxItems}} @Size(min={{minItems}},max={{maxItems}}){{/maxItems}}{{/minItems}}{{!
-@Size: minItems set, maxItems not 
+@Size: minItems set, maxItems not
 }}{{#minItems}}{{^maxItems}} @Size(min={{minItems}}){{/maxItems}}{{/minItems}}{{!
-@Size: minItems not set && maxItems set 
+@Size: minItems not set && maxItems set
-}}{{^minItems}}{{#maxItems}} @Size(max={{maxItems}}){{/maxItems}}{{/minItems}}{{! 
+}}{{^minItems}}{{#maxItems}} @Size(max={{maxItems}}){{/maxItems}}{{/minItems}}{{!
 check for integer or long / all others=decimal type with @Decimal*
 isInteger set
 }}{{#isInteger}}{{#minimum}} @Min({{minimum}}){{/minimum}}{{#maximum}} @Max({{maximum}}){{/maximum}}{{/isInteger}}{{!
-isLong set 
+isLong set
 }}{{#isLong}}{{#minimum}} @Min({{minimum}}){{/minimum}}{{#maximum}} @Max({{maximum}}){{/maximum}}{{/isLong}}{{!
 Not Integer, not Long => we have a decimal value!
 }}{{^isInteger}}{{^isLong}}{{#minimum}} @DecimalMin("{{minimum}}"){{/minimum}}{{#maximum}} @DecimalMax("{{maximum}}"){{/maximum}}{{/isLong}}{{/isInteger}}

modules/swagger-codegen/src/main/resources/JavaSpring/beanValidationQueryParams.mustache

@@ -1 +1 @@
-{{#required}} @NotNull{{/required}}{{>beanValidationCore}} 
+{{#required}} @NotNull{{/required}}{{>beanValidationCore}}

modules/swagger-codegen/src/main/resources/JavaSpring/model.mustache

@@ -7,8 +7,10 @@ import java.util.Objects;
 import java.io.Serializable;
 {{/serializableModel}}
 {{#useBeanValidation}}
+import javax.validation.Valid;
 import javax.validation.constraints.*;
 {{/useBeanValidation}}
+
 {{#models}}
 {{#model}}
 {{#isEnum}}

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

@@ -8,7 +8,9 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import javax.validation.Valid;
 import javax.validation.constraints.*;
+
 /**
  * AdditionalPropertiesClass
  */
@@ -38,6 +40,8 @@ public class AdditionalPropertiesClass   {
    * @return mapProperty
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Map<String, String> getMapProperty() {
     return mapProperty;
   }
@@ -64,6 +68,8 @@ public class AdditionalPropertiesClass   {
    * @return mapOfMapProperty
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Map<String, Map<String, String>> getMapOfMapProperty() {
     return mapOfMapProperty;
   }

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

@@ -7,7 +7,9 @@ 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.Valid;
 import javax.validation.constraints.*;
+
 /**
  * Animal
  */
@@ -35,6 +37,8 @@ public class Animal   {
   **/
   @ApiModelProperty(required = true, value = "")
   @NotNull
+
+  @Valid
   public String getClassName() {
     return className;
   }
@@ -53,6 +57,8 @@ public class Animal   {
    * @return color
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getColor() {
     return color;
   }

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

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

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

@@ -8,7 +8,9 @@ import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import javax.validation.Valid;
 import javax.validation.constraints.*;
+
 /**
  * ArrayOfArrayOfNumberOnly
  */
@@ -35,6 +37,8 @@ public class ArrayOfArrayOfNumberOnly   {
    * @return arrayArrayNumber
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
   }

samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/model/ArrayOfNumberOnly.java

@@ -8,7 +8,9 @@ import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import javax.validation.Valid;
 import javax.validation.constraints.*;
+
 /**
  * ArrayOfNumberOnly
  */
@@ -35,6 +37,8 @@ public class ArrayOfNumberOnly   {
    * @return arrayNumber
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
   }

samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/model/ArrayTest.java

@@ -8,7 +8,9 @@ import io.swagger.annotations.ApiModelProperty;
 import io.swagger.model.ReadOnlyFirst;
 import java.util.ArrayList;
 import java.util.List;
+import javax.validation.Valid;
 import javax.validation.constraints.*;
+
 /**
  * ArrayTest
  */
@@ -41,6 +43,8 @@ public class ArrayTest   {
    * @return arrayOfString
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public List<String> getArrayOfString() {
     return arrayOfString;
   }
@@ -67,6 +71,8 @@ public class ArrayTest   {
    * @return arrayArrayOfInteger
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
   }
@@ -93,6 +99,8 @@ public class ArrayTest   {
    * @return arrayArrayOfModel
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
   }

samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/model/Capitalization.java

@@ -5,7 +5,9 @@ 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.Valid;
 import javax.validation.constraints.*;
+
 /**
  * Capitalization
  */
@@ -39,6 +41,8 @@ public class Capitalization   {
    * @return smallCamel
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getSmallCamel() {
     return smallCamel;
   }
@@ -57,6 +61,8 @@ public class Capitalization   {
    * @return capitalCamel
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getCapitalCamel() {
     return capitalCamel;
   }
@@ -75,6 +81,8 @@ public class Capitalization   {
    * @return smallSnake
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getSmallSnake() {
     return smallSnake;
   }
@@ -93,6 +101,8 @@ public class Capitalization   {
    * @return capitalSnake
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getCapitalSnake() {
     return capitalSnake;
   }
@@ -111,6 +121,8 @@ public class Capitalization   {
    * @return scAETHFlowPoints
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
   }
@@ -129,6 +141,8 @@ public class Capitalization   {
    * @return ATT_NAME
   **/
   @ApiModelProperty(value = "Name of the pet ")
+
+  @Valid
   public String getATTNAME() {
     return ATT_NAME;
   }

samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/model/Cat.java

@@ -6,7 +6,9 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.model.Animal;
+import javax.validation.Valid;
 import javax.validation.constraints.*;
+
 /**
  * Cat
  */
@@ -25,6 +27,8 @@ public class Cat extends Animal  {
    * @return declawed
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Boolean getDeclawed() {
     return declawed;
   }

samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/model/Category.java

@@ -5,7 +5,9 @@ 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.Valid;
 import javax.validation.constraints.*;
+
 /**
  * Category
  */
@@ -27,6 +29,8 @@ public class Category   {
    * @return id
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Long getId() {
     return id;
   }
@@ -45,6 +49,8 @@ public class Category   {
    * @return name
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getName() {
     return name;
   }

samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/model/ClassModel.java

@@ -5,7 +5,9 @@ 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.Valid;
 import javax.validation.constraints.*;
+
 /**
  * Model for testing model with \"_class\" property
  */
@@ -25,6 +27,8 @@ public class ClassModel   {
    * @return propertyClass
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getPropertyClass() {
     return propertyClass;
   }

samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/model/Client.java

@@ -5,7 +5,9 @@ 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.Valid;
 import javax.validation.constraints.*;
+
 /**
  * Client
  */
@@ -24,6 +26,8 @@ public class Client   {
    * @return client
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getClient() {
     return client;
   }

samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/model/Dog.java

@@ -6,7 +6,9 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.model.Animal;
+import javax.validation.Valid;
 import javax.validation.constraints.*;
+
 /**
  * Dog
  */
@@ -25,6 +27,8 @@ public class Dog extends Animal  {
    * @return breed
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getBreed() {
     return breed;
   }

samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/model/EnumArrays.java

@@ -8,7 +8,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;
+import javax.validation.Valid;
 import javax.validation.constraints.*;
+
 /**
  * EnumArrays
  */
@@ -92,6 +94,8 @@ public class EnumArrays   {
    * @return justSymbol
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
   }
@@ -118,6 +122,8 @@ public class EnumArrays   {
    * @return arrayEnum
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
   }

samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/model/EnumClass.java

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

samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/model/EnumTest.java

@@ -7,7 +7,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.model.OuterEnum;
+import javax.validation.Valid;
 import javax.validation.constraints.*;
+
 /**
  * EnumTest
  */
@@ -130,6 +132,8 @@ public class EnumTest   {
    * @return enumString
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public EnumStringEnum getEnumString() {
     return enumString;
   }
@@ -148,6 +152,8 @@ public class EnumTest   {
    * @return enumInteger
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
   }
@@ -166,6 +172,8 @@ public class EnumTest   {
    * @return enumNumber
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
   }
@@ -184,6 +192,8 @@ public class EnumTest   {
    * @return outerEnum
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public OuterEnum getOuterEnum() {
     return outerEnum;
   }

samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/model/FormatTest.java

@@ -9,7 +9,9 @@ import java.math.BigDecimal;
 import java.util.UUID;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
+import javax.validation.Valid;
 import javax.validation.constraints.*;
+
 /**
  * FormatTest
  */
@@ -66,7 +68,9 @@ public class FormatTest   {
    * @return integer
   **/
   @ApiModelProperty(value = "")
- @Min(10) @Max(100)  public Integer getInteger() {
+ @Min(10) @Max(100)
+  @Valid
+  public Integer getInteger() {
     return integer;
   }
 
@@ -86,7 +90,9 @@ public class FormatTest   {
    * @return int32
   **/
   @ApiModelProperty(value = "")
- @Min(20) @Max(200)  public Integer getInt32() {
+ @Min(20) @Max(200)
+  @Valid
+  public Integer getInt32() {
     return int32;
   }
 
@@ -104,6 +110,8 @@ public class FormatTest   {
    * @return int64
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Long getInt64() {
     return int64;
   }
@@ -125,7 +133,9 @@ public class FormatTest   {
   **/
   @ApiModelProperty(required = true, value = "")
   @NotNull
- @DecimalMin("32.1") @DecimalMax("543.2")  public BigDecimal getNumber() {
+ @DecimalMin("32.1") @DecimalMax("543.2")
+  @Valid
+  public BigDecimal getNumber() {
     return number;
   }
 
@@ -145,7 +155,9 @@ public class FormatTest   {
    * @return _float
   **/
   @ApiModelProperty(value = "")
- @DecimalMin("54.3") @DecimalMax("987.6")  public Float getFloat() {
+ @DecimalMin("54.3") @DecimalMax("987.6")
+  @Valid
+  public Float getFloat() {
     return _float;
   }
 
@@ -165,7 +177,9 @@ public class FormatTest   {
    * @return _double
   **/
   @ApiModelProperty(value = "")
- @DecimalMin("67.8") @DecimalMax("123.4")  public Double getDouble() {
+ @DecimalMin("67.8") @DecimalMax("123.4")
+  @Valid
+  public Double getDouble() {
     return _double;
   }
 
@@ -183,7 +197,9 @@ public class FormatTest   {
    * @return string
   **/
   @ApiModelProperty(value = "")
- @Pattern(regexp="/[a-z]/i")  public String getString() {
+ @Pattern(regexp="/[a-z]/i")
+  @Valid
+  public String getString() {
     return string;
   }
 
@@ -202,6 +218,8 @@ public class FormatTest   {
   **/
   @ApiModelProperty(required = true, value = "")
   @NotNull
+
+  @Valid
   public byte[] getByte() {
     return _byte;
   }
@@ -220,6 +238,8 @@ public class FormatTest   {
    * @return binary
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public byte[] getBinary() {
     return binary;
   }
@@ -239,6 +259,8 @@ public class FormatTest   {
   **/
   @ApiModelProperty(required = true, value = "")
   @NotNull
+
+  @Valid
   public LocalDate getDate() {
     return date;
   }
@@ -257,6 +279,8 @@ public class FormatTest   {
    * @return dateTime
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public DateTime getDateTime() {
     return dateTime;
   }
@@ -275,6 +299,8 @@ public class FormatTest   {
    * @return uuid
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public UUID getUuid() {
     return uuid;
   }
@@ -294,7 +320,9 @@ public class FormatTest   {
   **/
   @ApiModelProperty(required = true, value = "")
   @NotNull
- @Size(min=10,max=64)  public String getPassword() {
+ @Size(min=10,max=64)
+  @Valid
+  public String getPassword() {
     return password;
   }
 

samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/model/HasOnlyReadOnly.java

@@ -5,7 +5,9 @@ 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.Valid;
 import javax.validation.constraints.*;
+
 /**
  * HasOnlyReadOnly
  */
@@ -27,6 +29,8 @@ public class HasOnlyReadOnly   {
    * @return bar
   **/
   @ApiModelProperty(readOnly = true, value = "")
+
+  @Valid
   public String getBar() {
     return bar;
   }
@@ -45,6 +49,8 @@ public class HasOnlyReadOnly   {
    * @return foo
   **/
   @ApiModelProperty(readOnly = true, value = "")
+
+  @Valid
   public String getFoo() {
     return foo;
   }

samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/model/MapTest.java

@@ -9,7 +9,9 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import javax.validation.Valid;
 import javax.validation.constraints.*;
+
 /**
  * MapTest
  */
@@ -70,6 +72,8 @@ public class MapTest   {
    * @return mapMapOfString
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
   }
@@ -96,6 +100,8 @@ public class MapTest   {
    * @return mapOfEnumString
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
   }

samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -11,7 +11,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import org.joda.time.DateTime;
+import javax.validation.Valid;
 import javax.validation.constraints.*;
+
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
@@ -36,6 +38,8 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
    * @return uuid
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public UUID getUuid() {
     return uuid;
   }
@@ -54,6 +58,8 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
    * @return dateTime
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public DateTime getDateTime() {
     return dateTime;
   }
@@ -80,6 +86,8 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
    * @return map
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Map<String, Animal> getMap() {
     return map;
   }

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

@@ -5,7 +5,9 @@ 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.Valid;
 import javax.validation.constraints.*;
+
 /**
  * Model for testing model name starting with number
  */
@@ -28,6 +30,8 @@ public class Model200Response   {
    * @return name
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Integer getName() {
     return name;
   }
@@ -46,6 +50,8 @@ public class Model200Response   {
    * @return propertyClass
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getPropertyClass() {
     return propertyClass;
   }

samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/model/ModelApiResponse.java

@@ -5,7 +5,9 @@ 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.Valid;
 import javax.validation.constraints.*;
+
 /**
  * ModelApiResponse
  */
@@ -30,6 +32,8 @@ public class ModelApiResponse   {
    * @return code
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Integer getCode() {
     return code;
   }
@@ -48,6 +52,8 @@ public class ModelApiResponse   {
    * @return type
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getType() {
     return type;
   }
@@ -66,6 +72,8 @@ public class ModelApiResponse   {
    * @return message
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getMessage() {
     return message;
   }

samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/model/ModelReturn.java

@@ -5,7 +5,9 @@ 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.Valid;
 import javax.validation.constraints.*;
+
 /**
  * Model for testing reserved words
  */
@@ -25,6 +27,8 @@ public class ModelReturn   {
    * @return _return
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Integer getReturn() {
     return _return;
   }

samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/model/Name.java

@@ -5,7 +5,9 @@ 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.Valid;
 import javax.validation.constraints.*;
+
 /**
  * Model for testing model name same as property name
  */
@@ -35,6 +37,8 @@ public class Name   {
   **/
   @ApiModelProperty(required = true, value = "")
   @NotNull
+
+  @Valid
   public Integer getName() {
     return name;
   }
@@ -53,6 +57,8 @@ public class Name   {
    * @return snakeCase
   **/
   @ApiModelProperty(readOnly = true, value = "")
+
+  @Valid
   public Integer getSnakeCase() {
     return snakeCase;
   }
@@ -71,6 +77,8 @@ public class Name   {
    * @return property
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getProperty() {
     return property;
   }
@@ -89,6 +97,8 @@ public class Name   {
    * @return _123Number
   **/
   @ApiModelProperty(readOnly = true, value = "")
+
+  @Valid
   public Integer get123Number() {
     return _123Number;
   }

samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/model/NumberOnly.java

@@ -6,7 +6,9 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
+import javax.validation.Valid;
 import javax.validation.constraints.*;
+
 /**
  * NumberOnly
  */
@@ -25,6 +27,8 @@ public class NumberOnly   {
    * @return justNumber
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public BigDecimal getJustNumber() {
     return justNumber;
   }

samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/model/Order.java

@@ -7,7 +7,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.joda.time.DateTime;
+import javax.validation.Valid;
 import javax.validation.constraints.*;
+
 /**
  * Order
  */
@@ -74,6 +76,8 @@ public class Order   {
    * @return id
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Long getId() {
     return id;
   }
@@ -92,6 +96,8 @@ public class Order   {
    * @return petId
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Long getPetId() {
     return petId;
   }
@@ -110,6 +116,8 @@ public class Order   {
    * @return quantity
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Integer getQuantity() {
     return quantity;
   }
@@ -128,6 +136,8 @@ public class Order   {
    * @return shipDate
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public DateTime getShipDate() {
     return shipDate;
   }
@@ -146,6 +156,8 @@ public class Order   {
    * @return status
   **/
   @ApiModelProperty(value = "Order Status")
+
+  @Valid
   public StatusEnum getStatus() {
     return status;
   }
@@ -164,6 +176,8 @@ public class Order   {
    * @return complete
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Boolean getComplete() {
     return complete;
   }

samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/model/OuterEnum.java

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

samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/model/Pet.java

@@ -10,7 +10,9 @@ import io.swagger.model.Category;
 import io.swagger.model.Tag;
 import java.util.ArrayList;
 import java.util.List;
+import javax.validation.Valid;
 import javax.validation.constraints.*;
+
 /**
  * Pet
  */
@@ -77,6 +79,8 @@ public class Pet   {
    * @return id
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Long getId() {
     return id;
   }
@@ -95,6 +99,8 @@ public class Pet   {
    * @return category
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Category getCategory() {
     return category;
   }
@@ -114,6 +120,8 @@ public class Pet   {
   **/
   @ApiModelProperty(example = "doggie", required = true, value = "")
   @NotNull
+
+  @Valid
   public String getName() {
     return name;
   }
@@ -138,6 +146,8 @@ public class Pet   {
   **/
   @ApiModelProperty(required = true, value = "")
   @NotNull
+
+  @Valid
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -164,6 +174,8 @@ public class Pet   {
    * @return tags
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public List<Tag> getTags() {
     return tags;
   }
@@ -182,6 +194,8 @@ public class Pet   {
    * @return status
   **/
   @ApiModelProperty(value = "pet status in the store")
+
+  @Valid
   public StatusEnum getStatus() {
     return status;
   }

samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/model/ReadOnlyFirst.java

@@ -5,7 +5,9 @@ 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.Valid;
 import javax.validation.constraints.*;
+
 /**
  * ReadOnlyFirst
  */
@@ -27,6 +29,8 @@ public class ReadOnlyFirst   {
    * @return bar
   **/
   @ApiModelProperty(readOnly = true, value = "")
+
+  @Valid
   public String getBar() {
     return bar;
   }
@@ -45,6 +49,8 @@ public class ReadOnlyFirst   {
    * @return baz
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getBaz() {
     return baz;
   }

samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/model/SpecialModelName.java

@@ -5,7 +5,9 @@ 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.Valid;
 import javax.validation.constraints.*;
+
 /**
  * SpecialModelName
  */
@@ -24,6 +26,8 @@ public class SpecialModelName   {
    * @return specialPropertyName
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Long getSpecialPropertyName() {
     return specialPropertyName;
   }

samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/model/Tag.java

@@ -5,7 +5,9 @@ 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.Valid;
 import javax.validation.constraints.*;
+
 /**
  * Tag
  */
@@ -27,6 +29,8 @@ public class Tag   {
    * @return id
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Long getId() {
     return id;
   }
@@ -45,6 +49,8 @@ public class Tag   {
    * @return name
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getName() {
     return name;
   }

samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/model/User.java

@@ -5,7 +5,9 @@ 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.Valid;
 import javax.validation.constraints.*;
+
 /**
  * User
  */
@@ -45,6 +47,8 @@ public class User   {
    * @return id
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Long getId() {
     return id;
   }
@@ -63,6 +67,8 @@ public class User   {
    * @return username
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getUsername() {
     return username;
   }
@@ -81,6 +87,8 @@ public class User   {
    * @return firstName
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getFirstName() {
     return firstName;
   }
@@ -99,6 +107,8 @@ public class User   {
    * @return lastName
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getLastName() {
     return lastName;
   }
@@ -117,6 +127,8 @@ public class User   {
    * @return email
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getEmail() {
     return email;
   }
@@ -135,6 +147,8 @@ public class User   {
    * @return password
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getPassword() {
     return password;
   }
@@ -153,6 +167,8 @@ public class User   {
    * @return phone
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getPhone() {
     return phone;
   }
@@ -171,6 +187,8 @@ public class User   {
    * @return userStatus
   **/
   @ApiModelProperty(value = "User Status")
+
+  @Valid
   public Integer getUserStatus() {
     return userStatus;
   }

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

@@ -8,7 +8,9 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import javax.validation.Valid;
 import javax.validation.constraints.*;
+
 /**
  * AdditionalPropertiesClass
  */
@@ -38,6 +40,8 @@ public class AdditionalPropertiesClass   {
    * @return mapProperty
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Map<String, String> getMapProperty() {
     return mapProperty;
   }
@@ -64,6 +68,8 @@ public class AdditionalPropertiesClass   {
    * @return mapOfMapProperty
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Map<String, Map<String, String>> getMapOfMapProperty() {
     return mapOfMapProperty;
   }

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

@@ -7,7 +7,9 @@ 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.Valid;
 import javax.validation.constraints.*;
+
 /**
  * Animal
  */
@@ -35,6 +37,8 @@ public class Animal   {
   **/
   @ApiModelProperty(required = true, value = "")
   @NotNull
+
+  @Valid
   public String getClassName() {
     return className;
   }
@@ -53,6 +57,8 @@ public class Animal   {
    * @return color
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getColor() {
     return color;
   }

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

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

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

@@ -8,7 +8,9 @@ import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import javax.validation.Valid;
 import javax.validation.constraints.*;
+
 /**
  * ArrayOfArrayOfNumberOnly
  */
@@ -35,6 +37,8 @@ public class ArrayOfArrayOfNumberOnly   {
    * @return arrayArrayNumber
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
   }

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

@@ -8,7 +8,9 @@ import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import javax.validation.Valid;
 import javax.validation.constraints.*;
+
 /**
  * ArrayOfNumberOnly
  */
@@ -35,6 +37,8 @@ public class ArrayOfNumberOnly   {
    * @return arrayNumber
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
   }

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

@@ -8,7 +8,9 @@ import io.swagger.annotations.ApiModelProperty;
 import io.swagger.model.ReadOnlyFirst;
 import java.util.ArrayList;
 import java.util.List;
+import javax.validation.Valid;
 import javax.validation.constraints.*;
+
 /**
  * ArrayTest
  */
@@ -41,6 +43,8 @@ public class ArrayTest   {
    * @return arrayOfString
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public List<String> getArrayOfString() {
     return arrayOfString;
   }
@@ -67,6 +71,8 @@ public class ArrayTest   {
    * @return arrayArrayOfInteger
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
   }
@@ -93,6 +99,8 @@ public class ArrayTest   {
    * @return arrayArrayOfModel
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
   }

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

@@ -5,7 +5,9 @@ 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.Valid;
 import javax.validation.constraints.*;
+
 /**
  * Capitalization
  */
@@ -39,6 +41,8 @@ public class Capitalization   {
    * @return smallCamel
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getSmallCamel() {
     return smallCamel;
   }
@@ -57,6 +61,8 @@ public class Capitalization   {
    * @return capitalCamel
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getCapitalCamel() {
     return capitalCamel;
   }
@@ -75,6 +81,8 @@ public class Capitalization   {
    * @return smallSnake
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getSmallSnake() {
     return smallSnake;
   }
@@ -93,6 +101,8 @@ public class Capitalization   {
    * @return capitalSnake
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getCapitalSnake() {
     return capitalSnake;
   }
@@ -111,6 +121,8 @@ public class Capitalization   {
    * @return scAETHFlowPoints
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
   }
@@ -129,6 +141,8 @@ public class Capitalization   {
    * @return ATT_NAME
   **/
   @ApiModelProperty(value = "Name of the pet ")
+
+  @Valid
   public String getATTNAME() {
     return ATT_NAME;
   }

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

@@ -6,7 +6,9 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.model.Animal;
+import javax.validation.Valid;
 import javax.validation.constraints.*;
+
 /**
  * Cat
  */
@@ -25,6 +27,8 @@ public class Cat extends Animal  {
    * @return declawed
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Boolean getDeclawed() {
     return declawed;
   }

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

@@ -5,7 +5,9 @@ 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.Valid;
 import javax.validation.constraints.*;
+
 /**
  * Category
  */
@@ -27,6 +29,8 @@ public class Category   {
    * @return id
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Long getId() {
     return id;
   }
@@ -45,6 +49,8 @@ public class Category   {
    * @return name
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getName() {
     return name;
   }

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

@@ -5,7 +5,9 @@ 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.Valid;
 import javax.validation.constraints.*;
+
 /**
  * Model for testing model with \"_class\" property
  */
@@ -25,6 +27,8 @@ public class ClassModel   {
    * @return propertyClass
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getPropertyClass() {
     return propertyClass;
   }

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

@@ -5,7 +5,9 @@ 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.Valid;
 import javax.validation.constraints.*;
+
 /**
  * Client
  */
@@ -24,6 +26,8 @@ public class Client   {
    * @return client
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getClient() {
     return client;
   }

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

@@ -6,7 +6,9 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.model.Animal;
+import javax.validation.Valid;
 import javax.validation.constraints.*;
+
 /**
  * Dog
  */
@@ -25,6 +27,8 @@ public class Dog extends Animal  {
    * @return breed
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getBreed() {
     return breed;
   }

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

@@ -8,7 +8,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;
+import javax.validation.Valid;
 import javax.validation.constraints.*;
+
 /**
  * EnumArrays
  */
@@ -92,6 +94,8 @@ public class EnumArrays   {
    * @return justSymbol
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
   }
@@ -118,6 +122,8 @@ public class EnumArrays   {
    * @return arrayEnum
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
   }

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

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

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

@@ -7,7 +7,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.model.OuterEnum;
+import javax.validation.Valid;
 import javax.validation.constraints.*;
+
 /**
  * EnumTest
  */
@@ -130,6 +132,8 @@ public class EnumTest   {
    * @return enumString
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public EnumStringEnum getEnumString() {
     return enumString;
   }
@@ -148,6 +152,8 @@ public class EnumTest   {
    * @return enumInteger
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
   }
@@ -166,6 +172,8 @@ public class EnumTest   {
    * @return enumNumber
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
   }
@@ -184,6 +192,8 @@ public class EnumTest   {
    * @return outerEnum
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public OuterEnum getOuterEnum() {
     return outerEnum;
   }

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

@@ -9,7 +9,9 @@ import java.math.BigDecimal;
 import java.util.UUID;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
+import javax.validation.Valid;
 import javax.validation.constraints.*;
+
 /**
  * FormatTest
  */
@@ -66,7 +68,9 @@ public class FormatTest   {
    * @return integer
   **/
   @ApiModelProperty(value = "")
- @Min(10) @Max(100)  public Integer getInteger() {
+ @Min(10) @Max(100)
+  @Valid
+  public Integer getInteger() {
     return integer;
   }
 
@@ -86,7 +90,9 @@ public class FormatTest   {
    * @return int32
   **/
   @ApiModelProperty(value = "")
- @Min(20) @Max(200)  public Integer getInt32() {
+ @Min(20) @Max(200)
+  @Valid
+  public Integer getInt32() {
     return int32;
   }
 
@@ -104,6 +110,8 @@ public class FormatTest   {
    * @return int64
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Long getInt64() {
     return int64;
   }
@@ -125,7 +133,9 @@ public class FormatTest   {
   **/
   @ApiModelProperty(required = true, value = "")
   @NotNull
- @DecimalMin("32.1") @DecimalMax("543.2")  public BigDecimal getNumber() {
+ @DecimalMin("32.1") @DecimalMax("543.2")
+  @Valid
+  public BigDecimal getNumber() {
     return number;
   }
 
@@ -145,7 +155,9 @@ public class FormatTest   {
    * @return _float
   **/
   @ApiModelProperty(value = "")
- @DecimalMin("54.3") @DecimalMax("987.6")  public Float getFloat() {
+ @DecimalMin("54.3") @DecimalMax("987.6")
+  @Valid
+  public Float getFloat() {
     return _float;
   }
 
@@ -165,7 +177,9 @@ public class FormatTest   {
    * @return _double
   **/
   @ApiModelProperty(value = "")
- @DecimalMin("67.8") @DecimalMax("123.4")  public Double getDouble() {
+ @DecimalMin("67.8") @DecimalMax("123.4")
+  @Valid
+  public Double getDouble() {
     return _double;
   }
 
@@ -183,7 +197,9 @@ public class FormatTest   {
    * @return string
   **/
   @ApiModelProperty(value = "")
- @Pattern(regexp="/[a-z]/i")  public String getString() {
+ @Pattern(regexp="/[a-z]/i")
+  @Valid
+  public String getString() {
     return string;
   }
 
@@ -202,6 +218,8 @@ public class FormatTest   {
   **/
   @ApiModelProperty(required = true, value = "")
   @NotNull
+
+  @Valid
   public byte[] getByte() {
     return _byte;
   }
@@ -220,6 +238,8 @@ public class FormatTest   {
    * @return binary
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public byte[] getBinary() {
     return binary;
   }
@@ -239,6 +259,8 @@ public class FormatTest   {
   **/
   @ApiModelProperty(required = true, value = "")
   @NotNull
+
+  @Valid
   public LocalDate getDate() {
     return date;
   }
@@ -257,6 +279,8 @@ public class FormatTest   {
    * @return dateTime
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public DateTime getDateTime() {
     return dateTime;
   }
@@ -275,6 +299,8 @@ public class FormatTest   {
    * @return uuid
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public UUID getUuid() {
     return uuid;
   }
@@ -294,7 +320,9 @@ public class FormatTest   {
   **/
   @ApiModelProperty(required = true, value = "")
   @NotNull
- @Size(min=10,max=64)  public String getPassword() {
+ @Size(min=10,max=64)
+  @Valid
+  public String getPassword() {
     return password;
   }
 

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

@@ -5,7 +5,9 @@ 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.Valid;
 import javax.validation.constraints.*;
+
 /**
  * HasOnlyReadOnly
  */
@@ -27,6 +29,8 @@ public class HasOnlyReadOnly   {
    * @return bar
   **/
   @ApiModelProperty(readOnly = true, value = "")
+
+  @Valid
   public String getBar() {
     return bar;
   }
@@ -45,6 +49,8 @@ public class HasOnlyReadOnly   {
    * @return foo
   **/
   @ApiModelProperty(readOnly = true, value = "")
+
+  @Valid
   public String getFoo() {
     return foo;
   }

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

@@ -9,7 +9,9 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import javax.validation.Valid;
 import javax.validation.constraints.*;
+
 /**
  * MapTest
  */
@@ -70,6 +72,8 @@ public class MapTest   {
    * @return mapMapOfString
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
   }
@@ -96,6 +100,8 @@ public class MapTest   {
    * @return mapOfEnumString
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
   }

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

@@ -11,7 +11,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import org.joda.time.DateTime;
+import javax.validation.Valid;
 import javax.validation.constraints.*;
+
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
@@ -36,6 +38,8 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
    * @return uuid
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public UUID getUuid() {
     return uuid;
   }
@@ -54,6 +58,8 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
    * @return dateTime
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public DateTime getDateTime() {
     return dateTime;
   }
@@ -80,6 +86,8 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
    * @return map
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Map<String, Animal> getMap() {
     return map;
   }

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

@@ -5,7 +5,9 @@ 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.Valid;
 import javax.validation.constraints.*;
+
 /**
  * Model for testing model name starting with number
  */
@@ -28,6 +30,8 @@ public class Model200Response   {
    * @return name
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Integer getName() {
     return name;
   }
@@ -46,6 +50,8 @@ public class Model200Response   {
    * @return propertyClass
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getPropertyClass() {
     return propertyClass;
   }

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

@@ -5,7 +5,9 @@ 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.Valid;
 import javax.validation.constraints.*;
+
 /**
  * ModelApiResponse
  */
@@ -30,6 +32,8 @@ public class ModelApiResponse   {
    * @return code
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Integer getCode() {
     return code;
   }
@@ -48,6 +52,8 @@ public class ModelApiResponse   {
    * @return type
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getType() {
     return type;
   }
@@ -66,6 +72,8 @@ public class ModelApiResponse   {
    * @return message
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getMessage() {
     return message;
   }

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

@@ -5,7 +5,9 @@ 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.Valid;
 import javax.validation.constraints.*;
+
 /**
  * Model for testing reserved words
  */
@@ -25,6 +27,8 @@ public class ModelReturn   {
    * @return _return
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Integer getReturn() {
     return _return;
   }

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

@@ -5,7 +5,9 @@ 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.Valid;
 import javax.validation.constraints.*;
+
 /**
  * Model for testing model name same as property name
  */
@@ -35,6 +37,8 @@ public class Name   {
   **/
   @ApiModelProperty(required = true, value = "")
   @NotNull
+
+  @Valid
   public Integer getName() {
     return name;
   }
@@ -53,6 +57,8 @@ public class Name   {
    * @return snakeCase
   **/
   @ApiModelProperty(readOnly = true, value = "")
+
+  @Valid
   public Integer getSnakeCase() {
     return snakeCase;
   }
@@ -71,6 +77,8 @@ public class Name   {
    * @return property
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getProperty() {
     return property;
   }
@@ -89,6 +97,8 @@ public class Name   {
    * @return _123Number
   **/
   @ApiModelProperty(readOnly = true, value = "")
+
+  @Valid
   public Integer get123Number() {
     return _123Number;
   }

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

@@ -6,7 +6,9 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
+import javax.validation.Valid;
 import javax.validation.constraints.*;
+
 /**
  * NumberOnly
  */
@@ -25,6 +27,8 @@ public class NumberOnly   {
    * @return justNumber
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public BigDecimal getJustNumber() {
     return justNumber;
   }

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

@@ -7,7 +7,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.joda.time.DateTime;
+import javax.validation.Valid;
 import javax.validation.constraints.*;
+
 /**
  * Order
  */
@@ -74,6 +76,8 @@ public class Order   {
    * @return id
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Long getId() {
     return id;
   }
@@ -92,6 +96,8 @@ public class Order   {
    * @return petId
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Long getPetId() {
     return petId;
   }
@@ -110,6 +116,8 @@ public class Order   {
    * @return quantity
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Integer getQuantity() {
     return quantity;
   }
@@ -128,6 +136,8 @@ public class Order   {
    * @return shipDate
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public DateTime getShipDate() {
     return shipDate;
   }
@@ -146,6 +156,8 @@ public class Order   {
    * @return status
   **/
   @ApiModelProperty(value = "Order Status")
+
+  @Valid
   public StatusEnum getStatus() {
     return status;
   }
@@ -164,6 +176,8 @@ public class Order   {
    * @return complete
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Boolean getComplete() {
     return complete;
   }

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

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

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

@@ -10,7 +10,9 @@ import io.swagger.model.Category;
 import io.swagger.model.Tag;
 import java.util.ArrayList;
 import java.util.List;
+import javax.validation.Valid;
 import javax.validation.constraints.*;
+
 /**
  * Pet
  */
@@ -77,6 +79,8 @@ public class Pet   {
    * @return id
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Long getId() {
     return id;
   }
@@ -95,6 +99,8 @@ public class Pet   {
    * @return category
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Category getCategory() {
     return category;
   }
@@ -114,6 +120,8 @@ public class Pet   {
   **/
   @ApiModelProperty(example = "doggie", required = true, value = "")
   @NotNull
+
+  @Valid
   public String getName() {
     return name;
   }
@@ -138,6 +146,8 @@ public class Pet   {
   **/
   @ApiModelProperty(required = true, value = "")
   @NotNull
+
+  @Valid
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -164,6 +174,8 @@ public class Pet   {
    * @return tags
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public List<Tag> getTags() {
     return tags;
   }
@@ -182,6 +194,8 @@ public class Pet   {
    * @return status
   **/
   @ApiModelProperty(value = "pet status in the store")
+
+  @Valid
   public StatusEnum getStatus() {
     return status;
   }

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

@@ -5,7 +5,9 @@ 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.Valid;
 import javax.validation.constraints.*;
+
 /**
  * ReadOnlyFirst
  */
@@ -27,6 +29,8 @@ public class ReadOnlyFirst   {
    * @return bar
   **/
   @ApiModelProperty(readOnly = true, value = "")
+
+  @Valid
   public String getBar() {
     return bar;
   }
@@ -45,6 +49,8 @@ public class ReadOnlyFirst   {
    * @return baz
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getBaz() {
     return baz;
   }

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

@@ -5,7 +5,9 @@ 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.Valid;
 import javax.validation.constraints.*;
+
 /**
  * SpecialModelName
  */
@@ -24,6 +26,8 @@ public class SpecialModelName   {
    * @return specialPropertyName
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Long getSpecialPropertyName() {
     return specialPropertyName;
   }

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

@@ -5,7 +5,9 @@ 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.Valid;
 import javax.validation.constraints.*;
+
 /**
  * Tag
  */
@@ -27,6 +29,8 @@ public class Tag   {
    * @return id
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Long getId() {
     return id;
   }
@@ -45,6 +49,8 @@ public class Tag   {
    * @return name
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getName() {
     return name;
   }

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

@@ -5,7 +5,9 @@ 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.Valid;
 import javax.validation.constraints.*;
+
 /**
  * User
  */
@@ -45,6 +47,8 @@ public class User   {
    * @return id
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public Long getId() {
     return id;
   }
@@ -63,6 +67,8 @@ public class User   {
    * @return username
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getUsername() {
     return username;
   }
@@ -81,6 +87,8 @@ public class User   {
    * @return firstName
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getFirstName() {
     return firstName;
   }
@@ -99,6 +107,8 @@ public class User   {
    * @return lastName
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getLastName() {
     return lastName;
   }
@@ -117,6 +127,8 @@ public class User   {
    * @return email
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getEmail() {
     return email;
   }
@@ -135,6 +147,8 @@ public class User   {
    * @return password
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getPassword() {
     return password;
   }
@@ -153,6 +167,8 @@ public class User   {
    * @return phone
   **/
   @ApiModelProperty(value = "")
+
+  @Valid
   public String getPhone() {
     return phone;
   }
@@ -171,6 +187,8 @@ public class User   {
    * @return userStatus
   **/
   @ApiModelProperty(value = "User Status")
+
+  @Valid
   public Integer getUserStatus() {
     return userStatus;
   }