Skip to content

Commit 93aec4d

Browse files
authored
Fix #17831 @lombok.NonNull on all required fields when any lombok annotation is included (#17861)
* fix #17831 @lombok.NonNull on all required fields when any lombok annotation is included * fix #17831 @lombok.NonNull on all required fields when any lombok annotation is included
1 parent 033993c commit 93aec4d

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

  • modules/openapi-generator/src/main/resources/JavaSpring
  • samples/server/petstore
    • springboot-lombok-data/src/main/java/org/openapitools/model
    • springboot-lombok-tostring/src/main/java/org/openapitools/model

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,18 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}}
5151
{{#gson}}
5252
@SerializedName("{{baseName}}")
5353
{{/gson}}
54-
{{#lombok}}
54+
{{#lombok.RequiredArgsConstructor}}
55+
{{^useBeanValidation}}
5556
{{#required}}
5657
@lombok.NonNull
5758
{{/required}}
59+
{{/useBeanValidation}}
60+
{{/lombok.RequiredArgsConstructor}}
61+
{{#lombok.ToString}}
5862
{{#isPassword}}
5963
@lombok.ToString.Exclude
6064
{{/isPassword}}
61-
{{/lombok}}
65+
{{/lombok.ToString}}
6266
{{#vendorExtensions.x-field-extra-annotation}}
6367
{{{vendorExtensions.x-field-extra-annotation}}}
6468
{{/vendorExtensions.x-field-extra-annotation}}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,8 @@ public class Pet {
3636

3737
private Category category;
3838

39-
@lombok.NonNull
4039
private String name;
4140

42-
@lombok.NonNull
4341
@Valid
4442
private List<String> photoUrls = new ArrayList<>();
4543

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,8 @@ public class Pet {
3737

3838
private Category category;
3939

40-
@lombok.NonNull
4140
private String name;
4241

43-
@lombok.NonNull
4442
@Valid
4543
private List<String> photoUrls = new ArrayList<>();
4644

0 commit comments

Comments
 (0)