remove newline char in *.mustache; added generated code

modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/formParams.mustache.save

@@ -0,0 +1 @@
+{{#isFormParam}}{{#notFile}}{{#isMultipart}}retrofit.http@retrofit2.http.Part{{/isMultipart}}{{^isMultipart}}@Field{{/isMultipart}}("{{baseName}}") {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}{{#isMultipart}}@Part{{/isMultipart}}{{^isMultipart}}@Field{{/isMultipart}}("{{baseName}}\"; filename=\"{{baseName}}") RequestBody {{paramName}}{{/isFile}}{{/isFormParam}}

samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/FakeApi.java

@@ -27,7 +27,12 @@ public interface FakeApi {
   
   @PATCH("/fake")
   Client testClientModel(
-    @Body Client body
+    
+
+
+@retrofit.http.Body Client body
+
+
   );
 
   /**
@@ -40,7 +45,12 @@ public interface FakeApi {
   
   @PATCH("/fake")
   void testClientModel(
-    @Body Client body, Callback<Client> cb
+    
+
+
+@retrofit.http.Body Client body
+
+, Callback<Client> cb
   );
   /**
    * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -59,13 +69,84 @@ public interface FakeApi {
    * @param date None (optional)
    * @param dateTime None (optional)
    * @param password None (optional)
+   * @param paramCallback None (optional)
    * @return Void
    */
   
-  @FormUrlEncoded
+  @retrofit.http.FormUrlEncoded
   @POST("/fake")
   Void testEndpointParameters(
-    @Field("number") BigDecimal number, @Field("double") Double _double, @Field("pattern_without_delimiter") String patternWithoutDelimiter, @Field("byte") byte[] _byte, @Field("integer") Integer integer, @Field("int32") Integer int32, @Field("int64") Long int64, @Field("float") Float _float, @Field("string") String string, @Field("binary") byte[] binary, @Field("date") LocalDate date, @Field("dateTime") DateTime dateTime, @Field("password") String password
+    
+
+
+
+@retrofit.http.Field("number") BigDecimal number
+, 
+
+
+
+@retrofit.http.Field("double") Double _double
+, 
+
+
+
+@retrofit.http.Field("pattern_without_delimiter") String patternWithoutDelimiter
+, 
+
+
+
+@retrofit.http.Field("byte") byte[] _byte
+, 
+
+
+
+@retrofit.http.Field("integer") Integer integer
+, 
+
+
+
+@retrofit.http.Field("int32") Integer int32
+, 
+
+
+
+@retrofit.http.Field("int64") Long int64
+, 
+
+
+
+@retrofit.http.Field("float") Float _float
+, 
+
+
+
+@retrofit.http.Field("string") String string
+, 
+
+
+
+@retrofit.http.Field("binary") byte[] binary
+, 
+
+
+
+@retrofit.http.Field("date") LocalDate date
+, 
+
+
+
+@retrofit.http.Field("dateTime") DateTime dateTime
+, 
+
+
+
+@retrofit.http.Field("password") String password
+, 
+
+
+
+@retrofit.http.Field("callback") String paramCallback
+
   );
 
   /**
@@ -84,14 +165,85 @@ public interface FakeApi {
    * @param date None (optional)
    * @param dateTime None (optional)
    * @param password None (optional)
+   * @param paramCallback None (optional)
    * @param cb callback method
    * @return void
    */
   
-  @FormUrlEncoded
+  @retrofit.http.FormUrlEncoded
   @POST("/fake")
   void testEndpointParameters(
-    @Field("number") BigDecimal number, @Field("double") Double _double, @Field("pattern_without_delimiter") String patternWithoutDelimiter, @Field("byte") byte[] _byte, @Field("integer") Integer integer, @Field("int32") Integer int32, @Field("int64") Long int64, @Field("float") Float _float, @Field("string") String string, @Field("binary") byte[] binary, @Field("date") LocalDate date, @Field("dateTime") DateTime dateTime, @Field("password") String password, Callback<Void> cb
+    
+
+
+
+@retrofit.http.Field("number") BigDecimal number
+, 
+
+
+
+@retrofit.http.Field("double") Double _double
+, 
+
+
+
+@retrofit.http.Field("pattern_without_delimiter") String patternWithoutDelimiter
+, 
+
+
+
+@retrofit.http.Field("byte") byte[] _byte
+, 
+
+
+
+@retrofit.http.Field("integer") Integer integer
+, 
+
+
+
+@retrofit.http.Field("int32") Integer int32
+, 
+
+
+
+@retrofit.http.Field("int64") Long int64
+, 
+
+
+
+@retrofit.http.Field("float") Float _float
+, 
+
+
+
+@retrofit.http.Field("string") String string
+, 
+
+
+
+@retrofit.http.Field("binary") byte[] binary
+, 
+
+
+
+@retrofit.http.Field("date") LocalDate date
+, 
+
+
+
+@retrofit.http.Field("dateTime") DateTime dateTime
+, 
+
+
+
+@retrofit.http.Field("password") String password
+, 
+
+
+
+@retrofit.http.Field("callback") String paramCallback
+, Callback<Void> cb
   );
   /**
    * To test enum parameters
@@ -108,10 +260,50 @@ public interface FakeApi {
    * @return Void
    */
   
-  @FormUrlEncoded
+  @retrofit.http.FormUrlEncoded
   @GET("/fake")
   Void testEnumParameters(
-    @Field("enum_form_string_array") List<String> enumFormStringArray, @Field("enum_form_string") String enumFormString, @Header("enum_header_string_array") List<String> enumHeaderStringArray, @Header("enum_header_string") String enumHeaderString, @Query("enum_query_string_array") CSVParams enumQueryStringArray, @Query("enum_query_string") String enumQueryString, @Query("enum_query_integer") BigDecimal enumQueryInteger, @Field("enum_query_double") Double enumQueryDouble
+    
+
+
+
+@retrofit.http.Field("enum_form_string_array") List<String> enumFormStringArray
+, 
+
+
+
+@retrofit.http.Field("enum_form_string") String enumFormString
+, 
+
+@retrofit.http.Header("enum_header_string_array") List<String> enumHeaderStringArray
+
+
+, 
+
+@retrofit.http.Header("enum_header_string") String enumHeaderString
+
+
+, @retrofit.http.Query("enum_query_string_array") CSVParams enumQueryStringArray
+
+
+
+
+, @retrofit.http.Query("enum_query_string") String enumQueryString
+
+
+
+
+, @retrofit.http.Query("enum_query_integer") BigDecimal enumQueryInteger
+
+
+
+
+, 
+
+
+
+@retrofit.http.Field("enum_query_double") Double enumQueryDouble
+
   );
 
   /**
@@ -129,9 +321,49 @@ public interface FakeApi {
    * @return void
    */
   
-  @FormUrlEncoded
+  @retrofit.http.FormUrlEncoded
   @GET("/fake")
   void testEnumParameters(
-    @Field("enum_form_string_array") List<String> enumFormStringArray, @Field("enum_form_string") String enumFormString, @Header("enum_header_string_array") List<String> enumHeaderStringArray, @Header("enum_header_string") String enumHeaderString, @Query("enum_query_string_array") CSVParams enumQueryStringArray, @Query("enum_query_string") String enumQueryString, @Query("enum_query_integer") BigDecimal enumQueryInteger, @Field("enum_query_double") Double enumQueryDouble, Callback<Void> cb
+    
+
+
+
+@retrofit.http.Field("enum_form_string_array") List<String> enumFormStringArray
+, 
+
+
+
+@retrofit.http.Field("enum_form_string") String enumFormString
+, 
+
+@retrofit.http.Header("enum_header_string_array") List<String> enumHeaderStringArray
+
+
+, 
+
+@retrofit.http.Header("enum_header_string") String enumHeaderString
+
+
+, @retrofit.http.Query("enum_query_string_array") CSVParams enumQueryStringArray
+
+
+
+
+, @retrofit.http.Query("enum_query_string") String enumQueryString
+
+
+
+
+, @retrofit.http.Query("enum_query_integer") BigDecimal enumQueryInteger
+
+
+
+
+, 
+
+
+
+@retrofit.http.Field("enum_query_double") Double enumQueryDouble
+, Callback<Void> cb
   );
 }

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

@@ -26,7 +26,12 @@ public interface PetApi {
   
   @POST("/pet")
   Void addPet(
-    @Body Pet body
+    
+
+
+@retrofit.http.Body Pet body
+
+
   );
 
   /**
@@ -39,7 +44,12 @@ public interface PetApi {
   
   @POST("/pet")
   void addPet(
-    @Body Pet body, Callback<Void> cb
+    
+
+
+@retrofit.http.Body Pet body
+
+, Callback<Void> cb
   );
   /**
    * Deletes a pet
@@ -52,7 +62,17 @@ public interface PetApi {
   
   @DELETE("/pet/{petId}")
   Void deletePet(
-    @Path("petId") Long petId, @Header("api_key") String apiKey
+    
+@retrofit.http.Path("petId") Long petId
+
+
+
+, 
+
+@retrofit.http.Header("api_key") String apiKey
+
+
+
   );
 
   /**
@@ -66,7 +86,17 @@ public interface PetApi {
   
   @DELETE("/pet/{petId}")
   void deletePet(
-    @Path("petId") Long petId, @Header("api_key") String apiKey, Callback<Void> cb
+    
+@retrofit.http.Path("petId") Long petId
+
+
+
+, 
+
+@retrofit.http.Header("api_key") String apiKey
+
+
+, Callback<Void> cb
   );
   /**
    * Finds Pets by status
@@ -78,7 +108,12 @@ public interface PetApi {
   
   @GET("/pet/findByStatus")
   List<Pet> findPetsByStatus(
-    @Query("status") CSVParams status
+    @retrofit.http.Query("status") CSVParams status
+
+
+
+
+
   );
 
   /**
@@ -91,7 +126,12 @@ public interface PetApi {
   
   @GET("/pet/findByStatus")
   void findPetsByStatus(
-    @Query("status") CSVParams status, Callback<List<Pet>> cb
+    @retrofit.http.Query("status") CSVParams status
+
+
+
+
+, Callback<List<Pet>> cb
   );
   /**
    * Finds Pets by tags
@@ -103,7 +143,12 @@ public interface PetApi {
   
   @GET("/pet/findByTags")
   List<Pet> findPetsByTags(
-    @Query("tags") CSVParams tags
+    @retrofit.http.Query("tags") CSVParams tags
+
+
+
+
+
   );
 
   /**
@@ -116,7 +161,12 @@ public interface PetApi {
   
   @GET("/pet/findByTags")
   void findPetsByTags(
-    @Query("tags") CSVParams tags, Callback<List<Pet>> cb
+    @retrofit.http.Query("tags") CSVParams tags
+
+
+
+
+, Callback<List<Pet>> cb
   );
   /**
    * Find pet by ID
@@ -128,7 +178,12 @@ public interface PetApi {
   
   @GET("/pet/{petId}")
   Pet getPetById(
-    @Path("petId") Long petId
+    
+@retrofit.http.Path("petId") Long petId
+
+
+
+
   );
 
   /**
@@ -141,7 +196,12 @@ public interface PetApi {
   
   @GET("/pet/{petId}")
   void getPetById(
-    @Path("petId") Long petId, Callback<Pet> cb
+    
+@retrofit.http.Path("petId") Long petId
+
+
+
+, Callback<Pet> cb
   );
   /**
    * Update an existing pet
@@ -153,7 +213,12 @@ public interface PetApi {
   
   @PUT("/pet")
   Void updatePet(
-    @Body Pet body
+    
+
+
+@retrofit.http.Body Pet body
+
+
   );
 
   /**
@@ -166,7 +231,12 @@ public interface PetApi {
   
   @PUT("/pet")
   void updatePet(
-    @Body Pet body, Callback<Void> cb
+    
+
+
+@retrofit.http.Body Pet body
+
+, Callback<Void> cb
   );
   /**
    * Updates a pet in the store with form data
@@ -178,10 +248,25 @@ public interface PetApi {
    * @return Void
    */
   
-  @FormUrlEncoded
+  @retrofit.http.FormUrlEncoded
   @POST("/pet/{petId}")
   Void updatePetWithForm(
-    @Path("petId") Long petId, @Field("name") String name, @Field("status") String status
+    
+@retrofit.http.Path("petId") Long petId
+
+
+
+, 
+
+
+
+@retrofit.http.Field("name") String name
+, 
+
+
+
+@retrofit.http.Field("status") String status
+
   );
 
   /**
@@ -194,10 +279,25 @@ public interface PetApi {
    * @return void
    */
   
-  @FormUrlEncoded
+  @retrofit.http.FormUrlEncoded
   @POST("/pet/{petId}")
   void updatePetWithForm(
-    @Path("petId") Long petId, @Field("name") String name, @Field("status") String status, Callback<Void> cb
+    
+@retrofit.http.Path("petId") Long petId
+
+
+
+, 
+
+
+
+@retrofit.http.Field("name") String name
+, 
+
+
+
+@retrofit.http.Field("status") String status
+, Callback<Void> cb
   );
   /**
    * uploads an image
@@ -209,10 +309,25 @@ public interface PetApi {
    * @return ModelApiResponse
    */
   
-  @Multipart
+  @retrofit.http.Multipart
   @POST("/pet/{petId}/uploadImage")
   ModelApiResponse uploadFile(
-    @Path("petId") Long petId, @Part("additionalMetadata") String additionalMetadata, @Part("file") TypedFile file
+    
+@retrofit.http.Path("petId") Long petId
+
+
+
+, 
+
+
+
+@retrofit.http.Part("additionalMetadata") String additionalMetadata
+, 
+
+
+
+@retrofit.http.Part("file") TypedFile file
+
   );
 
   /**
@@ -225,9 +340,24 @@ public interface PetApi {
    * @return void
    */
   
-  @Multipart
+  @retrofit.http.Multipart
   @POST("/pet/{petId}/uploadImage")
   void uploadFile(
-    @Path("petId") Long petId, @Part("additionalMetadata") String additionalMetadata, @Part("file") TypedFile file, Callback<ModelApiResponse> cb
+    
+@retrofit.http.Path("petId") Long petId
+
+
+
+, 
+
+
+
+@retrofit.http.Part("additionalMetadata") String additionalMetadata
+, 
+
+
+
+@retrofit.http.Part("file") TypedFile file
+, Callback<ModelApiResponse> cb
   );
 }

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

@@ -24,7 +24,12 @@ public interface StoreApi {
   
   @DELETE("/store/order/{orderId}")
   Void deleteOrder(
-    @Path("orderId") String orderId
+    
+@retrofit.http.Path("orderId") String orderId
+
+
+
+
   );
 
   /**
@@ -37,7 +42,12 @@ public interface StoreApi {
   
   @DELETE("/store/order/{orderId}")
   void deleteOrder(
-    @Path("orderId") String orderId, Callback<Void> cb
+    
+@retrofit.http.Path("orderId") String orderId
+
+
+
+, Callback<Void> cb
   );
   /**
    * Returns pet inventories by status
@@ -71,7 +81,12 @@ public interface StoreApi {
   
   @GET("/store/order/{orderId}")
   Order getOrderById(
-    @Path("orderId") Long orderId
+    
+@retrofit.http.Path("orderId") Long orderId
+
+
+
+
   );
 
   /**
@@ -84,7 +99,12 @@ public interface StoreApi {
   
   @GET("/store/order/{orderId}")
   void getOrderById(
-    @Path("orderId") Long orderId, Callback<Order> cb
+    
+@retrofit.http.Path("orderId") Long orderId
+
+
+
+, Callback<Order> cb
   );
   /**
    * Place an order for a pet
@@ -96,7 +116,12 @@ public interface StoreApi {
   
   @POST("/store/order")
   Order placeOrder(
-    @Body Order body
+    
+
+
+@retrofit.http.Body Order body
+
+
   );
 
   /**
@@ -109,6 +134,11 @@ public interface StoreApi {
   
   @POST("/store/order")
   void placeOrder(
-    @Body Order body, Callback<Order> cb
+    
+
+
+@retrofit.http.Body Order body
+
+, Callback<Order> cb
   );
 }

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

@@ -24,7 +24,12 @@ public interface UserApi {
   
   @POST("/user")
   Void createUser(
-    @Body User body
+    
+
+
+@retrofit.http.Body User body
+
+
   );
 
   /**
@@ -37,7 +42,12 @@ public interface UserApi {
   
   @POST("/user")
   void createUser(
-    @Body User body, Callback<Void> cb
+    
+
+
+@retrofit.http.Body User body
+
+, Callback<Void> cb
   );
   /**
    * Creates list of users with given input array
@@ -49,7 +59,12 @@ public interface UserApi {
   
   @POST("/user/createWithArray")
   Void createUsersWithArrayInput(
-    @Body List<User> body
+    
+
+
+@retrofit.http.Body List<User> body
+
+
   );
 
   /**
@@ -62,7 +77,12 @@ public interface UserApi {
   
   @POST("/user/createWithArray")
   void createUsersWithArrayInput(
-    @Body List<User> body, Callback<Void> cb
+    
+
+
+@retrofit.http.Body List<User> body
+
+, Callback<Void> cb
   );
   /**
    * Creates list of users with given input array
@@ -74,7 +94,12 @@ public interface UserApi {
   
   @POST("/user/createWithList")
   Void createUsersWithListInput(
-    @Body List<User> body
+    
+
+
+@retrofit.http.Body List<User> body
+
+
   );
 
   /**
@@ -87,7 +112,12 @@ public interface UserApi {
   
   @POST("/user/createWithList")
   void createUsersWithListInput(
-    @Body List<User> body, Callback<Void> cb
+    
+
+
+@retrofit.http.Body List<User> body
+
+, Callback<Void> cb
   );
   /**
    * Delete user
@@ -99,7 +129,12 @@ public interface UserApi {
   
   @DELETE("/user/{username}")
   Void deleteUser(
-    @Path("username") String username
+    
+@retrofit.http.Path("username") String username
+
+
+
+
   );
 
   /**
@@ -112,7 +147,12 @@ public interface UserApi {
   
   @DELETE("/user/{username}")
   void deleteUser(
-    @Path("username") String username, Callback<Void> cb
+    
+@retrofit.http.Path("username") String username
+
+
+
+, Callback<Void> cb
   );
   /**
    * Get user by user name
@@ -124,7 +164,12 @@ public interface UserApi {
   
   @GET("/user/{username}")
   User getUserByName(
-    @Path("username") String username
+    
+@retrofit.http.Path("username") String username
+
+
+
+
   );
 
   /**
@@ -137,7 +182,12 @@ public interface UserApi {
   
   @GET("/user/{username}")
   void getUserByName(
-    @Path("username") String username, Callback<User> cb
+    
+@retrofit.http.Path("username") String username
+
+
+
+, Callback<User> cb
   );
   /**
    * Logs user into the system
@@ -150,7 +200,17 @@ public interface UserApi {
   
   @GET("/user/login")
   String loginUser(
-    @Query("username") String username, @Query("password") String password
+    @retrofit.http.Query("username") String username
+
+
+
+
+, @retrofit.http.Query("password") String password
+
+
+
+
+
   );
 
   /**
@@ -164,7 +224,17 @@ public interface UserApi {
   
   @GET("/user/login")
   void loginUser(
-    @Query("username") String username, @Query("password") String password, Callback<String> cb
+    @retrofit.http.Query("username") String username
+
+
+
+
+, @retrofit.http.Query("password") String password
+
+
+
+
+, Callback<String> cb
   );
   /**
    * Logs out current logged in user session
@@ -199,7 +269,17 @@ public interface UserApi {
   
   @PUT("/user/{username}")
   Void updateUser(
-    @Path("username") String username, @Body User body
+    
+@retrofit.http.Path("username") String username
+
+
+
+, 
+
+
+@retrofit.http.Body User body
+
+
   );
 
   /**
@@ -213,6 +293,16 @@ public interface UserApi {
   
   @PUT("/user/{username}")
   void updateUser(
-    @Path("username") String username, @Body User body, Callback<Void> cb
+    
+@retrofit.http.Path("username") String username
+
+
+
+, 
+
+
+@retrofit.http.Body User body
+
+, Callback<Void> cb
   );
 }

samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java

@@ -33,7 +33,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
 /**
  * AdditionalPropertiesClass
  */
@@ -131,5 +130,6 @@ public class AdditionalPropertiesClass   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * Animal
  */
@@ -118,5 +117,6 @@ public class Animal   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/AnimalFarm.java

@@ -30,7 +30,6 @@ import io.swagger.client.model.Animal;
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * AnimalFarm
  */
@@ -72,5 +71,6 @@ public class AnimalFarm extends ArrayList<Animal>  {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java

@@ -33,7 +33,6 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * ArrayOfArrayOfNumberOnly
  */
@@ -103,5 +102,6 @@ public class ArrayOfArrayOfNumberOnly   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java

@@ -33,7 +33,6 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * ArrayOfNumberOnly
  */
@@ -103,5 +102,6 @@ public class ArrayOfNumberOnly   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ArrayTest.java

@@ -33,7 +33,6 @@ import io.swagger.client.model.ReadOnlyFirst;
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * ArrayTest
  */
@@ -159,5 +158,6 @@ public class ArrayTest   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -31,7 +31,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.client.model.Animal;
 
-
 /**
  * Cat
  */
@@ -97,5 +96,6 @@ public class Cat extends Animal  {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * Category
  */
@@ -118,5 +117,6 @@ public class Category   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Client.java

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * Client
  */
@@ -95,5 +94,6 @@ public class Client   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -31,7 +31,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.client.model.Animal;
 
-
 /**
  * Dog
  */
@@ -97,5 +96,6 @@ public class Dog extends Animal  {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumArrays.java

@@ -32,7 +32,6 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * EnumArrays
  */
@@ -169,5 +168,6 @@ public class EnumArrays   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumClass.java

@@ -29,7 +29,6 @@ import java.util.Objects;
 import com.google.gson.annotations.SerializedName;
 
 
-
 /**
  * Gets or Sets EnumClass
  */

samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumTest.java

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * EnumTest
  */
@@ -207,5 +206,6 @@ public class EnumTest   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -33,7 +33,6 @@ import java.math.BigDecimal;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
 
-
 /**
  * FormatTest
  */
@@ -384,5 +383,6 @@ public class FormatTest   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * HasOnlyReadOnly
  */
@@ -100,5 +99,6 @@ public class HasOnlyReadOnly   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MapTest.java

@@ -33,7 +33,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
 /**
  * MapTest
  */
@@ -153,5 +152,6 @@ public class MapTest   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -35,7 +35,6 @@ import java.util.List;
 import java.util.Map;
 import org.joda.time.DateTime;
 
-
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
@@ -151,5 +150,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * Model for testing model name starting with number
  */
@@ -119,5 +118,6 @@ public class Model200Response   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ModelApiResponse.java

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * ModelApiResponse
  */
@@ -141,5 +140,6 @@ public class ModelApiResponse   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * Model for testing reserved words
  */
@@ -96,5 +95,6 @@ public class ModelReturn   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * Model for testing model name same as property name
  */
@@ -147,5 +146,6 @@ public class Name   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/NumberOnly.java

@@ -31,7 +31,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 
-
 /**
  * NumberOnly
  */
@@ -96,5 +95,6 @@ public class NumberOnly   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -31,7 +31,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.joda.time.DateTime;
 
-
 /**
  * Order
  */
@@ -236,5 +235,6 @@ public class Order   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -34,7 +34,6 @@ import io.swagger.client.model.Tag;
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * Pet
  */
@@ -249,5 +248,6 @@ public class Pet   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ReadOnlyFirst.java

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * ReadOnlyFirst
  */
@@ -109,5 +108,6 @@ public class ReadOnlyFirst   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * SpecialModelName
  */
@@ -95,5 +94,6 @@ public class SpecialModelName   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * Tag
  */
@@ -118,5 +117,6 @@ public class Tag   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * User
  */
@@ -256,5 +255,6 @@ public class User   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit2/docs/FakeApi.md

@@ -54,7 +54,7 @@ No authorization required
 
 <a name="testEndpointParameters"></a>
 # **testEndpointParameters**
-> Void testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password)
+> Void testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -90,8 +90,9 @@ byte[] binary = B; // byte[] | None
 LocalDate date = new LocalDate(); // LocalDate | None
 DateTime dateTime = new DateTime(); // DateTime | None
 String password = "password_example"; // String | None
+String paramCallback = "paramCallback_example"; // String | None
 try {
-    Void result = apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password);
+    Void result = apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
     System.out.println(result);
 } catch (ApiException e) {
     System.err.println("Exception when calling FakeApi#testEndpointParameters");
@@ -116,6 +117,7 @@ Name | Type | Description  | Notes
  **date** | **LocalDate**| None | [optional]
  **dateTime** | **DateTime**| None | [optional]
  **password** | **String**| None | [optional]
+ **paramCallback** | **String**| None | [optional]
 
 ### Return type
 

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeApi.java

@@ -28,7 +28,12 @@ public interface FakeApi {
   
   @PATCH("fake")
   Call<Client> testClientModel(
-    @Body Client body
+    
+
+
+@retrofit2.http.Body Client body
+
+
   );
 
   /**
@@ -47,13 +52,84 @@ public interface FakeApi {
    * @param date None (optional)
    * @param dateTime None (optional)
    * @param password None (optional)
+   * @param paramCallback None (optional)
    * @return Call&lt;Void&gt;
    */
   
-  @FormUrlEncoded
+  @retrofit2.http.FormUrlEncoded
   @POST("fake")
   Call<Void> testEndpointParameters(
-    @Field("number") BigDecimal number, @Field("double") Double _double, @Field("pattern_without_delimiter") String patternWithoutDelimiter, @Field("byte") byte[] _byte, @Field("integer") Integer integer, @Field("int32") Integer int32, @Field("int64") Long int64, @Field("float") Float _float, @Field("string") String string, @Field("binary") byte[] binary, @Field("date") LocalDate date, @Field("dateTime") DateTime dateTime, @Field("password") String password
+    
+
+
+
+@retrofit2.http.Field("number") BigDecimal number
+, 
+
+
+
+@retrofit2.http.Field("double") Double _double
+, 
+
+
+
+@retrofit2.http.Field("pattern_without_delimiter") String patternWithoutDelimiter
+, 
+
+
+
+@retrofit2.http.Field("byte") byte[] _byte
+, 
+
+
+
+@retrofit2.http.Field("integer") Integer integer
+, 
+
+
+
+@retrofit2.http.Field("int32") Integer int32
+, 
+
+
+
+@retrofit2.http.Field("int64") Long int64
+, 
+
+
+
+@retrofit2.http.Field("float") Float _float
+, 
+
+
+
+@retrofit2.http.Field("string") String string
+, 
+
+
+
+@retrofit2.http.Field("binary") byte[] binary
+, 
+
+
+
+@retrofit2.http.Field("date") LocalDate date
+, 
+
+
+
+@retrofit2.http.Field("dateTime") DateTime dateTime
+, 
+
+
+
+@retrofit2.http.Field("password") String password
+, 
+
+
+
+@retrofit2.http.Field("callback") String paramCallback
+
   );
 
   /**
@@ -70,10 +146,50 @@ public interface FakeApi {
    * @return Call&lt;Void&gt;
    */
   
-  @FormUrlEncoded
+  @retrofit2.http.FormUrlEncoded
   @GET("fake")
   Call<Void> testEnumParameters(
-    @Field("enum_form_string_array") List<String> enumFormStringArray, @Field("enum_form_string") String enumFormString, @Header("enum_header_string_array") List<String> enumHeaderStringArray, @Header("enum_header_string") String enumHeaderString, @Query("enum_query_string_array") CSVParams enumQueryStringArray, @Query("enum_query_string") String enumQueryString, @Query("enum_query_integer") BigDecimal enumQueryInteger, @Field("enum_query_double") Double enumQueryDouble
+    
+
+
+
+@retrofit2.http.Field("enum_form_string_array") List<String> enumFormStringArray
+, 
+
+
+
+@retrofit2.http.Field("enum_form_string") String enumFormString
+, 
+
+@retrofit2.http.Header("enum_header_string_array") List<String> enumHeaderStringArray
+
+
+, 
+
+@retrofit2.http.Header("enum_header_string") String enumHeaderString
+
+
+, @retrofit2.http.Query("enum_query_string_array") CSVParams enumQueryStringArray
+
+
+
+
+, @retrofit2.http.Query("enum_query_string") String enumQueryString
+
+
+
+
+, @retrofit2.http.Query("enum_query_integer") BigDecimal enumQueryInteger
+
+
+
+
+, 
+
+
+
+@retrofit2.http.Field("enum_query_double") Double enumQueryDouble
+
   );
 
 }

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

@@ -27,7 +27,12 @@ public interface PetApi {
   
   @POST("pet")
   Call<Void> addPet(
-    @Body Pet body
+    
+
+
+@retrofit2.http.Body Pet body
+
+
   );
 
   /**
@@ -40,7 +45,17 @@ public interface PetApi {
   
   @DELETE("pet/{petId}")
   Call<Void> deletePet(
-    @Path("petId") Long petId, @Header("api_key") String apiKey
+    
+@retrofit2.http.Path("petId") Long petId
+
+
+
+, 
+
+@retrofit2.http.Header("api_key") String apiKey
+
+
+
   );
 
   /**
@@ -52,7 +67,12 @@ public interface PetApi {
   
   @GET("pet/findByStatus")
   Call<List<Pet>> findPetsByStatus(
-    @Query("status") CSVParams status
+    @retrofit2.http.Query("status") CSVParams status
+
+
+
+
+
   );
 
   /**
@@ -64,7 +84,12 @@ public interface PetApi {
   
   @GET("pet/findByTags")
   Call<List<Pet>> findPetsByTags(
-    @Query("tags") CSVParams tags
+    @retrofit2.http.Query("tags") CSVParams tags
+
+
+
+
+
   );
 
   /**
@@ -76,7 +101,12 @@ public interface PetApi {
   
   @GET("pet/{petId}")
   Call<Pet> getPetById(
-    @Path("petId") Long petId
+    
+@retrofit2.http.Path("petId") Long petId
+
+
+
+
   );
 
   /**
@@ -88,7 +118,12 @@ public interface PetApi {
   
   @PUT("pet")
   Call<Void> updatePet(
-    @Body Pet body
+    
+
+
+@retrofit2.http.Body Pet body
+
+
   );
 
   /**
@@ -100,10 +135,25 @@ public interface PetApi {
    * @return Call&lt;Void&gt;
    */
   
-  @FormUrlEncoded
+  @retrofit2.http.FormUrlEncoded
   @POST("pet/{petId}")
   Call<Void> updatePetWithForm(
-    @Path("petId") Long petId, @Field("name") String name, @Field("status") String status
+    
+@retrofit2.http.Path("petId") Long petId
+
+
+
+, 
+
+
+
+@retrofit2.http.Field("name") String name
+, 
+
+
+
+@retrofit2.http.Field("status") String status
+
   );
 
   /**
@@ -115,10 +165,25 @@ public interface PetApi {
    * @return Call&lt;ModelApiResponse&gt;
    */
   
-  @Multipart
+  @retrofit2.http.Multipart
   @POST("pet/{petId}/uploadImage")
   Call<ModelApiResponse> uploadFile(
-    @Path("petId") Long petId, @Part("additionalMetadata") String additionalMetadata, @Part("file\"; filename=\"file") RequestBody file
+    
+@retrofit2.http.Path("petId") Long petId
+
+
+
+, 
+
+
+
+@retrofit2.http.Part("additionalMetadata") String additionalMetadata
+, 
+
+
+
+@retrofit2.http.Part("file\"; filename=\"file") RequestBody file
+
   );
 
 }

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

@@ -25,7 +25,12 @@ public interface StoreApi {
   
   @DELETE("store/order/{orderId}")
   Call<Void> deleteOrder(
-    @Path("orderId") String orderId
+    
+@retrofit2.http.Path("orderId") String orderId
+
+
+
+
   );
 
   /**
@@ -47,7 +52,12 @@ public interface StoreApi {
   
   @GET("store/order/{orderId}")
   Call<Order> getOrderById(
-    @Path("orderId") Long orderId
+    
+@retrofit2.http.Path("orderId") Long orderId
+
+
+
+
   );
 
   /**
@@ -59,7 +69,12 @@ public interface StoreApi {
   
   @POST("store/order")
   Call<Order> placeOrder(
-    @Body Order body
+    
+
+
+@retrofit2.http.Body Order body
+
+
   );
 
 }

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

@@ -25,7 +25,12 @@ public interface UserApi {
   
   @POST("user")
   Call<Void> createUser(
-    @Body User body
+    
+
+
+@retrofit2.http.Body User body
+
+
   );
 
   /**
@@ -37,7 +42,12 @@ public interface UserApi {
   
   @POST("user/createWithArray")
   Call<Void> createUsersWithArrayInput(
-    @Body List<User> body
+    
+
+
+@retrofit2.http.Body List<User> body
+
+
   );
 
   /**
@@ -49,7 +59,12 @@ public interface UserApi {
   
   @POST("user/createWithList")
   Call<Void> createUsersWithListInput(
-    @Body List<User> body
+    
+
+
+@retrofit2.http.Body List<User> body
+
+
   );
 
   /**
@@ -61,7 +76,12 @@ public interface UserApi {
   
   @DELETE("user/{username}")
   Call<Void> deleteUser(
-    @Path("username") String username
+    
+@retrofit2.http.Path("username") String username
+
+
+
+
   );
 
   /**
@@ -73,7 +93,12 @@ public interface UserApi {
   
   @GET("user/{username}")
   Call<User> getUserByName(
-    @Path("username") String username
+    
+@retrofit2.http.Path("username") String username
+
+
+
+
   );
 
   /**
@@ -86,7 +111,17 @@ public interface UserApi {
   
   @GET("user/login")
   Call<String> loginUser(
-    @Query("username") String username, @Query("password") String password
+    @retrofit2.http.Query("username") String username
+
+
+
+
+, @retrofit2.http.Query("password") String password
+
+
+
+
+
   );
 
   /**
@@ -109,7 +144,17 @@ public interface UserApi {
   
   @PUT("user/{username}")
   Call<Void> updateUser(
-    @Path("username") String username, @Body User body
+    
+@retrofit2.http.Path("username") String username
+
+
+
+, 
+
+
+@retrofit2.http.Body User body
+
+
   );
 
 }

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java

@@ -33,7 +33,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
 /**
  * AdditionalPropertiesClass
  */
@@ -131,5 +130,6 @@ public class AdditionalPropertiesClass   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * Animal
  */
@@ -118,5 +117,6 @@ public class Animal   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/AnimalFarm.java

@@ -30,7 +30,6 @@ import io.swagger.client.model.Animal;
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * AnimalFarm
  */
@@ -72,5 +71,6 @@ public class AnimalFarm extends ArrayList<Animal>  {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java

@@ -33,7 +33,6 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * ArrayOfArrayOfNumberOnly
  */
@@ -103,5 +102,6 @@ public class ArrayOfArrayOfNumberOnly   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java

@@ -33,7 +33,6 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * ArrayOfNumberOnly
  */
@@ -103,5 +102,6 @@ public class ArrayOfNumberOnly   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ArrayTest.java

@@ -33,7 +33,6 @@ import io.swagger.client.model.ReadOnlyFirst;
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * ArrayTest
  */
@@ -159,5 +158,6 @@ public class ArrayTest   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -31,7 +31,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.client.model.Animal;
 
-
 /**
  * Cat
  */
@@ -97,5 +96,6 @@ public class Cat extends Animal  {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * Category
  */
@@ -118,5 +117,6 @@ public class Category   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Client.java

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * Client
  */
@@ -95,5 +94,6 @@ public class Client   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -31,7 +31,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.client.model.Animal;
 
-
 /**
  * Dog
  */
@@ -97,5 +96,6 @@ public class Dog extends Animal  {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumArrays.java

@@ -32,7 +32,6 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * EnumArrays
  */
@@ -169,5 +168,6 @@ public class EnumArrays   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumClass.java

@@ -29,7 +29,6 @@ import java.util.Objects;
 import com.google.gson.annotations.SerializedName;
 
 
-
 /**
  * Gets or Sets EnumClass
  */

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumTest.java

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * EnumTest
  */
@@ -207,5 +206,6 @@ public class EnumTest   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -33,7 +33,6 @@ import java.math.BigDecimal;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
 
-
 /**
  * FormatTest
  */
@@ -384,5 +383,6 @@ public class FormatTest   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * HasOnlyReadOnly
  */
@@ -100,5 +99,6 @@ public class HasOnlyReadOnly   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/MapTest.java

@@ -33,7 +33,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
 /**
  * MapTest
  */
@@ -153,5 +152,6 @@ public class MapTest   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -35,7 +35,6 @@ import java.util.List;
 import java.util.Map;
 import org.joda.time.DateTime;
 
-
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
@@ -151,5 +150,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * Model for testing model name starting with number
  */
@@ -119,5 +118,6 @@ public class Model200Response   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ModelApiResponse.java

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * ModelApiResponse
  */
@@ -141,5 +140,6 @@ public class ModelApiResponse   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * Model for testing reserved words
  */
@@ -96,5 +95,6 @@ public class ModelReturn   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * Model for testing model name same as property name
  */
@@ -147,5 +146,6 @@ public class Name   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/NumberOnly.java

@@ -31,7 +31,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 
-
 /**
  * NumberOnly
  */
@@ -96,5 +95,6 @@ public class NumberOnly   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -31,7 +31,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.joda.time.DateTime;
 
-
 /**
  * Order
  */
@@ -236,5 +235,6 @@ public class Order   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -34,7 +34,6 @@ import io.swagger.client.model.Tag;
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * Pet
  */
@@ -249,5 +248,6 @@ public class Pet   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ReadOnlyFirst.java

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * ReadOnlyFirst
  */
@@ -109,5 +108,6 @@ public class ReadOnlyFirst   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * SpecialModelName
  */
@@ -95,5 +94,6 @@ public class SpecialModelName   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * Tag
  */
@@ -118,5 +117,6 @@ public class Tag   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * User
  */
@@ -256,5 +255,6 @@ public class User   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/FakeApi.java

@@ -28,7 +28,12 @@ public interface FakeApi {
   
   @PATCH("fake")
   Observable<Client> testClientModel(
-    @Body Client body
+    
+
+
+@retrofit2.http.Body Client body
+
+
   );
 
   /**
@@ -47,13 +52,84 @@ public interface FakeApi {
    * @param date None (optional)
    * @param dateTime None (optional)
    * @param password None (optional)
+   * @param paramCallback None (optional)
    * @return Call&lt;Void&gt;
    */
   
-  @FormUrlEncoded
+  @retrofit2.http.FormUrlEncoded
   @POST("fake")
   Observable<Void> testEndpointParameters(
-    @Field("number") BigDecimal number, @Field("double") Double _double, @Field("pattern_without_delimiter") String patternWithoutDelimiter, @Field("byte") byte[] _byte, @Field("integer") Integer integer, @Field("int32") Integer int32, @Field("int64") Long int64, @Field("float") Float _float, @Field("string") String string, @Field("binary") byte[] binary, @Field("date") LocalDate date, @Field("dateTime") DateTime dateTime, @Field("password") String password
+    
+
+
+
+@retrofit2.http.Field("number") BigDecimal number
+, 
+
+
+
+@retrofit2.http.Field("double") Double _double
+, 
+
+
+
+@retrofit2.http.Field("pattern_without_delimiter") String patternWithoutDelimiter
+, 
+
+
+
+@retrofit2.http.Field("byte") byte[] _byte
+, 
+
+
+
+@retrofit2.http.Field("integer") Integer integer
+, 
+
+
+
+@retrofit2.http.Field("int32") Integer int32
+, 
+
+
+
+@retrofit2.http.Field("int64") Long int64
+, 
+
+
+
+@retrofit2.http.Field("float") Float _float
+, 
+
+
+
+@retrofit2.http.Field("string") String string
+, 
+
+
+
+@retrofit2.http.Field("binary") byte[] binary
+, 
+
+
+
+@retrofit2.http.Field("date") LocalDate date
+, 
+
+
+
+@retrofit2.http.Field("dateTime") DateTime dateTime
+, 
+
+
+
+@retrofit2.http.Field("password") String password
+, 
+
+
+
+@retrofit2.http.Field("callback") String paramCallback
+
   );
 
   /**
@@ -70,10 +146,50 @@ public interface FakeApi {
    * @return Call&lt;Void&gt;
    */
   
-  @FormUrlEncoded
+  @retrofit2.http.FormUrlEncoded
   @GET("fake")
   Observable<Void> testEnumParameters(
-    @Field("enum_form_string_array") List<String> enumFormStringArray, @Field("enum_form_string") String enumFormString, @Header("enum_header_string_array") List<String> enumHeaderStringArray, @Header("enum_header_string") String enumHeaderString, @Query("enum_query_string_array") CSVParams enumQueryStringArray, @Query("enum_query_string") String enumQueryString, @Query("enum_query_integer") BigDecimal enumQueryInteger, @Field("enum_query_double") Double enumQueryDouble
+    
+
+
+
+@retrofit2.http.Field("enum_form_string_array") List<String> enumFormStringArray
+, 
+
+
+
+@retrofit2.http.Field("enum_form_string") String enumFormString
+, 
+
+@retrofit2.http.Header("enum_header_string_array") List<String> enumHeaderStringArray
+
+
+, 
+
+@retrofit2.http.Header("enum_header_string") String enumHeaderString
+
+
+, @retrofit2.http.Query("enum_query_string_array") CSVParams enumQueryStringArray
+
+
+
+
+, @retrofit2.http.Query("enum_query_string") String enumQueryString
+
+
+
+
+, @retrofit2.http.Query("enum_query_integer") BigDecimal enumQueryInteger
+
+
+
+
+, 
+
+
+
+@retrofit2.http.Field("enum_query_double") Double enumQueryDouble
+
   );
 
 }

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

@@ -27,7 +27,12 @@ public interface PetApi {
   
   @POST("pet")
   Observable<Void> addPet(
-    @Body Pet body
+    
+
+
+@retrofit2.http.Body Pet body
+
+
   );
 
   /**
@@ -40,7 +45,17 @@ public interface PetApi {
   
   @DELETE("pet/{petId}")
   Observable<Void> deletePet(
-    @Path("petId") Long petId, @Header("api_key") String apiKey
+    
+@retrofit2.http.Path("petId") Long petId
+
+
+
+, 
+
+@retrofit2.http.Header("api_key") String apiKey
+
+
+
   );
 
   /**
@@ -52,7 +67,12 @@ public interface PetApi {
   
   @GET("pet/findByStatus")
   Observable<List<Pet>> findPetsByStatus(
-    @Query("status") CSVParams status
+    @retrofit2.http.Query("status") CSVParams status
+
+
+
+
+
   );
 
   /**
@@ -64,7 +84,12 @@ public interface PetApi {
   
   @GET("pet/findByTags")
   Observable<List<Pet>> findPetsByTags(
-    @Query("tags") CSVParams tags
+    @retrofit2.http.Query("tags") CSVParams tags
+
+
+
+
+
   );
 
   /**
@@ -76,7 +101,12 @@ public interface PetApi {
   
   @GET("pet/{petId}")
   Observable<Pet> getPetById(
-    @Path("petId") Long petId
+    
+@retrofit2.http.Path("petId") Long petId
+
+
+
+
   );
 
   /**
@@ -88,7 +118,12 @@ public interface PetApi {
   
   @PUT("pet")
   Observable<Void> updatePet(
-    @Body Pet body
+    
+
+
+@retrofit2.http.Body Pet body
+
+
   );
 
   /**
@@ -100,10 +135,25 @@ public interface PetApi {
    * @return Call&lt;Void&gt;
    */
   
-  @FormUrlEncoded
+  @retrofit2.http.FormUrlEncoded
   @POST("pet/{petId}")
   Observable<Void> updatePetWithForm(
-    @Path("petId") Long petId, @Field("name") String name, @Field("status") String status
+    
+@retrofit2.http.Path("petId") Long petId
+
+
+
+, 
+
+
+
+@retrofit2.http.Field("name") String name
+, 
+
+
+
+@retrofit2.http.Field("status") String status
+
   );
 
   /**
@@ -115,10 +165,25 @@ public interface PetApi {
    * @return Call&lt;ModelApiResponse&gt;
    */
   
-  @Multipart
+  @retrofit2.http.Multipart
   @POST("pet/{petId}/uploadImage")
   Observable<ModelApiResponse> uploadFile(
-    @Path("petId") Long petId, @Part("additionalMetadata") String additionalMetadata, @Part("file\"; filename=\"file") RequestBody file
+    
+@retrofit2.http.Path("petId") Long petId
+
+
+
+, 
+
+
+
+@retrofit2.http.Part("additionalMetadata") String additionalMetadata
+, 
+
+
+
+@retrofit2.http.Part("file\"; filename=\"file") RequestBody file
+
   );
 
 }

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

@@ -25,7 +25,12 @@ public interface StoreApi {
   
   @DELETE("store/order/{orderId}")
   Observable<Void> deleteOrder(
-    @Path("orderId") String orderId
+    
+@retrofit2.http.Path("orderId") String orderId
+
+
+
+
   );
 
   /**
@@ -47,7 +52,12 @@ public interface StoreApi {
   
   @GET("store/order/{orderId}")
   Observable<Order> getOrderById(
-    @Path("orderId") Long orderId
+    
+@retrofit2.http.Path("orderId") Long orderId
+
+
+
+
   );
 
   /**
@@ -59,7 +69,12 @@ public interface StoreApi {
   
   @POST("store/order")
   Observable<Order> placeOrder(
-    @Body Order body
+    
+
+
+@retrofit2.http.Body Order body
+
+
   );
 
 }

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

@@ -25,7 +25,12 @@ public interface UserApi {
   
   @POST("user")
   Observable<Void> createUser(
-    @Body User body
+    
+
+
+@retrofit2.http.Body User body
+
+
   );
 
   /**
@@ -37,7 +42,12 @@ public interface UserApi {
   
   @POST("user/createWithArray")
   Observable<Void> createUsersWithArrayInput(
-    @Body List<User> body
+    
+
+
+@retrofit2.http.Body List<User> body
+
+
   );
 
   /**
@@ -49,7 +59,12 @@ public interface UserApi {
   
   @POST("user/createWithList")
   Observable<Void> createUsersWithListInput(
-    @Body List<User> body
+    
+
+
+@retrofit2.http.Body List<User> body
+
+
   );
 
   /**
@@ -61,7 +76,12 @@ public interface UserApi {
   
   @DELETE("user/{username}")
   Observable<Void> deleteUser(
-    @Path("username") String username
+    
+@retrofit2.http.Path("username") String username
+
+
+
+
   );
 
   /**
@@ -73,7 +93,12 @@ public interface UserApi {
   
   @GET("user/{username}")
   Observable<User> getUserByName(
-    @Path("username") String username
+    
+@retrofit2.http.Path("username") String username
+
+
+
+
   );
 
   /**
@@ -86,7 +111,17 @@ public interface UserApi {
   
   @GET("user/login")
   Observable<String> loginUser(
-    @Query("username") String username, @Query("password") String password
+    @retrofit2.http.Query("username") String username
+
+
+
+
+, @retrofit2.http.Query("password") String password
+
+
+
+
+
   );
 
   /**
@@ -109,7 +144,17 @@ public interface UserApi {
   
   @PUT("user/{username}")
   Observable<Void> updateUser(
-    @Path("username") String username, @Body User body
+    
+@retrofit2.http.Path("username") String username
+
+
+
+, 
+
+
+@retrofit2.http.Body User body
+
+
   );
 
 }

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java

@@ -33,7 +33,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
 /**
  * AdditionalPropertiesClass
  */
@@ -131,5 +130,6 @@ public class AdditionalPropertiesClass   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * Animal
  */
@@ -118,5 +117,6 @@ public class Animal   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/AnimalFarm.java

@@ -30,7 +30,6 @@ import io.swagger.client.model.Animal;
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * AnimalFarm
  */
@@ -72,5 +71,6 @@ public class AnimalFarm extends ArrayList<Animal>  {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java

@@ -33,7 +33,6 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * ArrayOfArrayOfNumberOnly
  */
@@ -103,5 +102,6 @@ public class ArrayOfArrayOfNumberOnly   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java

@@ -33,7 +33,6 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * ArrayOfNumberOnly
  */
@@ -103,5 +102,6 @@ public class ArrayOfNumberOnly   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ArrayTest.java

@@ -33,7 +33,6 @@ import io.swagger.client.model.ReadOnlyFirst;
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * ArrayTest
  */
@@ -159,5 +158,6 @@ public class ArrayTest   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -31,7 +31,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.client.model.Animal;
 
-
 /**
  * Cat
  */
@@ -97,5 +96,6 @@ public class Cat extends Animal  {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * Category
  */
@@ -118,5 +117,6 @@ public class Category   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Client.java

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * Client
  */
@@ -95,5 +94,6 @@ public class Client   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -31,7 +31,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.client.model.Animal;
 
-
 /**
  * Dog
  */
@@ -97,5 +96,6 @@ public class Dog extends Animal  {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumArrays.java

@@ -32,7 +32,6 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * EnumArrays
  */
@@ -169,5 +168,6 @@ public class EnumArrays   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumClass.java

@@ -29,7 +29,6 @@ import java.util.Objects;
 import com.google.gson.annotations.SerializedName;
 
 
-
 /**
  * Gets or Sets EnumClass
  */

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumTest.java

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * EnumTest
  */
@@ -207,5 +206,6 @@ public class EnumTest   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -33,7 +33,6 @@ import java.math.BigDecimal;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
 
-
 /**
  * FormatTest
  */
@@ -384,5 +383,6 @@ public class FormatTest   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * HasOnlyReadOnly
  */
@@ -100,5 +99,6 @@ public class HasOnlyReadOnly   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/MapTest.java

@@ -33,7 +33,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
 /**
  * MapTest
  */
@@ -153,5 +152,6 @@ public class MapTest   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -35,7 +35,6 @@ import java.util.List;
 import java.util.Map;
 import org.joda.time.DateTime;
 
-
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
@@ -151,5 +150,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * Model for testing model name starting with number
  */
@@ -119,5 +118,6 @@ public class Model200Response   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ModelApiResponse.java

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * ModelApiResponse
  */
@@ -141,5 +140,6 @@ public class ModelApiResponse   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * Model for testing reserved words
  */
@@ -96,5 +95,6 @@ public class ModelReturn   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * Model for testing model name same as property name
  */
@@ -147,5 +146,6 @@ public class Name   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/NumberOnly.java

@@ -31,7 +31,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 
-
 /**
  * NumberOnly
  */
@@ -96,5 +95,6 @@ public class NumberOnly   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -31,7 +31,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.joda.time.DateTime;
 
-
 /**
  * Order
  */
@@ -236,5 +235,6 @@ public class Order   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -34,7 +34,6 @@ import io.swagger.client.model.Tag;
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * Pet
  */
@@ -249,5 +248,6 @@ public class Pet   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ReadOnlyFirst.java

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * ReadOnlyFirst
  */
@@ -109,5 +108,6 @@ public class ReadOnlyFirst   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * SpecialModelName
  */
@@ -95,5 +94,6 @@ public class SpecialModelName   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * Tag
  */
@@ -118,5 +117,6 @@ public class Tag   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 

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

@@ -30,7 +30,6 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * User
  */
@@ -256,5 +255,6 @@ public class User   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }