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

Author: dabdirb

bin/configs/spring-boot-lombok-data.yaml

@@ -12,4 +12,4 @@ additionalProperties:
   useSpringBoot3: true
   skipDefaultInterface: true
   interfaceOnly: true
-  performBeanValidation: true,
+  performBeanValidation: true

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

@@ -1,26 +1,27 @@
 {{#lombok.RequiredArgsConstructor}}
   {{^useBeanValidation}}
     {{#required}}
-      @lombok.NonNull
+    @lombok.NonNull
     {{/required}}
   {{/useBeanValidation}}
 {{/lombok.RequiredArgsConstructor}}
 {{#lombok.ToString}}
   {{#isPassword}}
-    @lombok.ToString.Exclude
+  @lombok.ToString.Exclude
   {{/isPassword}}
 {{/lombok.ToString}}
 {{#lombok.Data}}
   {{#isPassword}}
-    @lombok.ToString.Exclude
+  @lombok.ToString.Exclude
   {{/isPassword}}
   {{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}
   {{^useBeanValidation}}
     {{#required}}
       @lombok.NonNull
     {{/required}}
   {{/useBeanValidation}}
-  {{#swagger2AnnotationLibrary}}@Schema(name = "{{{baseName}}}"{{#isReadOnly}}, accessMode = Schema.AccessMode.READ_ONLY{{/isReadOnly}}{{#example}}, example = "{{{.}}}"{{/example}}{{#description}}, description = "{{{.}}}"{{/description}}{{#deprecated}}, deprecated = true{{/deprecated}}, requiredMode = {{#required}}Schema.RequiredMode.REQUIRED{{/required}}{{^required}}Schema.RequiredMode.NOT_REQUIRED{{/required}})
+  {{#swagger2AnnotationLibrary}}
+  @Schema(name = "{{{baseName}}}"{{#isReadOnly}}, accessMode = Schema.AccessMode.READ_ONLY{{/isReadOnly}}{{#example}}, example = "{{{.}}}"{{/example}}{{#description}}, description = "{{{.}}}"{{/description}}{{#deprecated}}, deprecated = true{{/deprecated}}, requiredMode = {{#required}}Schema.RequiredMode.REQUIRED{{/required}}{{^required}}Schema.RequiredMode.NOT_REQUIRED{{/required}})
   {{/swagger2AnnotationLibrary}}
   {{#jackson}}@JsonProperty("{{baseName}}")
     {{#withXml}}
@@ -33,6 +34,6 @@
 {{/lombok.Data}}
 {{#lombok.Builder}}
   {{#defaultValue}}
-    @lombok.Builder.Default
+  @lombok.Builder.Default
   {{/defaultValue}}
 {{/lombok.Builder}}

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

@@ -9,6 +9,7 @@
 import java.time.OffsetDateTime;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.*;
+import org.hibernate.validator.constraints.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 

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

@@ -10,6 +10,7 @@
 import java.time.OffsetDateTime;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.*;
+import org.hibernate.validator.constraints.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 

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

@@ -12,6 +12,7 @@
 import java.time.OffsetDateTime;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.*;
+import org.hibernate.validator.constraints.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 
@@ -96,7 +97,7 @@ public static StatusEnum fromValue(String value) {
 
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("complete")
-    @lombok.Builder.Default
+  @lombok.Builder.Default
   private Boolean complete = false;
 
 }

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

@@ -15,6 +15,7 @@
 import java.time.OffsetDateTime;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.*;
+import org.hibernate.validator.constraints.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 
@@ -51,14 +52,14 @@ public class Pet {
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("photoUrls")
-    @lombok.Builder.Default
+  @lombok.Builder.Default
   @Valid
   private List<String> photoUrls = new ArrayList<>();
 
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("tags")
-    @lombok.Builder.Default
+  @lombok.Builder.Default
   @Valid
   private List<@Valid Tag> tags = new ArrayList<>();
 

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

@@ -9,6 +9,7 @@
 import java.time.OffsetDateTime;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.*;
+import org.hibernate.validator.constraints.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 

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

@@ -9,6 +9,7 @@
 import java.time.OffsetDateTime;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.*;
+import org.hibernate.validator.constraints.*;
 import io.swagger.v3.oas.annotations.media.Schema;