fix #22492 [BUG][JAVA][MAVEN] Lombok @Getter disables validation and #19743 #18794 #17793 #17606

Author: dabdirb

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

@@ -14,7 +14,9 @@
   {{#isPassword}}
   @lombok.ToString.Exclude
   {{/isPassword}}
-  {{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}
+  {{^isContainer}}
+    {{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}
+  {{/isContainer}}
   {{^useBeanValidation}}
     {{#required}}
       @lombok.NonNull

samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/PetApiController.java

@@ -28,12 +28,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
 public class Category {
 
-  
+    
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
   private @Nullable Long id;
 
-  @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
+    @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
   private @Nullable String name;

samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/StoreApiController.java

@@ -30,17 +30,17 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
 public class ModelApiResponse {
 
-  
+    
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("code")
   private @Nullable Integer code;
 
-  
+    
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("type")
   private @Nullable String type;
 
-  
+    
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("message")
   private @Nullable String message;

samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/UserApiController.java

@@ -31,22 +31,22 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
 public class Order {
 
-  
+    
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
   private @Nullable Long id;
 
-  
+    
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("petId")
   private @Nullable Long petId;
 
-  
+    
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("quantity")
   private @Nullable Integer quantity;
 
-  @Valid 
+    @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
@@ -89,12 +89,12 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  
+    
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
   private @Nullable StatusEnum status;
 
-  
+    
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("complete")
   @lombok.Builder.Default

samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Category.java

@@ -34,29 +34,27 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
 public class Pet {
 
-  
+    
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
   private @Nullable Long id;
 
-  @Valid 
+    @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("category")
   private @Nullable Category category;
 
-  @NotNull 
+    @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("name")
   private String name;
 
-  @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("photoUrls")
   @lombok.Builder.Default
   @Valid
   private List<String> photoUrls = new ArrayList<>();
 
-  @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("tags")
   @lombok.Builder.Default
@@ -100,7 +98,7 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  
+    
   @Schema(name = "status", description = "pet status in the store", deprecated = true, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
   @Deprecated

samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/ModelApiResponse.java

@@ -28,12 +28,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
 public class Tag {
 
-  
+    
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
   private @Nullable Long id;
 
-  
+    
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
   private @Nullable String name;

samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Order.java

@@ -28,42 +28,42 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.18.0-SNAPSHOT")
 public class User {
 
-  
+    
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
   private @Nullable Long id;
 
-  
+    
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("username")
   private @Nullable String username;
 
-  
+    
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("firstName")
   private @Nullable String firstName;
 
-  
+    
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("lastName")
   private @Nullable String lastName;
 
-  
+    
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("email")
   private @Nullable String email;
 
-  
+    
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("password")
   private @Nullable String password;
 
-  
+    
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("phone")
   private @Nullable String phone;
 
-  
+    
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("userStatus")
   private @Nullable Integer userStatus;