[Java + Android] Update generated samples

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiException.java

@@ -3,7 +3,7 @@ package io.swagger.client;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:51.831+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:34.419+02:00")
 public class ApiException extends Exception {
   private int code = 0;
   private Map<String, List<String>> responseHeaders = null;

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Configuration.java

@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:51.831+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:34.419+02:00")
 public class Configuration {
   private static ApiClient defaultApiClient = new ApiClient();
 

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Pair.java

@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:51.831+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:34.419+02:00")
 public class Pair {
     private String name = "";
     private String value = "";

samples/client/petstore/java/okhttp-gson/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:51.831+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:34.419+02:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/PetApi.java

@@ -46,7 +46,6 @@ public class PetApi {
     this.apiClient = apiClient;
   }
 
-  
   /* Build call for addPet */
   private Call addPetCall(Pet body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = body;
@@ -144,14 +143,13 @@ public class PetApi {
     apiClient.executeAsync(call, callback);
     return call;
   }
-  
   /* Build call for addPetUsingByteArray */
   private Call addPetUsingByteArrayCall(byte[] body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = body;
     
 
     // create path and map variables
-    String localVarPath = "/pet?testing_byte_array=true".replaceAll("\\{format\\}","json");
+    String localVarPath = "/pet?testing_byte_array=true".replaceAll("\\{format\\}","json");
 
     List<Pair> localVarQueryParams = new ArrayList<Pair>();
 
@@ -242,7 +240,6 @@ public class PetApi {
     apiClient.executeAsync(call, callback);
     return call;
   }
-  
   /* Build call for deletePet */
   private Call deletePetCall(Long petId, String apiKey, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
@@ -351,7 +348,6 @@ public class PetApi {
     apiClient.executeAsync(call, callback);
     return call;
   }
-  
   /* Build call for findPetsByStatus */
   private Call findPetsByStatusCall(List<String> status, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
@@ -455,7 +451,6 @@ public class PetApi {
     apiClient.executeAsync(call, localVarReturnType, callback);
     return call;
   }
-  
   /* Build call for findPetsByTags */
   private Call findPetsByTagsCall(List<String> tags, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
@@ -559,7 +554,6 @@ public class PetApi {
     apiClient.executeAsync(call, localVarReturnType, callback);
     return call;
   }
-  
   /* Build call for getPetById */
   private Call getPetByIdCall(Long petId, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
@@ -604,7 +598,7 @@ public class PetApi {
       });
     }
 
-    String[] localVarAuthNames = new String[] { "petstore_auth", "api_key" };
+    String[] localVarAuthNames = new String[] { "api_key", "petstore_auth" };
     return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
   }
 
@@ -667,7 +661,6 @@ public class PetApi {
     apiClient.executeAsync(call, localVarReturnType, callback);
     return call;
   }
-  
   /* Build call for getPetByIdInObject */
   private Call getPetByIdInObjectCall(Long petId, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
@@ -679,7 +672,7 @@ public class PetApi {
     
 
     // create path and map variables
-    String localVarPath = "/pet/{petId}?response=inline_arbitrary_object".replaceAll("\\{format\\}","json")
+    String localVarPath = "/pet/{petId}?response&#x3D;inline_arbitrary_object".replaceAll("\\{format\\}","json")
       .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
 
     List<Pair> localVarQueryParams = new ArrayList<Pair>();
@@ -712,7 +705,7 @@ public class PetApi {
       });
     }
 
-    String[] localVarAuthNames = new String[] { "petstore_auth", "api_key" };
+    String[] localVarAuthNames = new String[] { "api_key", "petstore_auth" };
     return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
   }
 
@@ -775,7 +768,6 @@ public class PetApi {
     apiClient.executeAsync(call, localVarReturnType, callback);
     return call;
   }
-  
   /* Build call for petPetIdtestingByteArraytrueGet */
   private Call petPetIdtestingByteArraytrueGetCall(Long petId, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
@@ -787,7 +779,7 @@ public class PetApi {
     
 
     // create path and map variables
-    String localVarPath = "/pet/{petId}?testing_byte_array=true".replaceAll("\\{format\\}","json")
+    String localVarPath = "/pet/{petId}?testing_byte_array&#x3D;true".replaceAll("\\{format\\}","json")
       .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
 
     List<Pair> localVarQueryParams = new ArrayList<Pair>();
@@ -820,7 +812,7 @@ public class PetApi {
       });
     }
 
-    String[] localVarAuthNames = new String[] { "petstore_auth", "api_key" };
+    String[] localVarAuthNames = new String[] { "api_key", "petstore_auth" };
     return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
   }
 
@@ -883,7 +875,6 @@ public class PetApi {
     apiClient.executeAsync(call, localVarReturnType, callback);
     return call;
   }
-  
   /* Build call for updatePet */
   private Call updatePetCall(Pet body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = body;
@@ -981,7 +972,6 @@ public class PetApi {
     apiClient.executeAsync(call, callback);
     return call;
   }
-  
   /* Build call for updatePetWithForm */
   private Call updatePetWithFormCall(String petId, String name, String status, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
@@ -1095,7 +1085,6 @@ public class PetApi {
     apiClient.executeAsync(call, callback);
     return call;
   }
-  
   /* Build call for uploadFile */
   private Call uploadFileCall(Long petId, String additionalMetadata, File file, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
@@ -1209,5 +1198,4 @@ public class PetApi {
     apiClient.executeAsync(call, callback);
     return call;
   }
-  
 }

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/StoreApi.java

@@ -44,7 +44,6 @@ public class StoreApi {
     this.apiClient = apiClient;
   }
 
-  
   /* Build call for deleteOrder */
   private Call deleteOrderCall(String orderId, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
@@ -148,7 +147,6 @@ public class StoreApi {
     apiClient.executeAsync(call, callback);
     return call;
   }
-  
   /* Build call for findOrdersByStatus */
   private Call findOrdersByStatusCall(String status, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
@@ -252,7 +250,6 @@ public class StoreApi {
     apiClient.executeAsync(call, localVarReturnType, callback);
     return call;
   }
-  
   /* Build call for getInventory */
   private Call getInventoryCall(final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
@@ -351,14 +348,13 @@ public class StoreApi {
     apiClient.executeAsync(call, localVarReturnType, callback);
     return call;
   }
-  
   /* Build call for getInventoryInObject */
   private Call getInventoryInObjectCall(final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
     
 
     // create path and map variables
-    String localVarPath = "/store/inventory?response=arbitrary_object".replaceAll("\\{format\\}","json");
+    String localVarPath = "/store/inventory?response=arbitrary_object".replaceAll("\\{format\\}","json");
 
     List<Pair> localVarQueryParams = new ArrayList<Pair>();
 
@@ -450,7 +446,6 @@ public class StoreApi {
     apiClient.executeAsync(call, localVarReturnType, callback);
     return call;
   }
-  
   /* Build call for getOrderById */
   private Call getOrderByIdCall(String orderId, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
@@ -495,13 +490,13 @@ public class StoreApi {
       });
     }
 
-    String[] localVarAuthNames = new String[] { "test_api_key_query", "test_api_key_header" };
+    String[] localVarAuthNames = new String[] { "test_api_key_header", "test_api_key_query" };
     return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
   }
 
   /**
    * 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
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
@@ -513,7 +508,7 @@ public class StoreApi {
 
   /**
    * 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 ApiResponse<Order>
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
@@ -526,7 +521,7 @@ public class StoreApi {
 
   /**
    * Find purchase order by ID (asynchronously)
-   * 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)
    * @param callback The callback to be executed when the API call finishes
    * @return The request call
@@ -558,7 +553,6 @@ public class StoreApi {
     apiClient.executeAsync(call, localVarReturnType, callback);
     return call;
   }
-  
   /* Build call for placeOrder */
   private Call placeOrderCall(Order body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = body;
@@ -660,5 +654,4 @@ public class StoreApi {
     apiClient.executeAsync(call, localVarReturnType, callback);
     return call;
   }
-  
 }

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/UserApi.java

@@ -44,7 +44,6 @@ public class UserApi {
     this.apiClient = apiClient;
   }
 
-  
   /* Build call for createUser */
   private Call createUserCall(User body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = body;
@@ -142,7 +141,6 @@ public class UserApi {
     apiClient.executeAsync(call, callback);
     return call;
   }
-  
   /* Build call for createUsersWithArrayInput */
   private Call createUsersWithArrayInputCall(List<User> body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = body;
@@ -240,7 +238,6 @@ public class UserApi {
     apiClient.executeAsync(call, callback);
     return call;
   }
-  
   /* Build call for createUsersWithListInput */
   private Call createUsersWithListInputCall(List<User> body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = body;
@@ -338,7 +335,6 @@ public class UserApi {
     apiClient.executeAsync(call, callback);
     return call;
   }
-  
   /* Build call for deleteUser */
   private Call deleteUserCall(String username, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
@@ -442,7 +438,6 @@ public class UserApi {
     apiClient.executeAsync(call, callback);
     return call;
   }
-  
   /* Build call for getUserByName */
   private Call getUserByNameCall(String username, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
@@ -494,7 +489,7 @@ public class UserApi {
   /**
    * 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
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
    */
@@ -506,7 +501,7 @@ public class UserApi {
   /**
    * 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 ApiResponse<User>
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
    */
@@ -519,7 +514,7 @@ public class UserApi {
   /**
    * Get user by user name (asynchronously)
    * 
-   * @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)
    * @param callback The callback to be executed when the API call finishes
    * @return The request call
    * @throws ApiException If fail to process the API call, e.g. serializing the request body object
@@ -550,7 +545,6 @@ public class UserApi {
     apiClient.executeAsync(call, localVarReturnType, callback);
     return call;
   }
-  
   /* Build call for loginUser */
   private Call loginUserCall(String username, String password, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
@@ -659,7 +653,6 @@ public class UserApi {
     apiClient.executeAsync(call, localVarReturnType, callback);
     return call;
   }
-  
   /* Build call for logoutUser */
   private Call logoutUserCall(final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
@@ -754,7 +747,6 @@ public class UserApi {
     apiClient.executeAsync(call, callback);
     return call;
   }
-  
   /* Build call for updateUser */
   private Call updateUserCall(String username, User body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = body;
@@ -861,5 +853,4 @@ public class UserApi {
     apiClient.executeAsync(call, callback);
     return call;
   }
-  
 }

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/ApiKeyAuth.java

@@ -5,7 +5,7 @@ import io.swagger.client.Pair;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:51.831+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:34.419+02:00")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuth.java

@@ -5,7 +5,7 @@ import io.swagger.client.Pair;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:51.831+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:34.419+02:00")
 public class OAuth implements Authentication {
   private String accessToken;
 

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Animal.java

@@ -0,0 +1,66 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class Animal   {
+  
+  @SerializedName("className")
+  private String className = null;
+
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+
+  @Override
+  public boolean equals(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(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Cat.java

@@ -0,0 +1,83 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.client.model.Animal;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class Cat extends Animal  {
+  
+  @SerializedName("className")
+  private String className = null;
+
+  @SerializedName("declawed")
+  private Boolean declawed = null;
+
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Boolean getDeclawed() {
+    return declawed;
+  }
+  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;
+    }
+    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(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Category.java

@@ -14,12 +14,10 @@ public class Category   {
   
   @SerializedName("id")
   private Long id = null;
-  
+
   @SerializedName("name")
   private String name = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -30,7 +28,6 @@ public class Category   {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -41,7 +38,6 @@ public class Category   {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Dog.java

@@ -0,0 +1,83 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.client.model.Animal;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class Dog extends Animal  {
+  
+  @SerializedName("className")
+  private String className = null;
+
+  @SerializedName("breed")
+  private String breed = null;
+
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getBreed() {
+    return breed;
+  }
+  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;
+    }
+    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(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/FormatTest.java

@@ -0,0 +1,233 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class FormatTest   {
+  
+  @SerializedName("integer")
+  private Integer integer = null;
+
+  @SerializedName("int32")
+  private Integer int32 = null;
+
+  @SerializedName("int64")
+  private Long int64 = null;
+
+  @SerializedName("number")
+  private BigDecimal number = null;
+
+  @SerializedName("float")
+  private Float _float = null;
+
+  @SerializedName("double")
+  private Double _double = null;
+
+  @SerializedName("string")
+  private String string = null;
+
+  @SerializedName("byte")
+  private byte[] _byte = null;
+
+  @SerializedName("binary")
+  private byte[] binary = null;
+
+  @SerializedName("date")
+  private Date date = null;
+
+  @SerializedName("dateTime")
+  private Date dateTime = null;
+
+  @SerializedName("password")
+  private String password = null;
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getInteger() {
+    return integer;
+  }
+  public void setInteger(Integer integer) {
+    this.integer = integer;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getInt32() {
+    return int32;
+  }
+  public void setInt32(Integer int32) {
+    this.int32 = int32;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Long getInt64() {
+    return int64;
+  }
+  public void setInt64(Long int64) {
+    this.int64 = int64;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public BigDecimal getNumber() {
+    return number;
+  }
+  public void setNumber(BigDecimal number) {
+    this.number = number;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Float getFloat() {
+    return _float;
+  }
+  public void setFloat(Float _float) {
+    this._float = _float;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Double getDouble() {
+    return _double;
+  }
+  public void setDouble(Double _double) {
+    this._double = _double;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getString() {
+    return string;
+  }
+  public void setString(String string) {
+    this.string = string;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public byte[] getByte() {
+    return _byte;
+  }
+  public void setByte(byte[] _byte) {
+    this._byte = _byte;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public byte[] getBinary() {
+    return binary;
+  }
+  public void setBinary(byte[] binary) {
+    this.binary = binary;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Date getDate() {
+    return date;
+  }
+  public void setDate(Date date) {
+    this.date = date;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Date getDateTime() {
+    return dateTime;
+  }
+  public void setDateTime(Date dateTime) {
+    this.dateTime = dateTime;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getPassword() {
+    return password;
+  }
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+
+  @Override
+  public boolean equals(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(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/InlineResponse200.java

@@ -15,21 +15,15 @@ import com.google.gson.annotations.SerializedName;
 
 public class InlineResponse200   {
   
-  @SerializedName("photoUrls")
-  private List<String> photoUrls = new ArrayList<String>();
-  
-  @SerializedName("name")
-  private String name = null;
-  
-  @SerializedName("id")
-  private Long id = null;
-  
-  @SerializedName("category")
-  private Object category = null;
-  
   @SerializedName("tags")
   private List<Tag> tags = new ArrayList<Tag>();
-  
+
+  @SerializedName("id")
+  private Long id = null;
+
+  @SerializedName("category")
+  private Object category = null;
+
 
 public enum StatusEnum {
   @SerializedName("available")
@@ -55,53 +49,13 @@ public enum StatusEnum {
 
   @SerializedName("status")
   private StatusEnum status = null;
-  
 
-  
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public List<String> getPhotoUrls() {
-    return photoUrls;
-  }
-  public void setPhotoUrls(List<String> photoUrls) {
-    this.photoUrls = photoUrls;
-  }
+  @SerializedName("name")
+  private String name = null;
 
-  
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public String getName() {
-    return name;
-  }
-  public void setName(String name) {
-    this.name = name;
-  }
+  @SerializedName("photoUrls")
+  private List<String> photoUrls = new ArrayList<String>();
 
-  
-  /**
-   **/
-  @ApiModelProperty(required = true, value = "")
-  public Long getId() {
-    return id;
-  }
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public Object getCategory() {
-    return category;
-  }
-  public void setCategory(Object category) {
-    this.category = category;
-  }
-
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -112,7 +66,26 @@ public enum StatusEnum {
     this.tags = tags;
   }
 
-  
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Object getCategory() {
+    return category;
+  }
+  public void setCategory(Object category) {
+    this.category = category;
+  }
+
   /**
    * pet status in the store
    **/
@@ -124,7 +97,26 @@ public enum StatusEnum {
     this.status = status;
   }
 
-  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public List<String> getPhotoUrls() {
+    return photoUrls;
+  }
+  public void setPhotoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -135,17 +127,17 @@ public enum StatusEnum {
       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
@@ -153,12 +145,12 @@ public enum StatusEnum {
     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();
   }

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Model200Response.java

@@ -9,14 +9,15 @@ import com.google.gson.annotations.SerializedName;
 
 
 
-
+/**
+ * Model for testing model name starting with number
+ **/
+@ApiModel(description = "Model for testing model name starting with number")
 public class Model200Response   {
   
   @SerializedName("name")
   private Integer name = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -27,7 +28,6 @@ public class Model200Response   {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelReturn.java

@@ -9,14 +9,15 @@ import com.google.gson.annotations.SerializedName;
 
 
 
-
+/**
+ * Model for testing reserved words
+ **/
+@ApiModel(description = "Model for testing reserved words")
 public class ModelReturn   {
   
   @SerializedName("return")
   private Integer _return = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -27,7 +28,6 @@ public class ModelReturn   {
     this._return = _return;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Name.java

@@ -9,17 +9,21 @@ import com.google.gson.annotations.SerializedName;
 
 
 
-
+/**
+ * Model for testing model name same as property name
+ **/
+@ApiModel(description = "Model for testing model name same as property name")
 public class Name   {
   
   @SerializedName("name")
   private Integer name = null;
-  
 
-  
+  @SerializedName("snake_case")
+  private Integer snakeCase = null;
+
   /**
    **/
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
   }
@@ -27,7 +31,13 @@ public class Name   {
     this.name = name;
   }
 
-  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getSnakeCase() {
+    return snakeCase;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -38,12 +48,13 @@ public class Name   {
       return false;
     }
     Name name = (Name) o;
-    return Objects.equals(this.name, name.name);
+    return Objects.equals(this.name, name.name) &&
+        Objects.equals(this.snakeCase, name.snakeCase);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(name);
+    return Objects.hash(name, snakeCase);
   }
 
   @Override
@@ -52,6 +63,7 @@ public class Name   {
     sb.append("class Name {\n");
     
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
     sb.append("}");
     return sb.toString();
   }

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Order.java

@@ -15,16 +15,16 @@ public class Order   {
   
   @SerializedName("id")
   private Long id = null;
-  
+
   @SerializedName("petId")
   private Long petId = null;
-  
+
   @SerializedName("quantity")
   private Integer quantity = null;
-  
+
   @SerializedName("shipDate")
   private Date shipDate = null;
-  
+
 
 public enum StatusEnum {
   @SerializedName("placed")
@@ -50,12 +50,10 @@ public enum StatusEnum {
 
   @SerializedName("status")
   private StatusEnum status = null;
-  
+
   @SerializedName("complete")
   private Boolean complete = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -63,7 +61,6 @@ public enum StatusEnum {
     return id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -74,7 +71,6 @@ public enum StatusEnum {
     this.petId = petId;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -85,7 +81,6 @@ public enum StatusEnum {
     this.quantity = quantity;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -96,7 +91,6 @@ public enum StatusEnum {
     this.shipDate = shipDate;
   }
 
-  
   /**
    * Order Status
    **/
@@ -108,7 +102,6 @@ public enum StatusEnum {
     this.status = status;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -119,7 +112,6 @@ public enum StatusEnum {
     this.complete = complete;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Pet.java

@@ -18,19 +18,19 @@ public class Pet   {
   
   @SerializedName("id")
   private Long id = null;
-  
+
   @SerializedName("category")
   private Category category = null;
-  
+
   @SerializedName("name")
   private String name = null;
-  
+
   @SerializedName("photoUrls")
   private List<String> photoUrls = new ArrayList<String>();
-  
+
   @SerializedName("tags")
   private List<Tag> tags = new ArrayList<Tag>();
-  
+
 
 public enum StatusEnum {
   @SerializedName("available")
@@ -56,9 +56,7 @@ public enum StatusEnum {
 
   @SerializedName("status")
   private StatusEnum status = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -69,7 +67,6 @@ public enum StatusEnum {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -80,7 +77,6 @@ public enum StatusEnum {
     this.category = category;
   }
 
-  
   /**
    **/
   @ApiModelProperty(required = true, value = "")
@@ -91,7 +87,6 @@ public enum StatusEnum {
     this.name = name;
   }
 
-  
   /**
    **/
   @ApiModelProperty(required = true, value = "")
@@ -102,7 +97,6 @@ public enum StatusEnum {
     this.photoUrls = photoUrls;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -113,7 +107,6 @@ public enum StatusEnum {
     this.tags = tags;
   }
 
-  
   /**
    * pet status in the store
    **/
@@ -125,7 +118,6 @@ public enum StatusEnum {
     this.status = status;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/SpecialModelName.java

@@ -14,9 +14,7 @@ public class SpecialModelName   {
   
   @SerializedName("$special[property.name]")
   private Long specialPropertyName = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -27,7 +25,6 @@ public class SpecialModelName   {
     this.specialPropertyName = specialPropertyName;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Tag.java

@@ -14,12 +14,10 @@ public class Tag   {
   
   @SerializedName("id")
   private Long id = null;
-  
+
   @SerializedName("name")
   private String name = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -30,7 +28,6 @@ public class Tag   {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -41,7 +38,6 @@ public class Tag   {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/User.java

@@ -14,30 +14,28 @@ public class User   {
   
   @SerializedName("id")
   private Long id = null;
-  
+
   @SerializedName("username")
   private String username = null;
-  
+
   @SerializedName("firstName")
   private String firstName = null;
-  
+
   @SerializedName("lastName")
   private String lastName = null;
-  
+
   @SerializedName("email")
   private String email = null;
-  
+
   @SerializedName("password")
   private String password = null;
-  
+
   @SerializedName("phone")
   private String phone = null;
-  
+
   @SerializedName("userStatus")
   private Integer userStatus = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -48,7 +46,6 @@ public class User   {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -59,7 +56,6 @@ public class User   {
     this.username = username;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -70,7 +66,6 @@ public class User   {
     this.firstName = firstName;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -81,7 +76,6 @@ public class User   {
     this.lastName = lastName;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -92,7 +86,6 @@ public class User   {
     this.email = email;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -103,7 +96,6 @@ public class User   {
     this.password = password;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -114,7 +106,6 @@ public class User   {
     this.phone = phone;
   }
 
-  
   /**
    * User Status
    **/
@@ -126,7 +117,6 @@ public class User   {
     this.userStatus = userStatus;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {