[Spring] Add beanvalidation annotations (#4600)

* update generated sample for spring boot #4091

* add beanvalidation annotations to spring #4091

* add tests for spring #4091

* cleanup spring-cloud (client lib) #4091

* update client sample spring-cloud #4091

* replace tabs

* add beanvalidation annotations to spring #4091

* add tests for spring #4091

* cleanup spring-cloud (client lib) #4091

* update client sample spring-cloud #4091

* replace tabs

* update spring-cloud sample

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

@@ -21,7 +21,9 @@ import java.util.List;
 {{#async}}
 import java.util.concurrent.{{^jdk8}}Callable{{/jdk8}}{{#jdk8}}CompletableFuture{{/jdk8}};
 {{/async}}
-
+{{#useBeanValidation}}
+import javax.validation.constraints.*;
+{{/useBeanValidation}}
 {{>generatedAnnotation}}
 @Api(value = "{{{baseName}}}", description = "the {{{baseName}}} API")
 {{#operations}}

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

@@ -22,7 +22,9 @@ import java.util.List;
 {{#async}}
 import java.util.concurrent.Callable;
 {{/async}}{{/jdk8-no-delegate}}
-
+{{#useBeanValidation}}
+import javax.validation.constraints.*;
+{{/useBeanValidation}}
 {{>generatedAnnotation}}
 @Controller
 {{#operations}}

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

+{{#required}}
+  @NotNull
+{{/required}}
+{{#pattern}}
+  @Pattern(regexp="{{pattern}}")
+{{/pattern}}
+{{#minLength}}
+{{#maxLength}}
+  @Size(min={{minLength}},max={{maxLength}})
+{{/maxLength}}
+{{/minLength}}
+{{#minLength}}
+{{^maxLength}}
+  @Size(min={{minLength}})
+{{/maxLength}}
+{{/minLength}}
+{{^minLength}}
+{{#maxLength}}
+  @Size(max={{maxLength}})
+  {{/maxLength}}
+  {{/minLength}}
+{{#minItems}}
+{{#maxItems}}
+  @Size(min={{minItems}},max={{maxItems}})
+{{/maxItems}}
+{{/minItems}}
+{{#minItems}}
+{{^maxItems}}
+  @Size(min={{minItems}})
+{{/maxItems}}
+{{/minItems}}
+{{^minItems}}
+{{#maxItems}}
+  @Size(max={{maxItems}})
+{{/maxItems}}
+{{/minItems}}
+{{! check for integer / number=decimal type}}
+{{#isInteger}}
+{{#minimum}}
+  @Min({{minimum}})
+{{/minimum}}
+{{#maximum}}
+  @Max({{maximum}})
+{{/maximum}}
+{{/isInteger}}
+{{^isInteger}}
+{{#minimum}}
+  @DecimalMin("{{minimum}}")
+{{/minimum}}
+{{#maximum}}
+  @DecimalMax("{{maximum}}")
+{{/maximum}}
+{{/isInteger}}
\ No newline at end of file

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

+{{! PathParam is always required, no @NotNull necessary }}{{#pattern}} @Pattern(regexp="{{pattern}}"){{/pattern}}{{#minLength}}{{#maxLength}} @Size(min={{minLength}},max={{maxLength}}){{/maxLength}}{{/minLength}}{{#minLength}}{{^maxLength}} @Size(min={{minLength}}){{/maxLength}}{{/minLength}}{{^minLength}}{{#maxLength}} @Size(max={{maxLength}}){{/maxLength}}{{/minLength}}{{#minItems}}{{#maxItems}} @Size(min={{minItems}},max={{maxItems}}){{/maxItems}}{{/minItems}}{{#minItems}}{{^maxItems}} @Size(min={{minItems}}){{/maxItems}}{{/minItems}}{{^minItems}}{{#maxItems}}   @Size(max={{maxItems}}){{/maxItems}}{{/minItems}}{{#minimum}} @Min({{minimum}}){{/minimum}}{{#maximum}} @Max({{maximum}}){{/maximum}}
\ No newline at end of file

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

+{{#required}} @NotNull{{/required}}{{#pattern}} @Pattern(regexp="{{pattern}}"){{/pattern}}{{#minLength}}{{#maxLength}} @Size(min={{minLength}},max={{maxLength}}){{/maxLength}}{{/minLength}}{{#minLength}}{{^maxLength}} @Size(min={{minLength}}){{/maxLength}}{{/minLength}}{{^minLength}}{{#maxLength}} @Size(max={{maxLength}}){{/maxLength}}{{/minLength}}{{#minItems}}{{#maxItems}} @Size(min={{minItems}},max={{maxItems}}){{/maxItems}}{{/minItems}}{{#minItems}}{{^maxItems}} @Size(min={{minItems}}){{/maxItems}}{{/minItems}}{{^minItems}}{{#maxItems}}   @Size(max={{maxItems}}){{/maxItems}}{{/minItems}}{{#minimum}} @Min({{minimum}}){{/minimum}}{{#maximum}} @Max({{maximum}}){{/maximum}} 
\ No newline at end of file

modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache

@@ -73,5 +73,14 @@
             <artifactId>joda-time</artifactId>
         </dependency>
         {{/java8}}
+{{#useBeanValidation}}
+    <!-- Bean Validation API support -->
+    <dependency>
+        <groupId>javax.validation</groupId>
+        <artifactId>validation-api</artifactId>
+        <version>1.1.0.Final</version>
+        <scope>provided</scope>
+    </dependency>
+{{/useBeanValidation}}        
     </dependencies>
 </project>
\ No newline at end of file

modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache

@@ -68,6 +68,15 @@
             <artifactId>joda-time</artifactId>
         </dependency>
         {{/java8}}
+{{#useBeanValidation}}
+    <!-- Bean Validation API support -->
+    <dependency>
+        <groupId>javax.validation</groupId>
+        <artifactId>validation-api</artifactId>
+        <version>1.1.0.Final</version>
+        <scope>provided</scope>
+    </dependency>
+{{/useBeanValidation}}
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache

@@ -131,6 +131,15 @@
             <artifactId>servlet-api</artifactId>
             <version>${servlet-api-version}</version>
         </dependency>
+{{#useBeanValidation}}
+    <!-- Bean Validation API support -->
+    <dependency>
+        <groupId>javax.validation</groupId>
+        <artifactId>validation-api</artifactId>
+        <version>1.1.0.Final</version>
+        <scope>provided</scope>
+    </dependency>
+{{/useBeanValidation}}        
     </dependencies>
     <properties>
         <java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>

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

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

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

-{{#isPathParam}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}} {{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @PathVariable("{{paramName}}") {{{dataType}}} {{paramName}}{{/isPathParam}}
\ No newline at end of file
+{{#isPathParam}}{{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}} {{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @PathVariable("{{paramName}}") {{{dataType}}} {{paramName}}{{/isPathParam}}
\ No newline at end of file

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

@@ -65,7 +65,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   {{{vendorExtensions.extraAnnotation}}}
   {{/vendorExtensions.extraAnnotation}}
   @ApiModelProperty({{#example}}example = "{{example}}", {{/example}}{{#required}}required = {{required}}, {{/required}}{{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}value = "{{{description}}}")
-  public {{{datatypeWithEnum}}} {{getter}}() {
+{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
   }
 

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

-{{#isQueryParam}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#enumVars}}{{{name}}}{{^-last}}, {{/-last}}{{#-last}}{{/-last}}{{/enumVars}}"{{/allowableValues}}{{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}) @RequestParam(value = "{{paramName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) {{{dataType}}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
+{{#isQueryParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#enumVars}}{{{name}}}{{^-last}}, {{/-last}}{{#-last}}{{/-last}}{{/enumVars}}"{{/allowableValues}}{{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}) @RequestParam(value = "{{paramName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) {{{dataType}}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file

modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringOptionsProvider.java

-package io.swagger.codegen.options;
-
-import io.swagger.codegen.CodegenConstants;
-import io.swagger.codegen.languages.SpringCodegen;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class SpringOptionsProvider extends JavaOptionsProvider {
-    public static final String TITLE = "swagger";
-    public static final String CONFIG_PACKAGE_VALUE = "configPackage";
-    public static final String BASE_PACKAGE_VALUE = "basePackage";
-    public static final String LIBRARY_VALUE = "spring-mvc"; //FIXME hidding value from super class
-    public static final String INTERFACE_ONLY = "true";
-    public static final String DELEGATE_PATTERN = "true";
-    public static final String SINGLE_CONTENT_TYPES = "true";
-    public static final String JAVA_8 = "true";
-    public static final String ASYNC = "true";
-    public static final String RESPONSE_WRAPPER = "Callable";
-    public static final String USE_TAGS = "useTags";
-
-    @Override
-    public String getLanguage() {
-        return "spring";
-    }
-
-    @Override
-    public Map<String, String> createOptions() {
-        Map<String, String> options = new HashMap<String, String>(super.createOptions());
-        options.put(SpringCodegen.TITLE, TITLE);
-        options.put(SpringCodegen.CONFIG_PACKAGE, CONFIG_PACKAGE_VALUE);
-        options.put(SpringCodegen.BASE_PACKAGE, BASE_PACKAGE_VALUE);
-        options.put(CodegenConstants.LIBRARY, LIBRARY_VALUE);
-        options.put(SpringCodegen.INTERFACE_ONLY, INTERFACE_ONLY);
-        options.put(SpringCodegen.DELEGATE_PATTERN, DELEGATE_PATTERN);
-        options.put(SpringCodegen.SINGLE_CONTENT_TYPES, SINGLE_CONTENT_TYPES);
-        options.put(SpringCodegen.JAVA_8, JAVA_8);
-        options.put(SpringCodegen.ASYNC, ASYNC);
-        options.put(SpringCodegen.RESPONSE_WRAPPER, RESPONSE_WRAPPER);
-        options.put(SpringCodegen.USE_TAGS, USE_TAGS);
-
-        return options;
-    }
-
-    @Override
-    public boolean isServer() {
-        return true;
-    }
-}
+package io.swagger.codegen.options;
+
+import io.swagger.codegen.CodegenConstants;
+import io.swagger.codegen.languages.SpringCodegen;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class SpringOptionsProvider extends JavaOptionsProvider {
+    public static final String TITLE = "swagger";
+    public static final String CONFIG_PACKAGE_VALUE = "configPackage";
+    public static final String BASE_PACKAGE_VALUE = "basePackage";
+    public static final String LIBRARY_VALUE = "spring-mvc"; //FIXME hidding value from super class
+    public static final String INTERFACE_ONLY = "true";
+    public static final String DELEGATE_PATTERN = "true";
+    public static final String SINGLE_CONTENT_TYPES = "true";
+    public static final String JAVA_8 = "true";
+    public static final String ASYNC = "true";
+    public static final String RESPONSE_WRAPPER = "Callable";
+    public static final String USE_TAGS = "useTags";
+    public static final String USE_BEANVALIDATION = "false";
+
+    @Override
+    public String getLanguage() {
+        return "spring";
+    }
+
+    @Override
+    public Map<String, String> createOptions() {
+        Map<String, String> options = new HashMap<String, String>(super.createOptions());
+        options.put(SpringCodegen.TITLE, TITLE);
+        options.put(SpringCodegen.CONFIG_PACKAGE, CONFIG_PACKAGE_VALUE);
+        options.put(SpringCodegen.BASE_PACKAGE, BASE_PACKAGE_VALUE);
+        options.put(CodegenConstants.LIBRARY, LIBRARY_VALUE);
+        options.put(SpringCodegen.INTERFACE_ONLY, INTERFACE_ONLY);
+        options.put(SpringCodegen.DELEGATE_PATTERN, DELEGATE_PATTERN);
+        options.put(SpringCodegen.SINGLE_CONTENT_TYPES, SINGLE_CONTENT_TYPES);
+        options.put(SpringCodegen.JAVA_8, JAVA_8);
+        options.put(SpringCodegen.ASYNC, ASYNC);
+        options.put(SpringCodegen.RESPONSE_WRAPPER, RESPONSE_WRAPPER);
+        options.put(SpringCodegen.USE_TAGS, USE_TAGS);
+        options.put(SpringCodegen.USE_BEANVALIDATION, USE_BEANVALIDATION);
+
+        return options;
+    }
+
+    @Override
+    public boolean isServer() {
+        return true;
+    }
+}

modules/swagger-codegen/src/test/java/io/swagger/codegen/spring/SpringOptionsTest.java

-package io.swagger.codegen.spring;
-
-import io.swagger.codegen.CodegenConfig;
-import io.swagger.codegen.java.JavaClientOptionsTest;
-import io.swagger.codegen.languages.SpringCodegen;
-import io.swagger.codegen.options.SpringOptionsProvider;
-
-import mockit.Expectations;
-import mockit.Tested;
-
-public class SpringOptionsTest extends JavaClientOptionsTest {
-
-    @Tested
-    private SpringCodegen clientCodegen;
-
-    public SpringOptionsTest() {
-        super(new SpringOptionsProvider());
-    }
-
-    @Override
-    protected CodegenConfig getCodegenConfig() {
-        return clientCodegen;
-    }
-
-    @SuppressWarnings("unused")
-    @Override
-    protected void setExpectations() {
-        new Expectations(clientCodegen) {{
-            clientCodegen.setModelPackage(SpringOptionsProvider.MODEL_PACKAGE_VALUE);
-            times = 1;
-            clientCodegen.setApiPackage(SpringOptionsProvider.API_PACKAGE_VALUE);
-            times = 1;
-            clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SpringOptionsProvider.SORT_PARAMS_VALUE));
-            times = 1;
-            clientCodegen.setInvokerPackage(SpringOptionsProvider.INVOKER_PACKAGE_VALUE);
-            times = 1;
-            clientCodegen.setGroupId(SpringOptionsProvider.GROUP_ID_VALUE);
-            times = 1;
-            clientCodegen.setArtifactId(SpringOptionsProvider.ARTIFACT_ID_VALUE);
-            times = 1;
-            clientCodegen.setArtifactVersion(SpringOptionsProvider.ARTIFACT_VERSION_VALUE);
-            times = 1;
-            clientCodegen.setSourceFolder(SpringOptionsProvider.SOURCE_FOLDER_VALUE);
-            times = 1;
-            clientCodegen.setLocalVariablePrefix(SpringOptionsProvider.LOCAL_PREFIX_VALUE);
-            times = 1;
-            clientCodegen.setSerializableModel(Boolean.valueOf(SpringOptionsProvider.SERIALIZABLE_MODEL_VALUE));
-            times = 1;
-            clientCodegen.setLibrary(SpringOptionsProvider.LIBRARY_VALUE);
-            times = 1;
-            clientCodegen.setFullJavaUtil(Boolean.valueOf(SpringOptionsProvider.FULL_JAVA_UTIL_VALUE));
-            times = 1;
-            clientCodegen.setTitle(SpringOptionsProvider.TITLE);
-            times = 1;
-            clientCodegen.setConfigPackage(SpringOptionsProvider.CONFIG_PACKAGE_VALUE);
-            times = 1;
-            clientCodegen.setBasePackage(SpringOptionsProvider.BASE_PACKAGE_VALUE);
-            times = 1;
-            clientCodegen.setInterfaceOnly(Boolean.valueOf(SpringOptionsProvider.INTERFACE_ONLY));
-            times = 1;
-            clientCodegen.setDelegatePattern(Boolean.valueOf(SpringOptionsProvider.DELEGATE_PATTERN));
-            times = 1;
-            clientCodegen.setSingleContentTypes(Boolean.valueOf(SpringOptionsProvider.SINGLE_CONTENT_TYPES));
-            times = 1;
-            clientCodegen.setJava8(Boolean.valueOf(SpringOptionsProvider.JAVA_8));
-            times = 1;
-            clientCodegen.setAsync(Boolean.valueOf(SpringOptionsProvider.ASYNC));
-            times = 1;
-            clientCodegen.setResponseWrapper(SpringOptionsProvider.RESPONSE_WRAPPER);
-            times = 1;
-            clientCodegen.setUseTags(Boolean.valueOf(SpringOptionsProvider.USE_TAGS));
-            times = 1;
-
-        }};
-    }
-}
+package io.swagger.codegen.spring;
+
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.java.JavaClientOptionsTest;
+import io.swagger.codegen.languages.SpringCodegen;
+import io.swagger.codegen.options.SpringOptionsProvider;
+
+import mockit.Expectations;
+import mockit.Tested;
+
+public class SpringOptionsTest extends JavaClientOptionsTest {
+
+    @Tested
+    private SpringCodegen clientCodegen;
+
+    public SpringOptionsTest() {
+        super(new SpringOptionsProvider());
+    }
+
+    @Override
+    protected CodegenConfig getCodegenConfig() {
+        return clientCodegen;
+    }
+
+    @SuppressWarnings("unused")
+    @Override
+    protected void setExpectations() {
+        new Expectations(clientCodegen) {{
+            clientCodegen.setModelPackage(SpringOptionsProvider.MODEL_PACKAGE_VALUE);
+            times = 1;
+            clientCodegen.setApiPackage(SpringOptionsProvider.API_PACKAGE_VALUE);
+            times = 1;
+            clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(SpringOptionsProvider.SORT_PARAMS_VALUE));
+            times = 1;
+            clientCodegen.setInvokerPackage(SpringOptionsProvider.INVOKER_PACKAGE_VALUE);
+            times = 1;
+            clientCodegen.setGroupId(SpringOptionsProvider.GROUP_ID_VALUE);
+            times = 1;
+            clientCodegen.setArtifactId(SpringOptionsProvider.ARTIFACT_ID_VALUE);
+            times = 1;
+            clientCodegen.setArtifactVersion(SpringOptionsProvider.ARTIFACT_VERSION_VALUE);
+            times = 1;
+            clientCodegen.setSourceFolder(SpringOptionsProvider.SOURCE_FOLDER_VALUE);
+            times = 1;
+            clientCodegen.setLocalVariablePrefix(SpringOptionsProvider.LOCAL_PREFIX_VALUE);
+            times = 1;
+            clientCodegen.setSerializableModel(Boolean.valueOf(SpringOptionsProvider.SERIALIZABLE_MODEL_VALUE));
+            times = 1;
+            clientCodegen.setLibrary(SpringOptionsProvider.LIBRARY_VALUE);
+            times = 1;
+            clientCodegen.setFullJavaUtil(Boolean.valueOf(SpringOptionsProvider.FULL_JAVA_UTIL_VALUE));
+            times = 1;
+            clientCodegen.setTitle(SpringOptionsProvider.TITLE);
+            times = 1;
+            clientCodegen.setConfigPackage(SpringOptionsProvider.CONFIG_PACKAGE_VALUE);
+            times = 1;
+            clientCodegen.setBasePackage(SpringOptionsProvider.BASE_PACKAGE_VALUE);
+            times = 1;
+            clientCodegen.setInterfaceOnly(Boolean.valueOf(SpringOptionsProvider.INTERFACE_ONLY));
+            times = 1;
+            clientCodegen.setDelegatePattern(Boolean.valueOf(SpringOptionsProvider.DELEGATE_PATTERN));
+            times = 1;
+            clientCodegen.setSingleContentTypes(Boolean.valueOf(SpringOptionsProvider.SINGLE_CONTENT_TYPES));
+            times = 1;
+            clientCodegen.setJava8(Boolean.valueOf(SpringOptionsProvider.JAVA_8));
+            times = 1;
+            clientCodegen.setAsync(Boolean.valueOf(SpringOptionsProvider.ASYNC));
+            times = 1;
+            clientCodegen.setResponseWrapper(SpringOptionsProvider.RESPONSE_WRAPPER);
+            times = 1;
+            clientCodegen.setUseTags(Boolean.valueOf(SpringOptionsProvider.USE_TAGS));
+            times = 1;
+            clientCodegen.setUseBeanValidation(Boolean.valueOf(SpringOptionsProvider.USE_BEANVALIDATION));
+            times = 1;
+
+        }};
+    }
+}
\ No newline at end of file

samples/client/petstore/spring-cloud/README.md

-# swagger-petstore-spring-cloud
+# swagger-spring
 
 ## Requirements
 
@@ -27,7 +27,7 @@ Add this dependency to your project's POM:
 ```xml
 <dependency>
     <groupId>io.swagger</groupId>
-    <artifactId>swagger-petstore-spring-cloud</artifactId>
+    <artifactId>swagger-spring</artifactId>
     <version>1.0.0</version>
     <scope>compile</scope>
 </dependency>
@@ -38,7 +38,7 @@ Add this dependency to your project's POM:
 Add this dependency to your project's build file:
 
 ```groovy
-compile "io.swagger:swagger-petstore-spring-cloud:1.0.0"
+compile "io.swagger:swagger-spring:1.0.0"
 ```
 
 ### Others
@@ -49,5 +49,5 @@ mvn package
 
 Then manually install the following JARs:
 
-* target/swagger-petstore-spring-cloud-1.0.0.jar
+* target/swagger-spring-1.0.0.jar
 * target/lib/*.jar

samples/client/petstore/spring-cloud/pom.xml

 <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-petstore-spring-cloud</artifactId>
+    <artifactId>swagger-spring</artifactId>
     <packaging>jar</packaging>
-    <name>swagger-petstore-spring-cloud</name>
+    <name>swagger-spring</name>
     <version>1.0.0</version>
     <properties>
         <java.version>1.7</java.version>
@@ -59,6 +59,13 @@
             <groupId>joda-time</groupId>
             <artifactId>joda-time</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>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

samples/client/petstore/spring-cloud/src/main/java/io/swagger/api/PetApi.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 = "Pet", description = "the Pet API")
 public interface PetApi {
@@ -65,7 +65,7 @@ public interface PetApi {
         produces = "application/json",
         consumes = "application/json",
         method = RequestMethod.GET)
-    com.netflix.hystrix.HystrixCommand<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);
+    com.netflix.hystrix.HystrixCommand<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);
 
 
     @ApiOperation(value = "Finds Pets by tags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List", authorizations = {
@@ -81,7 +81,7 @@ public interface PetApi {
         produces = "application/json",
         consumes = "application/json",
         method = RequestMethod.GET)
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<List<Pet>>> findPetsByTags(@ApiParam(value = "Tags to filter by", required = true) @RequestParam(value = "tags", required = true) List<String> tags);
+    com.netflix.hystrix.HystrixCommand<ResponseEntity<List<Pet>>> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @RequestParam(value = "tags", required = true) List<String> tags);
 
 
     @ApiOperation(value = "Find pet by ID", notes = "Returns a single pet", response = Pet.class, authorizations = {

samples/client/petstore/spring-cloud/src/main/java/io/swagger/api/StoreApi.java

@@ -15,7 +15,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 {
@@ -52,7 +52,7 @@ public interface StoreApi {
         produces = "application/json",
         consumes = "application/json",
         method = RequestMethod.GET)
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<Order>> getOrderById(@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathVariable("orderId") Long orderId);
+    com.netflix.hystrix.HystrixCommand<ResponseEntity<Order>> getOrderById( @Min(1) @Max(5)@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathVariable("orderId") Long orderId);
 
 
     @ApiOperation(value = "Place an order for a pet", notes = "", response = Order.class, tags={ "store", })

samples/client/petstore/spring-cloud/src/main/java/io/swagger/api/UserApi.java

@@ -15,7 +15,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 {
@@ -81,8 +81,8 @@ public interface UserApi {
         produces = "application/json",
         consumes = "application/json",
         method = RequestMethod.GET)
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<String>> loginUser(@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);
+    com.netflix.hystrix.HystrixCommand<ResponseEntity<String>> loginUser( @NotNull @ApiParam(value = "The user name for login", required = true) @RequestParam(value = "username", required = true) String username,
+         @NotNull @ApiParam(value = "The password for login in clear text", required = true) @RequestParam(value = "password", required = true) String password);
 
 
     @ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class, tags={ "user", })