From adb81832b15dc0c8c61a93b58cb2607336d781a1 Mon Sep 17 00:00:00 2001 From: Martin <2026226+martin-mfg@users.noreply.github.com> Date: Sun, 13 Oct 2024 15:27:13 +0200 Subject: [PATCH 1/2] merge PR 18690 --- .../src/main/resources/JavaSpring/pojo.mustache | 5 +++++ .../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, 11 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache index e94b47c326fe..0af4430d937e 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache @@ -66,6 +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 5b596dd50ad1..b8db01073cfc 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 2f34f75e116e..b69fad23eca0 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 e7f45e105e08..bada6dab4765 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 d3ae9e98e83d..3db856a2e303 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<>(); From 3dcea0bc270b6613c2ea7917fe38a9789444d9aa Mon Sep 17 00:00:00 2001 From: Martin <2026226+martin-mfg@users.noreply.github.com> Date: Sun, 13 Oct 2024 15:40:59 +0200 Subject: [PATCH 2/2] update samples --- .../java-camel/src/main/java/org/openapitools/model/Order.java | 1 - .../java-camel/src/main/java/org/openapitools/model/Pet.java | 2 -- 2 files changed, 3 deletions(-) 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 b8db01073cfc..5b596dd50ad1 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,7 +81,6 @@ 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 b69fad23eca0..2f34f75e116e 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,11 +42,9 @@ 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<>();