[Java/Spring] all-of and one-of Improvements and Fixes

samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java

@@ -89,6 +89,21 @@ public void setKind(KindEnum kind) {
     this.kind = kind;
   }
 
+  public BigCat declawed(Boolean declawed) {
+    super.setDeclawed(declawed);
+    return this;
+  }
+
+  public BigCat className(String className) {
+    super.setClassName(className);
+    return this;
+  }
+
+  public BigCat color(String color) {
+    super.setColor(color);
+    return this;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java

@@ -58,6 +58,16 @@ public void setDeclawed(Boolean declawed) {
     this.declawed = declawed;
   }
 
+  public Cat className(String className) {
+    super.setClassName(className);
+    return this;
+  }
+
+  public Cat color(String color) {
+    super.setColor(color);
+    return this;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Dog.java

@@ -49,6 +49,16 @@ public void setBreed(String breed) {
     this.breed = breed;
   }
 
+  public Dog className(String className) {
+    super.setClassName(className);
+    return this;
+  }
+
+  public Dog color(String color) {
+    super.setColor(color);
+    return this;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/openapi3/server/petstore/spring-boot-oneof/.openapi-generator/FILES

@@ -21,6 +21,7 @@ src/main/java/org/openapitools/model/FooRef.java
 src/main/java/org/openapitools/model/FooRefOrValue.java
 src/main/java/org/openapitools/model/Pasta.java
 src/main/java/org/openapitools/model/Pizza.java
+src/main/java/org/openapitools/model/PizzaSpeziale.java
 src/main/resources/application.properties
 src/main/resources/openapi.yaml
 src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java

samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java

@@ -115,6 +115,26 @@ public void setFoo(FooRefOrValue foo) {
     this.foo = foo;
   }
 
+  public Bar href(String href) {
+    super.setHref(href);
+    return this;
+  }
+
+  public Bar atSchemaLocation(String atSchemaLocation) {
+    super.setAtSchemaLocation(atSchemaLocation);
+    return this;
+  }
+
+  public Bar atBaseType(String atBaseType) {
+    super.setAtBaseType(atBaseType);
+    return this;
+  }
+
+  public Bar atType(String atType) {
+    super.setAtType(atType);
+    return this;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java

@@ -95,6 +95,31 @@ public void setFoo(FooRefOrValue foo) {
     this.foo = foo;
   }
 
+  public BarCreate href(String href) {
+    super.setHref(href);
+    return this;
+  }
+
+  public BarCreate id(String id) {
+    super.setId(id);
+    return this;
+  }
+
+  public BarCreate atSchemaLocation(String atSchemaLocation) {
+    super.setAtSchemaLocation(atSchemaLocation);
+    return this;
+  }
+
+  public BarCreate atBaseType(String atBaseType) {
+    super.setAtBaseType(atBaseType);
+    return this;
+  }
+
+  public BarCreate atType(String atType) {
+    super.setAtType(atType);
+    return this;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarRef.java

@@ -26,6 +26,41 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class BarRef extends EntityRef implements BarRefOrValue {
 
+  public BarRef name(String name) {
+    super.setName(name);
+    return this;
+  }
+
+  public BarRef atReferredType(String atReferredType) {
+    super.setAtReferredType(atReferredType);
+    return this;
+  }
+
+  public BarRef href(String href) {
+    super.setHref(href);
+    return this;
+  }
+
+  public BarRef id(String id) {
+    super.setId(id);
+    return this;
+  }
+
+  public BarRef atSchemaLocation(String atSchemaLocation) {
+    super.setAtSchemaLocation(atSchemaLocation);
+    return this;
+  }
+
+  public BarRef atBaseType(String atBaseType) {
+    super.setAtBaseType(atBaseType);
+    return this;
+  }
+
+  public BarRef atType(String atType) {
+    super.setAtType(atType);
+    return this;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Entity.java

@@ -14,6 +14,7 @@
 import org.openapitools.model.Foo;
 import org.openapitools.model.Pasta;
 import org.openapitools.model.Pizza;
+import org.openapitools.model.PizzaSpeziale;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
 import javax.validation.Valid;
@@ -38,7 +39,8 @@
   @JsonSubTypes.Type(value = BarCreate.class, name = "Bar_Create"),
   @JsonSubTypes.Type(value = Foo.class, name = "Foo"),
   @JsonSubTypes.Type(value = Pasta.class, name = "Pasta"),
-  @JsonSubTypes.Type(value = Pizza.class, name = "Pizza")
+  @JsonSubTypes.Type(value = Pizza.class, name = "Pizza"),
+  @JsonSubTypes.Type(value = PizzaSpeziale.class, name = "PizzaSpeziale")
 })
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")

samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java

@@ -70,6 +70,31 @@ public void setFooPropB(String fooPropB) {
     this.fooPropB = fooPropB;
   }
 
+  public Foo href(String href) {
+    super.setHref(href);
+    return this;
+  }
+
+  public Foo id(String id) {
+    super.setId(id);
+    return this;
+  }
+
+  public Foo atSchemaLocation(String atSchemaLocation) {
+    super.setAtSchemaLocation(atSchemaLocation);
+    return this;
+  }
+
+  public Foo atBaseType(String atBaseType) {
+    super.setAtBaseType(atBaseType);
+    return this;
+  }
+
+  public Foo atType(String atType) {
+    super.setAtType(atType);
+    return this;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java

@@ -48,6 +48,41 @@ public void setFoorefPropA(String foorefPropA) {
     this.foorefPropA = foorefPropA;
   }
 
+  public FooRef name(String name) {
+    super.setName(name);
+    return this;
+  }
+
+  public FooRef atReferredType(String atReferredType) {
+    super.setAtReferredType(atReferredType);
+    return this;
+  }
+
+  public FooRef href(String href) {
+    super.setHref(href);
+    return this;
+  }
+
+  public FooRef id(String id) {
+    super.setId(id);
+    return this;
+  }
+
+  public FooRef atSchemaLocation(String atSchemaLocation) {
+    super.setAtSchemaLocation(atSchemaLocation);
+    return this;
+  }
+
+  public FooRef atBaseType(String atBaseType) {
+    super.setAtBaseType(atBaseType);
+    return this;
+  }
+
+  public FooRef atType(String atType) {
+    super.setAtType(atType);
+    return this;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java

@@ -48,6 +48,31 @@ public void setVendor(String vendor) {
     this.vendor = vendor;
   }
 
+  public Pasta href(String href) {
+    super.setHref(href);
+    return this;
+  }
+
+  public Pasta id(String id) {
+    super.setId(id);
+    return this;
+  }
+
+  public Pasta atSchemaLocation(String atSchemaLocation) {
+    super.setAtSchemaLocation(atSchemaLocation);
+    return this;
+  }
+
+  public Pasta atBaseType(String atBaseType) {
+    super.setAtBaseType(atBaseType);
+    return this;
+  }
+
+  public Pasta atType(String atType) {
+    super.setAtType(atType);
+    return this;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java

@@ -7,7 +7,9 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import java.math.BigDecimal;
 import org.openapitools.model.Entity;
+import org.openapitools.model.PizzaSpeziale;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
 import javax.validation.Valid;
@@ -22,10 +24,65 @@
  * Pizza
  */
 
+@JsonIgnoreProperties(
+  value = "@type", // ignore manually set @type, it will be automatically generated by Jackson during serialization
+  allowSetters = true // allows the @type to be set during deserialization
+)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "@type", visible = true)
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = PizzaSpeziale.class, name = "PizzaSpeziale")
+})
 
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pizza extends Entity {
 
+  @JsonProperty("pizzaSize")
+  private BigDecimal pizzaSize;
+
+  public Pizza pizzaSize(BigDecimal pizzaSize) {
+    this.pizzaSize = pizzaSize;
+    return this;
+  }
+
+  /**
+   * Get pizzaSize
+   * @return pizzaSize
+  */
+  @Valid 
+  @Schema(name = "pizzaSize", required = false)
+  public BigDecimal getPizzaSize() {
+    return pizzaSize;
+  }
+
+  public void setPizzaSize(BigDecimal pizzaSize) {
+    this.pizzaSize = pizzaSize;
+  }
+
+  public Pizza href(String href) {
+    super.setHref(href);
+    return this;
+  }
+
+  public Pizza id(String id) {
+    super.setId(id);
+    return this;
+  }
+
+  public Pizza atSchemaLocation(String atSchemaLocation) {
+    super.setAtSchemaLocation(atSchemaLocation);
+    return this;
+  }
+
+  public Pizza atBaseType(String atBaseType) {
+    super.setAtBaseType(atBaseType);
+    return this;
+  }
+
+  public Pizza atType(String atType) {
+    super.setAtType(atType);
+    return this;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -34,19 +91,22 @@ public boolean equals(Object o) {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    return true;
+    Pizza pizza = (Pizza) o;
+    return Objects.equals(this.pizzaSize, pizza.pizzaSize) &&
+        super.equals(o);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(super.hashCode());
+    return Objects.hash(pizzaSize, super.hashCode());
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class Pizza {\n");
     sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    pizzaSize: ").append(toIndentedString(pizzaSize)).append("\n");
     sb.append("}");
     return sb.toString();
   }