From aea9d27567f5ebfe5fa8b38bc7f48fbab67caa9b Mon Sep 17 00:00:00 2001 From: Gleb Levitin Date: Thu, 16 May 2024 18:32:45 +0200 Subject: [PATCH 1/2] #18689: Resolve default value issue with Lombok Builder --- .../src/main/resources/JavaSpring/pojo.mustache | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache index 44be9a408981..6fca667d97ba 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache @@ -66,6 +66,9 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}} {{#vendorExtensions.x-field-extra-annotation}} {{{vendorExtensions.x-field-extra-annotation}}} {{/vendorExtensions.x-field-extra-annotation}} + {{#defaultValue}} + @lombok.Builder.Default + {{/defaultValue}} {{#deprecated}} @Deprecated {{/deprecated}} From 76877e27a8b979fe9544536c2e008c1e5603ddf0 Mon Sep 17 00:00:00 2001 From: Gleb Levitin Date: Tue, 21 May 2024 10:29:37 +0200 Subject: [PATCH 2/2] #18689: Update samples. --- .../src/main/resources/JavaSpring/pojo.mustache | 2 ++ .../java-camel/src/main/java/org/openapitools/model/Order.java | 1 + .../java-camel/src/main/java/org/openapitools/model/Pet.java | 2 ++ .../src/main/java/org/openapitools/model/Order.java | 1 + .../src/main/java/org/openapitools/model/Pet.java | 2 ++ 5 files changed, 8 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache index 6fca667d97ba..b6a6b2990669 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache @@ -66,9 +66,11 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}} {{#vendorExtensions.x-field-extra-annotation}} {{{vendorExtensions.x-field-extra-annotation}}} {{/vendorExtensions.x-field-extra-annotation}} + {{#lombok.Builder}} {{#defaultValue}} @lombok.Builder.Default {{/defaultValue}} + {{/lombok.Builder}} {{#deprecated}} @Deprecated {{/deprecated}} diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Order.java index a6b4cfedfed9..5464b1bbf8ac 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Order.java @@ -81,6 +81,7 @@ public static StatusEnum fromValue(String value) { private StatusEnum status; + @lombok.Builder.Default private Boolean complete = false; public Order id(Long id) { diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java index ad439050082b..101306e44343 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java @@ -42,9 +42,11 @@ public class Pet { private String name; + @lombok.Builder.Default @Valid private List photoUrls = new ArrayList<>(); + @lombok.Builder.Default @Valid private List<@Valid Tag> tags = new ArrayList<>(); diff --git a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Order.java index 4ca38772dd3f..c71fab98fe38 100644 --- a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Order.java @@ -77,6 +77,7 @@ public static StatusEnum fromValue(String value) { private StatusEnum status; + @lombok.Builder.Default private Boolean complete = false; } 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 220b3d8192de..673e06e3cd10 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 @@ -38,9 +38,11 @@ public class Pet { private String name; + @lombok.Builder.Default @Valid private List photoUrls = new ArrayList<>(); + @lombok.Builder.Default @Valid private List<@Valid Tag> tags = new ArrayList<>();