Update java client samples OAS2 (#140)

* Update java client examples * Rename artifactId in json config files * Add imports in api.mustache for play24 and play25
2018-04-24 09:51:50 +02:00
parent 5340c35ce1
commit c8c316e41e
873 changed files with 17421 additions and 16058 deletions
--- a/samples/client/petstore/java/google-api-client/.openapi-generator-ignore
+++ b/samples/client/petstore/java/google-api-client/.openapi-generator-ignore
@@ -1,11 +1,11 @@
-# Swagger Codegen Ignore
-# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator

 # Use this file to prevent files from being overwritten by the generator.
 # The patterns follow closely to .gitignore or .dockerignore.

 # As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
 #ApiClient.cs

 # You can match any string of characters against a directory, file or extension with a single asterisk (*):
--- a/samples/client/petstore/java/google-api-client/README.md
+++ b/samples/client/petstore/java/google-api-client/README.md
@@ -1,24 +1,35 @@
-# swagger-petstore-google-api-client
+# petstore-google-api-client
+
+Swagger Petstore
+- API version: 1.0.0
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+
+*Automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen)*
+

 ## Requirements

-Building the API client library requires [Maven](https://maven.apache.org/) to be installed.
+Building the API client library requires:
+1. Java 1.7+
+2. Maven/Gradle

 ## Installation

 To install the API client library to your local Maven repository, simply execute:

 ```shell
-mvn install
+mvn clean install
 ```

 To deploy it to a remote Maven repository instead, configure the settings of the repository and execute:

 ```shell
-mvn deploy
+mvn clean deploy
 ```

-Refer to the [official documentation](https://maven.apache.org/plugins/maven-deploy-plugin/usage.html) for more information.
+Refer to the [OSSRH Guide](http://central.sonatype.org/pages/ossrh-guide.html) for more information.

 ### Maven users

@@ -26,10 +37,10 @@ Add this dependency to your project's POM:

 ```xml
 <dependency>
-    <groupId>io.swagger</groupId>
-    <artifactId>swagger-petstore-google-api-client</artifactId>
-    <version>1.0.0</version>
-    <scope>compile</scope>
+  <groupId>org.openapitools</groupId>
+  <artifactId>petstore-google-api-client</artifactId>
+  <version>1.0.0</version>
+  <scope>compile</scope>
 </dependency>
 ```

@@ -38,19 +49,21 @@ Add this dependency to your project's POM:
 Add this dependency to your project's build file:

 ```groovy
-compile "io.swagger:swagger-petstore-google-api-client:1.0.0"
+compile "org.openapitools:petstore-google-api-client:1.0.0"
 ```

 ### Others

 At first generate the JAR by executing:

-    mvn package
+```shell
+mvn clean package
+```

 Then manually install the following JARs:

-* target/swagger-petstore-google-api-client-1.0.0.jar
-* target/lib/*.jar
+* `target/petstore-google-api-client-1.0.0.jar`
+* `target/lib/*.jar`

 ## Getting Started

@@ -71,9 +84,9 @@ public class AnotherFakeApiExample {
    public static void main(String[] args) {
        
        AnotherFakeApi apiInstance = new AnotherFakeApi();
-        Client body = new Client(); // Client | client model
+        Client client = new Client(); // Client | client model
        try {
-            Client result = apiInstance.testSpecialTags(body);
+            Client result = apiInstance.testSpecialTags(client);
            System.out.println(result);
        } catch (ApiException e) {
            System.err.println("Exception when calling AnotherFakeApi#testSpecialTags");
@@ -95,6 +108,7 @@ Class | Method | HTTP request | Description
 *FakeApi* | [**fakeOuterCompositeSerialize**](docs/FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 *FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
 *FakeApi* | [**fakeOuterStringSerialize**](docs/FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
+*FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \&quot;client\&quot; model
 *FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 *FakeApi* | [**testEnumParameters**](docs/FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
@@ -132,9 +146,11 @@ Class | Method | HTTP request | Description
 - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
 - [ArrayTest](docs/ArrayTest.md)
 - [Capitalization](docs/Capitalization.md)
+ - [Cat](docs/Cat.md)
 - [Category](docs/Category.md)
 - [ClassModel](docs/ClassModel.md)
 - [Client](docs/Client.md)
+ - [Dog](docs/Dog.md)
 - [EnumArrays](docs/EnumArrays.md)
 - [EnumClass](docs/EnumClass.md)
 - [EnumTest](docs/EnumTest.md)
@@ -148,15 +164,16 @@ Class | Method | HTTP request | Description
 - [Name](docs/Name.md)
 - [NumberOnly](docs/NumberOnly.md)
 - [Order](docs/Order.md)
+ - [OuterBoolean](docs/OuterBoolean.md)
 - [OuterComposite](docs/OuterComposite.md)
 - [OuterEnum](docs/OuterEnum.md)
+ - [OuterNumber](docs/OuterNumber.md)
+ - [OuterString](docs/OuterString.md)
 - [Pet](docs/Pet.md)
 - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
 - [SpecialModelName](docs/SpecialModelName.md)
 - [Tag](docs/Tag.md)
 - [User](docs/User.md)
- - [Cat](docs/Cat.md)
- - [Dog](docs/Dog.md)


 ## Documentation for Authorization
--- a/samples/client/petstore/java/google-api-client/build.gradle
+++ b/samples/client/petstore/java/google-api-client/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'idea'
 apply plugin: 'eclipse'

-group = 'io.swagger'
+group = 'org.openapitools'
 version = '1.0.0'

 buildscript {
@@ -83,7 +83,7 @@ if(hasProperty('target') && target == 'android') {

    install {
        repositories.mavenInstaller {
-            pom.artifactId = 'swagger-petstore-google-api-client'
+            pom.artifactId = 'petstore-google-api-client'
        }
    }
    
--- a/samples/client/petstore/java/google-api-client/build.sbt
+++ b/samples/client/petstore/java/google-api-client/build.sbt
@@ -1,7 +1,7 @@
 lazy val root = (project in file(".")).
  settings(
-    organization := "io.swagger",
-    name := "swagger-petstore-google-api-client",
+    organization := "org.openapitools",
+    name := "petstore-google-api-client",
    version := "1.0.0",
    scalaVersion := "2.11.4",
    scalacOptions ++= Seq("-feature"),
--- a/samples/client/petstore/java/google-api-client/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/java/google-api-client/docs/AnotherFakeApi.md
@@ -9,7 +9,7 @@ Method | HTTP request | Description

 <a name="testSpecialTags"></a>
 # **testSpecialTags**
-> Client testSpecialTags(body)
+> Client testSpecialTags(client)

 To test special tags

@@ -23,9 +23,9 @@ To test special tags


 AnotherFakeApi apiInstance = new AnotherFakeApi();
-Client body = new Client(); // Client | client model
+Client client = new Client(); // Client | client model
 try {
-    Client result = apiInstance.testSpecialTags(body);
+    Client result = apiInstance.testSpecialTags(client);
    System.out.println(result);
 } catch (ApiException e) {
    System.err.println("Exception when calling AnotherFakeApi#testSpecialTags");
@@ -37,7 +37,7 @@ try {

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**Client**](Client.md)| client model |
+ **client** | [**Client**](Client.md)| client model |

 ### Return type

--- a/samples/client/petstore/java/google-api-client/docs/EnumTest.md
+++ b/samples/client/petstore/java/google-api-client/docs/EnumTest.md
@@ -5,6 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **enumString** | [**EnumStringEnum**](#EnumStringEnum) |  |  [optional]
+**enumStringRequired** | [**EnumStringRequiredEnum**](#EnumStringRequiredEnum) |  | 
 **enumInteger** | [**EnumIntegerEnum**](#EnumIntegerEnum) |  |  [optional]
 **enumNumber** | [**EnumNumberEnum**](#EnumNumberEnum) |  |  [optional]
 **outerEnum** | [**OuterEnum**](OuterEnum.md) |  |  [optional]
@@ -19,6 +20,15 @@ LOWER | &quot;lower&quot;
 EMPTY | &quot;&quot;


+<a name="EnumStringRequiredEnum"></a>
+## Enum: EnumStringRequiredEnum
+Name | Value
+---- | -----
+UPPER | &quot;UPPER&quot;
+LOWER | &quot;lower&quot;
+EMPTY | &quot;&quot;
+
+
 <a name="EnumIntegerEnum"></a>
 ## Enum: EnumIntegerEnum
 Name | Value
--- a/samples/client/petstore/java/google-api-client/docs/FakeApi.md
+++ b/samples/client/petstore/java/google-api-client/docs/FakeApi.md
@@ -8,6 +8,7 @@ Method | HTTP request | Description
 [**fakeOuterCompositeSerialize**](FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 [**fakeOuterNumberSerialize**](FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
 [**fakeOuterStringSerialize**](FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
+[**testBodyWithQueryParams**](FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 [**testClientModel**](FakeApi.md#testClientModel) | **PATCH** /fake | To test \&quot;client\&quot; model
 [**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 [**testEnumParameters**](FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
@@ -17,7 +18,7 @@ Method | HTTP request | Description

 <a name="fakeOuterBooleanSerialize"></a>
 # **fakeOuterBooleanSerialize**
-> Boolean fakeOuterBooleanSerialize(body)
+> Boolean fakeOuterBooleanSerialize(booleanPostBody)



@@ -31,9 +32,9 @@ Test serialization of outer boolean types


 FakeApi apiInstance = new FakeApi();
-Boolean body = true; // Boolean | Input boolean as post body
+Boolean booleanPostBody = true; // Boolean | Input boolean as post body
 try {
-    Boolean result = apiInstance.fakeOuterBooleanSerialize(body);
+    Boolean result = apiInstance.fakeOuterBooleanSerialize(booleanPostBody);
    System.out.println(result);
 } catch (ApiException e) {
    System.err.println("Exception when calling FakeApi#fakeOuterBooleanSerialize");
@@ -45,7 +46,7 @@ try {

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**Boolean**](Boolean.md)| Input boolean as post body | [optional]
+ **booleanPostBody** | **Boolean**| Input boolean as post body | [optional]

 ### Return type

@@ -58,11 +59,11 @@ No authorization required
 ### HTTP request headers

 - **Content-Type**: Not defined
- - **Accept**: Not defined
+ - **Accept**: */*

 <a name="fakeOuterCompositeSerialize"></a>
 # **fakeOuterCompositeSerialize**
-> OuterComposite fakeOuterCompositeSerialize(body)
+> OuterComposite fakeOuterCompositeSerialize(outerComposite)



@@ -76,9 +77,9 @@ Test serialization of object with outer number type


 FakeApi apiInstance = new FakeApi();
-OuterComposite body = new OuterComposite(); // OuterComposite | Input composite as post body
+OuterComposite outerComposite = new OuterComposite(); // OuterComposite | Input composite as post body
 try {
-    OuterComposite result = apiInstance.fakeOuterCompositeSerialize(body);
+    OuterComposite result = apiInstance.fakeOuterCompositeSerialize(outerComposite);
    System.out.println(result);
 } catch (ApiException e) {
    System.err.println("Exception when calling FakeApi#fakeOuterCompositeSerialize");
@@ -90,7 +91,7 @@ try {

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**OuterComposite**](OuterComposite.md)| Input composite as post body | [optional]
+ **outerComposite** | [**OuterComposite**](OuterComposite.md)| Input composite as post body | [optional]

 ### Return type

@@ -103,7 +104,7 @@ No authorization required
 ### HTTP request headers

 - **Content-Type**: Not defined
- - **Accept**: Not defined
+ - **Accept**: */*

 <a name="fakeOuterNumberSerialize"></a>
 # **fakeOuterNumberSerialize**
@@ -135,7 +136,7 @@ try {

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**BigDecimal**](BigDecimal.md)| Input number as post body | [optional]
+ **body** | **BigDecimal**| Input number as post body | [optional]

 ### Return type

@@ -148,7 +149,7 @@ No authorization required
 ### HTTP request headers

 - **Content-Type**: Not defined
- - **Accept**: Not defined
+ - **Accept**: */*

 <a name="fakeOuterStringSerialize"></a>
 # **fakeOuterStringSerialize**
@@ -180,7 +181,7 @@ try {

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**String**](String.md)| Input string as post body | [optional]
+ **body** | **String**| Input string as post body | [optional]

 ### Return type

@@ -193,11 +194,55 @@ No authorization required
 ### HTTP request headers

 - **Content-Type**: Not defined
+ - **Accept**: */*
+
+<a name="testBodyWithQueryParams"></a>
+# **testBodyWithQueryParams**
+> testBodyWithQueryParams(query, user)
+
+
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiException;
+//import io.swagger.client.api.FakeApi;
+
+
+FakeApi apiInstance = new FakeApi();
+String query = "query_example"; // String | 
+User user = new User(); // User | 
+try {
+    apiInstance.testBodyWithQueryParams(query, user);
+} catch (ApiException e) {
+    System.err.println("Exception when calling FakeApi#testBodyWithQueryParams");
+    e.printStackTrace();
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **query** | **String**|  |
+ **user** | [**User**](User.md)|  |
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
 - **Accept**: Not defined

 <a name="testClientModel"></a>
 # **testClientModel**
-> Client testClientModel(body)
+> Client testClientModel(client)

 To test \&quot;client\&quot; model

@@ -211,9 +256,9 @@ To test \&quot;client\&quot; model


 FakeApi apiInstance = new FakeApi();
-Client body = new Client(); // Client | client model
+Client client = new Client(); // Client | client model
 try {
-    Client result = apiInstance.testClientModel(body);
+    Client result = apiInstance.testClientModel(client);
    System.out.println(result);
 } catch (ApiException e) {
    System.err.println("Exception when calling FakeApi#testClientModel");
@@ -225,7 +270,7 @@ try {

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**Client**](Client.md)| client model |
+ **client** | [**Client**](Client.md)| client model |

 ### Return type

@@ -268,13 +313,13 @@ FakeApi apiInstance = new FakeApi();
 BigDecimal number = new BigDecimal(); // BigDecimal | None
 Double _double = 3.4D; // Double | None
 String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
-byte[] _byte = B; // byte[] | None
+byte[] _byte = null; // byte[] | None
 Integer integer = 56; // Integer | None
 Integer int32 = 56; // Integer | None
-Long int64 = 789L; // Long | None
+Long int64 = 56L; // Long | None
 Float _float = 3.4F; // Float | None
 String string = "string_example"; // String | None
-byte[] binary = B; // byte[] | None
+File binary = new File("/path/to/file"); // File | None
 LocalDate date = new LocalDate(); // LocalDate | None
 OffsetDateTime dateTime = new OffsetDateTime(); // OffsetDateTime | None
 String password = "password_example"; // String | None
@@ -295,12 +340,12 @@ Name | Type | Description  | Notes
 **_double** | **Double**| None |
 **patternWithoutDelimiter** | **String**| None |
 **_byte** | **byte[]**| None |
- **integer** | **Integer**| None | [optional]
- **int32** | **Integer**| None | [optional]
+ **integer** | **Integer**| None | [optional] [enum: ]
+ **int32** | **Integer**| None | [optional] [enum: ]
 **int64** | **Long**| None | [optional]
 **_float** | **Float**| None | [optional]
 **string** | **String**| None | [optional]
- **binary** | **byte[]**| None | [optional]
+ **binary** | **File**| None | [optional]
 **date** | **LocalDate**| None | [optional]
 **dateTime** | **OffsetDateTime**| None | [optional]
 **password** | **String**| None | [optional]
@@ -316,12 +361,12 @@ null (empty response body)

 ### HTTP request headers

- - **Content-Type**: application/xml; charset=utf-8, application/json; charset=utf-8
- - **Accept**: application/xml; charset=utf-8, application/json; charset=utf-8
+ - **Content-Type**: application/x-www-form-urlencoded
+ - **Accept**: Not defined

 <a name="testEnumParameters"></a>
 # **testEnumParameters**
-> testEnumParameters(enumFormStringArray, enumFormString, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble)
+> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString)

 To test enum parameters

@@ -335,16 +380,16 @@ To test enum parameters


 FakeApi apiInstance = new FakeApi();
-List<String> enumFormStringArray = Arrays.asList("enumFormStringArray_example"); // List<String> | Form parameter enum test (string array)
-String enumFormString = "-efg"; // String | Form parameter enum test (string)
 List<String> enumHeaderStringArray = Arrays.asList("enumHeaderStringArray_example"); // List<String> | Header parameter enum test (string array)
 String enumHeaderString = "-efg"; // String | Header parameter enum test (string)
 List<String> enumQueryStringArray = Arrays.asList("enumQueryStringArray_example"); // List<String> | Query parameter enum test (string array)
 String enumQueryString = "-efg"; // String | Query parameter enum test (string)
 Integer enumQueryInteger = 56; // Integer | Query parameter enum test (double)
 Double enumQueryDouble = 3.4D; // Double | Query parameter enum test (double)
+List<String> enumFormStringArray = new List(); // List<String> | Form parameter enum test (string array)
+String enumFormString = "enumFormString_example"; // String | Form parameter enum test (string)
 try {
-    apiInstance.testEnumParameters(enumFormStringArray, enumFormString, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble);
+    apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
 } catch (ApiException e) {
    System.err.println("Exception when calling FakeApi#testEnumParameters");
    e.printStackTrace();
@@ -355,14 +400,14 @@ try {

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $]
- **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
 **enumHeaderStringArray** | [**List&lt;String&gt;**](String.md)| Header parameter enum test (string array) | [optional] [enum: >, $]
 **enumHeaderString** | **String**| Header parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
 **enumQueryStringArray** | [**List&lt;String&gt;**](String.md)| Query parameter enum test (string array) | [optional] [enum: >, $]
 **enumQueryString** | **String**| Query parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
 **enumQueryInteger** | **Integer**| Query parameter enum test (double) | [optional] [enum: 1, -2]
 **enumQueryDouble** | **Double**| Query parameter enum test (double) | [optional] [enum: 1.1, -1.2]
+ **enumFormStringArray** | [**List&lt;String&gt;**](List.md)| Form parameter enum test (string array) | [optional] [enum: >, $]
+ **enumFormString** | **String**| Form parameter enum test (string) | [optional] [enum: _abc, -efg, (xyz)]

 ### Return type

@@ -374,17 +419,15 @@ No authorization required

 ### HTTP request headers

- - **Content-Type**: */*
- - **Accept**: */*
+ - **Content-Type**: application/x-www-form-urlencoded
+ - **Accept**: Not defined

 <a name="testInlineAdditionalProperties"></a>
 # **testInlineAdditionalProperties**
-> testInlineAdditionalProperties(param)
+> testInlineAdditionalProperties(requestBody)

 test inline additionalProperties

-
-
 ### Example
 ```java
 // Import classes:
@@ -393,9 +436,9 @@ test inline additionalProperties


 FakeApi apiInstance = new FakeApi();
-Object param = null; // Object | request body
+String requestBody = new HashMap(); // String | request body
 try {
-    apiInstance.testInlineAdditionalProperties(param);
+    apiInstance.testInlineAdditionalProperties(requestBody);
 } catch (ApiException e) {
    System.err.println("Exception when calling FakeApi#testInlineAdditionalProperties");
    e.printStackTrace();
@@ -406,7 +449,7 @@ try {

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **param** | **Object**| request body |
+ **requestBody** | [**String**](String.md)| request body |

 ### Return type

@@ -427,8 +470,6 @@ No authorization required

 test json serialization of form data

-
-
 ### Example
 ```java
 // Import classes:
@@ -464,6 +505,6 @@ No authorization required

 ### HTTP request headers

- - **Content-Type**: application/json
+ - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined

--- a/samples/client/petstore/java/google-api-client/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/java/google-api-client/docs/FakeClassnameTags123Api.md
@@ -9,7 +9,7 @@ Method | HTTP request | Description

 <a name="testClassname"></a>
 # **testClassname**
-> Client testClassname(body)
+> Client testClassname(client)

 To test class name in snake case

@@ -33,9 +33,9 @@ api_key_query.setApiKey("YOUR API KEY");
 //api_key_query.setApiKeyPrefix("Token");

 FakeClassnameTags123Api apiInstance = new FakeClassnameTags123Api();
-Client body = new Client(); // Client | client model
+Client client = new Client(); // Client | client model
 try {
-    Client result = apiInstance.testClassname(body);
+    Client result = apiInstance.testClassname(client);
    System.out.println(result);
 } catch (ApiException e) {
    System.err.println("Exception when calling FakeClassnameTags123Api#testClassname");
@@ -47,7 +47,7 @@ try {

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**Client**](Client.md)| client model |
+ **client** | [**Client**](Client.md)| client model |

 ### Return type

--- a/samples/client/petstore/java/google-api-client/docs/FormatTest.md
+++ b/samples/client/petstore/java/google-api-client/docs/FormatTest.md
@@ -12,7 +12,7 @@ Name | Type | Description | Notes
 **_double** | **Double** |  |  [optional]
 **string** | **String** |  |  [optional]
 **_byte** | **byte[]** |  | 
-**binary** | **byte[]** |  |  [optional]
+**binary** | [**File**](File.md) |  |  [optional]
 **date** | [**LocalDate**](LocalDate.md) |  | 
 **dateTime** | [**OffsetDateTime**](OffsetDateTime.md) |  |  [optional]
 **uuid** | [**UUID**](UUID.md) |  |  [optional]
--- a/samples/client/petstore/java/google-api-client/docs/Name.md
+++ b/samples/client/petstore/java/google-api-client/docs/Name.md
@@ -7,7 +7,7 @@ Name | Type | Description | Notes
 **name** | **Integer** |  | 
 **snakeCase** | **Integer** |  |  [optional]
 **property** | **String** |  |  [optional]
-**_123Number** | **Integer** |  |  [optional]
+**_123number** | **Integer** |  |  [optional]



--- a/samples/client/petstore/java/google-api-client/docs/OuterBoolean.md
+++ b/samples/client/petstore/java/google-api-client/docs/OuterBoolean.md
@@ -0,0 +1,9 @@
+
+# OuterBoolean
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+
+
--- a/samples/client/petstore/java/google-api-client/docs/OuterNumber.md
+++ b/samples/client/petstore/java/google-api-client/docs/OuterNumber.md
@@ -0,0 +1,9 @@
+
+# OuterNumber
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+
+
--- a/samples/client/petstore/java/google-api-client/docs/OuterString.md
+++ b/samples/client/petstore/java/google-api-client/docs/OuterString.md
@@ -0,0 +1,9 @@
+
+# OuterString
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+
+
--- a/samples/client/petstore/java/google-api-client/docs/PetApi.md
+++ b/samples/client/petstore/java/google-api-client/docs/PetApi.md
@@ -16,12 +16,10 @@ Method | HTTP request | Description

 <a name="addPet"></a>
 # **addPet**
-> addPet(body)
+> addPet(pet)

 Add a new pet to the store

-
-
 ### Example
 ```java
 // Import classes:
@@ -38,9 +36,9 @@ OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
 petstore_auth.setAccessToken("YOUR ACCESS TOKEN");

 PetApi apiInstance = new PetApi();
-Pet body = new Pet(); // Pet | Pet object that needs to be added to the store
+Pet pet = new Pet(); // Pet | Pet object that needs to be added to the store
 try {
-    apiInstance.addPet(body);
+    apiInstance.addPet(pet);
 } catch (ApiException e) {
    System.err.println("Exception when calling PetApi#addPet");
    e.printStackTrace();
@@ -51,7 +49,7 @@ try {

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |
+ **pet** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |

 ### Return type

@@ -64,7 +62,7 @@ null (empty response body)
 ### HTTP request headers

 - **Content-Type**: application/json, application/xml
- - **Accept**: application/xml, application/json
+ - **Accept**: Not defined

 <a name="deletePet"></a>
 # **deletePet**
@@ -72,8 +70,6 @@ null (empty response body)

 Deletes a pet

-
-
 ### Example
 ```java
 // Import classes:
@@ -90,7 +86,7 @@ OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
 petstore_auth.setAccessToken("YOUR ACCESS TOKEN");

 PetApi apiInstance = new PetApi();
-Long petId = 789L; // Long | Pet id to delete
+Long petId = 56L; // Long | Pet id to delete
 String apiKey = "apiKey_example"; // String | 
 try {
    apiInstance.deletePet(petId, apiKey);
@@ -118,7 +114,7 @@ null (empty response body)
 ### HTTP request headers

 - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
+ - **Accept**: Not defined

 <a name="findPetsByStatus"></a>
 # **findPetsByStatus**
@@ -252,7 +248,7 @@ api_key.setApiKey("YOUR API KEY");
 //api_key.setApiKeyPrefix("Token");

 PetApi apiInstance = new PetApi();
-Long petId = 789L; // Long | ID of pet to return
+Long petId = 56L; // Long | ID of pet to return
 try {
    Pet result = apiInstance.getPetById(petId);
    System.out.println(result);
@@ -283,12 +279,10 @@ Name | Type | Description  | Notes

 <a name="updatePet"></a>
 # **updatePet**
-> updatePet(body)
+> updatePet(pet)

 Update an existing pet

-
-
 ### Example
 ```java
 // Import classes:
@@ -305,9 +299,9 @@ OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
 petstore_auth.setAccessToken("YOUR ACCESS TOKEN");

 PetApi apiInstance = new PetApi();
-Pet body = new Pet(); // Pet | Pet object that needs to be added to the store
+Pet pet = new Pet(); // Pet | Pet object that needs to be added to the store
 try {
-    apiInstance.updatePet(body);
+    apiInstance.updatePet(pet);
 } catch (ApiException e) {
    System.err.println("Exception when calling PetApi#updatePet");
    e.printStackTrace();
@@ -318,7 +312,7 @@ try {

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |
+ **pet** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |

 ### Return type

@@ -331,7 +325,7 @@ null (empty response body)
 ### HTTP request headers

 - **Content-Type**: application/json, application/xml
- - **Accept**: application/xml, application/json
+ - **Accept**: Not defined

 <a name="updatePetWithForm"></a>
 # **updatePetWithForm**
@@ -339,8 +333,6 @@ null (empty response body)

 Updates a pet in the store with form data

-
-
 ### Example
 ```java
 // Import classes:
@@ -357,7 +349,7 @@ OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
 petstore_auth.setAccessToken("YOUR ACCESS TOKEN");

 PetApi apiInstance = new PetApi();
-Long petId = 789L; // Long | ID of pet that needs to be updated
+Long petId = 56L; // Long | ID of pet that needs to be updated
 String name = "name_example"; // String | Updated name of the pet
 String status = "status_example"; // String | Updated status of the pet
 try {
@@ -387,7 +379,7 @@ null (empty response body)
 ### HTTP request headers

 - **Content-Type**: application/x-www-form-urlencoded
- - **Accept**: application/xml, application/json
+ - **Accept**: Not defined

 <a name="uploadFile"></a>
 # **uploadFile**
@@ -395,8 +387,6 @@ null (empty response body)

 uploads an image

-
-
 ### Example
 ```java
 // Import classes:
@@ -413,9 +403,9 @@ OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
 petstore_auth.setAccessToken("YOUR ACCESS TOKEN");

 PetApi apiInstance = new PetApi();
-Long petId = 789L; // Long | ID of pet to update
+Long petId = 56L; // Long | ID of pet to update
 String additionalMetadata = "additionalMetadata_example"; // String | Additional data to pass to server
-File file = new File("/path/to/file.txt"); // File | file to upload
+File file = new File("/path/to/file"); // File | file to upload
 try {
    ModelApiResponse result = apiInstance.uploadFile(petId, additionalMetadata, file);
    System.out.println(result);
--- a/samples/client/petstore/java/google-api-client/docs/SpecialModelName.md
+++ b/samples/client/petstore/java/google-api-client/docs/SpecialModelName.md
@@ -4,7 +4,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**specialPropertyName** | **Long** |  |  [optional]
+**$specialPropertyName** | **Long** |  |  [optional]



--- a/samples/client/petstore/java/google-api-client/docs/StoreApi.md
+++ b/samples/client/petstore/java/google-api-client/docs/StoreApi.md
@@ -52,7 +52,7 @@ No authorization required
 ### HTTP request headers

 - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
+ - **Accept**: Not defined

 <a name="getInventory"></a>
 # **getInventory**
@@ -121,7 +121,7 @@ For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other val


 StoreApi apiInstance = new StoreApi();
-Long orderId = 789L; // Long | ID of pet that needs to be fetched
+Long orderId = 56L; // Long | ID of pet that needs to be fetched
 try {
    Order result = apiInstance.getOrderById(orderId);
    System.out.println(result);
@@ -135,7 +135,7 @@ try {

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **orderId** | **Long**| ID of pet that needs to be fetched |
+ **orderId** | **Long**| ID of pet that needs to be fetched | [enum: ]

 ### Return type

@@ -152,12 +152,10 @@ No authorization required

 <a name="placeOrder"></a>
 # **placeOrder**
-> Order placeOrder(body)
+> Order placeOrder(order)

 Place an order for a pet

-
-
 ### Example
 ```java
 // Import classes:
@@ -166,9 +164,9 @@ Place an order for a pet


 StoreApi apiInstance = new StoreApi();
-Order body = new Order(); // Order | order placed for purchasing the pet
+Order order = new Order(); // Order | order placed for purchasing the pet
 try {
-    Order result = apiInstance.placeOrder(body);
+    Order result = apiInstance.placeOrder(order);
    System.out.println(result);
 } catch (ApiException e) {
    System.err.println("Exception when calling StoreApi#placeOrder");
@@ -180,7 +178,7 @@ try {

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**Order**](Order.md)| order placed for purchasing the pet |
+ **order** | [**Order**](Order.md)| order placed for purchasing the pet |

 ### Return type

--- a/samples/client/petstore/java/google-api-client/docs/UserApi.md
+++ b/samples/client/petstore/java/google-api-client/docs/UserApi.md
@@ -16,7 +16,7 @@ Method | HTTP request | Description

 <a name="createUser"></a>
 # **createUser**
-> createUser(body)
+> createUser(user)

 Create user

@@ -30,9 +30,9 @@ This can only be done by the logged in user.


 UserApi apiInstance = new UserApi();
-User body = new User(); // User | Created user object
+User user = new User(); // User | Created user object
 try {
-    apiInstance.createUser(body);
+    apiInstance.createUser(user);
 } catch (ApiException e) {
    System.err.println("Exception when calling UserApi#createUser");
    e.printStackTrace();
@@ -43,7 +43,7 @@ try {

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**User**](User.md)| Created user object |
+ **user** | [**User**](User.md)| Created user object |

 ### Return type

@@ -56,16 +56,14 @@ No authorization required
 ### HTTP request headers

 - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
+ - **Accept**: Not defined

 <a name="createUsersWithArrayInput"></a>
 # **createUsersWithArrayInput**
-> createUsersWithArrayInput(body)
+> createUsersWithArrayInput(user)

 Creates list of users with given input array

-
-
 ### Example
 ```java
 // Import classes:
@@ -74,9 +72,9 @@ Creates list of users with given input array


 UserApi apiInstance = new UserApi();
-List<User> body = Arrays.asList(new User()); // List<User> | List of user object
+List<User> user = Arrays.asList(new List()); // List<User> | List of user object
 try {
-    apiInstance.createUsersWithArrayInput(body);
+    apiInstance.createUsersWithArrayInput(user);
 } catch (ApiException e) {
    System.err.println("Exception when calling UserApi#createUsersWithArrayInput");
    e.printStackTrace();
@@ -87,7 +85,7 @@ try {

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**List&lt;User&gt;**](User.md)| List of user object |
+ **user** | [**List&lt;User&gt;**](List.md)| List of user object |

 ### Return type

@@ -100,16 +98,14 @@ No authorization required
 ### HTTP request headers

 - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
+ - **Accept**: Not defined

 <a name="createUsersWithListInput"></a>
 # **createUsersWithListInput**
-> createUsersWithListInput(body)
+> createUsersWithListInput(user)

 Creates list of users with given input array

-
-
 ### Example
 ```java
 // Import classes:
@@ -118,9 +114,9 @@ Creates list of users with given input array


 UserApi apiInstance = new UserApi();
-List<User> body = Arrays.asList(new User()); // List<User> | List of user object
+List<User> user = Arrays.asList(new List()); // List<User> | List of user object
 try {
-    apiInstance.createUsersWithListInput(body);
+    apiInstance.createUsersWithListInput(user);
 } catch (ApiException e) {
    System.err.println("Exception when calling UserApi#createUsersWithListInput");
    e.printStackTrace();
@@ -131,7 +127,7 @@ try {

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**List&lt;User&gt;**](User.md)| List of user object |
+ **user** | [**List&lt;User&gt;**](List.md)| List of user object |

 ### Return type

@@ -144,7 +140,7 @@ No authorization required
 ### HTTP request headers

 - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
+ - **Accept**: Not defined

 <a name="deleteUser"></a>
 # **deleteUser**
@@ -188,7 +184,7 @@ No authorization required
 ### HTTP request headers

 - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
+ - **Accept**: Not defined

 <a name="getUserByName"></a>
 # **getUserByName**
@@ -196,8 +192,6 @@ No authorization required

 Get user by user name

-
-
 ### Example
 ```java
 // Import classes:
@@ -241,8 +235,6 @@ No authorization required

 Logs user into the system

-
-
 ### Example
 ```java
 // Import classes:
@@ -288,8 +280,6 @@ No authorization required

 Logs out current logged in user session

-
-
 ### Example
 ```java
 // Import classes:
@@ -320,11 +310,11 @@ No authorization required
 ### HTTP request headers

 - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
+ - **Accept**: Not defined

 <a name="updateUser"></a>
 # **updateUser**
-> updateUser(username, body)
+> updateUser(username, user)

 Updated user

@@ -339,9 +329,9 @@ This can only be done by the logged in user.

 UserApi apiInstance = new UserApi();
 String username = "username_example"; // String | name that need to be deleted
-User body = new User(); // User | Updated user object
+User user = new User(); // User | Updated user object
 try {
-    apiInstance.updateUser(username, body);
+    apiInstance.updateUser(username, user);
 } catch (ApiException e) {
    System.err.println("Exception when calling UserApi#updateUser");
    e.printStackTrace();
@@ -353,7 +343,7 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 **username** | **String**| name that need to be deleted |
- **body** | [**User**](User.md)| Updated user object |
+ **user** | [**User**](User.md)| Updated user object |

 ### Return type

@@ -366,5 +356,5 @@ No authorization required
 ### HTTP request headers

 - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
+ - **Accept**: Not defined

--- a/samples/client/petstore/java/google-api-client/pom.xml
+++ b/samples/client/petstore/java/google-api-client/pom.xml
@@ -1,17 +1,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <groupId>io.swagger</groupId>
-    <artifactId>swagger-petstore-google-api-client</artifactId>
+    <groupId>org.openapitools</groupId>
+    <artifactId>petstore-google-api-client</artifactId>
    <packaging>jar</packaging>
-    <name>swagger-petstore-google-api-client</name>
+    <name>petstore-google-api-client</name>
    <version>1.0.0</version>
-    <url>https://github.com/swagger-api/swagger-codegen</url>
-    <description>Swagger Java</description>
+    <url>https://github.com/openapitools/openapi-generator</url>
+    <description>OpenAPI Java</description>
    <scm>
-        <connection>scm:git:git@github.com:swagger-api/swagger-codegen.git</connection>
-        <developerConnection>scm:git:git@github.com:swagger-api/swagger-codegen.git</developerConnection>
-        <url>https://github.com/swagger-api/swagger-codegen</url>
+        <connection>scm:git:git@github.com:openapitools/openapi-generator.git</connection>
+        <developerConnection>scm:git:git@github.com:openapitools/openapi-generator.git</developerConnection>
+        <url>https://github.com/openapitools/openapi-generator</url>
    </scm>

    <licenses>
@@ -24,10 +24,10 @@

    <developers>
        <developer>
-            <name>Swagger</name>
-            <email>apiteam@swagger.io</email>
-            <organization>Swagger</organization>
-            <organizationUrl>http://swagger.io</organizationUrl>
+            <name>OpenAPI</name>
+            <email>team@openapitools.org</email>
+            <organization>OpenAPI</organization>
+            <organizationUrl>http://openapitools.org</organizationUrl>
        </developer>
    </developers>

@@ -139,8 +139,7 @@
                <artifactId>maven-compiler-plugin</artifactId>
                <version>3.6.1</version>
                <configuration>
-                        <source>
-                        1.7</source>
+                        <source>1.7</source>
                        <target>1.7</target>
                </configuration>
            </plugin>
--- a/samples/client/petstore/java/google-api-client/settings.gradle
+++ b/samples/client/petstore/java/google-api-client/settings.gradle
@@ -1 +1 @@
-rootProject.name = "swagger-petstore-google-api-client"
+rootProject.name = "petstore-google-api-client"
--- a/samples/client/petstore/java/google-api-client/src/main/java/io/swagger/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/io/swagger/client/api/AnotherFakeApi.java
@@ -44,12 +44,12 @@ public class AnotherFakeApi {
    * To test special tags
    * To test special tags
    * <p><b>200</b> - successful operation
-    * @param body client model
+    * @param client client model
    * @return Client
    * @throws IOException if an error occurs while attempting to invoke the API
    **/
-    public Client testSpecialTags(Client body) throws IOException {
-        HttpResponse response = testSpecialTagsForHttpResponse(body);
+    public Client testSpecialTags(Client client) throws IOException {
+        HttpResponse response = testSpecialTagsForHttpResponse(client);
        TypeReference typeRef = new TypeReference<Client>() {};
        return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
    }
@@ -58,51 +58,51 @@ public class AnotherFakeApi {
    * To test special tags
    * To test special tags
    * <p><b>200</b> - successful operation
-    * @param body client model
+    * @param client client model
    * @param params Map of query params. A collection will be interpreted as passing in multiple instances of the same query param.
    * @return Client
    * @throws IOException if an error occurs while attempting to invoke the API
    **/
-    public Client testSpecialTags(Client body, Map<String, Object> params) throws IOException {
-        HttpResponse response = testSpecialTagsForHttpResponse(body, params);
+    public Client testSpecialTags(Client client, Map<String, Object> params) throws IOException {
+        HttpResponse response = testSpecialTagsForHttpResponse(client, params);
        TypeReference typeRef = new TypeReference<Client>() {};
        return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
    }

-    public HttpResponse testSpecialTagsForHttpResponse(Client body) throws IOException {
-        // verify the required parameter 'body' is set
-        if (body == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'body' when calling testSpecialTags");
+    public HttpResponse testSpecialTagsForHttpResponse(Client client) throws IOException {
+        // verify the required parameter 'client' is set
+        if (client == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'client' when calling testSpecialTags");
        }
        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/another-fake/dummy");

        String url = uriBuilder.build().toString();
        GenericUrl genericUrl = new GenericUrl(url);

-        HttpContent content = apiClient.new JacksonJsonHttpContent(body);
+        HttpContent content = apiClient.new JacksonJsonHttpContent(client);
        return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.PATCH, genericUrl, content).execute();
    }

-      public HttpResponse testSpecialTagsForHttpResponse(java.io.InputStream body, String mediaType) throws IOException {
-          // verify the required parameter 'body' is set
-              if (body == null) {
-              throw new IllegalArgumentException("Missing the required parameter 'body' when calling testSpecialTags");
+      public HttpResponse testSpecialTagsForHttpResponse(java.io.InputStream client, String mediaType) throws IOException {
+          // verify the required parameter 'client' is set
+              if (client == null) {
+              throw new IllegalArgumentException("Missing the required parameter 'client' when calling testSpecialTags");
              }
              UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/another-fake/dummy");

              String url = uriBuilder.build().toString();
              GenericUrl genericUrl = new GenericUrl(url);

-              HttpContent content = body == null ?
+              HttpContent content = client == null ?
                apiClient.new JacksonJsonHttpContent(null) :
-                new InputStreamContent(mediaType == null ? Json.MEDIA_TYPE : mediaType, body);
+                new InputStreamContent(mediaType == null ? Json.MEDIA_TYPE : mediaType, client);
              return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.PATCH, genericUrl, content).execute();
      }

-    public HttpResponse testSpecialTagsForHttpResponse(Client body, Map<String, Object> params) throws IOException {
-        // verify the required parameter 'body' is set
-        if (body == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'body' when calling testSpecialTags");
+    public HttpResponse testSpecialTagsForHttpResponse(Client client, Map<String, Object> params) throws IOException {
+        // verify the required parameter 'client' is set
+        if (client == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'client' when calling testSpecialTags");
        }
        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/another-fake/dummy");

@@ -127,7 +127,7 @@ public class AnotherFakeApi {
        String url = uriBuilder.build().toString();
        GenericUrl genericUrl = new GenericUrl(url);

-        HttpContent content = apiClient.new JacksonJsonHttpContent(body);
+        HttpContent content = apiClient.new JacksonJsonHttpContent(client);
        return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.PATCH, genericUrl, content).execute();
    }

--- a/samples/client/petstore/java/google-api-client/src/main/java/io/swagger/client/api/FakeApi.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/io/swagger/client/api/FakeApi.java
@@ -4,9 +4,11 @@ import io.swagger.client.ApiClient;

 import java.math.BigDecimal;
 import io.swagger.client.model.Client;
+import java.io.File;
 import org.threeten.bp.LocalDate;
 import org.threeten.bp.OffsetDateTime;
 import io.swagger.client.model.OuterComposite;
+import io.swagger.client.model.User;

 import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.api.client.http.GenericUrl;
@@ -47,12 +49,12 @@ public class FakeApi {
  /**
    * Test serialization of outer boolean types
    * <p><b>200</b> - Output boolean
-    * @param body Input boolean as post body
+    * @param booleanPostBody Input boolean as post body
    * @return Boolean
    * @throws IOException if an error occurs while attempting to invoke the API
    **/
-    public Boolean fakeOuterBooleanSerialize(Boolean body) throws IOException {
-        HttpResponse response = fakeOuterBooleanSerializeForHttpResponse(body);
+    public Boolean fakeOuterBooleanSerialize(Boolean booleanPostBody) throws IOException {
+        HttpResponse response = fakeOuterBooleanSerializeForHttpResponse(booleanPostBody);
        TypeReference typeRef = new TypeReference<Boolean>() {};
        return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
    }
@@ -64,37 +66,37 @@ public class FakeApi {
    * @return Boolean
    * @throws IOException if an error occurs while attempting to invoke the API
    **/
-    public Boolean fakeOuterBooleanSerialize(Boolean body, Map<String, Object> params) throws IOException {
-        HttpResponse response = fakeOuterBooleanSerializeForHttpResponse(body, params);
+    public Boolean fakeOuterBooleanSerialize(Boolean booleanPostBody, Map<String, Object> params) throws IOException {
+        HttpResponse response = fakeOuterBooleanSerializeForHttpResponse(booleanPostBody, params);
        TypeReference typeRef = new TypeReference<Boolean>() {};
        return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
    }

-    public HttpResponse fakeOuterBooleanSerializeForHttpResponse(Boolean body) throws IOException {
+    public HttpResponse fakeOuterBooleanSerializeForHttpResponse(Boolean booleanPostBody) throws IOException {
        
        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/fake/outer/boolean");

        String url = uriBuilder.build().toString();
        GenericUrl genericUrl = new GenericUrl(url);

-        HttpContent content = apiClient.new JacksonJsonHttpContent(body);
+        HttpContent content = apiClient.new JacksonJsonHttpContent(booleanPostBody);
        return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.POST, genericUrl, content).execute();
    }

-      public HttpResponse fakeOuterBooleanSerializeForHttpResponse(java.io.InputStream body, String mediaType) throws IOException {
+      public HttpResponse fakeOuterBooleanSerializeForHttpResponse(java.io.InputStream booleanPostBody, String mediaType) throws IOException {
          
              UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/fake/outer/boolean");

              String url = uriBuilder.build().toString();
              GenericUrl genericUrl = new GenericUrl(url);

-              HttpContent content = body == null ?
+              HttpContent content = booleanPostBody == null ?
                apiClient.new JacksonJsonHttpContent(null) :
-                new InputStreamContent(mediaType == null ? Json.MEDIA_TYPE : mediaType, body);
+                new InputStreamContent(mediaType == null ? Json.MEDIA_TYPE : mediaType, booleanPostBody);
              return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.POST, genericUrl, content).execute();
      }

-    public HttpResponse fakeOuterBooleanSerializeForHttpResponse(Boolean body, Map<String, Object> params) throws IOException {
+    public HttpResponse fakeOuterBooleanSerializeForHttpResponse(Boolean booleanPostBody, Map<String, Object> params) throws IOException {
        
        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/fake/outer/boolean");

@@ -119,7 +121,7 @@ public class FakeApi {
        String url = uriBuilder.build().toString();
        GenericUrl genericUrl = new GenericUrl(url);

-        HttpContent content = apiClient.new JacksonJsonHttpContent(body);
+        HttpContent content = apiClient.new JacksonJsonHttpContent(booleanPostBody);
        return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.POST, genericUrl, content).execute();
    }

@@ -127,12 +129,12 @@ public class FakeApi {
  /**
    * Test serialization of object with outer number type
    * <p><b>200</b> - Output composite
-    * @param body Input composite as post body
+    * @param outerComposite Input composite as post body
    * @return OuterComposite
    * @throws IOException if an error occurs while attempting to invoke the API
    **/
-    public OuterComposite fakeOuterCompositeSerialize(OuterComposite body) throws IOException {
-        HttpResponse response = fakeOuterCompositeSerializeForHttpResponse(body);
+    public OuterComposite fakeOuterCompositeSerialize(OuterComposite outerComposite) throws IOException {
+        HttpResponse response = fakeOuterCompositeSerializeForHttpResponse(outerComposite);
        TypeReference typeRef = new TypeReference<OuterComposite>() {};
        return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
    }
@@ -144,37 +146,37 @@ public class FakeApi {
    * @return OuterComposite
    * @throws IOException if an error occurs while attempting to invoke the API
    **/
-    public OuterComposite fakeOuterCompositeSerialize(OuterComposite body, Map<String, Object> params) throws IOException {
-        HttpResponse response = fakeOuterCompositeSerializeForHttpResponse(body, params);
+    public OuterComposite fakeOuterCompositeSerialize(OuterComposite outerComposite, Map<String, Object> params) throws IOException {
+        HttpResponse response = fakeOuterCompositeSerializeForHttpResponse(outerComposite, params);
        TypeReference typeRef = new TypeReference<OuterComposite>() {};
        return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
    }

-    public HttpResponse fakeOuterCompositeSerializeForHttpResponse(OuterComposite body) throws IOException {
+    public HttpResponse fakeOuterCompositeSerializeForHttpResponse(OuterComposite outerComposite) throws IOException {
        
        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/fake/outer/composite");

        String url = uriBuilder.build().toString();
        GenericUrl genericUrl = new GenericUrl(url);

-        HttpContent content = apiClient.new JacksonJsonHttpContent(body);
+        HttpContent content = apiClient.new JacksonJsonHttpContent(outerComposite);
        return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.POST, genericUrl, content).execute();
    }

-      public HttpResponse fakeOuterCompositeSerializeForHttpResponse(java.io.InputStream body, String mediaType) throws IOException {
+      public HttpResponse fakeOuterCompositeSerializeForHttpResponse(java.io.InputStream outerComposite, String mediaType) throws IOException {
          
              UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/fake/outer/composite");

              String url = uriBuilder.build().toString();
              GenericUrl genericUrl = new GenericUrl(url);

-              HttpContent content = body == null ?
+              HttpContent content = outerComposite == null ?
                apiClient.new JacksonJsonHttpContent(null) :
-                new InputStreamContent(mediaType == null ? Json.MEDIA_TYPE : mediaType, body);
+                new InputStreamContent(mediaType == null ? Json.MEDIA_TYPE : mediaType, outerComposite);
              return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.POST, genericUrl, content).execute();
      }

-    public HttpResponse fakeOuterCompositeSerializeForHttpResponse(OuterComposite body, Map<String, Object> params) throws IOException {
+    public HttpResponse fakeOuterCompositeSerializeForHttpResponse(OuterComposite outerComposite, Map<String, Object> params) throws IOException {
        
        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/fake/outer/composite");

@@ -199,7 +201,7 @@ public class FakeApi {
        String url = uriBuilder.build().toString();
        GenericUrl genericUrl = new GenericUrl(url);

-        HttpContent content = apiClient.new JacksonJsonHttpContent(body);
+        HttpContent content = apiClient.new JacksonJsonHttpContent(outerComposite);
        return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.POST, genericUrl, content).execute();
    }

@@ -364,16 +366,133 @@ public class FakeApi {
    }


+  /**
+    * <p><b>200</b> - Success
+    * @param query The query parameter
+    * @param user The user parameter
+    * @throws IOException if an error occurs while attempting to invoke the API
+    **/
+    public void testBodyWithQueryParams(String query, User user) throws IOException {
+        testBodyWithQueryParamsForHttpResponse(query, user);
+    }
+
+  /**
+    * <p><b>200</b> - Success
+    * @param query The query parameter
+    * @param user The user parameter
+    * @param params Map of query params. A collection will be interpreted as passing in multiple instances of the same query param.
+    * @throws IOException if an error occurs while attempting to invoke the API
+    **/
+    public void testBodyWithQueryParams(String query, User user, Map<String, Object> params) throws IOException {
+        testBodyWithQueryParamsForHttpResponse(query, user, params);
+    }
+
+    public HttpResponse testBodyWithQueryParamsForHttpResponse(String query, User user) throws IOException {
+        // verify the required parameter 'query' is set
+        if (query == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'query' when calling testBodyWithQueryParams");
+        }// verify the required parameter 'user' is set
+        if (user == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'user' when calling testBodyWithQueryParams");
+        }
+        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/fake/body-with-query-params");
+        if (query != null) {
+            String key = "query";
+            Object value = query;
+            if (value instanceof Collection) {
+                uriBuilder = uriBuilder.queryParam(key, ((Collection) value).toArray());
+            } else if (value instanceof Object[]) {
+                uriBuilder = uriBuilder.queryParam(key, (Object[]) value);
+            } else {
+                uriBuilder = uriBuilder.queryParam(key, value);
+            }
+        }
+
+        String url = uriBuilder.build().toString();
+        GenericUrl genericUrl = new GenericUrl(url);
+
+        HttpContent content = apiClient.new JacksonJsonHttpContent(user);
+        return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.PUT, genericUrl, content).execute();
+    }
+
+      public HttpResponse testBodyWithQueryParamsForHttpResponse(String query, java.io.InputStream user, String mediaType) throws IOException {
+          // verify the required parameter 'query' is set
+              if (query == null) {
+              throw new IllegalArgumentException("Missing the required parameter 'query' when calling testBodyWithQueryParams");
+              }// verify the required parameter 'user' is set
+              if (user == null) {
+              throw new IllegalArgumentException("Missing the required parameter 'user' when calling testBodyWithQueryParams");
+              }
+              UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/fake/body-with-query-params");
+              if (query != null) {
+                  String key = "query";
+                  Object value = query;
+                  if (value instanceof Collection) {
+                    uriBuilder = uriBuilder.queryParam(key, ((Collection) value).toArray());
+                  } else if (value instanceof Object[]) {
+                    uriBuilder = uriBuilder.queryParam(key, (Object[]) value);
+                  } else {
+                    uriBuilder = uriBuilder.queryParam(key, value);
+                  }
+              }
+
+              String url = uriBuilder.build().toString();
+              GenericUrl genericUrl = new GenericUrl(url);
+
+              HttpContent content = user == null ?
+                apiClient.new JacksonJsonHttpContent(null) :
+                new InputStreamContent(mediaType == null ? Json.MEDIA_TYPE : mediaType, user);
+              return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.PUT, genericUrl, content).execute();
+      }
+
+    public HttpResponse testBodyWithQueryParamsForHttpResponse(String query, User user, Map<String, Object> params) throws IOException {
+        // verify the required parameter 'query' is set
+        if (query == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'query' when calling testBodyWithQueryParams");
+        }// verify the required parameter 'user' is set
+        if (user == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'user' when calling testBodyWithQueryParams");
+        }
+        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/fake/body-with-query-params");
+
+        // Copy the params argument if present, to allow passing in immutable maps
+        Map<String, Object> allParams = params == null ? new HashMap<String, Object>() : new HashMap<String, Object>(params);
+        // Add the required query param 'query' to the map of query params
+        allParams.put("query", query);
+
+        for (Map.Entry<String, Object> entry: allParams.entrySet()) {
+            String key = entry.getKey();
+            Object value = entry.getValue();
+
+            if (key != null && value != null) {
+                if (value instanceof Collection) {
+                    uriBuilder = uriBuilder.queryParam(key, ((Collection) value).toArray());
+                } else if (value instanceof Object[]) {
+                    uriBuilder = uriBuilder.queryParam(key, (Object[]) value);
+                } else {
+                    uriBuilder = uriBuilder.queryParam(key, value);
+                }
+            }
+        }
+
+        String url = uriBuilder.build().toString();
+        GenericUrl genericUrl = new GenericUrl(url);
+
+        HttpContent content = apiClient.new JacksonJsonHttpContent(user);
+        return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.PUT, genericUrl, content).execute();
+    }
+
+
  /**
    * To test \&quot;client\&quot; model
    * To test \&quot;client\&quot; model
    * <p><b>200</b> - successful operation
-    * @param body client model
+    * @param client client model
    * @return Client
    * @throws IOException if an error occurs while attempting to invoke the API
    **/
-    public Client testClientModel(Client body) throws IOException {
-        HttpResponse response = testClientModelForHttpResponse(body);
+    public Client testClientModel(Client client) throws IOException {
+        HttpResponse response = testClientModelForHttpResponse(client);
        TypeReference typeRef = new TypeReference<Client>() {};
        return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
    }
@@ -382,51 +501,51 @@ public class FakeApi {
    * To test \&quot;client\&quot; model
    * To test \&quot;client\&quot; model
    * <p><b>200</b> - successful operation
-    * @param body client model
+    * @param client client model
    * @param params Map of query params. A collection will be interpreted as passing in multiple instances of the same query param.
    * @return Client
    * @throws IOException if an error occurs while attempting to invoke the API
    **/
-    public Client testClientModel(Client body, Map<String, Object> params) throws IOException {
-        HttpResponse response = testClientModelForHttpResponse(body, params);
+    public Client testClientModel(Client client, Map<String, Object> params) throws IOException {
+        HttpResponse response = testClientModelForHttpResponse(client, params);
        TypeReference typeRef = new TypeReference<Client>() {};
        return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
    }

-    public HttpResponse testClientModelForHttpResponse(Client body) throws IOException {
-        // verify the required parameter 'body' is set
-        if (body == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'body' when calling testClientModel");
+    public HttpResponse testClientModelForHttpResponse(Client client) throws IOException {
+        // verify the required parameter 'client' is set
+        if (client == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'client' when calling testClientModel");
        }
        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/fake");

        String url = uriBuilder.build().toString();
        GenericUrl genericUrl = new GenericUrl(url);

-        HttpContent content = apiClient.new JacksonJsonHttpContent(body);
+        HttpContent content = apiClient.new JacksonJsonHttpContent(client);
        return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.PATCH, genericUrl, content).execute();
    }

-      public HttpResponse testClientModelForHttpResponse(java.io.InputStream body, String mediaType) throws IOException {
-          // verify the required parameter 'body' is set
-              if (body == null) {
-              throw new IllegalArgumentException("Missing the required parameter 'body' when calling testClientModel");
+      public HttpResponse testClientModelForHttpResponse(java.io.InputStream client, String mediaType) throws IOException {
+          // verify the required parameter 'client' is set
+              if (client == null) {
+              throw new IllegalArgumentException("Missing the required parameter 'client' when calling testClientModel");
              }
              UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/fake");

              String url = uriBuilder.build().toString();
              GenericUrl genericUrl = new GenericUrl(url);

-              HttpContent content = body == null ?
+              HttpContent content = client == null ?
                apiClient.new JacksonJsonHttpContent(null) :
-                new InputStreamContent(mediaType == null ? Json.MEDIA_TYPE : mediaType, body);
+                new InputStreamContent(mediaType == null ? Json.MEDIA_TYPE : mediaType, client);
              return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.PATCH, genericUrl, content).execute();
      }

-    public HttpResponse testClientModelForHttpResponse(Client body, Map<String, Object> params) throws IOException {
-        // verify the required parameter 'body' is set
-        if (body == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'body' when calling testClientModel");
+    public HttpResponse testClientModelForHttpResponse(Client client, Map<String, Object> params) throws IOException {
+        // verify the required parameter 'client' is set
+        if (client == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'client' when calling testClientModel");
        }
        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/fake");

@@ -451,7 +570,7 @@ public class FakeApi {
        String url = uriBuilder.build().toString();
        GenericUrl genericUrl = new GenericUrl(url);

-        HttpContent content = apiClient.new JacksonJsonHttpContent(body);
+        HttpContent content = apiClient.new JacksonJsonHttpContent(client);
        return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.PATCH, genericUrl, content).execute();
    }

@@ -477,7 +596,7 @@ public class FakeApi {
    * @param paramCallback None
    * @throws IOException if an error occurs while attempting to invoke the API
    **/
-    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, byte[] binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws IOException {
+    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws IOException {
        testEndpointParametersForHttpResponse(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
    }

@@ -497,7 +616,7 @@ public class FakeApi {
        testEndpointParametersForHttpResponse(number, _double, patternWithoutDelimiter, _byte, params);
    }

-    public HttpResponse testEndpointParametersForHttpResponse(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, byte[] binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws IOException {
+    public HttpResponse testEndpointParametersForHttpResponse(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws IOException {
        // verify the required parameter 'number' is set
        if (number == null) {
            throw new IllegalArgumentException("Missing the required parameter 'number' when calling testEndpointParameters");
@@ -567,18 +686,18 @@ public class FakeApi {
    * To test enum parameters
    * <p><b>400</b> - Invalid request
    * <p><b>404</b> - Not found
-    * @param enumFormStringArray Form parameter enum test (string array)
-    * @param enumFormString Form parameter enum test (string)
    * @param enumHeaderStringArray Header parameter enum test (string array)
    * @param enumHeaderString Header parameter enum test (string)
    * @param enumQueryStringArray Query parameter enum test (string array)
    * @param enumQueryString Query parameter enum test (string)
    * @param enumQueryInteger Query parameter enum test (double)
    * @param enumQueryDouble Query parameter enum test (double)
+    * @param enumFormStringArray Form parameter enum test (string array)
+    * @param enumFormString Form parameter enum test (string)
    * @throws IOException if an error occurs while attempting to invoke the API
    **/
-    public void testEnumParameters(List<String> enumFormStringArray, String enumFormString, List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble) throws IOException {
-        testEnumParametersForHttpResponse(enumFormStringArray, enumFormString, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble);
+    public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString) throws IOException {
+        testEnumParametersForHttpResponse(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
    }

  /**
@@ -593,7 +712,7 @@ public class FakeApi {
        testEnumParametersForHttpResponse(params);
    }

-    public HttpResponse testEnumParametersForHttpResponse(List<String> enumFormStringArray, String enumFormString, List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble) throws IOException {
+    public HttpResponse testEnumParametersForHttpResponse(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString) throws IOException {
        
        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/fake");
        if (enumQueryStringArray != null) {
@@ -626,6 +745,16 @@ public class FakeApi {
            } else {
                uriBuilder = uriBuilder.queryParam(key, value);
            }
+        }        if (enumQueryDouble != null) {
+            String key = "enum_query_double";
+            Object value = enumQueryDouble;
+            if (value instanceof Collection) {
+                uriBuilder = uriBuilder.queryParam(key, ((Collection) value).toArray());
+            } else if (value instanceof Object[]) {
+                uriBuilder = uriBuilder.queryParam(key, (Object[]) value);
+            } else {
+                uriBuilder = uriBuilder.queryParam(key, value);
+            }
        }

        String url = uriBuilder.build().toString();
@@ -667,61 +796,59 @@ public class FakeApi {

  /**
    * test inline additionalProperties
-    * 
    * <p><b>200</b> - successful operation
-    * @param param request body
+    * @param requestBody request body
    * @throws IOException if an error occurs while attempting to invoke the API
    **/
-    public void testInlineAdditionalProperties(Object param) throws IOException {
-        testInlineAdditionalPropertiesForHttpResponse(param);
+    public void testInlineAdditionalProperties(String requestBody) throws IOException {
+        testInlineAdditionalPropertiesForHttpResponse(requestBody);
    }

  /**
    * test inline additionalProperties
-    * 
    * <p><b>200</b> - successful operation
-    * @param param request body
+    * @param requestBody request body
    * @param params Map of query params. A collection will be interpreted as passing in multiple instances of the same query param.
    * @throws IOException if an error occurs while attempting to invoke the API
    **/
-    public void testInlineAdditionalProperties(Object param, Map<String, Object> params) throws IOException {
-        testInlineAdditionalPropertiesForHttpResponse(param, params);
+    public void testInlineAdditionalProperties(String requestBody, Map<String, Object> params) throws IOException {
+        testInlineAdditionalPropertiesForHttpResponse(requestBody, params);
    }

-    public HttpResponse testInlineAdditionalPropertiesForHttpResponse(Object param) throws IOException {
-        // verify the required parameter 'param' is set
-        if (param == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'param' when calling testInlineAdditionalProperties");
+    public HttpResponse testInlineAdditionalPropertiesForHttpResponse(String requestBody) throws IOException {
+        // verify the required parameter 'requestBody' is set
+        if (requestBody == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'requestBody' when calling testInlineAdditionalProperties");
        }
        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/fake/inline-additionalProperties");

        String url = uriBuilder.build().toString();
        GenericUrl genericUrl = new GenericUrl(url);

-        HttpContent content = apiClient.new JacksonJsonHttpContent(param);
+        HttpContent content = apiClient.new JacksonJsonHttpContent(requestBody);
        return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.POST, genericUrl, content).execute();
    }

-      public HttpResponse testInlineAdditionalPropertiesForHttpResponse(java.io.InputStream param, String mediaType) throws IOException {
-          // verify the required parameter 'param' is set
-              if (param == null) {
-              throw new IllegalArgumentException("Missing the required parameter 'param' when calling testInlineAdditionalProperties");
+      public HttpResponse testInlineAdditionalPropertiesForHttpResponse(java.io.InputStream requestBody, String mediaType) throws IOException {
+          // verify the required parameter 'requestBody' is set
+              if (requestBody == null) {
+              throw new IllegalArgumentException("Missing the required parameter 'requestBody' when calling testInlineAdditionalProperties");
              }
              UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/fake/inline-additionalProperties");

              String url = uriBuilder.build().toString();
              GenericUrl genericUrl = new GenericUrl(url);

-              HttpContent content = param == null ?
+              HttpContent content = requestBody == null ?
                apiClient.new JacksonJsonHttpContent(null) :
-                new InputStreamContent(mediaType == null ? Json.MEDIA_TYPE : mediaType, param);
+                new InputStreamContent(mediaType == null ? Json.MEDIA_TYPE : mediaType, requestBody);
              return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.POST, genericUrl, content).execute();
      }

-    public HttpResponse testInlineAdditionalPropertiesForHttpResponse(Object param, Map<String, Object> params) throws IOException {
-        // verify the required parameter 'param' is set
-        if (param == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'param' when calling testInlineAdditionalProperties");
+    public HttpResponse testInlineAdditionalPropertiesForHttpResponse(String requestBody, Map<String, Object> params) throws IOException {
+        // verify the required parameter 'requestBody' is set
+        if (requestBody == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'requestBody' when calling testInlineAdditionalProperties");
        }
        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/fake/inline-additionalProperties");

@@ -746,14 +873,13 @@ public class FakeApi {
        String url = uriBuilder.build().toString();
        GenericUrl genericUrl = new GenericUrl(url);

-        HttpContent content = apiClient.new JacksonJsonHttpContent(param);
+        HttpContent content = apiClient.new JacksonJsonHttpContent(requestBody);
        return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.POST, genericUrl, content).execute();
    }


  /**
    * test json serialization of form data
-    * 
    * <p><b>200</b> - successful operation
    * @param param field1
    * @param param2 field2
@@ -765,7 +891,6 @@ public class FakeApi {

  /**
    * test json serialization of form data
-    * 
    * <p><b>200</b> - successful operation
    * @param param field1
    * @param param2 field2
--- a/samples/client/petstore/java/google-api-client/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java
@@ -44,12 +44,12 @@ public class FakeClassnameTags123Api {
    * To test class name in snake case
    * To test class name in snake case
    * <p><b>200</b> - successful operation
-    * @param body client model
+    * @param client client model
    * @return Client
    * @throws IOException if an error occurs while attempting to invoke the API
    **/
-    public Client testClassname(Client body) throws IOException {
-        HttpResponse response = testClassnameForHttpResponse(body);
+    public Client testClassname(Client client) throws IOException {
+        HttpResponse response = testClassnameForHttpResponse(client);
        TypeReference typeRef = new TypeReference<Client>() {};
        return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
    }
@@ -58,51 +58,51 @@ public class FakeClassnameTags123Api {
    * To test class name in snake case
    * To test class name in snake case
    * <p><b>200</b> - successful operation
-    * @param body client model
+    * @param client client model
    * @param params Map of query params. A collection will be interpreted as passing in multiple instances of the same query param.
    * @return Client
    * @throws IOException if an error occurs while attempting to invoke the API
    **/
-    public Client testClassname(Client body, Map<String, Object> params) throws IOException {
-        HttpResponse response = testClassnameForHttpResponse(body, params);
+    public Client testClassname(Client client, Map<String, Object> params) throws IOException {
+        HttpResponse response = testClassnameForHttpResponse(client, params);
        TypeReference typeRef = new TypeReference<Client>() {};
        return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
    }

-    public HttpResponse testClassnameForHttpResponse(Client body) throws IOException {
-        // verify the required parameter 'body' is set
-        if (body == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'body' when calling testClassname");
+    public HttpResponse testClassnameForHttpResponse(Client client) throws IOException {
+        // verify the required parameter 'client' is set
+        if (client == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'client' when calling testClassname");
        }
        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/fake_classname_test");

        String url = uriBuilder.build().toString();
        GenericUrl genericUrl = new GenericUrl(url);

-        HttpContent content = apiClient.new JacksonJsonHttpContent(body);
+        HttpContent content = apiClient.new JacksonJsonHttpContent(client);
        return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.PATCH, genericUrl, content).execute();
    }

-      public HttpResponse testClassnameForHttpResponse(java.io.InputStream body, String mediaType) throws IOException {
-          // verify the required parameter 'body' is set
-              if (body == null) {
-              throw new IllegalArgumentException("Missing the required parameter 'body' when calling testClassname");
+      public HttpResponse testClassnameForHttpResponse(java.io.InputStream client, String mediaType) throws IOException {
+          // verify the required parameter 'client' is set
+              if (client == null) {
+              throw new IllegalArgumentException("Missing the required parameter 'client' when calling testClassname");
              }
              UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/fake_classname_test");

              String url = uriBuilder.build().toString();
              GenericUrl genericUrl = new GenericUrl(url);

-              HttpContent content = body == null ?
+              HttpContent content = client == null ?
                apiClient.new JacksonJsonHttpContent(null) :
-                new InputStreamContent(mediaType == null ? Json.MEDIA_TYPE : mediaType, body);
+                new InputStreamContent(mediaType == null ? Json.MEDIA_TYPE : mediaType, client);
              return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.PATCH, genericUrl, content).execute();
      }

-    public HttpResponse testClassnameForHttpResponse(Client body, Map<String, Object> params) throws IOException {
-        // verify the required parameter 'body' is set
-        if (body == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'body' when calling testClassname");
+    public HttpResponse testClassnameForHttpResponse(Client client, Map<String, Object> params) throws IOException {
+        // verify the required parameter 'client' is set
+        if (client == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'client' when calling testClassname");
        }
        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/fake_classname_test");

@@ -127,7 +127,7 @@ public class FakeClassnameTags123Api {
        String url = uriBuilder.build().toString();
        GenericUrl genericUrl = new GenericUrl(url);

-        HttpContent content = apiClient.new JacksonJsonHttpContent(body);
+        HttpContent content = apiClient.new JacksonJsonHttpContent(client);
        return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.PATCH, genericUrl, content).execute();
    }

--- a/samples/client/petstore/java/google-api-client/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/io/swagger/client/api/PetApi.java
@@ -44,61 +44,59 @@ public class PetApi {

  /**
    * Add a new pet to the store
-    * 
    * <p><b>405</b> - Invalid input
-    * @param body Pet object that needs to be added to the store
+    * @param pet Pet object that needs to be added to the store
    * @throws IOException if an error occurs while attempting to invoke the API
    **/
-    public void addPet(Pet body) throws IOException {
-        addPetForHttpResponse(body);
+    public void addPet(Pet pet) throws IOException {
+        addPetForHttpResponse(pet);
    }

  /**
    * Add a new pet to the store
-    * 
    * <p><b>405</b> - Invalid input
-    * @param body Pet object that needs to be added to the store
+    * @param pet Pet object that needs to be added to the store
    * @param params Map of query params. A collection will be interpreted as passing in multiple instances of the same query param.
    * @throws IOException if an error occurs while attempting to invoke the API
    **/
-    public void addPet(Pet body, Map<String, Object> params) throws IOException {
-        addPetForHttpResponse(body, params);
+    public void addPet(Pet pet, Map<String, Object> params) throws IOException {
+        addPetForHttpResponse(pet, params);
    }

-    public HttpResponse addPetForHttpResponse(Pet body) throws IOException {
-        // verify the required parameter 'body' is set
-        if (body == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'body' when calling addPet");
+    public HttpResponse addPetForHttpResponse(Pet pet) throws IOException {
+        // verify the required parameter 'pet' is set
+        if (pet == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'pet' when calling addPet");
        }
        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/pet");

        String url = uriBuilder.build().toString();
        GenericUrl genericUrl = new GenericUrl(url);

-        HttpContent content = apiClient.new JacksonJsonHttpContent(body);
+        HttpContent content = apiClient.new JacksonJsonHttpContent(pet);
        return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.POST, genericUrl, content).execute();
    }

-      public HttpResponse addPetForHttpResponse(java.io.InputStream body, String mediaType) throws IOException {
-          // verify the required parameter 'body' is set
-              if (body == null) {
-              throw new IllegalArgumentException("Missing the required parameter 'body' when calling addPet");
+      public HttpResponse addPetForHttpResponse(java.io.InputStream pet, String mediaType) throws IOException {
+          // verify the required parameter 'pet' is set
+              if (pet == null) {
+              throw new IllegalArgumentException("Missing the required parameter 'pet' when calling addPet");
              }
              UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/pet");

              String url = uriBuilder.build().toString();
              GenericUrl genericUrl = new GenericUrl(url);

-              HttpContent content = body == null ?
+              HttpContent content = pet == null ?
                apiClient.new JacksonJsonHttpContent(null) :
-                new InputStreamContent(mediaType == null ? Json.MEDIA_TYPE : mediaType, body);
+                new InputStreamContent(mediaType == null ? Json.MEDIA_TYPE : mediaType, pet);
              return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.POST, genericUrl, content).execute();
      }

-    public HttpResponse addPetForHttpResponse(Pet body, Map<String, Object> params) throws IOException {
-        // verify the required parameter 'body' is set
-        if (body == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'body' when calling addPet");
+    public HttpResponse addPetForHttpResponse(Pet pet, Map<String, Object> params) throws IOException {
+        // verify the required parameter 'pet' is set
+        if (pet == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'pet' when calling addPet");
        }
        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/pet");

@@ -123,14 +121,13 @@ public class PetApi {
        String url = uriBuilder.build().toString();
        GenericUrl genericUrl = new GenericUrl(url);

-        HttpContent content = apiClient.new JacksonJsonHttpContent(body);
+        HttpContent content = apiClient.new JacksonJsonHttpContent(pet);
        return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.POST, genericUrl, content).execute();
    }


  /**
    * Deletes a pet
-    * 
    * <p><b>400</b> - Invalid pet value
    * @param petId Pet id to delete
    * @param apiKey The apiKey parameter
@@ -142,7 +139,6 @@ public class PetApi {

  /**
    * Deletes a pet
-    * 
    * <p><b>400</b> - Invalid pet value
    * @param petId Pet id to delete
    * @param params Map of query params. A collection will be interpreted as passing in multiple instances of the same query param.
@@ -475,65 +471,63 @@ public class PetApi {

  /**
    * Update an existing pet
-    * 
    * <p><b>400</b> - Invalid ID supplied
    * <p><b>404</b> - Pet not found
    * <p><b>405</b> - Validation exception
-    * @param body Pet object that needs to be added to the store
+    * @param pet Pet object that needs to be added to the store
    * @throws IOException if an error occurs while attempting to invoke the API
    **/
-    public void updatePet(Pet body) throws IOException {
-        updatePetForHttpResponse(body);
+    public void updatePet(Pet pet) throws IOException {
+        updatePetForHttpResponse(pet);
    }

  /**
    * Update an existing pet
-    * 
    * <p><b>400</b> - Invalid ID supplied
    * <p><b>404</b> - Pet not found
    * <p><b>405</b> - Validation exception
-    * @param body Pet object that needs to be added to the store
+    * @param pet Pet object that needs to be added to the store
    * @param params Map of query params. A collection will be interpreted as passing in multiple instances of the same query param.
    * @throws IOException if an error occurs while attempting to invoke the API
    **/
-    public void updatePet(Pet body, Map<String, Object> params) throws IOException {
-        updatePetForHttpResponse(body, params);
+    public void updatePet(Pet pet, Map<String, Object> params) throws IOException {
+        updatePetForHttpResponse(pet, params);
    }

-    public HttpResponse updatePetForHttpResponse(Pet body) throws IOException {
-        // verify the required parameter 'body' is set
-        if (body == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'body' when calling updatePet");
+    public HttpResponse updatePetForHttpResponse(Pet pet) throws IOException {
+        // verify the required parameter 'pet' is set
+        if (pet == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'pet' when calling updatePet");
        }
        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/pet");

        String url = uriBuilder.build().toString();
        GenericUrl genericUrl = new GenericUrl(url);

-        HttpContent content = apiClient.new JacksonJsonHttpContent(body);
+        HttpContent content = apiClient.new JacksonJsonHttpContent(pet);
        return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.PUT, genericUrl, content).execute();
    }

-      public HttpResponse updatePetForHttpResponse(java.io.InputStream body, String mediaType) throws IOException {
-          // verify the required parameter 'body' is set
-              if (body == null) {
-              throw new IllegalArgumentException("Missing the required parameter 'body' when calling updatePet");
+      public HttpResponse updatePetForHttpResponse(java.io.InputStream pet, String mediaType) throws IOException {
+          // verify the required parameter 'pet' is set
+              if (pet == null) {
+              throw new IllegalArgumentException("Missing the required parameter 'pet' when calling updatePet");
              }
              UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/pet");

              String url = uriBuilder.build().toString();
              GenericUrl genericUrl = new GenericUrl(url);

-              HttpContent content = body == null ?
+              HttpContent content = pet == null ?
                apiClient.new JacksonJsonHttpContent(null) :
-                new InputStreamContent(mediaType == null ? Json.MEDIA_TYPE : mediaType, body);
+                new InputStreamContent(mediaType == null ? Json.MEDIA_TYPE : mediaType, pet);
              return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.PUT, genericUrl, content).execute();
      }

-    public HttpResponse updatePetForHttpResponse(Pet body, Map<String, Object> params) throws IOException {
-        // verify the required parameter 'body' is set
-        if (body == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'body' when calling updatePet");
+    public HttpResponse updatePetForHttpResponse(Pet pet, Map<String, Object> params) throws IOException {
+        // verify the required parameter 'pet' is set
+        if (pet == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'pet' when calling updatePet");
        }
        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/pet");

@@ -558,14 +552,13 @@ public class PetApi {
        String url = uriBuilder.build().toString();
        GenericUrl genericUrl = new GenericUrl(url);

-        HttpContent content = apiClient.new JacksonJsonHttpContent(body);
+        HttpContent content = apiClient.new JacksonJsonHttpContent(pet);
        return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.PUT, genericUrl, content).execute();
    }


  /**
    * Updates a pet in the store with form data
-    * 
    * <p><b>405</b> - Invalid input
    * @param petId ID of pet that needs to be updated
    * @param name Updated name of the pet
@@ -578,7 +571,6 @@ public class PetApi {

  /**
    * Updates a pet in the store with form data
-    * 
    * <p><b>405</b> - Invalid input
    * @param petId ID of pet that needs to be updated
    * @param params Map of query params. A collection will be interpreted as passing in multiple instances of the same query param.
@@ -643,7 +635,6 @@ public class PetApi {

  /**
    * uploads an image
-    * 
    * <p><b>200</b> - successful operation
    * @param petId ID of pet to update
    * @param additionalMetadata Additional data to pass to server
@@ -659,7 +650,6 @@ public class PetApi {

  /**
    * uploads an image
-    * 
    * <p><b>200</b> - successful operation
    * @param petId ID of pet to update
    * @param params Map of query params. A collection will be interpreted as passing in multiple instances of the same query param.
--- a/samples/client/petstore/java/google-api-client/src/main/java/io/swagger/client/api/StoreApi.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/io/swagger/client/api/StoreApi.java
@@ -274,69 +274,67 @@ public class StoreApi {

  /**
    * Place an order for a pet
-    * 
    * <p><b>200</b> - successful operation
    * <p><b>400</b> - Invalid Order
-    * @param body order placed for purchasing the pet
+    * @param order order placed for purchasing the pet
    * @return Order
    * @throws IOException if an error occurs while attempting to invoke the API
    **/
-    public Order placeOrder(Order body) throws IOException {
-        HttpResponse response = placeOrderForHttpResponse(body);
+    public Order placeOrder(Order order) throws IOException {
+        HttpResponse response = placeOrderForHttpResponse(order);
        TypeReference typeRef = new TypeReference<Order>() {};
        return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
    }

  /**
    * Place an order for a pet
-    * 
    * <p><b>200</b> - successful operation
    * <p><b>400</b> - Invalid Order
-    * @param body order placed for purchasing the pet
+    * @param order order placed for purchasing the pet
    * @param params Map of query params. A collection will be interpreted as passing in multiple instances of the same query param.
    * @return Order
    * @throws IOException if an error occurs while attempting to invoke the API
    **/
-    public Order placeOrder(Order body, Map<String, Object> params) throws IOException {
-        HttpResponse response = placeOrderForHttpResponse(body, params);
+    public Order placeOrder(Order order, Map<String, Object> params) throws IOException {
+        HttpResponse response = placeOrderForHttpResponse(order, params);
        TypeReference typeRef = new TypeReference<Order>() {};
        return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
    }

-    public HttpResponse placeOrderForHttpResponse(Order body) throws IOException {
-        // verify the required parameter 'body' is set
-        if (body == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'body' when calling placeOrder");
+    public HttpResponse placeOrderForHttpResponse(Order order) throws IOException {
+        // verify the required parameter 'order' is set
+        if (order == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'order' when calling placeOrder");
        }
        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/store/order");

        String url = uriBuilder.build().toString();
        GenericUrl genericUrl = new GenericUrl(url);

-        HttpContent content = apiClient.new JacksonJsonHttpContent(body);
+        HttpContent content = apiClient.new JacksonJsonHttpContent(order);
        return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.POST, genericUrl, content).execute();
    }

-      public HttpResponse placeOrderForHttpResponse(java.io.InputStream body, String mediaType) throws IOException {
-          // verify the required parameter 'body' is set
-              if (body == null) {
-              throw new IllegalArgumentException("Missing the required parameter 'body' when calling placeOrder");
+      public HttpResponse placeOrderForHttpResponse(java.io.InputStream order, String mediaType) throws IOException {
+          // verify the required parameter 'order' is set
+              if (order == null) {
+              throw new IllegalArgumentException("Missing the required parameter 'order' when calling placeOrder");
              }
              UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/store/order");

              String url = uriBuilder.build().toString();
              GenericUrl genericUrl = new GenericUrl(url);

-              HttpContent content = body == null ?
+              HttpContent content = order == null ?
                apiClient.new JacksonJsonHttpContent(null) :
-                new InputStreamContent(mediaType == null ? Json.MEDIA_TYPE : mediaType, body);
+                new InputStreamContent(mediaType == null ? Json.MEDIA_TYPE : mediaType, order);
              return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.POST, genericUrl, content).execute();
      }

-    public HttpResponse placeOrderForHttpResponse(Order body, Map<String, Object> params) throws IOException {
-        // verify the required parameter 'body' is set
-        if (body == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'body' when calling placeOrder");
+    public HttpResponse placeOrderForHttpResponse(Order order, Map<String, Object> params) throws IOException {
+        // verify the required parameter 'order' is set
+        if (order == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'order' when calling placeOrder");
        }
        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/store/order");

@@ -361,7 +359,7 @@ public class StoreApi {
        String url = uriBuilder.build().toString();
        GenericUrl genericUrl = new GenericUrl(url);

-        HttpContent content = apiClient.new JacksonJsonHttpContent(body);
+        HttpContent content = apiClient.new JacksonJsonHttpContent(order);
        return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.POST, genericUrl, content).execute();
    }

--- a/samples/client/petstore/java/google-api-client/src/main/java/io/swagger/client/api/UserApi.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/io/swagger/client/api/UserApi.java
@@ -44,59 +44,59 @@ public class UserApi {
    * Create user
    * This can only be done by the logged in user.
    * <p><b>0</b> - successful operation
-    * @param body Created user object
+    * @param user Created user object
    * @throws IOException if an error occurs while attempting to invoke the API
    **/
-    public void createUser(User body) throws IOException {
-        createUserForHttpResponse(body);
+    public void createUser(User user) throws IOException {
+        createUserForHttpResponse(user);
    }

  /**
    * Create user
    * This can only be done by the logged in user.
    * <p><b>0</b> - successful operation
-    * @param body Created user object
+    * @param user Created user object
    * @param params Map of query params. A collection will be interpreted as passing in multiple instances of the same query param.
    * @throws IOException if an error occurs while attempting to invoke the API
    **/
-    public void createUser(User body, Map<String, Object> params) throws IOException {
-        createUserForHttpResponse(body, params);
+    public void createUser(User user, Map<String, Object> params) throws IOException {
+        createUserForHttpResponse(user, params);
    }

-    public HttpResponse createUserForHttpResponse(User body) throws IOException {
-        // verify the required parameter 'body' is set
-        if (body == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'body' when calling createUser");
+    public HttpResponse createUserForHttpResponse(User user) throws IOException {
+        // verify the required parameter 'user' is set
+        if (user == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'user' when calling createUser");
        }
        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/user");

        String url = uriBuilder.build().toString();
        GenericUrl genericUrl = new GenericUrl(url);

-        HttpContent content = apiClient.new JacksonJsonHttpContent(body);
+        HttpContent content = apiClient.new JacksonJsonHttpContent(user);
        return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.POST, genericUrl, content).execute();
    }

-      public HttpResponse createUserForHttpResponse(java.io.InputStream body, String mediaType) throws IOException {
-          // verify the required parameter 'body' is set
-              if (body == null) {
-              throw new IllegalArgumentException("Missing the required parameter 'body' when calling createUser");
+      public HttpResponse createUserForHttpResponse(java.io.InputStream user, String mediaType) throws IOException {
+          // verify the required parameter 'user' is set
+              if (user == null) {
+              throw new IllegalArgumentException("Missing the required parameter 'user' when calling createUser");
              }
              UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/user");

              String url = uriBuilder.build().toString();
              GenericUrl genericUrl = new GenericUrl(url);

-              HttpContent content = body == null ?
+              HttpContent content = user == null ?
                apiClient.new JacksonJsonHttpContent(null) :
-                new InputStreamContent(mediaType == null ? Json.MEDIA_TYPE : mediaType, body);
+                new InputStreamContent(mediaType == null ? Json.MEDIA_TYPE : mediaType, user);
              return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.POST, genericUrl, content).execute();
      }

-    public HttpResponse createUserForHttpResponse(User body, Map<String, Object> params) throws IOException {
-        // verify the required parameter 'body' is set
-        if (body == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'body' when calling createUser");
+    public HttpResponse createUserForHttpResponse(User user, Map<String, Object> params) throws IOException {
+        // verify the required parameter 'user' is set
+        if (user == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'user' when calling createUser");
        }
        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/user");

@@ -121,68 +121,66 @@ public class UserApi {
        String url = uriBuilder.build().toString();
        GenericUrl genericUrl = new GenericUrl(url);

-        HttpContent content = apiClient.new JacksonJsonHttpContent(body);
+        HttpContent content = apiClient.new JacksonJsonHttpContent(user);
        return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.POST, genericUrl, content).execute();
    }


  /**
    * Creates list of users with given input array
-    * 
    * <p><b>0</b> - successful operation
-    * @param body List of user object
+    * @param user List of user object
    * @throws IOException if an error occurs while attempting to invoke the API
    **/
-    public void createUsersWithArrayInput(List<User> body) throws IOException {
-        createUsersWithArrayInputForHttpResponse(body);
+    public void createUsersWithArrayInput(List<User> user) throws IOException {
+        createUsersWithArrayInputForHttpResponse(user);
    }

  /**
    * Creates list of users with given input array
-    * 
    * <p><b>0</b> - successful operation
-    * @param body List of user object
+    * @param user List of user object
    * @param params Map of query params. A collection will be interpreted as passing in multiple instances of the same query param.
    * @throws IOException if an error occurs while attempting to invoke the API
    **/
-    public void createUsersWithArrayInput(List<User> body, Map<String, Object> params) throws IOException {
-        createUsersWithArrayInputForHttpResponse(body, params);
+    public void createUsersWithArrayInput(List<User> user, Map<String, Object> params) throws IOException {
+        createUsersWithArrayInputForHttpResponse(user, params);
    }

-    public HttpResponse createUsersWithArrayInputForHttpResponse(List<User> body) throws IOException {
-        // verify the required parameter 'body' is set
-        if (body == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'body' when calling createUsersWithArrayInput");
+    public HttpResponse createUsersWithArrayInputForHttpResponse(List<User> user) throws IOException {
+        // verify the required parameter 'user' is set
+        if (user == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'user' when calling createUsersWithArrayInput");
        }
        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/user/createWithArray");

        String url = uriBuilder.build().toString();
        GenericUrl genericUrl = new GenericUrl(url);

-        HttpContent content = apiClient.new JacksonJsonHttpContent(body);
+        HttpContent content = apiClient.new JacksonJsonHttpContent(user);
        return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.POST, genericUrl, content).execute();
    }

-      public HttpResponse createUsersWithArrayInputForHttpResponse(java.io.InputStream body, String mediaType) throws IOException {
-          // verify the required parameter 'body' is set
-              if (body == null) {
-              throw new IllegalArgumentException("Missing the required parameter 'body' when calling createUsersWithArrayInput");
+      public HttpResponse createUsersWithArrayInputForHttpResponse(java.io.InputStream user, String mediaType) throws IOException {
+          // verify the required parameter 'user' is set
+              if (user == null) {
+              throw new IllegalArgumentException("Missing the required parameter 'user' when calling createUsersWithArrayInput");
              }
              UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/user/createWithArray");

              String url = uriBuilder.build().toString();
              GenericUrl genericUrl = new GenericUrl(url);

-              HttpContent content = body == null ?
+              HttpContent content = user == null ?
                apiClient.new JacksonJsonHttpContent(null) :
-                new InputStreamContent(mediaType == null ? Json.MEDIA_TYPE : mediaType, body);
+                new InputStreamContent(mediaType == null ? Json.MEDIA_TYPE : mediaType, user);
              return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.POST, genericUrl, content).execute();
      }

-    public HttpResponse createUsersWithArrayInputForHttpResponse(List<User> body, Map<String, Object> params) throws IOException {
-        // verify the required parameter 'body' is set
-        if (body == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'body' when calling createUsersWithArrayInput");
+    public HttpResponse createUsersWithArrayInputForHttpResponse(List<User> user, Map<String, Object> params) throws IOException {
+        // verify the required parameter 'user' is set
+        if (user == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'user' when calling createUsersWithArrayInput");
        }
        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/user/createWithArray");

@@ -207,68 +205,66 @@ public class UserApi {
        String url = uriBuilder.build().toString();
        GenericUrl genericUrl = new GenericUrl(url);

-        HttpContent content = apiClient.new JacksonJsonHttpContent(body);
+        HttpContent content = apiClient.new JacksonJsonHttpContent(user);
        return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.POST, genericUrl, content).execute();
    }


  /**
    * Creates list of users with given input array
-    * 
    * <p><b>0</b> - successful operation
-    * @param body List of user object
+    * @param user List of user object
    * @throws IOException if an error occurs while attempting to invoke the API
    **/
-    public void createUsersWithListInput(List<User> body) throws IOException {
-        createUsersWithListInputForHttpResponse(body);
+    public void createUsersWithListInput(List<User> user) throws IOException {
+        createUsersWithListInputForHttpResponse(user);
    }

  /**
    * Creates list of users with given input array
-    * 
    * <p><b>0</b> - successful operation
-    * @param body List of user object
+    * @param user List of user object
    * @param params Map of query params. A collection will be interpreted as passing in multiple instances of the same query param.
    * @throws IOException if an error occurs while attempting to invoke the API
    **/
-    public void createUsersWithListInput(List<User> body, Map<String, Object> params) throws IOException {
-        createUsersWithListInputForHttpResponse(body, params);
+    public void createUsersWithListInput(List<User> user, Map<String, Object> params) throws IOException {
+        createUsersWithListInputForHttpResponse(user, params);
    }

-    public HttpResponse createUsersWithListInputForHttpResponse(List<User> body) throws IOException {
-        // verify the required parameter 'body' is set
-        if (body == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'body' when calling createUsersWithListInput");
+    public HttpResponse createUsersWithListInputForHttpResponse(List<User> user) throws IOException {
+        // verify the required parameter 'user' is set
+        if (user == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'user' when calling createUsersWithListInput");
        }
        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/user/createWithList");

        String url = uriBuilder.build().toString();
        GenericUrl genericUrl = new GenericUrl(url);

-        HttpContent content = apiClient.new JacksonJsonHttpContent(body);
+        HttpContent content = apiClient.new JacksonJsonHttpContent(user);
        return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.POST, genericUrl, content).execute();
    }

-      public HttpResponse createUsersWithListInputForHttpResponse(java.io.InputStream body, String mediaType) throws IOException {
-          // verify the required parameter 'body' is set
-              if (body == null) {
-              throw new IllegalArgumentException("Missing the required parameter 'body' when calling createUsersWithListInput");
+      public HttpResponse createUsersWithListInputForHttpResponse(java.io.InputStream user, String mediaType) throws IOException {
+          // verify the required parameter 'user' is set
+              if (user == null) {
+              throw new IllegalArgumentException("Missing the required parameter 'user' when calling createUsersWithListInput");
              }
              UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/user/createWithList");

              String url = uriBuilder.build().toString();
              GenericUrl genericUrl = new GenericUrl(url);

-              HttpContent content = body == null ?
+              HttpContent content = user == null ?
                apiClient.new JacksonJsonHttpContent(null) :
-                new InputStreamContent(mediaType == null ? Json.MEDIA_TYPE : mediaType, body);
+                new InputStreamContent(mediaType == null ? Json.MEDIA_TYPE : mediaType, user);
              return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.POST, genericUrl, content).execute();
      }

-    public HttpResponse createUsersWithListInputForHttpResponse(List<User> body, Map<String, Object> params) throws IOException {
-        // verify the required parameter 'body' is set
-        if (body == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'body' when calling createUsersWithListInput");
+    public HttpResponse createUsersWithListInputForHttpResponse(List<User> user, Map<String, Object> params) throws IOException {
+        // verify the required parameter 'user' is set
+        if (user == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'user' when calling createUsersWithListInput");
        }
        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/user/createWithList");

@@ -293,7 +289,7 @@ public class UserApi {
        String url = uriBuilder.build().toString();
        GenericUrl genericUrl = new GenericUrl(url);

-        HttpContent content = apiClient.new JacksonJsonHttpContent(body);
+        HttpContent content = apiClient.new JacksonJsonHttpContent(user);
        return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.POST, genericUrl, content).execute();
    }

@@ -378,7 +374,6 @@ public class UserApi {

  /**
    * Get user by user name
-    * 
    * <p><b>200</b> - successful operation
    * <p><b>400</b> - Invalid username supplied
    * <p><b>404</b> - User not found
@@ -394,7 +389,6 @@ public class UserApi {

  /**
    * Get user by user name
-    * 
    * <p><b>200</b> - successful operation
    * <p><b>400</b> - Invalid username supplied
    * <p><b>404</b> - User not found
@@ -464,7 +458,6 @@ public class UserApi {

  /**
    * Logs user into the system
-    * 
    * <p><b>200</b> - successful operation
    * <p><b>400</b> - Invalid username/password supplied
    * @param username The user name for login
@@ -480,7 +473,6 @@ public class UserApi {

  /**
    * Logs user into the system
-    * 
    * <p><b>200</b> - successful operation
    * <p><b>400</b> - Invalid username/password supplied
    * @param username The user name for login
@@ -575,7 +567,6 @@ public class UserApi {

  /**
    * Logs out current logged in user session
-    * 
    * <p><b>0</b> - successful operation
    * @throws IOException if an error occurs while attempting to invoke the API
    **/
@@ -585,7 +576,6 @@ public class UserApi {

  /**
    * Logs out current logged in user session
-    * 
    * <p><b>0</b> - successful operation
    * @param params Map of query params. A collection will be interpreted as passing in multiple instances of the same query param.
    * @throws IOException if an error occurs while attempting to invoke the API
@@ -641,11 +631,11 @@ public class UserApi {
    * <p><b>400</b> - Invalid user supplied
    * <p><b>404</b> - User not found
    * @param username name that need to be deleted
-    * @param body Updated user object
+    * @param user Updated user object
    * @throws IOException if an error occurs while attempting to invoke the API
    **/
-    public void updateUser(String username, User body) throws IOException {
-        updateUserForHttpResponse(username, body);
+    public void updateUser(String username, User user) throws IOException {
+        updateUserForHttpResponse(username, user);
    }

  /**
@@ -654,21 +644,21 @@ public class UserApi {
    * <p><b>400</b> - Invalid user supplied
    * <p><b>404</b> - User not found
    * @param username name that need to be deleted
-    * @param body Updated user object
+    * @param user Updated user object
    * @param params Map of query params. A collection will be interpreted as passing in multiple instances of the same query param.
    * @throws IOException if an error occurs while attempting to invoke the API
    **/
-    public void updateUser(String username, User body, Map<String, Object> params) throws IOException {
-        updateUserForHttpResponse(username, body, params);
+    public void updateUser(String username, User user, Map<String, Object> params) throws IOException {
+        updateUserForHttpResponse(username, user, params);
    }

-    public HttpResponse updateUserForHttpResponse(String username, User body) throws IOException {
+    public HttpResponse updateUserForHttpResponse(String username, User user) throws IOException {
        // verify the required parameter 'username' is set
        if (username == null) {
            throw new IllegalArgumentException("Missing the required parameter 'username' when calling updateUser");
-        }// verify the required parameter 'body' is set
-        if (body == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'body' when calling updateUser");
+        }// verify the required parameter 'user' is set
+        if (user == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'user' when calling updateUser");
        }
        // create a map of path variables
        final Map<String, Object> uriVariables = new HashMap<String, Object>();
@@ -678,17 +668,17 @@ public class UserApi {
        String url = uriBuilder.buildFromMap(uriVariables).toString();
        GenericUrl genericUrl = new GenericUrl(url);

-        HttpContent content = apiClient.new JacksonJsonHttpContent(body);
+        HttpContent content = apiClient.new JacksonJsonHttpContent(user);
        return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.PUT, genericUrl, content).execute();
    }

-      public HttpResponse updateUserForHttpResponse(String username, java.io.InputStream body, String mediaType) throws IOException {
+      public HttpResponse updateUserForHttpResponse(String username, java.io.InputStream user, String mediaType) throws IOException {
          // verify the required parameter 'username' is set
              if (username == null) {
              throw new IllegalArgumentException("Missing the required parameter 'username' when calling updateUser");
-              }// verify the required parameter 'body' is set
-              if (body == null) {
-              throw new IllegalArgumentException("Missing the required parameter 'body' when calling updateUser");
+              }// verify the required parameter 'user' is set
+              if (user == null) {
+              throw new IllegalArgumentException("Missing the required parameter 'user' when calling updateUser");
              }
                  // create a map of path variables
                  final Map<String, Object> uriVariables = new HashMap<String, Object>();
@@ -698,19 +688,19 @@ public class UserApi {
              String url = uriBuilder.buildFromMap(uriVariables).toString();
              GenericUrl genericUrl = new GenericUrl(url);

-              HttpContent content = body == null ?
+              HttpContent content = user == null ?
                apiClient.new JacksonJsonHttpContent(null) :
-                new InputStreamContent(mediaType == null ? Json.MEDIA_TYPE : mediaType, body);
+                new InputStreamContent(mediaType == null ? Json.MEDIA_TYPE : mediaType, user);
              return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.PUT, genericUrl, content).execute();
      }

-    public HttpResponse updateUserForHttpResponse(String username, User body, Map<String, Object> params) throws IOException {
+    public HttpResponse updateUserForHttpResponse(String username, User user, Map<String, Object> params) throws IOException {
        // verify the required parameter 'username' is set
        if (username == null) {
            throw new IllegalArgumentException("Missing the required parameter 'username' when calling updateUser");
-        }// verify the required parameter 'body' is set
-        if (body == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'body' when calling updateUser");
+        }// verify the required parameter 'user' is set
+        if (user == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'user' when calling updateUser");
        }
        // create a map of path variables
        final Map<String, Object> uriVariables = new HashMap<String, Object>();
@@ -738,7 +728,7 @@ public class UserApi {
        String url = uriBuilder.buildFromMap(uriVariables).toString();
        GenericUrl genericUrl = new GenericUrl(url);

-        HttpContent content = apiClient.new JacksonJsonHttpContent(body);
+        HttpContent content = apiClient.new JacksonJsonHttpContent(user);
        return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.PUT, genericUrl, content).execute();
    }

--- a/samples/client/petstore/java/google-api-client/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/io/swagger/client/model/EnumTest.java
@@ -67,6 +67,46 @@ public class EnumTest {
  @JsonProperty("enum_string")
  private EnumStringEnum enumString = null;

+  /**
+   * Gets or Sets enumStringRequired
+   */
+  public enum EnumStringRequiredEnum {
+    UPPER("UPPER"),
+    
+    LOWER("lower"),
+    
+    EMPTY("");
+
+    private String value;
+
+    EnumStringRequiredEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static EnumStringRequiredEnum fromValue(String text) {
+      for (EnumStringRequiredEnum b : EnumStringRequiredEnum.values()) {
+        if (String.valueOf(b.value).equals(text)) {
+          return b;
+        }
+      }
+      return null;
+    }
+  }
+
+  @JsonProperty("enum_string_required")
+  private EnumStringRequiredEnum enumStringRequired = null;
+
  /**
   * Gets or Sets enumInteger
   */
@@ -164,6 +204,24 @@ public class EnumTest {
    this.enumString = enumString;
  }

+  public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
+    this.enumStringRequired = enumStringRequired;
+    return this;
+  }
+
+   /**
+   * Get enumStringRequired
+   * @return enumStringRequired
+  **/
+  @ApiModelProperty(required = true, value = "")
+  public EnumStringRequiredEnum getEnumStringRequired() {
+    return enumStringRequired;
+  }
+
+  public void setEnumStringRequired(EnumStringRequiredEnum enumStringRequired) {
+    this.enumStringRequired = enumStringRequired;
+  }
+
  public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
    this.enumInteger = enumInteger;
    return this;
@@ -229,6 +287,7 @@ public class EnumTest {
    }
    EnumTest enumTest = (EnumTest) o;
    return Objects.equals(this.enumString, enumTest.enumString) &&
+        Objects.equals(this.enumStringRequired, enumTest.enumStringRequired) &&
        Objects.equals(this.enumInteger, enumTest.enumInteger) &&
        Objects.equals(this.enumNumber, enumTest.enumNumber) &&
        Objects.equals(this.outerEnum, enumTest.outerEnum);
@@ -236,7 +295,7 @@ public class EnumTest {

  @Override
  public int hashCode() {
-    return Objects.hash(enumString, enumInteger, enumNumber, outerEnum);
+    return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, outerEnum);
  }


@@ -246,6 +305,7 @@ public class EnumTest {
    sb.append("class EnumTest {\n");
    
    sb.append("    enumString: ").append(toIndentedString(enumString)).append("\n");
+    sb.append("    enumStringRequired: ").append(toIndentedString(enumStringRequired)).append("\n");
    sb.append("    enumInteger: ").append(toIndentedString(enumInteger)).append("\n");
    sb.append("    enumNumber: ").append(toIndentedString(enumNumber)).append("\n");
    sb.append("    outerEnum: ").append(toIndentedString(outerEnum)).append("\n");
--- a/samples/client/petstore/java/google-api-client/src/main/java/io/swagger/client/model/FormatTest.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/io/swagger/client/model/FormatTest.java
@@ -20,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.File;
 import java.math.BigDecimal;
 import java.util.UUID;
 import org.threeten.bp.LocalDate;
@@ -55,7 +56,7 @@ public class FormatTest {
  private byte[] _byte = null;

  @JsonProperty("binary")
-  private byte[] binary = null;
+  private File binary = null;

  @JsonProperty("date")
  private LocalDate date = null;
@@ -223,7 +224,7 @@ public class FormatTest {
    this._byte = _byte;
  }

-  public FormatTest binary(byte[] binary) {
+  public FormatTest binary(File binary) {
    this.binary = binary;
    return this;
  }
@@ -233,11 +234,11 @@ public class FormatTest {
   * @return binary
  **/
  @ApiModelProperty(value = "")
-  public byte[] getBinary() {
+  public File getBinary() {
    return binary;
  }

-  public void setBinary(byte[] binary) {
+  public void setBinary(File binary) {
    this.binary = binary;
  }

@@ -331,7 +332,7 @@ public class FormatTest {
        Objects.equals(this._double, formatTest._double) &&
        Objects.equals(this.string, formatTest.string) &&
        Arrays.equals(this._byte, formatTest._byte) &&
-        Arrays.equals(this.binary, formatTest.binary) &&
+        Objects.equals(this.binary, formatTest.binary) &&
        Objects.equals(this.date, formatTest.date) &&
        Objects.equals(this.dateTime, formatTest.dateTime) &&
        Objects.equals(this.uuid, formatTest.uuid) &&
@@ -340,7 +341,7 @@ public class FormatTest {

  @Override
  public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), Arrays.hashCode(binary), date, dateTime, uuid, password);
+    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password);
  }


--- a/samples/client/petstore/java/google-api-client/src/main/java/io/swagger/client/model/Model200Response.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/io/swagger/client/model/Model200Response.java
@@ -78,9 +78,9 @@ public class Model200Response {
    if (o == null || getClass() != o.getClass()) {
      return false;
    }
-    Model200Response _200Response = (Model200Response) o;
-    return Objects.equals(this.name, _200Response.name) &&
-        Objects.equals(this.propertyClass, _200Response.propertyClass);
+    Model200Response _200response = (Model200Response) o;
+    return Objects.equals(this.name, _200response.name) &&
+        Objects.equals(this.propertyClass, _200response.propertyClass);
  }

  @Override
--- a/samples/client/petstore/java/google-api-client/src/main/java/io/swagger/client/model/Name.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/io/swagger/client/model/Name.java
@@ -37,7 +37,7 @@ public class Name {
  private String property = null;

  @JsonProperty("123Number")
-  private Integer _123Number = null;
+  private Integer _123number = null;

  public Name name(Integer name) {
    this.name = name;
@@ -85,12 +85,12 @@ public class Name {
  }

   /**
-   * Get _123Number
-   * @return _123Number
+   * Get _123number
+   * @return _123number
  **/
  @ApiModelProperty(value = "")
-  public Integer get123Number() {
-    return _123Number;
+  public Integer get123number() {
+    return _123number;
  }


@@ -106,12 +106,12 @@ public class Name {
    return Objects.equals(this.name, name.name) &&
        Objects.equals(this.snakeCase, name.snakeCase) &&
        Objects.equals(this.property, name.property) &&
-        Objects.equals(this._123Number, name._123Number);
+        Objects.equals(this._123number, name._123number);
  }

  @Override
  public int hashCode() {
-    return Objects.hash(name, snakeCase, property, _123Number);
+    return Objects.hash(name, snakeCase, property, _123number);
  }


@@ -123,7 +123,7 @@ public class Name {
    sb.append("    name: ").append(toIndentedString(name)).append("\n");
    sb.append("    snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
    sb.append("    property: ").append(toIndentedString(property)).append("\n");
-    sb.append("    _123Number: ").append(toIndentedString(_123Number)).append("\n");
+    sb.append("    _123number: ").append(toIndentedString(_123number)).append("\n");
    sb.append("}");
    return sb.toString();
  }
--- a/samples/client/petstore/java/google-api-client/src/main/java/io/swagger/client/model/OuterBoolean.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/io/swagger/client/model/OuterBoolean.java
@@ -0,0 +1,63 @@
+/*
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package io.swagger.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+
+/**
+ * OuterBoolean
+ */
+
+public class OuterBoolean {
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash();
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class OuterBoolean {\n");
+    
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
--- a/samples/client/petstore/java/google-api-client/src/main/java/io/swagger/client/model/OuterNumber.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/io/swagger/client/model/OuterNumber.java
@@ -0,0 +1,63 @@
+/*
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package io.swagger.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+
+/**
+ * OuterNumber
+ */
+
+public class OuterNumber {
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash();
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class OuterNumber {\n");
+    
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
--- a/samples/client/petstore/java/google-api-client/src/main/java/io/swagger/client/model/OuterString.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/io/swagger/client/model/OuterString.java
@@ -0,0 +1,63 @@
+/*
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package io.swagger.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+
+/**
+ * OuterString
+ */
+
+public class OuterString {
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash();
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class OuterString {\n");
+    
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
--- a/samples/client/petstore/java/google-api-client/src/main/java/io/swagger/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -27,24 +27,24 @@ import io.swagger.annotations.ApiModelProperty;

 public class SpecialModelName {
  @JsonProperty("$special[property.name]")
-  private Long specialPropertyName = null;
+  private Long $specialPropertyName = null;

-  public SpecialModelName specialPropertyName(Long specialPropertyName) {
-    this.specialPropertyName = specialPropertyName;
+  public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
+    this.$specialPropertyName = $specialPropertyName;
    return this;
  }

   /**
-   * Get specialPropertyName
-   * @return specialPropertyName
+   * Get $specialPropertyName
+   * @return $specialPropertyName
  **/
  @ApiModelProperty(value = "")
-  public Long getSpecialPropertyName() {
-    return specialPropertyName;
+  public Long get$SpecialPropertyName() {
+    return $specialPropertyName;
  }

-  public void setSpecialPropertyName(Long specialPropertyName) {
-    this.specialPropertyName = specialPropertyName;
+  public void set$SpecialPropertyName(Long $specialPropertyName) {
+    this.$specialPropertyName = $specialPropertyName;
  }


@@ -56,13 +56,13 @@ public class SpecialModelName {
    if (o == null || getClass() != o.getClass()) {
      return false;
    }
-    SpecialModelName specialModelName = (SpecialModelName) o;
-    return Objects.equals(this.specialPropertyName, specialModelName.specialPropertyName);
+    SpecialModelName $specialModelName = (SpecialModelName) o;
+    return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName);
  }

  @Override
  public int hashCode() {
-    return Objects.hash(specialPropertyName);
+    return Objects.hash($specialPropertyName);
  }


@@ -71,7 +71,7 @@ public class SpecialModelName {
    StringBuilder sb = new StringBuilder();
    sb.append("class SpecialModelName {\n");
    
-    sb.append("    specialPropertyName: ").append(toIndentedString(specialPropertyName)).append("\n");
+    sb.append("    $specialPropertyName: ").append(toIndentedString($specialPropertyName)).append("\n");
    sb.append("}");
    return sb.toString();
  }
--- a/samples/client/petstore/java/google-api-client/src/test/java/io/swagger/client/api/AnotherFakeApiTest.java
+++ b/samples/client/petstore/java/google-api-client/src/test/java/io/swagger/client/api/AnotherFakeApiTest.java
@@ -42,8 +42,8 @@ public class AnotherFakeApiTest {
     */
    @Test
    public void testSpecialTagsTest() throws IOException {
-        Client body = null;
-        Client response = api.testSpecialTags(body);
+        Client client = null;
+        Client response = api.testSpecialTags(client);

        // TODO: test validations
    }
--- a/samples/client/petstore/java/google-api-client/src/test/java/io/swagger/client/api/FakeApiTest.java
+++ b/samples/client/petstore/java/google-api-client/src/test/java/io/swagger/client/api/FakeApiTest.java
@@ -15,9 +15,11 @@ package io.swagger.client.api;

 import java.math.BigDecimal;
 import io.swagger.client.model.Client;
+import java.io.File;
 import org.threeten.bp.LocalDate;
 import org.threeten.bp.OffsetDateTime;
 import io.swagger.client.model.OuterComposite;
+import io.swagger.client.model.User;
 import org.junit.Test;
 import org.junit.Ignore;

@@ -46,8 +48,8 @@ public class FakeApiTest {
     */
    @Test
    public void fakeOuterBooleanSerializeTest() throws IOException {
-        Boolean body = null;
-        Boolean response = api.fakeOuterBooleanSerialize(body);
+        Boolean booleanPostBody = null;
+        Boolean response = api.fakeOuterBooleanSerialize(booleanPostBody);

        // TODO: test validations
    }
@@ -62,8 +64,8 @@ public class FakeApiTest {
     */
    @Test
    public void fakeOuterCompositeSerializeTest() throws IOException {
-        OuterComposite body = null;
-        OuterComposite response = api.fakeOuterCompositeSerialize(body);
+        OuterComposite outerComposite = null;
+        OuterComposite response = api.fakeOuterCompositeSerialize(outerComposite);

        // TODO: test validations
    }
@@ -100,6 +102,23 @@ public class FakeApiTest {
        // TODO: test validations
    }
    
+    /**
+     * 
+     *
+     * 
+     *
+     * @throws IOException
+     *          if the Api call fails
+     */
+    @Test
+    public void testBodyWithQueryParamsTest() throws IOException {
+        String query = null;
+        User user = null;
+        api.testBodyWithQueryParams(query, user);
+
+        // TODO: test validations
+    }
+    
    /**
     * To test \&quot;client\&quot; model
     *
@@ -110,8 +129,8 @@ public class FakeApiTest {
     */
    @Test
    public void testClientModelTest() throws IOException {
-        Client body = null;
-        Client response = api.testClientModel(body);
+        Client client = null;
+        Client response = api.testClientModel(client);

        // TODO: test validations
    }
@@ -135,7 +154,7 @@ public class FakeApiTest {
        Long int64 = null;
        Float _float = null;
        String string = null;
-        byte[] binary = null;
+        File binary = null;
        LocalDate date = null;
        OffsetDateTime dateTime = null;
        String password = null;
@@ -155,15 +174,15 @@ public class FakeApiTest {
     */
    @Test
    public void testEnumParametersTest() throws IOException {
-        List<String> enumFormStringArray = null;
-        String enumFormString = null;
        List<String> enumHeaderStringArray = null;
        String enumHeaderString = null;
        List<String> enumQueryStringArray = null;
        String enumQueryString = null;
        Integer enumQueryInteger = null;
        Double enumQueryDouble = null;
-        api.testEnumParameters(enumFormStringArray, enumFormString, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble);
+        List<String> enumFormStringArray = null;
+        String enumFormString = null;
+        api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);

        // TODO: test validations
    }
@@ -178,8 +197,8 @@ public class FakeApiTest {
     */
    @Test
    public void testInlineAdditionalPropertiesTest() throws IOException {
-        Object param = null;
-        api.testInlineAdditionalProperties(param);
+        String requestBody = null;
+        api.testInlineAdditionalProperties(requestBody);

        // TODO: test validations
    }
--- a/samples/client/petstore/java/google-api-client/src/test/java/io/swagger/client/api/FakeClassnameTags123ApiTest.java
+++ b/samples/client/petstore/java/google-api-client/src/test/java/io/swagger/client/api/FakeClassnameTags123ApiTest.java
@@ -35,15 +35,15 @@ public class FakeClassnameTags123ApiTest {
    /**
     * To test class name in snake case
     *
-     * 
+     * To test class name in snake case
     *
     * @throws IOException
     *          if the Api call fails
     */
    @Test
    public void testClassnameTest() throws IOException {
-        Client body = null;
-        Client response = api.testClassname(body);
+        Client client = null;
+        Client response = api.testClassname(client);

        // TODO: test validations
    }
--- a/samples/client/petstore/java/google-api-client/src/test/java/io/swagger/client/api/PetApiTest.java
+++ b/samples/client/petstore/java/google-api-client/src/test/java/io/swagger/client/api/PetApiTest.java
@@ -44,8 +44,8 @@ public class PetApiTest {
     */
    @Test
    public void addPetTest() throws IOException {
-        Pet body = null;
-        api.addPet(body);
+        Pet pet = null;
+        api.addPet(pet);

        // TODO: test validations
    }
@@ -125,8 +125,8 @@ public class PetApiTest {
     */
    @Test
    public void updatePetTest() throws IOException {
-        Pet body = null;
-        api.updatePet(body);
+        Pet pet = null;
+        api.updatePet(pet);

        // TODO: test validations
    }
--- a/samples/client/petstore/java/google-api-client/src/test/java/io/swagger/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/google-api-client/src/test/java/io/swagger/client/api/StoreApiTest.java
@@ -89,8 +89,8 @@ public class StoreApiTest {
     */
    @Test
    public void placeOrderTest() throws IOException {
-        Order body = null;
-        Order response = api.placeOrder(body);
+        Order order = null;
+        Order response = api.placeOrder(order);

        // TODO: test validations
    }
--- a/samples/client/petstore/java/google-api-client/src/test/java/io/swagger/client/api/UserApiTest.java
+++ b/samples/client/petstore/java/google-api-client/src/test/java/io/swagger/client/api/UserApiTest.java
@@ -42,8 +42,8 @@ public class UserApiTest {
     */
    @Test
    public void createUserTest() throws IOException {
-        User body = null;
-        api.createUser(body);
+        User user = null;
+        api.createUser(user);

        // TODO: test validations
    }
@@ -58,8 +58,8 @@ public class UserApiTest {
     */
    @Test
    public void createUsersWithArrayInputTest() throws IOException {
-        List<User> body = null;
-        api.createUsersWithArrayInput(body);
+        List<User> user = null;
+        api.createUsersWithArrayInput(user);

        // TODO: test validations
    }
@@ -74,8 +74,8 @@ public class UserApiTest {
     */
    @Test
    public void createUsersWithListInputTest() throws IOException {
-        List<User> body = null;
-        api.createUsersWithListInput(body);
+        List<User> user = null;
+        api.createUsersWithListInput(user);

        // TODO: test validations
    }
@@ -155,8 +155,8 @@ public class UserApiTest {
    @Test
    public void updateUserTest() throws IOException {
        String username = null;
-        User body = null;
-        api.updateUser(username, body);
+        User user = null;
+        api.updateUser(username, user);

        // TODO: test validations
    }