[Java + Android] Update generated samples

samples/client/petstore/java/feign/src/main/java/io/swagger/client/FormAwareEncoder.java

@@ -14,7 +14,7 @@ import feign.codec.EncodeException;
 import feign.codec.Encoder;
 import feign.RequestTemplate;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:50.356+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
 public class FormAwareEncoder implements Encoder {
   public static final String UTF_8 = "utf-8";
   private static final String LINE_FEED = "\r\n";

samples/client/petstore/java/feign/src/main/java/io/swagger/client/StringUtil.java

@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:50.356+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).

samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/PetApi.java

@@ -6,16 +6,13 @@ import io.swagger.client.model.Pet;
 import io.swagger.client.model.InlineResponse200;
 import java.io.File;
 
-
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-19T15:53:31.820+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
 public interface PetApi extends ApiClient.Api {
 
 
@@ -31,7 +28,7 @@ public interface PetApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   void addPet(Pet body);
-  
+
   /**
    * Fake endpoint to test byte array in body parameter for adding a new pet to the store
    * 
@@ -44,7 +41,7 @@ public interface PetApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   void addPetUsingByteArray(byte[] body);
-  
+
   /**
    * Deletes a pet
    * 
@@ -59,7 +56,7 @@ public interface PetApi extends ApiClient.Api {
     "apiKey: {apiKey}"
   })
   void deletePet(@Param("petId") Long petId, @Param("apiKey") String apiKey);
-  
+
   /**
    * Finds Pets by status
    * Multiple status values can be provided with comma separated strings
@@ -72,7 +69,7 @@ public interface PetApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   List<Pet> findPetsByStatus(@Param("status") List<String> status);
-  
+
   /**
    * Finds Pets by tags
    * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
@@ -85,7 +82,7 @@ public interface PetApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   List<Pet> findPetsByTags(@Param("tags") List<String> tags);
-  
+
   /**
    * Find pet by ID
    * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
@@ -98,7 +95,7 @@ public interface PetApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   Pet getPetById(@Param("petId") Long petId);
-  
+
   /**
    * Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
    * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
@@ -111,7 +108,7 @@ public interface PetApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   InlineResponse200 getPetByIdInObject(@Param("petId") Long petId);
-  
+
   /**
    * Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
    * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
@@ -124,7 +121,7 @@ public interface PetApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   byte[] petPetIdtestingByteArraytrueGet(@Param("petId") Long petId);
-  
+
   /**
    * Update an existing pet
    * 
@@ -137,7 +134,7 @@ public interface PetApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   void updatePet(Pet body);
-  
+
   /**
    * Updates a pet in the store with form data
    * 
@@ -152,7 +149,7 @@ public interface PetApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   void updatePetWithForm(@Param("petId") String petId, @Param("name") String name, @Param("status") String status);
-  
+
   /**
    * uploads an image
    * 
@@ -167,6 +164,4 @@ public interface PetApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   void uploadFile(@Param("petId") Long petId, @Param("additionalMetadata") String additionalMetadata, @Param("file") File file);
-  
-
 }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/StoreApi.java

@@ -4,16 +4,13 @@ import io.swagger.client.ApiClient;
 
 import io.swagger.client.model.Order;
 
-
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-19T15:53:31.820+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
 public interface StoreApi extends ApiClient.Api {
 
 
@@ -29,7 +26,7 @@ public interface StoreApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   void deleteOrder(@Param("orderId") String orderId);
-  
+
   /**
    * Finds orders by status
    * A single status value can be provided as a string
@@ -42,7 +39,7 @@ public interface StoreApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   List<Order> findOrdersByStatus(@Param("status") String status);
-  
+
   /**
    * Returns pet inventories by status
    * Returns a map of status codes to quantities
@@ -54,7 +51,7 @@ public interface StoreApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   Map<String, Integer> getInventory();
-  
+
   /**
    * Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
    * Returns an arbitrary object which is actually a map of status codes to quantities
@@ -66,10 +63,10 @@ public interface StoreApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   Object getInventoryInObject();
-  
+
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+   * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return Order
    */
@@ -79,7 +76,7 @@ public interface StoreApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   Order getOrderById(@Param("orderId") String orderId);
-  
+
   /**
    * Place an order for a pet
    * 
@@ -92,6 +89,4 @@ public interface StoreApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   Order placeOrder(Order body);
-  
-
 }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/UserApi.java

@@ -4,16 +4,13 @@ import io.swagger.client.ApiClient;
 
 import io.swagger.client.model.User;
 
-
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-19T15:53:31.820+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
 public interface UserApi extends ApiClient.Api {
 
 
@@ -29,7 +26,7 @@ public interface UserApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   void createUser(User body);
-  
+
   /**
    * Creates list of users with given input array
    * 
@@ -42,7 +39,7 @@ public interface UserApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   void createUsersWithArrayInput(List<User> body);
-  
+
   /**
    * Creates list of users with given input array
    * 
@@ -55,7 +52,7 @@ public interface UserApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   void createUsersWithListInput(List<User> body);
-  
+
   /**
    * Delete user
    * This can only be done by the logged in user.
@@ -68,11 +65,11 @@ public interface UserApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   void deleteUser(@Param("username") String username);
-  
+
   /**
    * Get user by user name
    * 
-   * @param username The name that needs to be fetched. Use user1 for testing. (required)
+   * @param username The name that needs to be fetched. Use user1 for testing.  (required)
    * @return User
    */
   @RequestLine("GET /user/{username}")
@@ -81,7 +78,7 @@ public interface UserApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   User getUserByName(@Param("username") String username);
-  
+
   /**
    * Logs user into the system
    * 
@@ -95,7 +92,7 @@ public interface UserApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   String loginUser(@Param("username") String username, @Param("password") String password);
-  
+
   /**
    * Logs out current logged in user session
    * 
@@ -107,7 +104,7 @@ public interface UserApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   void logoutUser();
-  
+
   /**
    * Updated user
    * This can only be done by the logged in user.
@@ -121,6 +118,4 @@ public interface UserApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   void updateUser(@Param("username") String username, User body);
-  
-
 }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Animal.java

@@ -0,0 +1,73 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
+public class Animal   {
+  
+  private String className = null;
+
+  
+  /**
+   **/
+  public Animal className(String className) {
+    this.className = className;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", required = true, value = "")
+  @JsonProperty("className")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Animal animal = (Animal) o;
+    return Objects.equals(this.className, animal.className);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(className);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Animal {\n");
+    
+    sb.append("    className: ").append(toIndentedString(className)).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(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Cat.java

@@ -0,0 +1,95 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.client.model.Animal;
+
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
+public class Cat extends Animal  {
+  
+  private String className = null;
+  private Boolean declawed = null;
+
+  
+  /**
+   **/
+  public Cat className(String className) {
+    this.className = className;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", required = true, value = "")
+  @JsonProperty("className")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+
+  /**
+   **/
+  public Cat declawed(Boolean declawed) {
+    this.declawed = declawed;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("declawed")
+  public Boolean getDeclawed() {
+    return declawed;
+  }
+  public void setDeclawed(Boolean declawed) {
+    this.declawed = declawed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Cat cat = (Cat) o;
+    return Objects.equals(this.className, cat.className) &&
+        Objects.equals(this.declawed, cat.declawed) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(className, declawed, super.hashCode());
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Cat {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    className: ").append(toIndentedString(className)).append("\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(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Category.java

@@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:50.356+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
 public class Category   {
   
   private Long id = null;
@@ -32,7 +32,7 @@ public class Category   {
     this.id = id;
   }
 
-  
+
   /**
    **/
   public Category name(String name) {
@@ -49,7 +49,6 @@ public class Category   {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Dog.java

@@ -0,0 +1,95 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.client.model.Animal;
+
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
+public class Dog extends Animal  {
+  
+  private String className = null;
+  private String breed = null;
+
+  
+  /**
+   **/
+  public Dog className(String className) {
+    this.className = className;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", required = true, value = "")
+  @JsonProperty("className")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+
+  /**
+   **/
+  public Dog breed(String breed) {
+    this.breed = breed;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("breed")
+  public String getBreed() {
+    return breed;
+  }
+  public void setBreed(String breed) {
+    this.breed = breed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Dog dog = (Dog) o;
+    return Objects.equals(this.className, dog.className) &&
+        Objects.equals(this.breed, dog.breed) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(className, breed, super.hashCode());
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Dog {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    className: ").append(toIndentedString(className)).append("\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(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/FormatTest.java

@@ -0,0 +1,295 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
+public class FormatTest   {
+  
+  private Integer integer = null;
+  private Integer int32 = null;
+  private Long int64 = null;
+  private BigDecimal number = null;
+  private Float _float = null;
+  private Double _double = null;
+  private String string = null;
+  private byte[] _byte = null;
+  private byte[] binary = null;
+  private Date date = null;
+  private Date dateTime = null;
+  private String password = null;
+
+  
+  /**
+   **/
+  public FormatTest integer(Integer integer) {
+    this.integer = integer;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("integer")
+  public Integer getInteger() {
+    return integer;
+  }
+  public void setInteger(Integer integer) {
+    this.integer = integer;
+  }
+
+
+  /**
+   **/
+  public FormatTest int32(Integer int32) {
+    this.int32 = int32;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("int32")
+  public Integer getInt32() {
+    return int32;
+  }
+  public void setInt32(Integer int32) {
+    this.int32 = int32;
+  }
+
+
+  /**
+   **/
+  public FormatTest int64(Long int64) {
+    this.int64 = int64;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("int64")
+  public Long getInt64() {
+    return int64;
+  }
+  public void setInt64(Long int64) {
+    this.int64 = int64;
+  }
+
+
+  /**
+   **/
+  public FormatTest number(BigDecimal number) {
+    this.number = number;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", required = true, value = "")
+  @JsonProperty("number")
+  public BigDecimal getNumber() {
+    return number;
+  }
+  public void setNumber(BigDecimal number) {
+    this.number = number;
+  }
+
+
+  /**
+   **/
+  public FormatTest _float(Float _float) {
+    this._float = _float;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("float")
+  public Float getFloat() {
+    return _float;
+  }
+  public void setFloat(Float _float) {
+    this._float = _float;
+  }
+
+
+  /**
+   **/
+  public FormatTest _double(Double _double) {
+    this._double = _double;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("double")
+  public Double getDouble() {
+    return _double;
+  }
+  public void setDouble(Double _double) {
+    this._double = _double;
+  }
+
+
+  /**
+   **/
+  public FormatTest string(String string) {
+    this.string = string;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("string")
+  public String getString() {
+    return string;
+  }
+  public void setString(String string) {
+    this.string = string;
+  }
+
+
+  /**
+   **/
+  public FormatTest _byte(byte[] _byte) {
+    this._byte = _byte;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("byte")
+  public byte[] getByte() {
+    return _byte;
+  }
+  public void setByte(byte[] _byte) {
+    this._byte = _byte;
+  }
+
+
+  /**
+   **/
+  public FormatTest binary(byte[] binary) {
+    this.binary = binary;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("binary")
+  public byte[] getBinary() {
+    return binary;
+  }
+  public void setBinary(byte[] binary) {
+    this.binary = binary;
+  }
+
+
+  /**
+   **/
+  public FormatTest date(Date date) {
+    this.date = date;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("date")
+  public Date getDate() {
+    return date;
+  }
+  public void setDate(Date date) {
+    this.date = date;
+  }
+
+
+  /**
+   **/
+  public FormatTest dateTime(Date dateTime) {
+    this.dateTime = dateTime;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("dateTime")
+  public Date getDateTime() {
+    return dateTime;
+  }
+  public void setDateTime(Date dateTime) {
+    this.dateTime = dateTime;
+  }
+
+
+  /**
+   **/
+  public FormatTest password(String password) {
+    this.password = password;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("password")
+  public String getPassword() {
+    return password;
+  }
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FormatTest formatTest = (FormatTest) o;
+    return Objects.equals(this.integer, formatTest.integer) &&
+        Objects.equals(this.int32, formatTest.int32) &&
+        Objects.equals(this.int64, formatTest.int64) &&
+        Objects.equals(this.number, formatTest.number) &&
+        Objects.equals(this._float, formatTest._float) &&
+        Objects.equals(this._double, formatTest._double) &&
+        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._byte, formatTest._byte) &&
+        Objects.equals(this.binary, formatTest.binary) &&
+        Objects.equals(this.date, formatTest.date) &&
+        Objects.equals(this.dateTime, formatTest.dateTime) &&
+        Objects.equals(this.password, formatTest.password);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(integer, int32, int64, number, _float, _double, string, _byte, binary, date, dateTime, password);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FormatTest {\n");
+    
+    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
+    sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
+    sb.append("    number: ").append(toIndentedString(number)).append("\n");
+    sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
+    sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
+    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
+    sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
+    sb.append("    date: ").append(toIndentedString(date)).append("\n");
+    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
+    sb.append("    password: ").append(toIndentedString(password)).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(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/InlineResponse200.java

@@ -13,16 +13,12 @@ import java.util.List;
 
 
 
-
-
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-19T15:53:31.820+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
 public class InlineResponse200   {
   
-  private List<String> photoUrls = new ArrayList<String>();
-  private String name = null;
+  private List<Tag> tags = new ArrayList<Tag>();
   private Long id = null;
   private Object category = null;
-  private List<Tag> tags = new ArrayList<Tag>();
 
 
   public enum StatusEnum {
@@ -44,74 +40,8 @@ public class InlineResponse200   {
   }
 
   private StatusEnum status = null;
-
-  
-  /**
-   **/
-  public InlineResponse200 photoUrls(List<String> photoUrls) {
-    this.photoUrls = photoUrls;
-    return this;
-  }
-  
-  @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("photoUrls")
-  public List<String> getPhotoUrls() {
-    return photoUrls;
-  }
-  public void setPhotoUrls(List<String> photoUrls) {
-    this.photoUrls = photoUrls;
-  }
-
-  
-  /**
-   **/
-  public InlineResponse200 name(String name) {
-    this.name = name;
-    return this;
-  }
-  
-  @ApiModelProperty(example = "doggie", value = "")
-  @JsonProperty("name")
-  public String getName() {
-    return name;
-  }
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  
-  /**
-   **/
-  public InlineResponse200 id(Long id) {
-    this.id = id;
-    return this;
-  }
-  
-  @ApiModelProperty(example = "null", required = true, value = "")
-  @JsonProperty("id")
-  public Long getId() {
-    return id;
-  }
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  
-  /**
-   **/
-  public InlineResponse200 category(Object category) {
-    this.category = category;
-    return this;
-  }
-  
-  @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("category")
-  public Object getCategory() {
-    return category;
-  }
-  public void setCategory(Object category) {
-    this.category = category;
-  }
+  private String name = null;
+  private List<String> photoUrls = new ArrayList<String>();
 
   
   /**
@@ -130,7 +60,41 @@ public class InlineResponse200   {
     this.tags = tags;
   }
 
+
+  /**
+   **/
+  public InlineResponse200 id(Long id) {
+    this.id = id;
+    return this;
+  }
   
+  @ApiModelProperty(example = "null", required = true, value = "")
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+
+  /**
+   **/
+  public InlineResponse200 category(Object category) {
+    this.category = category;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("category")
+  public Object getCategory() {
+    return category;
+  }
+  public void setCategory(Object category) {
+    this.category = category;
+  }
+
+
   /**
    * pet status in the store
    **/
@@ -148,7 +112,40 @@ public class InlineResponse200   {
     this.status = status;
   }
 
+
+  /**
+   **/
+  public InlineResponse200 name(String name) {
+    this.name = name;
+    return this;
+  }
   
+  @ApiModelProperty(example = "doggie", value = "")
+  @JsonProperty("name")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  /**
+   **/
+  public InlineResponse200 photoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("photoUrls")
+  public List<String> getPhotoUrls() {
+    return photoUrls;
+  }
+  public void setPhotoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -159,17 +156,17 @@ public class InlineResponse200   {
       return false;
     }
     InlineResponse200 inlineResponse200 = (InlineResponse200) o;
-    return Objects.equals(this.photoUrls, inlineResponse200.photoUrls) &&
-        Objects.equals(this.name, inlineResponse200.name) &&
+    return Objects.equals(this.tags, inlineResponse200.tags) &&
         Objects.equals(this.id, inlineResponse200.id) &&
         Objects.equals(this.category, inlineResponse200.category) &&
-        Objects.equals(this.tags, inlineResponse200.tags) &&
-        Objects.equals(this.status, inlineResponse200.status);
+        Objects.equals(this.status, inlineResponse200.status) &&
+        Objects.equals(this.name, inlineResponse200.name) &&
+        Objects.equals(this.photoUrls, inlineResponse200.photoUrls);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(photoUrls, name, id, category, tags, status);
+    return Objects.hash(tags, id, category, status, name, photoUrls);
   }
 
   @Override
@@ -177,12 +174,12 @@ public class InlineResponse200   {
     StringBuilder sb = new StringBuilder();
     sb.append("class InlineResponse200 {\n");
     
-    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -199,5 +196,3 @@ public class InlineResponse200   {
   }
 }
 
-
-

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Model200Response.java

@@ -7,11 +7,12 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
+/**
+ * Model for testing model name starting with number
+ **/
 
-
-
-
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-19T15:53:31.820+08:00")
+@ApiModel(description = "Model for testing model name starting with number")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
 public class Model200Response   {
   
   private Integer name = null;
@@ -33,7 +34,6 @@ public class Model200Response   {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -74,5 +74,3 @@ public class Model200Response   {
   }
 }
 
-
-

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelReturn.java

@@ -7,11 +7,12 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
+/**
+ * Model for testing reserved words
+ **/
 
-
-
-
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-19T15:53:31.820+08:00")
+@ApiModel(description = "Model for testing reserved words")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
 public class ModelReturn   {
   
   private Integer _return = null;
@@ -33,7 +34,6 @@ public class ModelReturn   {
     this._return = _return;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -74,5 +74,3 @@ public class ModelReturn   {
   }
 }
 
-
-

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Name.java

@@ -7,11 +7,12 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
+/**
+ * Model for testing model name same as property name
+ **/
 
-
-
-
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-19T15:53:31.820+08:00")
+@ApiModel(description = "Model for testing model name same as property name")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
 public class Name   {
   
   private Integer name = null;
@@ -25,7 +26,7 @@ public class Name   {
     return this;
   }
   
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(example = "null", required = true, value = "")
   @JsonProperty("name")
   public Integer getName() {
     return name;
@@ -34,24 +35,13 @@ public class Name   {
     this.name = name;
   }
 
-  
-  /**
-   **/
-  public Name snakeCase(Integer snakeCase) {
-    this.snakeCase = snakeCase;
-    return this;
-  }
-  
+
   @ApiModelProperty(example = "null", value = "")
   @JsonProperty("snake_case")
   public Integer getSnakeCase() {
     return snakeCase;
   }
-  public void setSnakeCase(Integer snakeCase) {
-    this.snakeCase = snakeCase;
-  }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -94,5 +84,3 @@ public class Name   {
   }
 }
 
-
-

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Order.java

@@ -11,7 +11,7 @@ import java.util.Date;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:50.356+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
 public class Order   {
   
   private Long id = null;
@@ -48,7 +48,7 @@ public class Order   {
     return id;
   }
 
-  
+
   /**
    **/
   public Order petId(Long petId) {
@@ -65,7 +65,7 @@ public class Order   {
     this.petId = petId;
   }
 
-  
+
   /**
    **/
   public Order quantity(Integer quantity) {
@@ -82,7 +82,7 @@ public class Order   {
     this.quantity = quantity;
   }
 
-  
+
   /**
    **/
   public Order shipDate(Date shipDate) {
@@ -99,7 +99,7 @@ public class Order   {
     this.shipDate = shipDate;
   }
 
-  
+
   /**
    * Order Status
    **/
@@ -117,7 +117,7 @@ public class Order   {
     this.status = status;
   }
 
-  
+
   /**
    **/
   public Order complete(Boolean complete) {
@@ -134,7 +134,6 @@ public class Order   {
     this.complete = complete;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java

@@ -14,7 +14,7 @@ import java.util.List;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:50.356+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
 public class Pet   {
   
   private Long id = null;
@@ -61,7 +61,7 @@ public class Pet   {
     this.id = id;
   }
 
-  
+
   /**
    **/
   public Pet category(Category category) {
@@ -78,7 +78,7 @@ public class Pet   {
     this.category = category;
   }
 
-  
+
   /**
    **/
   public Pet name(String name) {
@@ -95,7 +95,7 @@ public class Pet   {
     this.name = name;
   }
 
-  
+
   /**
    **/
   public Pet photoUrls(List<String> photoUrls) {
@@ -112,7 +112,7 @@ public class Pet   {
     this.photoUrls = photoUrls;
   }
 
-  
+
   /**
    **/
   public Pet tags(List<Tag> tags) {
@@ -129,7 +129,7 @@ public class Pet   {
     this.tags = tags;
   }
 
-  
+
   /**
    * pet status in the store
    **/
@@ -147,7 +147,6 @@ public class Pet   {
     this.status = status;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SpecialModelName.java

@@ -9,9 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-
-
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-19T15:53:31.820+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
 public class SpecialModelName   {
   
   private Long specialPropertyName = null;
@@ -33,7 +31,6 @@ public class SpecialModelName   {
     this.specialPropertyName = specialPropertyName;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -74,5 +71,3 @@ public class SpecialModelName   {
   }
 }
 
-
-

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Tag.java

@@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:50.356+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
 public class Tag   {
   
   private Long id = null;
@@ -32,7 +32,7 @@ public class Tag   {
     this.id = id;
   }
 
-  
+
   /**
    **/
   public Tag name(String name) {
@@ -49,7 +49,6 @@ public class Tag   {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java

@@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:50.356+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
 public class User   {
   
   private Long id = null;
@@ -38,7 +38,7 @@ public class User   {
     this.id = id;
   }
 
-  
+
   /**
    **/
   public User username(String username) {
@@ -55,7 +55,7 @@ public class User   {
     this.username = username;
   }
 
-  
+
   /**
    **/
   public User firstName(String firstName) {
@@ -72,7 +72,7 @@ public class User   {
     this.firstName = firstName;
   }
 
-  
+
   /**
    **/
   public User lastName(String lastName) {
@@ -89,7 +89,7 @@ public class User   {
     this.lastName = lastName;
   }
 
-  
+
   /**
    **/
   public User email(String email) {
@@ -106,7 +106,7 @@ public class User   {
     this.email = email;
   }
 
-  
+
   /**
    **/
   public User password(String password) {
@@ -123,7 +123,7 @@ public class User   {
     this.password = password;
   }
 
-  
+
   /**
    **/
   public User phone(String phone) {
@@ -140,7 +140,7 @@ public class User   {
     this.phone = phone;
   }
 
-  
+
   /**
    * User Status
    **/
@@ -158,7 +158,6 @@ public class User   {
     this.userStatus = userStatus;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {