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

samples/server/petstore/springboot-lombok-data/.openapi-generator/FILES

@@ -4,11 +4,8 @@ src/main/java/org/openapitools/OpenApiGeneratorApplication.java
 src/main/java/org/openapitools/RFC3339DateFormat.java
 src/main/java/org/openapitools/api/ApiUtil.java
 src/main/java/org/openapitools/api/PetApi.java
-src/main/java/org/openapitools/api/PetApiController.java
 src/main/java/org/openapitools/api/StoreApi.java
-src/main/java/org/openapitools/api/StoreApiController.java
 src/main/java/org/openapitools/api/UserApi.java
-src/main/java/org/openapitools/api/UserApiController.java
 src/main/java/org/openapitools/configuration/HomeController.java
 src/main/java/org/openapitools/configuration/SpringDocConfiguration.java
 src/main/java/org/openapitools/model/Category.java

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

@@ -27,12 +27,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

@@ -29,17 +29,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

@@ -30,22 +30,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)
@@ -88,12 +88,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

@@ -33,27 +33,29 @@
 @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;
 
+  
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("photoUrls")
   @lombok.Builder.Default
   @Valid
   private List<String> photoUrls = new ArrayList<>();
 
+  
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("tags")
   @lombok.Builder.Default
@@ -97,7 +99,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

@@ -27,12 +27,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;