diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache
index 9e3cb2ed6f3..3bbcddb75e5 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache
@@ -51,14 +51,18 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}}
   {{#gson}}
   @SerializedName("{{baseName}}")
   {{/gson}}
-  {{#lombok}}
+  {{#lombok.RequiredArgsConstructor}}
+  {{^useBeanValidation}}
   {{#required}}
   @lombok.NonNull
   {{/required}}
+  {{/useBeanValidation}}
+  {{/lombok.RequiredArgsConstructor}}
+  {{#lombok.ToString}}
   {{#isPassword}}
   @lombok.ToString.Exclude
   {{/isPassword}}
-  {{/lombok}}
+  {{/lombok.ToString}}
   {{#vendorExtensions.x-field-extra-annotation}}
   {{{vendorExtensions.x-field-extra-annotation}}}
   {{/vendorExtensions.x-field-extra-annotation}}
diff --git a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Pet.java
index f8e30e16916..00ed5738aa7 100644
--- a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Pet.java
@@ -36,10 +36,8 @@ public class Pet {
 
   private Category category;
 
-  @lombok.NonNull
   private String name;
 
-  @lombok.NonNull
   @Valid
   private List<String> photoUrls = new ArrayList<>();
 
diff --git a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/model/Pet.java
index 76ed5dddf2c..658bd7fc01c 100644
--- a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/model/Pet.java
@@ -37,10 +37,8 @@ public class Pet {
 
   private Category category;
 
-  @lombok.NonNull
   private String name;
 
-  @lombok.NonNull
   @Valid
   private List<String> photoUrls = new ArrayList<>();