[Java-Feign]: model combining properties and additionalProperties (#16546)

* [Java-Feign]: model combining properties and additionalProperties (#6146)

* update samples

---------

Co-authored-by: François Dodé <francois.dode@dawex.com>

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java

@@ -110,6 +110,7 @@ public class AdditionalPropertiesClass {
     this.mapOfMapProperty = mapOfMapProperty;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java

@@ -93,6 +93,7 @@ public class AllOfWithSingleRef {
     this.singleRefType = singleRefType;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java

@@ -105,6 +105,7 @@ public class Animal {
     this.color = color;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java

@@ -74,6 +74,7 @@ public class ArrayOfArrayOfNumberOnly {
     this.arrayArrayNumber = arrayArrayNumber;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java

@@ -74,6 +74,7 @@ public class ArrayOfNumberOnly {
     this.arrayNumber = arrayNumber;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java

@@ -150,6 +150,7 @@ public class ArrayTest {
     this.arrayArrayOfModel = arrayArrayOfModel;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Capitalization.java

@@ -212,6 +212,7 @@ public class Capitalization {
     this.ATT_NAME = ATT_NAME;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java

@@ -73,17 +73,6 @@ public class Cat extends Animal {
     this.declawed = declawed;
   }
 
-  @Override
-  public Cat className(String className) {
-    this.setClassName(className);
-    return this;
-  }
-
-  @Override
-  public Cat color(String color) {
-    this.setColor(color);
-    return this;
-  }
 
   @Override
   public boolean equals(Object o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/CatAllOf.java

@@ -0,0 +1,105 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * CatAllOf
+ */
+@JsonPropertyOrder({
+  CatAllOf.JSON_PROPERTY_DECLAWED
+})
+@JsonTypeName("Cat_allOf")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class CatAllOf {
+  public static final String JSON_PROPERTY_DECLAWED = "declawed";
+  private Boolean declawed;
+
+  public CatAllOf() {
+  }
+
+  public CatAllOf declawed(Boolean declawed) {
+    
+    this.declawed = declawed;
+    return this;
+  }
+
+   /**
+   * Get declawed
+   * @return declawed
+  **/
+  @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_DECLAWED)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Boolean isDeclawed() {
+    return declawed;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_DECLAWED)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setDeclawed(Boolean declawed) {
+    this.declawed = declawed;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    CatAllOf catAllOf = (CatAllOf) o;
+    return Objects.equals(this.declawed, catAllOf.declawed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(declawed);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class CatAllOf {\n");
+    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Category.java

@@ -92,6 +92,7 @@ public class Category {
     this.name = name;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ClassModel.java

@@ -62,6 +62,7 @@ public class ClassModel {
     this.propertyClass = propertyClass;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Client.java

@@ -62,6 +62,7 @@ public class Client {
     this.client = client;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DeprecatedObject.java

@@ -64,6 +64,7 @@ public class DeprecatedObject {
     this.name = name;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java

@@ -73,17 +73,6 @@ public class Dog extends Animal {
     this.breed = breed;
   }
 
-  @Override
-  public Dog className(String className) {
-    this.setClassName(className);
-    return this;
-  }
-
-  @Override
-  public Dog color(String color) {
-    this.setColor(color);
-    return this;
-  }
 
   @Override
   public boolean equals(Object o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DogAllOf.java

@@ -0,0 +1,105 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * DogAllOf
+ */
+@JsonPropertyOrder({
+  DogAllOf.JSON_PROPERTY_BREED
+})
+@JsonTypeName("Dog_allOf")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class DogAllOf {
+  public static final String JSON_PROPERTY_BREED = "breed";
+  private String breed;
+
+  public DogAllOf() {
+  }
+
+  public DogAllOf breed(String breed) {
+    
+    this.breed = breed;
+    return this;
+  }
+
+   /**
+   * Get breed
+   * @return breed
+  **/
+  @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_BREED)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getBreed() {
+    return breed;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_BREED)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setBreed(String breed) {
+    this.breed = breed;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    DogAllOf dogAllOf = (DogAllOf) o;
+    return Objects.equals(this.breed, dogAllOf.breed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(breed);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class DogAllOf {\n");
+    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java

@@ -173,6 +173,7 @@ public class EnumArrays {
     this.arrayEnum = arrayEnum;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java

@@ -433,6 +433,7 @@ public class EnumTest {
     this.outerEnumIntegerDefaultValue = outerEnumIntegerDefaultValue;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java

@@ -104,6 +104,7 @@ public class FakeBigDecimalMap200Response {
     this.someMap = someMap;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/File.java

@@ -62,6 +62,7 @@ public class File {
     this.sourceURI = sourceURI;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java

@@ -104,6 +104,7 @@ public class FileSchemaTestClass {
     this.files = files;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Foo.java

@@ -62,6 +62,7 @@ public class Foo {
     this.bar = bar;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java

@@ -64,6 +64,7 @@ public class FooGetDefaultResponse {
     this.string = string;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java

@@ -528,6 +528,7 @@ public class FormatTest {
     this.patternWithDigitsAndDelimiter = patternWithDigitsAndDelimiter;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java

@@ -81,6 +81,7 @@ public class HasOnlyReadOnly {
 
 
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HealthCheckResult.java

@@ -74,6 +74,7 @@ public class HealthCheckResult {
     this.nullableMessage = JsonNullable.<String>of(nullableMessage);
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java

@@ -221,6 +221,7 @@ public class MapTest {
     this.indirectMap = indirectMap;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -135,6 +135,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
     this.map = map;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Model200Response.java

@@ -93,6 +93,7 @@ public class Model200Response {
     this.propertyClass = propertyClass;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelApiResponse.java

@@ -123,6 +123,7 @@ public class ModelApiResponse {
     this.message = message;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelList.java

@@ -63,6 +63,7 @@ public class ModelList {
     this._123list = _123list;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelReturn.java

@@ -63,6 +63,7 @@ public class ModelReturn {
     this._return = _return;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Name.java

@@ -140,6 +140,7 @@ public class Name {
 
 
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NullableClass.java

@@ -13,6 +13,10 @@
 
 package org.openapitools.client.model;
 
+import java.util.Map;
+import java.util.HashMap;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import java.util.Objects;
 import java.util.Arrays;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -549,6 +553,50 @@ public class NullableClass extends HashMap<String, Object> {
     this.objectItemsNullable = objectItemsNullable;
   }
 
+  /**
+   * A container for additional, undeclared properties.
+   * This is a holder for any undeclared properties as specified with
+   * the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value.
+   * If the property does not already exist, create it otherwise replace it.
+   * @param key the name of the property
+   * @param value the value of the property
+   * @return self reference
+   */
+  @JsonAnySetter
+  public NullableClass putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+        this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) properties.
+   * @return the additional (undeclared) properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   * @param key the name of the property
+   * @return the additional (undeclared) property with the specified name
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+        return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NumberOnly.java

@@ -63,6 +63,7 @@ public class NumberOnly {
     this.justNumber = justNumber;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java

@@ -171,6 +171,7 @@ public class ObjectWithDeprecatedFields {
     this.bars = bars;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java

@@ -250,6 +250,7 @@ public class Order {
     this.complete = complete;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterComposite.java

@@ -123,6 +123,7 @@ public class OuterComposite {
     this.myBoolean = myBoolean;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java

@@ -63,6 +63,7 @@ public class OuterObjectWithEnumProperty {
     this.value = value;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java

@@ -274,6 +274,7 @@ public class Pet {
     this.status = status;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java

@@ -89,6 +89,7 @@ public class ReadOnlyFirst {
     this.baz = baz;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/SpecialModelName.java

@@ -63,6 +63,7 @@ public class SpecialModelName {
     this.$specialPropertyName = $specialPropertyName;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Tag.java

@@ -92,6 +92,7 @@ public class Tag {
     this.name = name;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/User.java

@@ -272,6 +272,7 @@ public class User {
     this.userStatus = userStatus;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {