[Play Framework] Update the bean validation to use version 2.0. (#8354)

* Update the bean validation to use version 2.0. For a reason I don't know, it was not working anymore with version 1.

* better format

Co-authored-by: William Cheng <wing328hk@gmail.com>

Author: JFCote

modules/openapi-generator/src/main/resources/JavaPlayFramework/beanValidation.mustache

@@ -53,4 +53,4 @@
 {{/isInteger}}
 {{^isPrimitiveType}}
 @Valid
-{{/isPrimitiveType}}
+{{/isPrimitiveType}}

modules/openapi-generator/src/main/resources/JavaPlayFramework/build.mustache

@@ -10,6 +10,6 @@ scalaVersion := "2.12.6"
 libraryDependencies += "org.webjars" % "swagger-ui" % "3.32.5"
 {{/useSwaggerUI}}
 {{#useBeanValidation}}
-libraryDependencies += "javax.validation" % "validation-api" % "1.1.0.Final"
+libraryDependencies += "javax.validation" % "validation-api" % "2.0.1.Final"
 {{/useBeanValidation}}
 libraryDependencies += guice

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

@@ -26,9 +26,15 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   @SerializedName("{{baseName}}")
   {{/gson}}
   {{#isContainer}}
+  {{#useBeanValidation}}
+  {{>beanValidation}}
+  {{/useBeanValidation}}
   private {{{datatypeWithEnum}}} {{name}}{{#required}} = {{{defaultValue}}}{{/required}}{{^required}} = null{{/required}};
   {{/isContainer}}
   {{^isContainer}}
+  {{#useBeanValidation}}
+  {{>beanValidation}}
+  {{/useBeanValidation}}
   private {{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}};
   {{/isContainer}}
 
@@ -78,10 +84,10 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   {{/maximum}}
    * @return {{name}}
   **/
- {{#vendorExtensions.x-extra-annotation}}
+  {{#vendorExtensions.x-extra-annotation}}
   {{{vendorExtensions.x-extra-annotation}}}
   {{/vendorExtensions.x-extra-annotation}}
-  {{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{getter}}() {
+  public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
   }
 

samples/server/petstore/java-play-framework-api-package-override/app/apimodels/Category.java

@@ -12,9 +12,11 @@
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Category   {
   @JsonProperty("id")
+  
   private Long id;
 
   @JsonProperty("name")
+  
   private String name;
 
   public Category id(Long id) {
@@ -26,7 +28,7 @@ public Category id(Long id) {
    * Get id
    * @return id
   **/
-    public Long getId() {
+  public Long getId() {
     return id;
   }
 
@@ -43,7 +45,7 @@ public Category name(String name) {
    * Get name
    * @return name
   **/
-    public String getName() {
+  public String getName() {
     return name;
   }
 

samples/server/petstore/java-play-framework-api-package-override/app/apimodels/ModelApiResponse.java

@@ -12,12 +12,15 @@
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class ModelApiResponse   {
   @JsonProperty("code")
+  
   private Integer code;
 
   @JsonProperty("type")
+  
   private String type;
 
   @JsonProperty("message")
+  
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -29,7 +32,7 @@ public ModelApiResponse code(Integer code) {
    * Get code
    * @return code
   **/
-    public Integer getCode() {
+  public Integer getCode() {
     return code;
   }
 
@@ -46,7 +49,7 @@ public ModelApiResponse type(String type) {
    * Get type
    * @return type
   **/
-    public String getType() {
+  public String getType() {
     return type;
   }
 
@@ -63,7 +66,7 @@ public ModelApiResponse message(String message) {
    * Get message
    * @return message
   **/
-    public String getMessage() {
+  public String getMessage() {
     return message;
   }
 

samples/server/petstore/java-play-framework-api-package-override/app/apimodels/Order.java

@@ -13,15 +13,20 @@
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Order   {
   @JsonProperty("id")
+  
   private Long id;
 
   @JsonProperty("petId")
+  
   private Long petId;
 
   @JsonProperty("quantity")
+  
   private Integer quantity;
 
   @JsonProperty("shipDate")
+  @Valid
+
   private OffsetDateTime shipDate;
 
   /**
@@ -58,9 +63,11 @@ public static StatusEnum fromValue(String value) {
   }
 
   @JsonProperty("status")
+  
   private StatusEnum status;
 
   @JsonProperty("complete")
+  
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -72,7 +79,7 @@ public Order id(Long id) {
    * Get id
    * @return id
   **/
-    public Long getId() {
+  public Long getId() {
     return id;
   }
 
@@ -89,7 +96,7 @@ public Order petId(Long petId) {
    * Get petId
    * @return petId
   **/
-    public Long getPetId() {
+  public Long getPetId() {
     return petId;
   }
 
@@ -106,7 +113,7 @@ public Order quantity(Integer quantity) {
    * Get quantity
    * @return quantity
   **/
-    public Integer getQuantity() {
+  public Integer getQuantity() {
     return quantity;
   }
 
@@ -123,7 +130,6 @@ public Order shipDate(OffsetDateTime shipDate) {
    * Get shipDate
    * @return shipDate
   **/
-  @Valid
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -141,7 +147,7 @@ public Order status(StatusEnum status) {
    * Order Status
    * @return status
   **/
-    public StatusEnum getStatus() {
+  public StatusEnum getStatus() {
     return status;
   }
 
@@ -158,7 +164,7 @@ public Order complete(Boolean complete) {
    * Get complete
    * @return complete
   **/
-    public Boolean getComplete() {
+  public Boolean getComplete() {
     return complete;
   }
 

samples/server/petstore/java-play-framework-api-package-override/app/apimodels/Pet.java

@@ -16,18 +16,27 @@
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Pet   {
   @JsonProperty("id")
+  
   private Long id;
 
   @JsonProperty("category")
+  @Valid
+
   private Category category;
 
   @JsonProperty("name")
+  @NotNull
+
   private String name;
 
   @JsonProperty("photoUrls")
+  @NotNull
+
   private List<String> photoUrls = new ArrayList<>();
 
   @JsonProperty("tags")
+  @Valid
+
   private List<Tag> tags = null;
 
   /**
@@ -64,6 +73,7 @@ public static StatusEnum fromValue(String value) {
   }
 
   @JsonProperty("status")
+  
   private StatusEnum status;
 
   public Pet id(Long id) {
@@ -75,7 +85,7 @@ public Pet id(Long id) {
    * Get id
    * @return id
   **/
-    public Long getId() {
+  public Long getId() {
     return id;
   }
 
@@ -92,7 +102,6 @@ public Pet category(Category category) {
    * Get category
    * @return category
   **/
-  @Valid
   public Category getCategory() {
     return category;
   }
@@ -110,7 +119,6 @@ public Pet name(String name) {
    * Get name
    * @return name
   **/
-  @NotNull
   public String getName() {
     return name;
   }
@@ -133,7 +141,6 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
    * Get photoUrls
    * @return photoUrls
   **/
-  @NotNull
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -159,7 +166,6 @@ public Pet addTagsItem(Tag tagsItem) {
    * Get tags
    * @return tags
   **/
-  @Valid
   public List<Tag> getTags() {
     return tags;
   }
@@ -177,7 +183,7 @@ public Pet status(StatusEnum status) {
    * pet status in the store
    * @return status
   **/
-    public StatusEnum getStatus() {
+  public StatusEnum getStatus() {
     return status;
   }
 

samples/server/petstore/java-play-framework-api-package-override/app/apimodels/Tag.java

@@ -12,9 +12,11 @@
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Tag   {
   @JsonProperty("id")
+  
   private Long id;
 
   @JsonProperty("name")
+  
   private String name;
 
   public Tag id(Long id) {
@@ -26,7 +28,7 @@ public Tag id(Long id) {
    * Get id
    * @return id
   **/
-    public Long getId() {
+  public Long getId() {
     return id;
   }
 
@@ -43,7 +45,7 @@ public Tag name(String name) {
    * Get name
    * @return name
   **/
-    public String getName() {
+  public String getName() {
     return name;
   }