[Java][Spring] fix missing import for java.io.IOException (#5501)

* fix issue about import io exception for spring mvc

* fix spring-mvc-petstore-j8-async script, config

* update spring cloud client, restore petstore.yaml

bin/spring-mvc-petstore-j8-async-server.sh

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

bin/spring-mvc-petstore-j8-async.json

@@ -1,3 +1,6 @@
 {
-    "library": "j8-async"
+    "java8": true,
+    "async": true,
+    "library": "spring-mvc",
+    "artifactId": "swagger-spring-mvc-server-j8-async"
 }

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

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
-{{#useSpringCloudClient}}
+{{^useSpringCloudClient}}
 import java.io.IOException;
 {{/useSpringCloudClient}}
 

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

@@ -17,15 +17,16 @@ import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
-{{^useSpringCloudClient}}
-import com.fasterxml.jackson.databind.ObjectMapper;
-import java.io.IOException;
-{{/useSpringCloudClient}}
 
 import java.util.List;
 {{#async}}
 import java.util.concurrent.Callable;
-{{/async}}{{/jdk8-no-delegate}}
+{{/async}}
+{{/jdk8-no-delegate}}
+{{^useSpringCloudClient}}
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
+{{/useSpringCloudClient}}
 {{#useBeanValidation}}
 import javax.validation.constraints.*;
 import javax.validation.Valid;

modules/swagger-codegen/src/test/resources/2_0/petstore.yaml

@@ -1,20 +1,29 @@
 swagger: '2.0'
 info:
-  description: >-
+  description: 'This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.'
-    This is a sample server Petstore server.  You can find out more about
-    Swagger at <a href="http://swagger.io">http://swagger.io</a> or on
-    irc.freenode.net, #swagger.  For this sample, you can use the api key
-    "special-key" to test the authorization filters
   version: 1.0.0
   title: Swagger Petstore
-  termsOfService: 'http://helloreverb.com/terms/'
+  termsOfService: 'http://swagger.io/terms/'
   contact:
-    email: apiteam@wordnik.com
+    email: apiteam@swagger.io
   license:
     name: Apache 2.0
     url: 'http://www.apache.org/licenses/LICENSE-2.0.html'
 host: petstore.swagger.io
 basePath: /v2
+tags:
+  - name: pet
+    description: Everything about your Pets
+    externalDocs:
+      description: Find out more
+      url: 'http://swagger.io'
+  - name: store
+    description: Access to Petstore orders
+  - name: user
+    description: Operations about user
+    externalDocs:
+      description: Find out more about our store
+      url: 'http://swagger.io'
 schemes:
   - http
 paths:
@@ -29,13 +38,13 @@ paths:
         - application/json
         - application/xml
       produces:
-        - application/json
         - application/xml
+        - application/json
       parameters:
         - in: body
           name: body
           description: Pet object that needs to be added to the store
-          required: false
+          required: true
           schema:
             $ref: '#/definitions/Pet'
       responses:
@@ -55,13 +64,13 @@ paths:
         - application/json
         - application/xml
       produces:
-        - application/json
         - application/xml
+        - application/json
       parameters:
         - in: body
           name: body
           description: Pet object that needs to be added to the store
-          required: false
+          required: true
           schema:
             $ref: '#/definitions/Pet'
       responses:
@@ -83,13 +92,13 @@ paths:
       description: Multiple status values can be provided with comma separated strings
       operationId: findPetsByStatus
       produces:
-        - application/json
         - application/xml
+        - application/json
       parameters:
         - name: status
           in: query
           description: Status values that need to be considered for filter
-          required: false
+          required: true
           type: array
           items:
             type: string
@@ -97,8 +106,8 @@ paths:
               - available
               - pending
               - sold
-          collectionFormat: multi
             default: available
+          collectionFormat: csv
       responses:
         '200':
           description: successful operation
@@ -106,13 +115,6 @@ paths:
             type: array
             items:
               $ref: '#/definitions/Pet'
-          examples:
-            application/json:
-              name: Puma
-              type: Dog
-              color: Black
-              gender: Female
-              breed: Mixed
         '400':
           description: Invalid status value
       security:
@@ -124,22 +126,20 @@ paths:
       tags:
         - pet
       summary: Finds Pets by tags
-      description: >-
+      description: 'Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.'
-        Multiple tags can be provided with comma separated strings. Use tag1,
-        tag2, tag3 for testing.
       operationId: findPetsByTags
       produces:
-        - application/json
         - application/xml
+        - application/json
       parameters:
         - name: tags
           in: query
           description: Tags to filter by
-          required: false
+          required: true
           type: array
           items:
             type: string
-          collectionFormat: multi
+          collectionFormat: csv
       responses:
         '200':
           description: successful operation
@@ -158,17 +158,15 @@ paths:
       tags:
         - pet
       summary: Find pet by ID
-      description: >-
+      description: Returns a single pet
-        Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API
-        error conditions
       operationId: getPetById
       produces:
-        - application/json
         - application/xml
+        - application/json
       parameters:
         - name: petId
           in: path
-          description: ID of pet that needs to be fetched
+          description: ID of pet to return
           required: true
           type: integer
           format: int64
@@ -183,9 +181,6 @@ paths:
           description: Pet not found
       security:
         - api_key: []
-        - petstore_auth:
-            - 'write:pets'
-            - 'read:pets'
     post:
       tags:
         - pet
@@ -195,14 +190,15 @@ paths:
       consumes:
         - application/x-www-form-urlencoded
       produces:
-        - application/json
         - application/xml
+        - application/json
       parameters:
         - name: petId
           in: path
           description: ID of pet that needs to be updated
           required: true
-          type: string
+          type: integer
+          format: int64
         - name: name
           in: formData
           description: Updated name of the pet
@@ -227,12 +223,11 @@ paths:
       description: ''
       operationId: deletePet
       produces:
-        - application/json
         - application/xml
+        - application/json
       parameters:
         - name: api_key
           in: header
-          description: ''
           required: false
           type: string
         - name: petId
@@ -259,7 +254,6 @@ paths:
         - multipart/form-data
       produces:
         - application/json
-        - application/xml
       parameters:
         - name: petId
           in: path
@@ -278,8 +272,10 @@ paths:
           required: false
           type: file
       responses:
-        default:
+        '200':
           description: successful operation
+          schema:
+            $ref: '#/definitions/ApiResponse'
       security:
         - petstore_auth:
             - 'write:pets'
@@ -293,7 +289,7 @@ paths:
       operationId: getInventory
       produces:
         - application/json
-        - application/xml
+      parameters: []
       responses:
         '200':
           description: successful operation
@@ -312,13 +308,13 @@ paths:
       description: ''
       operationId: placeOrder
       produces:
-        - application/json
         - application/xml
+        - application/json
       parameters:
         - in: body
           name: body
           description: order placed for purchasing the pet
-          required: false
+          required: true
           schema:
             $ref: '#/definitions/Order'
       responses:
@@ -333,19 +329,20 @@ paths:
       tags:
         - store
       summary: Find purchase order by ID
-      description: >-
+      description: 'For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions'
-        For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
       operationId: getOrderById
       produces:
-        - application/json
         - application/xml
+        - application/json
       parameters:
         - name: orderId
           in: path
           description: ID of pet that needs to be fetched
           required: true
-          type: string
+          type: integer
+          maximum: 5
+          minimum: 1
+          format: int64
       responses:
         '200':
           description: successful operation
@@ -359,13 +356,11 @@ paths:
       tags:
         - store
       summary: Delete purchase order by ID
-      description: >-
+      description: For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
-        For valid response try integer IDs with value < 1000. Anything above
-        1000 or nonintegers will generate API errors
       operationId: deleteOrder
       produces:
-        - application/json
         - application/xml
+        - application/json
       parameters:
         - name: orderId
           in: path
@@ -385,13 +380,13 @@ paths:
       description: This can only be done by the logged in user.
       operationId: createUser
       produces:
-        - application/json
         - application/xml
+        - application/json
       parameters:
         - in: body
           name: body
           description: Created user object
-          required: false
+          required: true
           schema:
             $ref: '#/definitions/User'
       responses:
@@ -405,13 +400,13 @@ paths:
       description: ''
       operationId: createUsersWithArrayInput
       produces:
-        - application/json
         - application/xml
+        - application/json
       parameters:
         - in: body
           name: body
           description: List of user object
-          required: false
+          required: true
           schema:
             type: array
             items:
@@ -427,13 +422,13 @@ paths:
       description: ''
       operationId: createUsersWithListInput
       produces:
-        - application/json
         - application/xml
+        - application/json
       parameters:
         - in: body
           name: body
           description: List of user object
-          required: false
+          required: true
           schema:
             type: array
             items:
@@ -449,24 +444,33 @@ paths:
       description: ''
       operationId: loginUser
       produces:
-        - application/json
         - application/xml
+        - application/json
       parameters:
         - name: username
           in: query
           description: The user name for login
-          required: false
+          required: true
           type: string
         - name: password
           in: query
           description: The password for login in clear text
-          required: false
+          required: true
           type: string
       responses:
         '200':
           description: successful operation
           schema:
             type: string
+          headers:
+            X-Rate-Limit:
+              type: integer
+              format: int32
+              description: calls per hour allowed by the user
+            X-Expires-After:
+              type: string
+              format: date-time
+              description: date in UTC when toekn expires
         '400':
           description: Invalid username/password supplied
   /user/logout:
@@ -477,8 +481,9 @@ paths:
       description: ''
       operationId: logoutUser
       produces:
-        - application/json
         - application/xml
+        - application/json
+      parameters: []
       responses:
         default:
           description: successful operation
@@ -490,8 +495,8 @@ paths:
       description: ''
       operationId: getUserByName
       produces:
-        - application/json
         - application/xml
+        - application/json
       parameters:
         - name: username
           in: path
@@ -514,8 +519,8 @@ paths:
       description: This can only be done by the logged in user.
       operationId: updateUser
       produces:
-        - application/json
         - application/xml
+        - application/json
       parameters:
         - name: username
           in: path
@@ -525,7 +530,7 @@ paths:
         - in: body
           name: body
           description: Updated user object
-          required: false
+          required: true
           schema:
             $ref: '#/definitions/User'
       responses:
@@ -540,8 +545,8 @@ paths:
       description: This can only be done by the logged in user.
       operationId: deleteUser
       produces:
-        - application/json
         - application/xml
+        - application/json
       parameters:
         - name: username
           in: path
@@ -554,10 +559,6 @@ paths:
         '404':
           description: User not found
 securityDefinitions:
-  api_key:
-    type: apiKey
-    name: api_key
-    in: header
   petstore_auth:
     type: oauth2
     authorizationUrl: 'http://petstore.swagger.io/api/oauth/dialog'
@@ -565,8 +566,56 @@ securityDefinitions:
     scopes:
       'write:pets': modify pets in your account
       'read:pets': read your pets
+  api_key:
+    type: apiKey
+    name: api_key
+    in: header
 definitions:
+  Order:
+    title: Pet Order
+    description: An order for a pets from the pet store
+    type: object
+    properties:
+      id:
+        type: integer
+        format: int64
+      petId:
+        type: integer
+        format: int64
+      quantity:
+        type: integer
+        format: int32
+      shipDate:
+        type: string
+        format: date-time
+      status:
+        type: string
+        description: Order Status
+        enum:
+          - placed
+          - approved
+          - delivered
+      complete:
+        type: boolean
+        default: false
+    xml:
+      name: Order
+  Category:
+    title: Pet catehgry
+    description: A category for a pet
+    type: object
+    properties:
+      id:
+        type: integer
+        format: int64
+      name:
+        type: string
+    xml:
+      name: Category
   User:
+    title: a User
+    description: A User who is purchasing from the pet store
+    type: object
     properties:
       id:
         type: integer
@@ -589,7 +638,10 @@ definitions:
         description: User Status
     xml:
       name: User
-  Category:
+  Tag:
+    title: Pet Tag
+    description: A tag for a pet
+    type: object
     properties:
       id:
         type: integer
@@ -597,8 +649,11 @@ definitions:
       name:
         type: string
     xml:
-      name: Category
+      name: Tag
   Pet:
+    title: a Pet
+    description: A pet for sale in the pet store
+    type: object
     required:
       - name
       - photoUrls
@@ -634,37 +689,18 @@ definitions:
           - sold
     xml:
       name: Pet
-  Tag:
+  ApiResponse:
+    title: An uploaded response
+    description: Describes the result of uploading an image resource
+    type: object
     properties:
-      id:
+      code:
-        type: integer
-        format: int64
-      name:
-        type: string
-    xml:
-      name: Tag
-  Order:
-    properties:
-      id:
-        type: integer
-        format: int64
-      petId:
-        type: integer
-        format: int64
-      quantity:
         type: integer
         format: int32
-      shipDate:
+      type:
         type: string
-        format: date-time
+      message:
-      status:
         type: string
-        description: Order Status
+externalDocs:
-        enum:
+  description: Find out more about Swagger
-          - placed
+  url: 'http://swagger.io'
-          - approved
-          - delivered
-      complete:
-        type: boolean
-    xml:
-      name: Order

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

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
-import java.io.IOException;
 
 import java.util.List;
 import javax.validation.constraints.*;

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

@@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
-import java.io.IOException;
 
 import java.util.List;
 import javax.validation.constraints.*;

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

@@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
-import java.io.IOException;
 
 import java.util.List;
 import javax.validation.constraints.*;

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

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

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

@@ -63,7 +63,7 @@ public interface FakeApi {
         produces = { "*/*" }, 
         consumes = { "*/*" },
         method = RequestMethod.GET)
-    default CompletableFuture<ResponseEntity<Void>> testEnumParameters(@ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $") @RequestPart(value="enum_form_string_array", required=false)  List<String> enumFormStringArray,@ApiParam(value = "Form parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @RequestPart(value="enum_form_string", required=false)  String enumFormString,@ApiParam(value = "Header parameter enum test (string array)" , allowableValues=">, $") @RequestHeader(value="enum_header_string_array", required=false) List<String> enumHeaderStringArray,@ApiParam(value = "Header parameter enum test (string)" , allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @RequestHeader(value="enum_header_string", required=false) String enumHeaderString, @ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @RequestParam(value = "enum_query_string_array", required = false) List<String> enumQueryStringArray, @ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestParam(value = "enum_query_string", required = false, defaultValue="-efg") String enumQueryString, @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @RequestParam(value = "enum_query_integer", required = false) Integer enumQueryInteger,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1.1, -1.2") @RequestPart(value="enum_query_double", required=false)  Double enumQueryDouble, @RequestHeader("Accept") String accept) {
+    default CompletableFuture<ResponseEntity<Void>> testEnumParameters(@ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $") @RequestPart(value="enum_form_string_array", required=false)  List<String> enumFormStringArray,@ApiParam(value = "Form parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @RequestPart(value="enum_form_string", required=false)  String enumFormString,@ApiParam(value = "Header parameter enum test (string array)" , allowableValues=">, $") @RequestHeader(value="enum_header_string_array", required=false) List<String> enumHeaderStringArray,@ApiParam(value = "Header parameter enum test (string)" , allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @RequestHeader(value="enum_header_string", required=false) String enumHeaderString,@ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @RequestParam(value = "enum_query_string_array", required = false) List<String> enumQueryStringArray,@ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestParam(value = "enum_query_string", required = false, defaultValue="-efg") String enumQueryString,@ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @RequestParam(value = "enum_query_integer", required = false) Integer enumQueryInteger,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1.1, -1.2") @RequestPart(value="enum_query_double", required=false)  Double enumQueryDouble, @RequestHeader("Accept") String accept) {
         // do some magic!
         return CompletableFuture.completedFuture(new ResponseEntity<Void>(HttpStatus.OK));
     }

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

@@ -1,10 +1,17 @@
 package io.swagger.api;
 
 import org.springframework.stereotype.Controller;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
 @Controller
 public class FakeApiController implements FakeApi {
+    private final ObjectMapper objectMapper;
+
+    public FakeApiController(ObjectMapper objectMapper) {
+        this.objectMapper = objectMapper;
+    }
+
 }

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

@@ -72,7 +72,7 @@ public interface PetApi {
     @RequestMapping(value = "/pet/findByStatus",
         produces = { "application/xml", "application/json" }, 
         method = RequestMethod.GET)
-    default CompletableFuture<ResponseEntity<List<Pet>>> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @RequestParam(value = "status", required = true) List<String> status, @RequestHeader("Accept") String accept) throws IOException {
+    default CompletableFuture<ResponseEntity<List<Pet>>> findPetsByStatus( @NotNull@ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @RequestParam(value = "status", required = true) List<String> status, @RequestHeader("Accept") String accept) throws IOException {
         // do some magic!
         return CompletableFuture.completedFuture(new ResponseEntity<List<Pet>>(HttpStatus.OK));
     }
@@ -90,7 +90,7 @@ public interface PetApi {
     @RequestMapping(value = "/pet/findByTags",
         produces = { "application/xml", "application/json" }, 
         method = RequestMethod.GET)
-    default CompletableFuture<ResponseEntity<List<Pet>>> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @RequestParam(value = "tags", required = true) List<String> tags, @RequestHeader("Accept") String accept) throws IOException {
+    default CompletableFuture<ResponseEntity<List<Pet>>> findPetsByTags( @NotNull@ApiParam(value = "Tags to filter by", required = true) @RequestParam(value = "tags", required = true) List<String> tags, @RequestHeader("Accept") String accept) throws IOException {
         // do some magic!
         return CompletableFuture.completedFuture(new ResponseEntity<List<Pet>>(HttpStatus.OK));
     }

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

@@ -1,10 +1,17 @@
 package io.swagger.api;
 
 import org.springframework.stereotype.Controller;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
 @Controller
 public class PetApiController implements PetApi {
+    private final ObjectMapper objectMapper;
+
+    public PetApiController(ObjectMapper objectMapper) {
+        this.objectMapper = objectMapper;
+    }
+
 }

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

@@ -1,10 +1,17 @@
 package io.swagger.api;
 
 import org.springframework.stereotype.Controller;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
 @Controller
 public class StoreApiController implements StoreApi {
+    private final ObjectMapper objectMapper;
+
+    public StoreApiController(ObjectMapper objectMapper) {
+        this.objectMapper = objectMapper;
+    }
+
 }

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

@@ -94,7 +94,7 @@ public interface UserApi {
     @RequestMapping(value = "/user/login",
         produces = { "application/xml", "application/json" }, 
         method = RequestMethod.GET)
-    default CompletableFuture<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, @RequestHeader("Accept") String accept) throws IOException {
+    default CompletableFuture<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, @RequestHeader("Accept") String accept) throws IOException {
         // do some magic!
         return CompletableFuture.completedFuture(new ResponseEntity<String>(HttpStatus.OK));
     }

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

@@ -1,10 +1,17 @@
 package io.swagger.api;
 
 import org.springframework.stereotype.Controller;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
 @Controller
 public class UserApiController implements UserApi {
+    private final ObjectMapper objectMapper;
+
+    public UserApiController(ObjectMapper objectMapper) {
+        this.objectMapper = objectMapper;
+    }
+
 }

samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/HomeController.java

@@ -0,0 +1,16 @@
+package io.swagger.configuration;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * Home redirection to swagger api documentation 
+ */
+@Controller
+public class HomeController {
+    @RequestMapping(value = "/")
+    public String index() {
+        System.out.println("swagger-ui.html");
+        return "redirect:swagger-ui.html";
+    }
+}

samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/SwaggerUiConfiguration.java

@@ -6,6 +6,7 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.Bean;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
@@ -58,14 +59,23 @@ public class SwaggerUiConfiguration extends WebMvcConfigurerAdapter {
     }
   }
 
+  @Bean
+  public Jackson2ObjectMapperBuilder builder() {
+    Jackson2ObjectMapperBuilder builder = new Jackson2ObjectMapperBuilder()
+        .indentOutput(true)
+        .featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+        .dateFormat(new RFC3339DateFormat());
+    return builder;
+  }
+
   @Override
   public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
-    ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.json()
+    converters.add(new MappingJackson2HttpMessageConverter(objectMapper()));
-        .featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
-        .dateFormat( new RFC3339DateFormat())
-        .build();
-    converters.add(new MappingJackson2HttpMessageConverter(objectMapper));
     super.configureMessageConverters(converters);
   }
 
+  @Bean
+  public ObjectMapper objectMapper(){
+    return builder().build();
+  }
 }

samples/server/petstore/spring-mvc-j8-async/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/spring-mvc-j8-async/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/spring-mvc-j8-async/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/spring-mvc-j8-async/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/spring-mvc-j8-async/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/spring-mvc-j8-async/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/spring-mvc-j8-async/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/spring-mvc-j8-async/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/spring-mvc-j8-async/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/spring-mvc-j8-async/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/spring-mvc-j8-async/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/spring-mvc-j8-async/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/spring-mvc-j8-async/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/spring-mvc-j8-async/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/spring-mvc-j8-async/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/spring-mvc-j8-async/src/main/java/io/swagger/model/FormatTest.java

@@ -9,7 +9,9 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.UUID;
+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 OffsetDateTime 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/spring-mvc-j8-async/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/spring-mvc-j8-async/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/spring-mvc-j8-async/src/main/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -11,7 +11,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+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 OffsetDateTime 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/spring-mvc-j8-async/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/spring-mvc-j8-async/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/spring-mvc-j8-async/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/spring-mvc-j8-async/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/spring-mvc-j8-async/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/spring-mvc-j8-async/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 java.time.OffsetDateTime;
+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 OffsetDateTime 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/spring-mvc-j8-async/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/spring-mvc-j8-async/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/spring-mvc-j8-async/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/spring-mvc-j8-async/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/spring-mvc-j8-async/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/spring-mvc-j8-async/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/spring-mvc-j8-async/src/main/resources/application.properties

@@ -0,0 +1,5 @@
+springfox.documentation.swagger.v2.path=/api-docs
+server.contextPath=/v2
+server.port=80
+spring.jackson.date-format=io.swagger.RFC3339DateFormat
+spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false

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

@@ -55,6 +55,6 @@ public interface FakeApi {
         produces = { "*/*" }, 
         consumes = { "*/*" },
         method = RequestMethod.GET)
-    ResponseEntity<Void> testEnumParameters(@ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $") @RequestPart(value="enum_form_string_array", required=false)  List<String> enumFormStringArray,@ApiParam(value = "Form parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @RequestPart(value="enum_form_string", required=false)  String enumFormString,@ApiParam(value = "Header parameter enum test (string array)" , allowableValues=">, $") @RequestHeader(value="enum_header_string_array", required=false) List<String> enumHeaderStringArray,@ApiParam(value = "Header parameter enum test (string)" , allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @RequestHeader(value="enum_header_string", required=false) String enumHeaderString, @ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @RequestParam(value = "enum_query_string_array", required = false) List<String> enumQueryStringArray, @ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestParam(value = "enum_query_string", required = false, defaultValue="-efg") String enumQueryString, @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @RequestParam(value = "enum_query_integer", required = false) Integer enumQueryInteger,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1.1, -1.2") @RequestPart(value="enum_query_double", required=false)  Double enumQueryDouble, @RequestHeader("Accept") String accept);
+    ResponseEntity<Void> testEnumParameters(@ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $") @RequestPart(value="enum_form_string_array", required=false)  List<String> enumFormStringArray,@ApiParam(value = "Form parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @RequestPart(value="enum_form_string", required=false)  String enumFormString,@ApiParam(value = "Header parameter enum test (string array)" , allowableValues=">, $") @RequestHeader(value="enum_header_string_array", required=false) List<String> enumHeaderStringArray,@ApiParam(value = "Header parameter enum test (string)" , allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @RequestHeader(value="enum_header_string", required=false) String enumHeaderString,@ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @RequestParam(value = "enum_query_string_array", required = false) List<String> enumQueryStringArray,@ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestParam(value = "enum_query_string", required = false, defaultValue="-efg") String enumQueryString,@ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @RequestParam(value = "enum_query_integer", required = false) Integer enumQueryInteger,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1.1, -1.2") @RequestPart(value="enum_query_double", required=false)  Double enumQueryDouble, @RequestHeader("Accept") String accept);
 
 }

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

@@ -16,11 +16,10 @@ import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import java.io.IOException;
 
 import java.util.List;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 

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

@@ -64,7 +64,7 @@ public interface PetApi {
     @RequestMapping(value = "/pet/findByStatus",
         produces = { "application/xml", "application/json" }, 
         method = RequestMethod.GET)
-    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, @RequestHeader("Accept") String accept) throws IOException;
+    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, @RequestHeader("Accept") String accept) throws IOException;
 
 
     @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 = {
@@ -79,7 +79,7 @@ public interface PetApi {
     @RequestMapping(value = "/pet/findByTags",
         produces = { "application/xml", "application/json" }, 
         method = RequestMethod.GET)
-    ResponseEntity<List<Pet>> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @RequestParam(value = "tags", required = true) List<String> tags, @RequestHeader("Accept") String accept) throws IOException;
+    ResponseEntity<List<Pet>> findPetsByTags( @NotNull@ApiParam(value = "Tags to filter by", required = true) @RequestParam(value = "tags", required = true) List<String> tags, @RequestHeader("Accept") String accept) throws IOException;
 
 
     @ApiOperation(value = "Find pet by ID", notes = "Returns a single pet", response = Pet.class, authorizations = {

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

@@ -15,11 +15,10 @@ import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import java.io.IOException;
 
 import java.util.List;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -44,7 +43,7 @@ public class PetApiController implements PetApi {
         return new ResponseEntity<Void>(HttpStatus.OK);
     }
 
-    public ResponseEntity<List<Pet>> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @RequestParam(value = "status", required = true) List<String> status,
+    public ResponseEntity<List<Pet>> findPetsByStatus( @NotNull@ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @RequestParam(value = "status", required = true) List<String> status,
         @RequestHeader("Accept") String accept) throws IOException {
         // do some magic!
 
@@ -60,7 +59,7 @@ public class PetApiController implements PetApi {
         return new ResponseEntity<List<Pet>>(HttpStatus.OK);
     }
 
-    public ResponseEntity<List<Pet>> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @RequestParam(value = "tags", required = true) List<String> tags,
+    public ResponseEntity<List<Pet>> findPetsByTags( @NotNull@ApiParam(value = "Tags to filter by", required = true) @RequestParam(value = "tags", required = true) List<String> tags,
         @RequestHeader("Accept") String accept) throws IOException {
         // do some magic!
 

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

@@ -14,11 +14,10 @@ import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import java.io.IOException;
 
 import java.util.List;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 

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

@@ -77,7 +77,7 @@ public interface UserApi {
     @RequestMapping(value = "/user/login",
         produces = { "application/xml", "application/json" }, 
         method = RequestMethod.GET)
-    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, @RequestHeader("Accept") String accept) throws IOException;
+    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, @RequestHeader("Accept") String accept) throws IOException;
 
 
     @ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class, tags={ "user", })

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

@@ -14,11 +14,10 @@ import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import java.io.IOException;
 
 import java.util.List;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -70,8 +69,8 @@ public class UserApiController implements UserApi {
         return new ResponseEntity<User>(HttpStatus.OK);
     }
 
-    public ResponseEntity<String> loginUser( @NotNull @ApiParam(value = "The user name for login", required = true) @RequestParam(value = "username", required = true) String username,
+    public ResponseEntity<String> loginUser( @NotNull@ApiParam(value = "The user name for login", required = true) @RequestParam(value = "username", required = true) String username,
-         @NotNull @ApiParam(value = "The password for login in clear text", required = true) @RequestParam(value = "password", required = true) String password,
+         @NotNull@ApiParam(value = "The password for login in clear text", required = true) @RequestParam(value = "password", required = true) String password,
         @RequestHeader("Accept") String accept) throws IOException {
         // do some magic!
 

samples/server/petstore/spring-mvc/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/spring-mvc/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/spring-mvc/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/spring-mvc/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/spring-mvc/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/spring-mvc/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/spring-mvc/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/spring-mvc/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/spring-mvc/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/spring-mvc/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/spring-mvc/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/spring-mvc/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/spring-mvc/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/spring-mvc/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/spring-mvc/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/spring-mvc/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/spring-mvc/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/spring-mvc/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/spring-mvc/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/spring-mvc/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/spring-mvc/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/spring-mvc/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/spring-mvc/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/spring-mvc/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/spring-mvc/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/spring-mvc/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/spring-mvc/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/spring-mvc/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/spring-mvc/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/spring-mvc/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/spring-mvc/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;
   }