partial fix

samples/client/echo_api/java/okhttp-gson-user-defined-templates/modelCopy/Category.java

@@ -25,11 +25,11 @@ import org.openapitools.client.JSON;
  * Category
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.10.0-SNAPSHOT")
+
 public class Category {
   public Category() {
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/echo_api/java/okhttp-gson-user-defined-templates/modelCopy/ModelApiResponse.java

@@ -25,11 +25,11 @@ import org.openapitools.client.JSON;
  * ModelApiResponse
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.10.0-SNAPSHOT")
+
 public class ModelApiResponse {
   public ModelApiResponse() {
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/echo_api/java/okhttp-gson-user-defined-templates/modelCopy/Order.java

@@ -25,11 +25,11 @@ import org.openapitools.client.JSON;
  * Order
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.10.0-SNAPSHOT")
+
 public class Order {
   public Order() {
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/echo_api/java/okhttp-gson-user-defined-templates/modelCopy/Pet.java

@@ -25,11 +25,11 @@ import org.openapitools.client.JSON;
  * Pet
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.10.0-SNAPSHOT")
+
 public class Pet {
   public Pet() {
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/echo_api/java/okhttp-gson-user-defined-templates/modelCopy/Tag.java

@@ -25,11 +25,11 @@ import org.openapitools.client.JSON;
  * Tag
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.10.0-SNAPSHOT")
+
 public class Tag {
   public Tag() {
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/echo_api/java/okhttp-gson-user-defined-templates/modelCopy/User.java

@@ -25,11 +25,11 @@ import org.openapitools.client.JSON;
  * User
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.10.0-SNAPSHOT")
+
 public class User {
   public User() {
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java

@@ -142,5 +142,4 @@ public abstract class AbstractOpenApiSchema {
     }
 
 
-
 }

samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Category.java

@@ -49,16 +49,15 @@ import org.openapitools.client.JSON;
  * A category for a pet
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.10.0-SNAPSHOT")
+
 public class Category {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
-  @javax.annotation.Nullable
-  private Long id;
+  @javax.annotation.Nullable  private Long id;
 
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
-  @javax.annotation.Nullable
-  private String name;
+  @javax.annotation.Nullable  private String name;
 
   public Category() {
   }
@@ -72,8 +71,7 @@ public class Category {
    * Get id
    * @return id
    */
-  @javax.annotation.Nullable
-  public Long getId() {
+  @javax.annotation.Nullable  public Long getId() {
     return id;
   }
 
@@ -91,8 +89,7 @@ public class Category {
    * Get name
    * @return name
    */
-  @javax.annotation.Nullable
-  public String getName() {
+  @javax.annotation.Nullable  public String getName() {
     return name;
   }
 
@@ -101,7 +98,6 @@ public class Category {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/ModelApiResponse.java

@@ -49,21 +49,19 @@ import org.openapitools.client.JSON;
  * Describes the result of uploading an image resource
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.10.0-SNAPSHOT")
+
 public class ModelApiResponse {
   public static final String SERIALIZED_NAME_CODE = "code";
   @SerializedName(SERIALIZED_NAME_CODE)
-  @javax.annotation.Nullable
-  private Integer code;
+  @javax.annotation.Nullable  private Integer code;
 
   public static final String SERIALIZED_NAME_TYPE = "type";
   @SerializedName(SERIALIZED_NAME_TYPE)
-  @javax.annotation.Nullable
-  private String type;
+  @javax.annotation.Nullable  private String type;
 
   public static final String SERIALIZED_NAME_MESSAGE = "message";
   @SerializedName(SERIALIZED_NAME_MESSAGE)
-  @javax.annotation.Nullable
-  private String message;
+  @javax.annotation.Nullable  private String message;
 
   public ModelApiResponse() {
   }
@@ -77,8 +75,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
    */
-  @javax.annotation.Nullable
-  public Integer getCode() {
+  @javax.annotation.Nullable  public Integer getCode() {
     return code;
   }
 
@@ -96,8 +93,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
    */
-  @javax.annotation.Nullable
-  public String getType() {
+  @javax.annotation.Nullable  public String getType() {
     return type;
   }
 
@@ -115,8 +111,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
    */
-  @javax.annotation.Nullable
-  public String getMessage() {
+  @javax.annotation.Nullable  public String getMessage() {
     return message;
   }
 
@@ -125,7 +120,6 @@ public class ModelApiResponse {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Order.java

@@ -50,26 +50,23 @@ import org.openapitools.client.JSON;
  * An order for a pets from the pet store
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.10.0-SNAPSHOT")
+
 public class Order {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
-  @javax.annotation.Nullable
-  private Long id;
+  @javax.annotation.Nullable  private Long id;
 
   public static final String SERIALIZED_NAME_PET_ID = "petId";
   @SerializedName(SERIALIZED_NAME_PET_ID)
-  @javax.annotation.Nullable
-  private Long petId;
+  @javax.annotation.Nullable  private Long petId;
 
   public static final String SERIALIZED_NAME_QUANTITY = "quantity";
   @SerializedName(SERIALIZED_NAME_QUANTITY)
-  @javax.annotation.Nullable
-  private Integer quantity;
+  @javax.annotation.Nullable  private Integer quantity;
 
   public static final String SERIALIZED_NAME_SHIP_DATE = "shipDate";
   @SerializedName(SERIALIZED_NAME_SHIP_DATE)
-  @javax.annotation.Nullable
-  private OffsetDateTime shipDate;
+  @javax.annotation.Nullable  private OffsetDateTime shipDate;
 
   /**
    * Order Status
@@ -124,16 +121,13 @@ public class Order {
       StatusEnum.fromValue(value);
     }
   }
-
   public static final String SERIALIZED_NAME_STATUS = "status";
   @SerializedName(SERIALIZED_NAME_STATUS)
-  @javax.annotation.Nullable
-  private StatusEnum status;
+  @javax.annotation.Nullable  private StatusEnum status;
 
   public static final String SERIALIZED_NAME_COMPLETE = "complete";
   @SerializedName(SERIALIZED_NAME_COMPLETE)
-  @javax.annotation.Nullable
-  private Boolean complete = false;
+  @javax.annotation.Nullable  private Boolean complete = false;
 
   public Order() {
   }
@@ -147,8 +141,7 @@ public class Order {
    * Get id
    * @return id
    */
-  @javax.annotation.Nullable
-  public Long getId() {
+  @javax.annotation.Nullable  public Long getId() {
     return id;
   }
 
@@ -166,8 +159,7 @@ public class Order {
    * Get petId
    * @return petId
    */
-  @javax.annotation.Nullable
-  public Long getPetId() {
+  @javax.annotation.Nullable  public Long getPetId() {
     return petId;
   }
 
@@ -185,8 +177,7 @@ public class Order {
    * Get quantity
    * @return quantity
    */
-  @javax.annotation.Nullable
-  public Integer getQuantity() {
+  @javax.annotation.Nullable  public Integer getQuantity() {
     return quantity;
   }
 
@@ -204,8 +195,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
    */
-  @javax.annotation.Nullable
-  public OffsetDateTime getShipDate() {
+  @javax.annotation.Nullable  public OffsetDateTime getShipDate() {
     return shipDate;
   }
 
@@ -223,8 +213,7 @@ public class Order {
    * Order Status
    * @return status
    */
-  @javax.annotation.Nullable
-  public StatusEnum getStatus() {
+  @javax.annotation.Nullable  public StatusEnum getStatus() {
     return status;
   }
 
@@ -242,8 +231,7 @@ public class Order {
    * Get complete
    * @return complete
    */
-  @javax.annotation.Nullable
-  public Boolean getComplete() {
+  @javax.annotation.Nullable  public Boolean getComplete() {
     return complete;
   }
 
@@ -252,7 +240,6 @@ public class Order {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Pet.java

@@ -53,31 +53,27 @@ import org.openapitools.client.JSON;
  * A pet for sale in the pet store
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.10.0-SNAPSHOT")
+
 public class Pet {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
-  @javax.annotation.Nullable
-  private Long id;
+  @javax.annotation.Nullable  private Long id;
 
   public static final String SERIALIZED_NAME_CATEGORY = "category";
   @SerializedName(SERIALIZED_NAME_CATEGORY)
-  @javax.annotation.Nullable
-  private Category category;
+  @javax.annotation.Nullable  private Category category;
 
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
-  @javax.annotation.Nonnull
-  private String name;
+  @javax.annotation.Nonnull  private String name;
 
   public static final String SERIALIZED_NAME_PHOTO_URLS = "photoUrls";
   @SerializedName(SERIALIZED_NAME_PHOTO_URLS)
-  @javax.annotation.Nonnull
-  private List<String> photoUrls = new ArrayList<>();
+  @javax.annotation.Nonnull  private List<String> photoUrls = new ArrayList<>();
 
   public static final String SERIALIZED_NAME_TAGS = "tags";
   @SerializedName(SERIALIZED_NAME_TAGS)
-  @javax.annotation.Nullable
-  private List<Tag> tags = new ArrayList<>();
+  @javax.annotation.Nullable  private List<Tag> tags = new ArrayList<>();
 
   /**
    * pet status in the store
@@ -132,12 +128,10 @@ public class Pet {
       StatusEnum.fromValue(value);
     }
   }
-
   public static final String SERIALIZED_NAME_STATUS = "status";
   @Deprecated
   @SerializedName(SERIALIZED_NAME_STATUS)
-  @javax.annotation.Nullable
-  private StatusEnum status;
+  @javax.annotation.Nullable  private StatusEnum status;
 
   public Pet() {
   }
@@ -151,8 +145,7 @@ public class Pet {
    * Get id
    * @return id
    */
-  @javax.annotation.Nullable
-  public Long getId() {
+  @javax.annotation.Nullable  public Long getId() {
     return id;
   }
 
@@ -170,8 +163,7 @@ public class Pet {
    * Get category
    * @return category
    */
-  @javax.annotation.Nullable
-  public Category getCategory() {
+  @javax.annotation.Nullable  public Category getCategory() {
     return category;
   }
 
@@ -189,8 +181,7 @@ public class Pet {
    * Get name
    * @return name
    */
-  @javax.annotation.Nonnull
-  public String getName() {
+  @javax.annotation.Nonnull  public String getName() {
     return name;
   }
 
@@ -216,8 +207,7 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
    */
-  @javax.annotation.Nonnull
-  public List<String> getPhotoUrls() {
+  @javax.annotation.Nonnull  public List<String> getPhotoUrls() {
     return photoUrls;
   }
 
@@ -243,8 +233,7 @@ public class Pet {
    * Get tags
    * @return tags
    */
-  @javax.annotation.Nullable
-  public List<Tag> getTags() {
+  @javax.annotation.Nullable  public List<Tag> getTags() {
     return tags;
   }
 
@@ -265,8 +254,7 @@ public class Pet {
    * @deprecated
    */
   @Deprecated
-  @javax.annotation.Nullable
-  public StatusEnum getStatus() {
+  @javax.annotation.Nullable  public StatusEnum getStatus() {
     return status;
   }
 
@@ -276,7 +264,6 @@ public class Pet {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Tag.java

@@ -49,16 +49,15 @@ import org.openapitools.client.JSON;
  * A tag for a pet
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.10.0-SNAPSHOT")
+
 public class Tag {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
-  @javax.annotation.Nullable
-  private Long id;
+  @javax.annotation.Nullable  private Long id;
 
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
-  @javax.annotation.Nullable
-  private String name;
+  @javax.annotation.Nullable  private String name;
 
   public Tag() {
   }
@@ -72,8 +71,7 @@ public class Tag {
    * Get id
    * @return id
    */
-  @javax.annotation.Nullable
-  public Long getId() {
+  @javax.annotation.Nullable  public Long getId() {
     return id;
   }
 
@@ -91,8 +89,7 @@ public class Tag {
    * Get name
    * @return name
    */
-  @javax.annotation.Nullable
-  public String getName() {
+  @javax.annotation.Nullable  public String getName() {
     return name;
   }
 
@@ -101,7 +98,6 @@ public class Tag {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/User.java

@@ -49,46 +49,39 @@ import org.openapitools.client.JSON;
  * A User who is purchasing from the pet store
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.10.0-SNAPSHOT")
+
 public class User {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
-  @javax.annotation.Nullable
-  private Long id;
+  @javax.annotation.Nullable  private Long id;
 
   public static final String SERIALIZED_NAME_USERNAME = "username";
   @SerializedName(SERIALIZED_NAME_USERNAME)
-  @javax.annotation.Nullable
-  private String username;
+  @javax.annotation.Nullable  private String username;
 
   public static final String SERIALIZED_NAME_FIRST_NAME = "firstName";
   @SerializedName(SERIALIZED_NAME_FIRST_NAME)
-  @javax.annotation.Nullable
-  private String firstName;
+  @javax.annotation.Nullable  private String firstName;
 
   public static final String SERIALIZED_NAME_LAST_NAME = "lastName";
   @SerializedName(SERIALIZED_NAME_LAST_NAME)
-  @javax.annotation.Nullable
-  private String lastName;
+  @javax.annotation.Nullable  private String lastName;
 
   public static final String SERIALIZED_NAME_EMAIL = "email";
   @SerializedName(SERIALIZED_NAME_EMAIL)
-  @javax.annotation.Nullable
-  private String email;
+  @javax.annotation.Nullable  private String email;
 
   public static final String SERIALIZED_NAME_PASSWORD = "password";
   @SerializedName(SERIALIZED_NAME_PASSWORD)
-  @javax.annotation.Nullable
-  private String password;
+  @javax.annotation.Nullable  private String password;
 
   public static final String SERIALIZED_NAME_PHONE = "phone";
   @SerializedName(SERIALIZED_NAME_PHONE)
-  @javax.annotation.Nullable
-  private String phone;
+  @javax.annotation.Nullable  private String phone;
 
   public static final String SERIALIZED_NAME_USER_STATUS = "userStatus";
   @SerializedName(SERIALIZED_NAME_USER_STATUS)
-  @javax.annotation.Nullable
-  private Integer userStatus;
+  @javax.annotation.Nullable  private Integer userStatus;
 
   public User() {
   }
@@ -102,8 +95,7 @@ public class User {
    * Get id
    * @return id
    */
-  @javax.annotation.Nullable
-  public Long getId() {
+  @javax.annotation.Nullable  public Long getId() {
     return id;
   }
 
@@ -121,8 +113,7 @@ public class User {
    * Get username
    * @return username
    */
-  @javax.annotation.Nullable
-  public String getUsername() {
+  @javax.annotation.Nullable  public String getUsername() {
     return username;
   }
 
@@ -140,8 +131,7 @@ public class User {
    * Get firstName
    * @return firstName
    */
-  @javax.annotation.Nullable
-  public String getFirstName() {
+  @javax.annotation.Nullable  public String getFirstName() {
     return firstName;
   }
 
@@ -159,8 +149,7 @@ public class User {
    * Get lastName
    * @return lastName
    */
-  @javax.annotation.Nullable
-  public String getLastName() {
+  @javax.annotation.Nullable  public String getLastName() {
     return lastName;
   }
 
@@ -178,8 +167,7 @@ public class User {
    * Get email
    * @return email
    */
-  @javax.annotation.Nullable
-  public String getEmail() {
+  @javax.annotation.Nullable  public String getEmail() {
     return email;
   }
 
@@ -197,8 +185,7 @@ public class User {
    * Get password
    * @return password
    */
-  @javax.annotation.Nullable
-  public String getPassword() {
+  @javax.annotation.Nullable  public String getPassword() {
     return password;
   }
 
@@ -216,8 +203,7 @@ public class User {
    * Get phone
    * @return phone
    */
-  @javax.annotation.Nullable
-  public String getPhone() {
+  @javax.annotation.Nullable  public String getPhone() {
     return phone;
   }
 
@@ -235,8 +221,7 @@ public class User {
    * User Status
    * @return userStatus
    */
-  @javax.annotation.Nullable
-  public Integer getUserStatus() {
+  @javax.annotation.Nullable  public Integer getUserStatus() {
     return userStatus;
   }
 
@@ -245,7 +230,6 @@ public class User {
   }
 
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {