[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/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Bird.java

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

samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Category.java

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

samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DataQuery.java

@@ -113,17 +113,6 @@ public class DataQuery extends Query {
     this.date = date;
   }
 
-  @Override
-  public DataQuery id(Long id) {
-    this.setId(id);
-    return this;
-  }
-
-  @Override
-  public DataQuery outcomes(List<OutcomesEnum> outcomes) {
-    this.setOutcomes(outcomes);
-    return this;
-  }
 
   @Override
   public boolean equals(Object o) {

samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DataQueryAllOf.java

@@ -0,0 +1,154 @@
+/*
+ * Echo Server API
+ * Echo Server API
+ *
+ * The version of the OpenAPI document: 0.1.0
+ * Contact: team@openapitools.org
+ *
+ * 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.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+import java.time.OffsetDateTime;
+
+/**
+ * DataQueryAllOf
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class DataQueryAllOf {
+  public static final String SERIALIZED_NAME_SUFFIX = "suffix";
+  @SerializedName(SERIALIZED_NAME_SUFFIX)
+  private String suffix;
+
+  public static final String SERIALIZED_NAME_TEXT = "text";
+  @SerializedName(SERIALIZED_NAME_TEXT)
+  private String text;
+
+  public static final String SERIALIZED_NAME_DATE = "date";
+  @SerializedName(SERIALIZED_NAME_DATE)
+  private OffsetDateTime date;
+
+  public DataQueryAllOf() {
+  }
+
+  public DataQueryAllOf suffix(String suffix) {
+    
+    this.suffix = suffix;
+    return this;
+  }
+
+   /**
+   * test suffix
+   * @return suffix
+  **/
+  @javax.annotation.Nullable
+
+  public String getSuffix() {
+    return suffix;
+  }
+
+
+  public void setSuffix(String suffix) {
+    this.suffix = suffix;
+  }
+
+
+  public DataQueryAllOf text(String text) {
+    
+    this.text = text;
+    return this;
+  }
+
+   /**
+   * Some text containing white spaces
+   * @return text
+  **/
+  @javax.annotation.Nullable
+
+  public String getText() {
+    return text;
+  }
+
+
+  public void setText(String text) {
+    this.text = text;
+  }
+
+
+  public DataQueryAllOf date(OffsetDateTime date) {
+    
+    this.date = date;
+    return this;
+  }
+
+   /**
+   * A date
+   * @return date
+  **/
+  @javax.annotation.Nullable
+
+  public OffsetDateTime getDate() {
+    return date;
+  }
+
+
+  public void setDate(OffsetDateTime date) {
+    this.date = date;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    DataQueryAllOf dataQueryAllOf = (DataQueryAllOf) o;
+    return Objects.equals(this.suffix, dataQueryAllOf.suffix) &&
+        Objects.equals(this.text, dataQueryAllOf.text) &&
+        Objects.equals(this.date, dataQueryAllOf.date);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(suffix, text, date);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class DataQueryAllOf {\n");
+    sb.append("    suffix: ").append(toIndentedString(suffix)).append("\n");
+    sb.append("    text: ").append(toIndentedString(text)).append("\n");
+    sb.append("    date: ").append(toIndentedString(date)).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/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DefaultValue.java

@@ -347,6 +347,7 @@ public class DefaultValue {
     this.stringNullable = stringNullable;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java

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

samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Pet.java

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

samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Query.java

@@ -141,6 +141,7 @@ public class Query {
     this.outcomes = outcomes;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Tag.java

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

samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java

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

samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java

@@ -66,6 +66,7 @@ public class TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter {
     this.values = values;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {