[Java][Spring] Add beanvalidation annotations

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

@@ -0,0 +1,53 @@
+{{#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}}

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

@@ -0,0 +1 @@
+{{! 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}}

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

@@ -0,0 +1 @@
+{{#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}} 

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>

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

@@ -1 +1 @@
-{{#isPathParam}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}} {{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @PathVariable("{{paramName}}") {{{dataType}}} {{paramName}}{{/isPathParam}}
+{{#isPathParam}}{{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}} {{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @PathVariable("{{paramName}}") {{{dataType}}} {{paramName}}{{/isPathParam}}

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

@@ -1 +1 @@
-{{#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}}
+{{#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}}

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

@@ -1,49 +1,51 @@
-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;
+    }
+}