From a84946bdb3446e274f592bdbb2515a58cfbe848e Mon Sep 17 00:00:00 2001 From: Marvin Sommer <85678940+marvinsommer@users.noreply.github.com> Date: Thu, 10 Oct 2024 10:52:38 +0200 Subject: [PATCH] [Java Spring] Fix copyOf inheritance using empty object instead of passed value (#19426) * Fix copyOf inheritance using empty object instead of passed value * Generate new samples --- .../src/main/resources/JavaSpring/javaBuilder.mustache | 2 +- .../src/main/java/org/openapitools/model/Bar.java | 2 +- .../src/main/java/org/openapitools/model/BarCreate.java | 2 +- .../src/main/java/org/openapitools/model/BarRef.java | 2 +- .../src/main/java/org/openapitools/model/Foo.java | 2 +- .../src/main/java/org/openapitools/model/FooRef.java | 2 +- .../src/main/java/org/openapitools/model/Pasta.java | 2 +- .../src/main/java/org/openapitools/model/Pizza.java | 2 +- .../src/main/java/org/openapitools/model/PizzaSpeziale.java | 2 +- .../src/main/java/org/openapitools/model/BigCat.java | 2 +- .../src/main/java/org/openapitools/model/Cat.java | 2 +- .../src/main/java/org/openapitools/model/ChildWithNullable.java | 2 +- .../src/main/java/org/openapitools/model/Dog.java | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/javaBuilder.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/javaBuilder.mustache index c210b33e7fe..2b15a6ceeea 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/javaBuilder.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/javaBuilder.mustache @@ -15,7 +15,7 @@ } protected Builder copyOf({{classname}} value) { {{#parentModel}} - super.copyOf(instance);{{/parentModel}}{{#vars}} + super.copyOf(value);{{/parentModel}}{{#vars}} this.instance.{{setter}}(value.{{name}});{{/vars}} return this; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java index d144f5a1308..aa6b6e20e02 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java @@ -206,7 +206,7 @@ public class Bar extends Entity implements BarRefOrValue { } protected Builder copyOf(Bar value) { - super.copyOf(instance); + super.copyOf(value); this.instance.setId(value.id); this.instance.setBarPropA(value.barPropA); this.instance.setFooPropB(value.fooPropB); diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java index dd7a77d4d3a..034ec214c9b 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java @@ -188,7 +188,7 @@ public class BarCreate extends Entity { } protected Builder copyOf(BarCreate value) { - super.copyOf(instance); + super.copyOf(value); this.instance.setBarPropA(value.barPropA); this.instance.setFooPropB(value.fooPropB); this.instance.setFoo(value.foo); diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarRef.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarRef.java index 73cf2235242..9b969cb784f 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarRef.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarRef.java @@ -122,7 +122,7 @@ public class BarRef extends EntityRef implements BarRefOrValue { } protected Builder copyOf(BarRef value) { - super.copyOf(instance); + super.copyOf(value); return this; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java index 3e41134510b..f6446173f1d 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java @@ -161,7 +161,7 @@ public class Foo extends Entity implements FooRefOrValue { } protected Builder copyOf(Foo value) { - super.copyOf(instance); + super.copyOf(value); this.instance.setFooPropA(value.fooPropA); this.instance.setFooPropB(value.fooPropB); return this; diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java index 606b5219078..13b1254d382 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java @@ -147,7 +147,7 @@ public class FooRef extends EntityRef implements FooRefOrValue { } protected Builder copyOf(FooRef value) { - super.copyOf(instance); + super.copyOf(value); this.instance.setFoorefPropA(value.foorefPropA); return this; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java index 0337c91d2a7..5b46a9c58a8 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java @@ -137,7 +137,7 @@ public class Pasta extends Entity { } protected Builder copyOf(Pasta value) { - super.copyOf(instance); + super.copyOf(value); this.instance.setVendor(value.vendor); return this; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java index caf4e12ca39..3fd55852aac 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java @@ -146,7 +146,7 @@ public class Pizza extends Entity { } protected Builder copyOf(Pizza value) { - super.copyOf(instance); + super.copyOf(value); this.instance.setPizzaSize(value.pizzaSize); return this; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java index 8aae51cc81f..bed04dc6c8c 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java @@ -143,7 +143,7 @@ public class PizzaSpeziale extends Pizza { } protected Builder copyOf(PizzaSpeziale value) { - super.copyOf(instance); + super.copyOf(value); this.instance.setToppings(value.toppings); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java index 88a9c88fcf4..00c66ea92a0 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java @@ -168,7 +168,7 @@ public class BigCat extends Cat { } protected Builder copyOf(BigCat value) { - super.copyOf(instance); + super.copyOf(value); this.instance.setKind(value.kind); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java index 41d0503df07..b6e19be2979 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java @@ -131,7 +131,7 @@ public class Cat extends Animal { } protected Builder copyOf(Cat value) { - super.copyOf(instance); + super.copyOf(value); this.instance.setDeclawed(value.declawed); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ChildWithNullable.java index f62ca5e8788..6c44926c2b0 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -126,7 +126,7 @@ public class ChildWithNullable extends ParentWithNullable { } protected Builder copyOf(ChildWithNullable value) { - super.copyOf(instance); + super.copyOf(value); this.instance.setOtherProperty(value.otherProperty); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java index 46653ec2659..955be3e16e3 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java @@ -123,7 +123,7 @@ public class Dog extends Animal { } protected Builder copyOf(Dog value) { - super.copyOf(instance); + super.copyOf(value); this.instance.setBreed(value.breed); return this; }