[Spring] Fix spring controller validation

modules/openapi-generator/src/main/resources/JavaSpring/api.mustache

@@ -13,6 +13,9 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 {{/jdk8-no-delegate}}
 import org.springframework.http.ResponseEntity;
+{{#useBeanValidation}}
+import org.springframework.validation.annotation.Validated;
+{{/useBeanValidation}}
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -50,6 +53,9 @@ import java.util.Optional;
 import java.util.concurrent.{{^jdk8}}Callable{{/jdk8}}{{#jdk8}}CompletableFuture{{/jdk8}};
 {{/async}}
 {{>generatedAnnotation}}
+{{#useBeanValidation}}
+@Validated
+{{/useBeanValidation}}
 @Api(value = "{{{baseName}}}", description = "the {{{baseName}}} API")
 {{#operations}}
 public interface {{classname}} {

modules/openapi-generator/src/main/resources/JavaSpring/model.mustache

@@ -7,7 +7,6 @@ import java.util.Objects;
 import java.io.Serializable;
 {{/serializableModel}}
 {{#useBeanValidation}}
-import org.springframework.validation.annotation.Validated;
 import javax.validation.Valid;
 import javax.validation.constraints.*;
 {{/useBeanValidation}}

modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache

@@ -2,7 +2,6 @@
  * {{#description}}{{.}}{{/description}}{{^description}}{{classname}}{{/description}}
  */{{#description}}
 @ApiModel(description = "{{{description}}}"){{/description}}
-{{#useBeanValidation}}@Validated{{/useBeanValidation}}
 {{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}{{>xmlAnnotation}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
 {{#serializableModel}}

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java

@@ -12,6 +12,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -28,6 +29,7 @@
 import java.util.Map;
 import java.util.Optional;
 
+@Validated
 @Api(value = "Pet", description = "the Pet API")
 public interface PetApi {
 

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java

@@ -11,6 +11,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -27,6 +28,7 @@
 import java.util.Map;
 import java.util.Optional;
 
+@Validated
 @Api(value = "Store", description = "the Store API")
 public interface StoreApi {
 

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java

@@ -11,6 +11,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -27,6 +28,7 @@
 import java.util.Map;
 import java.util.Optional;
 
+@Validated
 @Api(value = "User", description = "the User API")
 public interface UserApi {
 

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java

@@ -5,15 +5,13 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.springframework.validation.annotation.Validated;
 import javax.validation.Valid;
 import javax.validation.constraints.*;
 
 /**
  * A category for a pet
  */
 @ApiModel(description = "A category for a pet")
-@Validated
 
 public class Category   {
   @JsonProperty("id")

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java

@@ -5,15 +5,13 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.springframework.validation.annotation.Validated;
 import javax.validation.Valid;
 import javax.validation.constraints.*;
 
 /**
  * Describes the result of uploading an image resource
  */
 @ApiModel(description = "Describes the result of uploading an image resource")
-@Validated
 
 public class ModelApiResponse   {
   @JsonProperty("code")

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java

@@ -7,15 +7,13 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.time.OffsetDateTime;
-import org.springframework.validation.annotation.Validated;
 import javax.validation.Valid;
 import javax.validation.constraints.*;
 
 /**
  * An order for a pets from the pet store
  */
 @ApiModel(description = "An order for a pets from the pet store")
-@Validated
 
 public class Order   {
   @JsonProperty("id")

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java

@@ -10,15 +10,13 @@
 import java.util.List;
 import org.openapitools.model.Category;
 import org.openapitools.model.Tag;
-import org.springframework.validation.annotation.Validated;
 import javax.validation.Valid;
 import javax.validation.constraints.*;
 
 /**
  * A pet for sale in the pet store
  */
 @ApiModel(description = "A pet for sale in the pet store")
-@Validated
 
 public class Pet   {
   @JsonProperty("id")

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java

@@ -5,15 +5,13 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.springframework.validation.annotation.Validated;
 import javax.validation.Valid;
 import javax.validation.constraints.*;
 
 /**
  * A tag for a pet
  */
 @ApiModel(description = "A tag for a pet")
-@Validated
 
 public class Tag   {
   @JsonProperty("id")

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java

@@ -5,15 +5,13 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.springframework.validation.annotation.Validated;
 import javax.validation.Valid;
 import javax.validation.constraints.*;
 
 /**
  * A User who is purchasing from the pet store
  */
 @ApiModel(description = "A User who is purchasing from the pet store")
-@Validated
 
 public class User   {
   @JsonProperty("id")

samples/client/petstore/spring-cloud/src/test/java/org/openapitools/api/StoreApiTest.java

@@ -4,7 +4,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.openapitools.Application;
-import org.openapitools.TestUtils;
 import org.openapitools.model.Order;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -31,6 +30,11 @@ public void testGetInventory() {
     @Test
     public void testPlaceOrder() {
         Order order = createOrder();
+        try {
+            client.deleteOrder(order.getId().toString()).execute();
+        } catch (HystrixRuntimeException e) {
+            // noop
+        }
         client.placeOrder(order).execute();
 
         Order fetched = client.getOrderById(order.getId()).execute().getBody();
@@ -43,6 +47,7 @@ public void testPlaceOrder() {
     @Test
     public void testDeleteOrder() {
         Order order = createOrder();
+        client.deleteOrder(order.getId().toString());
         client.placeOrder(order).execute();
 
         Order fetched = client.getOrderById(order.getId()).execute().getBody();
@@ -60,7 +65,7 @@ public void testDeleteOrder() {
 
     private Order createOrder() {
         return new Order()
-                .id(TestUtils.nextId())
+                .id(1L)
                 .petId(200L)
                 .quantity(13)
                 //Ensure 3 fractional digits because of a bug in the petstore server

samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java

@@ -12,6 +12,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -28,6 +29,7 @@
 import java.util.Map;
 import java.util.Optional;
 
+@Validated
 @Api(value = "pet", description = "the pet API")
 public interface PetApi {
 

samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java

@@ -11,6 +11,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -27,6 +28,7 @@
 import java.util.Map;
 import java.util.Optional;
 
+@Validated
 @Api(value = "store", description = "the store API")
 public interface StoreApi {
 

samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java

@@ -11,6 +11,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -27,6 +28,7 @@
 import java.util.Map;
 import java.util.Optional;
 
+@Validated
 @Api(value = "user", description = "the user API")
 public interface UserApi {
 

samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java

@@ -5,15 +5,13 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.springframework.validation.annotation.Validated;
 import javax.validation.Valid;
 import javax.validation.constraints.*;
 
 /**
  * A category for a pet
  */
 @ApiModel(description = "A category for a pet")
-@Validated
 
 public class Category   {
   @JsonProperty("id")

samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java

@@ -5,15 +5,13 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.springframework.validation.annotation.Validated;
 import javax.validation.Valid;
 import javax.validation.constraints.*;
 
 /**
  * Describes the result of uploading an image resource
  */
 @ApiModel(description = "Describes the result of uploading an image resource")
-@Validated
 
 public class ModelApiResponse   {
   @JsonProperty("code")

samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java

@@ -7,15 +7,13 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.time.OffsetDateTime;
-import org.springframework.validation.annotation.Validated;
 import javax.validation.Valid;
 import javax.validation.constraints.*;
 
 /**
  * An order for a pets from the pet store
  */
 @ApiModel(description = "An order for a pets from the pet store")
-@Validated
 
 public class Order   {
   @JsonProperty("id")

samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java

@@ -10,15 +10,13 @@
 import java.util.List;
 import org.openapitools.model.Category;
 import org.openapitools.model.Tag;
-import org.springframework.validation.annotation.Validated;
 import javax.validation.Valid;
 import javax.validation.constraints.*;
 
 /**
  * A pet for sale in the pet store
  */
 @ApiModel(description = "A pet for sale in the pet store")
-@Validated
 
 public class Pet   {
   @JsonProperty("id")

samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java

@@ -5,15 +5,13 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.springframework.validation.annotation.Validated;
 import javax.validation.Valid;
 import javax.validation.constraints.*;
 
 /**
  * A tag for a pet
  */
 @ApiModel(description = "A tag for a pet")
-@Validated
 
 public class Tag   {
   @JsonProperty("id")

samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java

@@ -5,15 +5,13 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.springframework.validation.annotation.Validated;
 import javax.validation.Valid;
 import javax.validation.constraints.*;
 
 /**
  * A User who is purchasing from the pet store
  */
 @ApiModel(description = "A User who is purchasing from the pet store")
-@Validated
 
 public class User   {
   @JsonProperty("id")

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java

@@ -10,6 +10,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -27,6 +28,7 @@
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
+@Validated
 @Api(value = "another-fake", description = "the another-fake API")
 public interface AnotherFakeApi {
 

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java

@@ -17,6 +17,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -34,6 +35,7 @@
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
+@Validated
 @Api(value = "fake", description = "the fake API")
 public interface FakeApi {