[Java Spring] Fix copyOf inheritance using empty object instead of pa…

…ssed value (OpenAPITools#19426) * Fix copyOf inheritance using empty object instead of passed value * Generate new samples
Bandwidth · Oct 10, 2024 · a84946b · a84946b
1 parent d9cdecf
commit a84946b
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 13 deletions.
diff --git 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/.../openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java b/.../openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java
@@ -206,7 +206,7 @@ protected Builder(Bar instance) {
     }
 
     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/...pi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java b/...pi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java
@@ -188,7 +188,7 @@ protected Builder(BarCreate instance) {
     }
 
     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/...enapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarRef.java b/...enapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarRef.java
@@ -122,7 +122,7 @@ protected Builder(BarRef instance) {
     }
 
     protected Builder copyOf(BarRef value) { 
-      super.copyOf(instance);
+      super.copyOf(value);
       return this;
     }
 

diff --git a/.../openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java b/.../openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java
@@ -161,7 +161,7 @@ protected Builder(Foo instance) {
     }
 
     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/...enapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java b/...enapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java
@@ -147,7 +147,7 @@ protected Builder(FooRef instance) {
     }
 
     protected Builder copyOf(FooRef value) { 
-      super.copyOf(instance);
+      super.copyOf(value);
       this.instance.setFoorefPropA(value.foorefPropA);
       return this;
     }

diff --git a/...penapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java b/...penapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java
@@ -137,7 +137,7 @@ protected Builder(Pasta instance) {
     }
 
     protected Builder copyOf(Pasta value) { 
-      super.copyOf(instance);
+      super.copyOf(value);
       this.instance.setVendor(value.vendor);
       return this;
     }

diff --git a/...penapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java b/...penapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java
@@ -146,7 +146,7 @@ protected Builder(Pizza instance) {
     }
 
     protected Builder copyOf(Pizza value) { 
-      super.copyOf(instance);
+      super.copyOf(value);
       this.instance.setPizzaSize(value.pizzaSize);
       return this;
     }

diff --git a/...server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java b/...server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java
@@ -143,7 +143,7 @@ protected Builder(PizzaSpeziale instance) {
     }
 
     protected Builder copyOf(PizzaSpeziale value) { 
-      super.copyOf(instance);
+      super.copyOf(value);
       this.instance.setToppings(value.toppings);
       return this;
     }

diff --git a/...s/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java b/...s/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java
@@ -168,7 +168,7 @@ protected Builder(BigCat instance) {
     }
 
     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
@@ -131,7 +131,7 @@ protected Builder(Cat instance) {
     }
 
     protected Builder copyOf(Cat value) { 
-      super.copyOf(instance);
+      super.copyOf(value);
       this.instance.setDeclawed(value.declawed);
       return this;
     }

diff --git a/...tstore/springboot-useoptional/src/main/java/org/openapitools/model/ChildWithNullable.java b/...tstore/springboot-useoptional/src/main/java/org/openapitools/model/ChildWithNullable.java
@@ -126,7 +126,7 @@ protected Builder(ChildWithNullable instance) {
     }
 
     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
@@ -123,7 +123,7 @@ protected Builder(Dog instance) {
     }
 
     protected Builder copyOf(Dog value) { 
-      super.copyOf(instance);
+      super.copyOf(value);
       this.instance.setBreed(value.breed);
       return this;
     }