[java][resttemplate] Fix model combining properties and additional properties (#19706)

samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/Bird.java

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

samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/Category.java

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

samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/DataQuery.java

@@ -129,6 +129,7 @@ public class DataQuery extends Query {
     this.date = date;
   }
 
+
   @Override
   public DataQuery id(@javax.annotation.Nullable Long id) {
     this.setId(id);

samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/DefaultValue.java

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

samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java

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

samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java

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

samples/client/echo_api/java/resttemplate/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/resttemplate/src/main/java/org/openapitools/client/model/Tag.java

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

samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java

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

samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java

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

samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java

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