update jaxrs jersey1 templates and sample output #4091

2017-01-06 15:10:40 +01:00 · 2017-01-06 15:10:40 +01:00 · dde24eb9c2
commit dde24eb9c2
parent 1a1d0aebc8
56 changed files with 5344 additions and 5129 deletions
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/beanValidation.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/beanValidation.mustache
@ -35,8 +35,8 @@
  {{/maxItems}}
  {{/minItems}}
 {{#minimum}}
-  @Min({{minimum}})
+//  @Min({{minimum}})
 {{/minimum}}
 {{#maximum}}
-  @Max({{maximum}})
+//  @Max({{maximum}})
 {{/maximum}}
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/apiService.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/apiService.mustache
@ -18,7 +18,9 @@ import com.sun.jersey.multipart.FormDataParam;

 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
-
+{{#useBeanValidation}}
+import javax.validation.constraints.*;
+{{/useBeanValidation}}
 {{>generatedAnnotation}}
 {{#operations}}
 public abstract class {{classname}}Service {
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/apiServiceImpl.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/apiServiceImpl.mustache
@ -18,7 +18,9 @@ import com.sun.jersey.multipart.FormDataParam;

 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
-
+{{#useBeanValidation}}
+import javax.validation.constraints.*;
+{{/useBeanValidation}}
 {{>generatedAnnotation}}
 {{#operations}}
 public class {{classname}}ServiceImpl extends {{classname}}Service {
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/FakeApi.java
@ -8,6 +8,7 @@ import io.swagger.annotations.ApiParam;
 import io.swagger.jaxrs.*;

 import com.sun.jersey.multipart.FormDataParam;
+import javax.validation.constraints.*;

 import java.math.BigDecimal;
 import io.swagger.model.Client;
@ -38,7 +39,7 @@ public class FakeApi  {
    
    @Consumes({ "application/json" })
    @Produces({ "application/json" })
-    @io.swagger.annotations.ApiOperation(value = "To test \"client\" model", notes = "", response = Client.class, tags={ "fake",  })
+    @io.swagger.annotations.ApiOperation(value = "To test \"client\" model", notes = "To test \"client\" model", response = Client.class, tags={ "fake",  })
    @io.swagger.annotations.ApiResponses(value = { 
        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) })
    public Response testClientModel(
@ -80,7 +81,7 @@ public class FakeApi  {
    
    @Consumes({ "*/*" })
    @Produces({ "*/*" })
-    @io.swagger.annotations.ApiOperation(value = "To test enum parameters", notes = "", response = void.class, tags={ "fake" })
+    @io.swagger.annotations.ApiOperation(value = "To test enum parameters", notes = "To test enum parameters", response = void.class, tags={ "fake" })
    @io.swagger.annotations.ApiResponses(value = { 
        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid request", response = void.class),
        @io.swagger.annotations.ApiResponse(code = 404, message = "Not found", response = void.class) })
@ -91,7 +92,7 @@ public class FakeApi  {
        @ApiParam(value = "Header parameter enum test (string)" , allowableValues="_abc, -efg, (xyz)", defaultValue="-efg")@HeaderParam("enum_header_string") String enumHeaderString,
        @ApiParam(value = "Query parameter enum test (string array)", allowableValues=">, $") @QueryParam("enum_query_string_array") List<String> enumQueryStringArray,
        @ApiParam(value = "Query parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @DefaultValue("-efg") @QueryParam("enum_query_string") String enumQueryString,
-        @ApiParam(value = "Query parameter enum test (double)") @QueryParam("enum_query_integer") BigDecimal enumQueryInteger,
+        @ApiParam(value = "Query parameter enum test (double)") @QueryParam("enum_query_integer") Integer enumQueryInteger,
        @ApiParam(value = "Query parameter enum test (double)")  @FormParam("enum_query_double")  Double enumQueryDouble,
        @Context SecurityContext securityContext)
    throws NotFoundException {
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/FakeApiService.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/FakeApiService.java
@ -19,13 +19,13 @@ import com.sun.jersey.multipart.FormDataParam;

 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
-
+import javax.validation.constraints.*;

 public abstract class FakeApiService {
      public abstract Response testClientModel(Client body,SecurityContext securityContext)
      throws NotFoundException;
      public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer integer,Integer int32,Long int64,Float _float,String string,byte[] binary,Date date,Date dateTime,String password,String paramCallback,SecurityContext securityContext)
      throws NotFoundException;
-      public abstract Response testEnumParameters(List<String> enumFormStringArray,String enumFormString,List<String> enumHeaderStringArray,String enumHeaderString,List<String> enumQueryStringArray,String enumQueryString,BigDecimal enumQueryInteger,Double enumQueryDouble,SecurityContext securityContext)
+      public abstract Response testEnumParameters(List<String> enumFormStringArray,String enumFormString,List<String> enumHeaderStringArray,String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger,Double enumQueryDouble,SecurityContext securityContext)
      throws NotFoundException;
 }
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/PetApi.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/PetApi.java
@ -11,6 +11,7 @@ import com.sun.jersey.multipart.FormDataParam;
 import javax.validation.constraints.*;

 import java.io.File;
+import io.swagger.model.ModelApiResponse;
 import io.swagger.model.Pet;

 import java.util.List;
@ -37,7 +38,7 @@ public class PetApi  {
    @POST
    
    @Consumes({ "application/json", "application/xml" })
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
    @io.swagger.annotations.ApiOperation(value = "Add a new pet to the store", notes = "", response = void.class, authorizations = {
        @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
            @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
@ -47,7 +48,7 @@ public class PetApi  {
    @io.swagger.annotations.ApiResponses(value = { 
        @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = void.class) })
    public Response addPet(
-        @ApiParam(value = "Pet object that needs to be added to the store" ) Pet body,
+        @ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet body,
        @Context SecurityContext securityContext)
    throws NotFoundException {
        return delegate.addPet(body,securityContext);
@ -55,7 +56,7 @@ public class PetApi  {
    @DELETE
    @Path("/{petId}")
    
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
    @io.swagger.annotations.ApiOperation(value = "Deletes a pet", notes = "", response = void.class, authorizations = {
        @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
            @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
@ -74,7 +75,7 @@ public class PetApi  {
    @GET
    @Path("/findByStatus")
    
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
    @io.swagger.annotations.ApiOperation(value = "Finds Pets by status", notes = "Multiple status values can be provided with comma separated strings", response = Pet.class, responseContainer = "List", authorizations = {
        @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
            @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
@ -85,7 +86,7 @@ public class PetApi  {
        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid status value", response = Pet.class, responseContainer = "List") })
    public Response findPetsByStatus(
-        @ApiParam(value = "Status values that need to be considered for filter", allowableValues="available, pending, sold", defaultValue="available") @DefaultValue("available") @QueryParam("status") List<String> status,
+        @ApiParam(value = "Status values that need to be considered for filter",required=true, allowableValues="available, pending, sold") @QueryParam("status") List<String> status,
        @Context SecurityContext securityContext)
    throws NotFoundException {
        return delegate.findPetsByStatus(status,securityContext);
@ -93,7 +94,7 @@ public class PetApi  {
    @GET
    @Path("/findByTags")
    
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
    @io.swagger.annotations.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 = {
        @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
            @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
@ -104,7 +105,7 @@ public class PetApi  {
        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid tag value", response = Pet.class, responseContainer = "List") })
    public Response findPetsByTags(
-        @ApiParam(value = "Tags to filter by") @QueryParam("tags") List<String> tags,
+        @ApiParam(value = "Tags to filter by",required=true) @QueryParam("tags") List<String> tags,
        @Context SecurityContext securityContext)
    throws NotFoundException {
        return delegate.findPetsByTags(tags,securityContext);
@ -112,12 +113,8 @@ public class PetApi  {
    @GET
    @Path("/{petId}")
    
-    @Produces({ "application/json", "application/xml" })
-    @io.swagger.annotations.ApiOperation(value = "Find pet by ID", notes = "Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions", response = Pet.class, authorizations = {
-        @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
-            @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-            @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets")
-        }),
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Find pet by ID", notes = "Returns a single pet", response = Pet.class, authorizations = {
        @io.swagger.annotations.Authorization(value = "api_key")
    }, tags={ "pet",  })
    @io.swagger.annotations.ApiResponses(value = { 
@ -125,7 +122,7 @@ public class PetApi  {
        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Pet.class),
        @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Pet.class) })
    public Response getPetById(
-        @ApiParam(value = "ID of pet that needs to be fetched",required=true) @PathParam("petId") Long petId,
+        @ApiParam(value = "ID of pet to return",required=true) @PathParam("petId") Long petId,
        @Context SecurityContext securityContext)
    throws NotFoundException {
        return delegate.getPetById(petId,securityContext);
@ -133,7 +130,7 @@ public class PetApi  {
    @PUT
    
    @Consumes({ "application/json", "application/xml" })
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
    @io.swagger.annotations.ApiOperation(value = "Update an existing pet", notes = "", response = void.class, authorizations = {
        @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
            @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
@ -145,7 +142,7 @@ public class PetApi  {
        @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = void.class),
        @io.swagger.annotations.ApiResponse(code = 405, message = "Validation exception", response = void.class) })
    public Response updatePet(
-        @ApiParam(value = "Pet object that needs to be added to the store" ) Pet body,
+        @ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet body,
        @Context SecurityContext securityContext)
    throws NotFoundException {
        return delegate.updatePet(body,securityContext);
@ -153,7 +150,7 @@ public class PetApi  {
    @POST
    @Path("/{petId}")
    @Consumes({ "application/x-www-form-urlencoded" })
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
    @io.swagger.annotations.ApiOperation(value = "Updates a pet in the store with form data", notes = "", response = void.class, authorizations = {
        @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
            @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
@ -163,7 +160,7 @@ public class PetApi  {
    @io.swagger.annotations.ApiResponses(value = { 
        @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = void.class) })
    public Response updatePetWithForm(
-        @ApiParam(value = "ID of pet that needs to be updated",required=true) @PathParam("petId") String petId,
+        @ApiParam(value = "ID of pet that needs to be updated",required=true) @PathParam("petId") Long petId,
        @ApiParam(value = "Updated name of the pet")  @FormParam("name")  String name,
        @ApiParam(value = "Updated status of the pet")  @FormParam("status")  String status,
        @Context SecurityContext securityContext)
@ -173,15 +170,15 @@ public class PetApi  {
    @POST
    @Path("/{petId}/uploadImage")
    @Consumes({ "multipart/form-data" })
-    @Produces({ "application/json", "application/xml" })
-    @io.swagger.annotations.ApiOperation(value = "uploads an image", notes = "", response = void.class, authorizations = {
+    @Produces({ "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "uploads an image", notes = "", response = ModelApiResponse.class, authorizations = {
        @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
            @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
            @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets")
        })
    }, tags={ "pet" })
    @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = void.class) })
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
    public Response uploadFile(
        @ApiParam(value = "ID of pet to update",required=true) @PathParam("petId") Long petId,
        @FormDataParam("additionalMetadata")  String additionalMetadata,
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/PetApiService.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/PetApiService.java
@ -6,6 +6,7 @@ import io.swagger.model.*;
 import com.sun.jersey.multipart.FormDataParam;

 import java.io.File;
+import io.swagger.model.ModelApiResponse;
 import io.swagger.model.Pet;

 import java.util.List;
@ -18,22 +19,22 @@ import com.sun.jersey.multipart.FormDataParam;

 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
-
+import javax.validation.constraints.*;

 public abstract class PetApiService {
      public abstract Response addPet(Pet body,SecurityContext securityContext)
      throws NotFoundException;
      public abstract Response deletePet(Long petId,String apiKey,SecurityContext securityContext)
      throws NotFoundException;
-      public abstract Response findPetsByStatus( List<String> status,SecurityContext securityContext)
+      public abstract Response findPetsByStatus( @NotNull List<String> status,SecurityContext securityContext)
      throws NotFoundException;
-      public abstract Response findPetsByTags( List<String> tags,SecurityContext securityContext)
+      public abstract Response findPetsByTags( @NotNull List<String> tags,SecurityContext securityContext)
      throws NotFoundException;
      public abstract Response getPetById(Long petId,SecurityContext securityContext)
      throws NotFoundException;
      public abstract Response updatePet(Pet body,SecurityContext securityContext)
      throws NotFoundException;
-      public abstract Response updatePetWithForm(String petId,String name,String status,SecurityContext securityContext)
+      public abstract Response updatePetWithForm(Long petId,String name,String status,SecurityContext securityContext)
      throws NotFoundException;
      public abstract Response uploadFile(Long petId,String additionalMetadata,InputStream fileInputStream, FormDataContentDisposition fileDetail,SecurityContext securityContext)
      throws NotFoundException;
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/StoreApi.java
@ -37,7 +37,7 @@ public class StoreApi  {
    @DELETE
    @Path("/order/{orderId}")
    
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
    @io.swagger.annotations.ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = void.class, tags={ "store",  })
    @io.swagger.annotations.ApiResponses(value = { 
        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = void.class),
@ -51,7 +51,7 @@ public class StoreApi  {
    @GET
    @Path("/inventory")
    
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/json" })
    @io.swagger.annotations.ApiOperation(value = "Returns pet inventories by status", notes = "Returns a map of status codes to quantities", response = Integer.class, responseContainer = "Map", authorizations = {
        @io.swagger.annotations.Authorization(value = "api_key")
    }, tags={ "store",  })
@ -65,14 +65,14 @@ public class StoreApi  {
    @GET
    @Path("/order/{orderId}")
    
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class, tags={ "store",  })
    @io.swagger.annotations.ApiResponses(value = { 
        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Order.class),
        @io.swagger.annotations.ApiResponse(code = 404, message = "Order not found", response = Order.class) })
    public Response getOrderById(
-        @ApiParam(value = "ID of pet that needs to be fetched",required=true) @PathParam("orderId") String orderId,
+        @ApiParam(value = "ID of pet that needs to be fetched",required=true) @PathParam("orderId") Long orderId,
        @Context SecurityContext securityContext)
    throws NotFoundException {
        return delegate.getOrderById(orderId,securityContext);
@ -80,13 +80,13 @@ public class StoreApi  {
    @POST
    @Path("/order")
    
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
    @io.swagger.annotations.ApiOperation(value = "Place an order for a pet", notes = "", response = Order.class, tags={ "store" })
    @io.swagger.annotations.ApiResponses(value = { 
        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid Order", response = Order.class) })
    public Response placeOrder(
-        @ApiParam(value = "order placed for purchasing the pet" ) Order body,
+        @ApiParam(value = "order placed for purchasing the pet" ,required=true) Order body,
        @Context SecurityContext securityContext)
    throws NotFoundException {
        return delegate.placeOrder(body,securityContext);
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/StoreApiService.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/StoreApiService.java
@ -18,14 +18,14 @@ import com.sun.jersey.multipart.FormDataParam;

 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
-
+import javax.validation.constraints.*;

 public abstract class StoreApiService {
-      public abstract Response deleteOrder(String orderId,SecurityContext securityContext)
+      public abstract Response deleteOrder( @Min(1)String orderId,SecurityContext securityContext)
      throws NotFoundException;
      public abstract Response getInventory(SecurityContext securityContext)
      throws NotFoundException;
-      public abstract Response getOrderById(String orderId,SecurityContext securityContext)
+      public abstract Response getOrderById( @Min(1) @Max(5)Long orderId,SecurityContext securityContext)
      throws NotFoundException;
      public abstract Response placeOrder(Order body,SecurityContext securityContext)
      throws NotFoundException;
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/UserApi.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/UserApi.java
@ -37,12 +37,12 @@ public class UserApi  {
    @POST
    
    
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
    @io.swagger.annotations.ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = void.class, tags={ "user",  })
    @io.swagger.annotations.ApiResponses(value = { 
        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = void.class) })
    public Response createUser(
-        @ApiParam(value = "Created user object" ) User body,
+        @ApiParam(value = "Created user object" ,required=true) User body,
        @Context SecurityContext securityContext)
    throws NotFoundException {
        return delegate.createUser(body,securityContext);
@ -50,12 +50,12 @@ public class UserApi  {
    @POST
    @Path("/createWithArray")
    
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
    @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = void.class, tags={ "user",  })
    @io.swagger.annotations.ApiResponses(value = { 
        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = void.class) })
    public Response createUsersWithArrayInput(
-        @ApiParam(value = "List of user object" ) List<User> body,
+        @ApiParam(value = "List of user object" ,required=true) List<User> body,
        @Context SecurityContext securityContext)
    throws NotFoundException {
        return delegate.createUsersWithArrayInput(body,securityContext);
@ -63,12 +63,12 @@ public class UserApi  {
    @POST
    @Path("/createWithList")
    
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
    @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = void.class, tags={ "user",  })
    @io.swagger.annotations.ApiResponses(value = { 
        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = void.class) })
    public Response createUsersWithListInput(
-        @ApiParam(value = "List of user object" ) List<User> body,
+        @ApiParam(value = "List of user object" ,required=true) List<User> body,
        @Context SecurityContext securityContext)
    throws NotFoundException {
        return delegate.createUsersWithListInput(body,securityContext);
@ -76,7 +76,7 @@ public class UserApi  {
    @DELETE
    @Path("/{username}")
    
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
    @io.swagger.annotations.ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", response = void.class, tags={ "user",  })
    @io.swagger.annotations.ApiResponses(value = { 
        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = void.class),
@ -90,7 +90,7 @@ public class UserApi  {
    @GET
    @Path("/{username}")
    
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
    @io.swagger.annotations.ApiOperation(value = "Get user by user name", notes = "", response = User.class, tags={ "user",  })
    @io.swagger.annotations.ApiResponses(value = { 
        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = User.class),
@ -105,14 +105,14 @@ public class UserApi  {
    @GET
    @Path("/login")
    
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
    @io.swagger.annotations.ApiOperation(value = "Logs user into the system", notes = "", response = String.class, tags={ "user",  })
    @io.swagger.annotations.ApiResponses(value = { 
        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = String.class),
        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username/password supplied", response = String.class) })
    public Response loginUser(
-        @ApiParam(value = "The user name for login") @QueryParam("username") String username,
-        @ApiParam(value = "The password for login in clear text") @QueryParam("password") String password,
+        @ApiParam(value = "The user name for login",required=true) @QueryParam("username") String username,
+        @ApiParam(value = "The password for login in clear text",required=true) @QueryParam("password") String password,
        @Context SecurityContext securityContext)
    throws NotFoundException {
        return delegate.loginUser(username,password,securityContext);
@ -120,7 +120,7 @@ public class UserApi  {
    @GET
    @Path("/logout")
    
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
    @io.swagger.annotations.ApiOperation(value = "Logs out current logged in user session", notes = "", response = void.class, tags={ "user",  })
    @io.swagger.annotations.ApiResponses(value = { 
        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = void.class) })
@ -132,14 +132,14 @@ public class UserApi  {
    @PUT
    @Path("/{username}")
    
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
    @io.swagger.annotations.ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", response = void.class, tags={ "user" })
    @io.swagger.annotations.ApiResponses(value = { 
        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid user supplied", response = void.class),
        @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = void.class) })
    public Response updateUser(
        @ApiParam(value = "name that need to be deleted",required=true) @PathParam("username") String username,
-        @ApiParam(value = "Updated user object" ) User body,
+        @ApiParam(value = "Updated user object" ,required=true) User body,
        @Context SecurityContext securityContext)
    throws NotFoundException {
        return delegate.updateUser(username,body,securityContext);
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/UserApiService.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/UserApiService.java
@ -18,7 +18,7 @@ import com.sun.jersey.multipart.FormDataParam;

 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
-
+import javax.validation.constraints.*;

 public abstract class UserApiService {
      public abstract Response createUser(User body,SecurityContext securityContext)
@ -31,7 +31,7 @@ public abstract class UserApiService {
      throws NotFoundException;
      public abstract Response getUserByName(String username,SecurityContext securityContext)
      throws NotFoundException;
-      public abstract Response loginUser( String username, String password,SecurityContext securityContext)
+      public abstract Response loginUser( @NotNull String username, @NotNull String password,SecurityContext securityContext)
      throws NotFoundException;
      public abstract Response logoutUser(SecurityContext securityContext)
      throws NotFoundException;
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java
@ -21,6 +21,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import javax.validation.constraints.*;

 /**
 * AdditionalPropertiesClass
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Animal.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Animal.java
@ -16,8 +16,11 @@ package io.swagger.model;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.*;

 /**
 * Animal
@ -40,6 +43,7 @@ public class Animal   {
   * @return className
  **/
  @ApiModelProperty(required = true, value = "")
+  @NotNull
  public String getClassName() {
    return className;
  }
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/AnimalFarm.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/AnimalFarm.java
@ -17,6 +17,7 @@ import java.util.Objects;
 import io.swagger.model.Animal;
 import java.util.ArrayList;
 import java.util.List;
+import javax.validation.constraints.*;

 /**
 * AnimalFarm
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java
@ -21,6 +21,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import javax.validation.constraints.*;

 /**
 * ArrayOfArrayOfNumberOnly
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java
@ -21,6 +21,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import javax.validation.constraints.*;

 /**
 * ArrayOfNumberOnly
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ArrayTest.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ArrayTest.java
@ -21,6 +21,7 @@ import io.swagger.annotations.ApiModelProperty;
 import io.swagger.model.ReadOnlyFirst;
 import java.util.ArrayList;
 import java.util.List;
+import javax.validation.constraints.*;

 /**
 * ArrayTest
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Cat.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Cat.java
@ -19,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.model.Animal;
+import javax.validation.constraints.*;

 /**
 * Cat
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Category.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Category.java
@ -1,9 +1,9 @@
 /*
 * Swagger Petstore
- * 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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ClassModel.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ClassModel.java
@ -0,0 +1,90 @@
+/*
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package io.swagger.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.*;
+
+/**
+ * Model for testing model with \&quot;_class\&quot; property
+ */
+@ApiModel(description = "Model for testing model with \"_class\" property")
+
+public class ClassModel   {
+  @JsonProperty("_class")
+  private String propertyClass = null;
+
+  public ClassModel propertyClass(String propertyClass) {
+    this.propertyClass = propertyClass;
+    return this;
+  }
+
+   /**
+   * Get propertyClass
+   * @return propertyClass
+  **/
+  @ApiModelProperty(value = "")
+  public String getPropertyClass() {
+    return propertyClass;
+  }
+
+  public void setPropertyClass(String propertyClass) {
+    this.propertyClass = propertyClass;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ClassModel classModel = (ClassModel) o;
+    return Objects.equals(this.propertyClass, classModel.propertyClass);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(propertyClass);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ClassModel {\n");
+    
+    sb.append("    propertyClass: ").append(toIndentedString(propertyClass)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Client.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Client.java
@ -18,6 +18,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.*;

 /**
 * Client
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Dog.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Dog.java
@ -19,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.model.Animal;
+import javax.validation.constraints.*;

 /**
 * Dog
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/EnumArrays.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/EnumArrays.java
@ -21,6 +21,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;
+import javax.validation.constraints.*;

 /**
 * EnumArrays
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/EnumClass.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/EnumClass.java
@ -15,6 +15,7 @@ package io.swagger.model;

 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonValue;
+import javax.validation.constraints.*;

 import com.fasterxml.jackson.annotation.JsonCreator;

--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/EnumTest.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/EnumTest.java
@ -19,6 +19,8 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.model.OuterEnum;
+import javax.validation.constraints.*;

 /**
 * EnumTest
@ -127,6 +129,9 @@ public class EnumTest   {
  @JsonProperty("enum_number")
  private EnumNumberEnum enumNumber = null;

+  @JsonProperty("outerEnum")
+  private OuterEnum outerEnum = null;
+
  public EnumTest enumString(EnumStringEnum enumString) {
    this.enumString = enumString;
    return this;
@ -181,6 +186,24 @@ public class EnumTest   {
    this.enumNumber = enumNumber;
  }

+  public EnumTest outerEnum(OuterEnum outerEnum) {
+    this.outerEnum = outerEnum;
+    return this;
+  }
+
+   /**
+   * Get outerEnum
+   * @return outerEnum
+  **/
+  @ApiModelProperty(value = "")
+  public OuterEnum getOuterEnum() {
+    return outerEnum;
+  }
+
+  public void setOuterEnum(OuterEnum outerEnum) {
+    this.outerEnum = outerEnum;
+  }
+

  @Override
  public boolean equals(java.lang.Object o) {
@ -193,12 +216,13 @@ public class EnumTest   {
    EnumTest enumTest = (EnumTest) o;
    return Objects.equals(this.enumString, enumTest.enumString) &&
        Objects.equals(this.enumInteger, enumTest.enumInteger) &&
-        Objects.equals(this.enumNumber, enumTest.enumNumber);
+        Objects.equals(this.enumNumber, enumTest.enumNumber) &&
+        Objects.equals(this.outerEnum, enumTest.outerEnum);
  }

  @Override
  public int hashCode() {
-    return Objects.hash(enumString, enumInteger, enumNumber);
+    return Objects.hash(enumString, enumInteger, enumNumber, outerEnum);
  }


@ -210,6 +234,7 @@ public class EnumTest   {
    sb.append("    enumString: ").append(toIndentedString(enumString)).append("\n");
    sb.append("    enumInteger: ").append(toIndentedString(enumInteger)).append("\n");
    sb.append("    enumNumber: ").append(toIndentedString(enumNumber)).append("\n");
+    sb.append("    outerEnum: ").append(toIndentedString(outerEnum)).append("\n");
    sb.append("}");
    return sb.toString();
  }
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/FormatTest.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/FormatTest.java
@ -20,6 +20,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.Date;
+import javax.validation.constraints.*;

 /**
 * FormatTest
@ -72,11 +73,13 @@ public class FormatTest   {

   /**
   * Get integer
-   * minimum: 10.0
-   * maximum: 100.0
+   * minimum: 10
+   * maximum: 100
   * @return integer
  **/
  @ApiModelProperty(value = "")
+//  @Min(10)
+//  @Max(100)
  public Integer getInteger() {
    return integer;
  }
@ -92,11 +95,13 @@ public class FormatTest   {

   /**
   * Get int32
-   * minimum: 20.0
-   * maximum: 200.0
+   * minimum: 20
+   * maximum: 200
   * @return int32
  **/
  @ApiModelProperty(value = "")
+//  @Min(20)
+//  @Max(200)
  public Integer getInt32() {
    return int32;
  }
@ -135,6 +140,9 @@ public class FormatTest   {
   * @return number
  **/
  @ApiModelProperty(required = true, value = "")
+  @NotNull
+//  @Min(32.1)
+//  @Max(543.2)
  public BigDecimal getNumber() {
    return number;
  }
@ -155,6 +163,8 @@ public class FormatTest   {
   * @return _float
  **/
  @ApiModelProperty(value = "")
+//  @Min(54.3)
+//  @Max(987.6)
  public Float getFloat() {
    return _float;
  }
@ -175,6 +185,8 @@ public class FormatTest   {
   * @return _double
  **/
  @ApiModelProperty(value = "")
+//  @Min(67.8)
+//  @Max(123.4)
  public Double getDouble() {
    return _double;
  }
@ -193,6 +205,7 @@ public class FormatTest   {
   * @return string
  **/
  @ApiModelProperty(value = "")
+  @Pattern(regexp="/[a-z]/i")
  public String getString() {
    return string;
  }
@ -211,6 +224,7 @@ public class FormatTest   {
   * @return _byte
  **/
  @ApiModelProperty(required = true, value = "")
+  @NotNull
  public byte[] getByte() {
    return _byte;
  }
@ -247,6 +261,7 @@ public class FormatTest   {
   * @return date
  **/
  @ApiModelProperty(required = true, value = "")
+  @NotNull
  public Date getDate() {
    return date;
  }
@ -301,6 +316,8 @@ public class FormatTest   {
   * @return password
  **/
  @ApiModelProperty(required = true, value = "")
+  @NotNull
+  @Size(min=10,max=64)
  public String getPassword() {
    return password;
  }
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/HasOnlyReadOnly.java
@ -18,6 +18,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.*;

 /**
 * HasOnlyReadOnly
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/MapTest.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/MapTest.java
@ -22,6 +22,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import javax.validation.constraints.*;

 /**
 * MapTest
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java
@ -23,6 +23,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import javax.validation.constraints.*;

 /**
 * MixedPropertiesAndAdditionalPropertiesClass
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Model200Response.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Model200Response.java
@ -18,6 +18,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.*;

 /**
 * Model for testing model name starting with number
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ModelApiResponse.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ModelApiResponse.java
@ -18,6 +18,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.*;

 /**
 * ModelApiResponse
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ModelReturn.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ModelReturn.java
@ -18,6 +18,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.*;

 /**
 * Model for testing reserved words
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Name.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Name.java
@ -18,6 +18,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.*;

 /**
 * Model for testing model name same as property name
@ -47,6 +48,7 @@ public class Name   {
   * @return name
  **/
  @ApiModelProperty(required = true, value = "")
+  @NotNull
  public Integer getName() {
    return name;
  }
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/NumberOnly.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/NumberOnly.java
@ -19,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
+import javax.validation.constraints.*;

 /**
 * NumberOnly
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Order.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Order.java
@ -1,9 +1,9 @@
 /*
 * Swagger Petstore
- * 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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
@ -76,7 +76,7 @@ public class Order   {
  private StatusEnum status = null;

  @JsonProperty("complete")
-  private Boolean complete = null;
+  private Boolean complete = false;

  public Order id(Long id) {
    this.id = id;
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/OuterEnum.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/OuterEnum.java
@ -0,0 +1,54 @@
+/*
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package io.swagger.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonValue;
+import javax.validation.constraints.*;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+
+/**
+ * Gets or Sets OuterEnum
+ */
+public enum OuterEnum {
+  
+  PLACED("placed"),
+  
+  APPROVED("approved"),
+  
+  DELIVERED("delivered");
+
+  private String value;
+
+  OuterEnum(String value) {
+    this.value = value;
+  }
+
+  @Override
+  public String toString() {
+    return String.valueOf(value);
+  }
+
+  @JsonCreator
+  public static OuterEnum fromValue(String text) {
+    for (OuterEnum b : OuterEnum.values()) {
+      if (String.valueOf(b.value).equals(text)) {
+        return b;
+      }
+    }
+    return null;
+  }
+}
+
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Pet.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Pet.java
@ -1,9 +1,9 @@
 /*
 * Swagger Petstore
- * 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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ReadOnlyFirst.java
@ -18,6 +18,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.*;

 /**
 * ReadOnlyFirst
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/SpecialModelName.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/SpecialModelName.java
@ -18,6 +18,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.*;

 /**
 * SpecialModelName
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Tag.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Tag.java
@ -1,9 +1,9 @@
 /*
 * Swagger Petstore
- * 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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/User.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/User.java
@ -1,9 +1,9 @@
 /*
 * Swagger Petstore
- * 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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
--- a/samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java
@ -19,7 +19,7 @@ import com.sun.jersey.multipart.FormDataParam;

 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
-
+import javax.validation.constraints.*;

 public class FakeApiServiceImpl extends FakeApiService {
    @Override
@ -35,7 +35,7 @@ public class FakeApiServiceImpl extends FakeApiService {
        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
    }
    @Override
-    public Response testEnumParameters(List<String> enumFormStringArray, String enumFormString, List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, BigDecimal enumQueryInteger, Double enumQueryDouble, SecurityContext securityContext)
+    public Response testEnumParameters(List<String> enumFormStringArray, String enumFormString, List<String> enumHeaderStringArray, String enumHeaderString,  List<String> enumQueryStringArray,  String enumQueryString,  Integer enumQueryInteger, Double enumQueryDouble, SecurityContext securityContext)
    throws NotFoundException {
        // do some magic!
        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
--- a/samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java
@ -6,6 +6,7 @@ import io.swagger.model.*;
 import com.sun.jersey.multipart.FormDataParam;

 import java.io.File;
+import io.swagger.model.ModelApiResponse;
 import io.swagger.model.Pet;

 import java.util.List;
@ -18,7 +19,7 @@ import com.sun.jersey.multipart.FormDataParam;

 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
-
+import javax.validation.constraints.*;

 public class PetApiServiceImpl extends PetApiService {
    @Override
@ -34,13 +35,13 @@ public class PetApiServiceImpl extends PetApiService {
        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
    }
    @Override
-    public Response findPetsByStatus( List<String> status, SecurityContext securityContext)
+    public Response findPetsByStatus( @NotNull List<String> status, SecurityContext securityContext)
    throws NotFoundException {
        // do some magic!
        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
    }
    @Override
-    public Response findPetsByTags( List<String> tags, SecurityContext securityContext)
+    public Response findPetsByTags( @NotNull List<String> tags, SecurityContext securityContext)
    throws NotFoundException {
        // do some magic!
        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
@ -58,7 +59,7 @@ public class PetApiServiceImpl extends PetApiService {
        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
    }
    @Override
-    public Response updatePetWithForm(String petId, String name, String status, SecurityContext securityContext)
+    public Response updatePetWithForm(Long petId, String name, String status, SecurityContext securityContext)
    throws NotFoundException {
        // do some magic!
        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
--- a/samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java
@ -18,11 +18,11 @@ import com.sun.jersey.multipart.FormDataParam;

 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
-
+import javax.validation.constraints.*;

 public class StoreApiServiceImpl extends StoreApiService {
    @Override
-    public Response deleteOrder(String orderId, SecurityContext securityContext)
+    public Response deleteOrder( @Min(1)String orderId, SecurityContext securityContext)
    throws NotFoundException {
        // do some magic!
        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
@ -34,7 +34,7 @@ public class StoreApiServiceImpl extends StoreApiService {
        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
    }
    @Override
-    public Response getOrderById(String orderId, SecurityContext securityContext)
+    public Response getOrderById( @Min(1) @Max(5)Long orderId, SecurityContext securityContext)
    throws NotFoundException {
        // do some magic!
        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
--- a/samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java
@ -18,7 +18,7 @@ import com.sun.jersey.multipart.FormDataParam;

 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
-
+import javax.validation.constraints.*;

 public class UserApiServiceImpl extends UserApiService {
    @Override
@ -52,7 +52,7 @@ public class UserApiServiceImpl extends UserApiService {
        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
    }
    @Override
-    public Response loginUser( String username,  String password, SecurityContext securityContext)
+    public Response loginUser( @NotNull String username,  @NotNull String password, SecurityContext securityContext)
    throws NotFoundException {
        // do some magic!
        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();