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 · 2018-04-24 09:51:50 +02:00 · c8c316e41e
commit c8c316e41e
parent 5340c35ce1
873 changed files with 17421 additions and 16058 deletions
--- a/bin/android-petstore-volley.json
+++ b/bin/android-petstore-volley.json
@ -1,4 +1,4 @@
 {
    "library": "volley",
-    "artifactId": "swagger-petstore-android-volley"
+    "artifactId": "petstore-android-volley"
 }
--- a/bin/java-petstore-feign.json
+++ b/bin/java-petstore-feign.json
@ -1,4 +1,4 @@
 {
    "library": "feign",
-    "artifactId": "swagger-petstore-feign"
+    "artifactId": "petstore-feign"
 }
--- a/bin/java-petstore-google-api-client.json
+++ b/bin/java-petstore-google-api-client.json
@ -1,4 +1,4 @@
 {
    "library": "google-api-client",
-    "artifactId": "swagger-petstore-google-api-client"
+    "artifactId": "petstore-google-api-client"
 }
--- a/bin/java-petstore-jersey1.sh
+++ b/bin/java-petstore-jersey1.sh
@ -27,7 +27,7 @@ fi

 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/openapi-generator/src/main/resources/Java -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -o samples/client/petstore/java/jersey1 -DhideGenerationTimestamp=true --library=jersey1"
+ags="$@ generate --artifact-id petstore-java-client-jersey1 -t modules/openapi-generator/src/main/resources/Java -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -o samples/client/petstore/java/jersey1 -DhideGenerationTimestamp=true --library=jersey1"

 echo "Removing files and folders under samples/client/petstore/java/jersey1/src/main"
 rm -rf samples/client/petstore/java/jersey1/src/main
--- a/bin/java-petstore-jersey2.json
+++ b/bin/java-petstore-jersey2.json
@ -1,4 +1,4 @@
 {
    "library": "jersey2",
-    "artifactId": "swagger-petstore-jersey2"
+    "artifactId": "petstore-jersey2"
 }
--- a/bin/java-petstore-okhttp-gson-parcelable.sh
+++ b/bin/java-petstore-okhttp-gson-parcelable.sh
@ -27,7 +27,7 @@ fi

 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-okhttp-gson.json -o samples/client/petstore/java/okhttp-gson-parcelableModel -DhideGenerationTimestamp=true,parcelableModel=true"
+ags="$@ generate --artifact-id petstore-okhttp-gson-parcelableModel -t modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-okhttp-gson.json -o samples/client/petstore/java/okhttp-gson-parcelableModel -DhideGenerationTimestamp=true,parcelableModel=true"

 rm -rf samples/client/petstore/java/okhttp-gson-parcelableModel/src/main
 find samples/client/petstore/java/okhttp-gson-parcelableModel -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
--- a/bin/java-petstore-okhttp-gson.json
+++ b/bin/java-petstore-okhttp-gson.json
@ -1,4 +1,4 @@
 {
    "library": "okhttp-gson",
-    "artifactId": "swagger-petstore-okhttp-gson"
+    "artifactId": "petstore-okhttp-gson"
 }
--- a/bin/java-petstore-rest-assured.json
+++ b/bin/java-petstore-rest-assured.json
@ -1,4 +1,4 @@
 {
  "library": "rest-assured",
-  "artifactId": "swagger-petstore-rest-assured"
+  "artifactId": "petstore-rest-assured"
 }
--- a/bin/java-petstore-resteasy.json
+++ b/bin/java-petstore-resteasy.json
@ -1,4 +1,4 @@
 {
    "library": "resteasy",
-    "artifactId": "swagger-petstore-resteasy"
+    "artifactId": "petstore-resteasy"
 }
--- a/bin/java-petstore-resttemplate.json
+++ b/bin/java-petstore-resttemplate.json
@ -1,4 +1,4 @@
 {
    "library": "resttemplate",
-    "artifactId": "swagger-petstore-resttemplate"
+    "artifactId": "petstore-resttemplate"
 }
--- a/bin/java-petstore-retrofit.json
+++ b/bin/java-petstore-retrofit.json
@ -1,4 +1,4 @@
 {
    "library": "retrofit",
-    "artifactId": "swagger-petstore-retrofit"
+    "artifactId": "petstore-retrofit"
 }
--- a/bin/java-petstore-retrofit2-play24.sh
+++ b/bin/java-petstore-retrofit2-play24.sh
@ -27,7 +27,7 @@ fi

 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-retrofit2-play24.json -o samples/client/petstore/java/retrofit2-play24 -DhideGenerationTimestamp=true"
+ags="$@ generate --artifact-id petstore-java-client-retrofit2-play24 -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-retrofit2-play24.json -o samples/client/petstore/java/retrofit2-play24 -DhideGenerationTimestamp=true"

 echo "Removing files and folders under samples/client/petstore/java/retrofit2-play24/src/main"
 rm -rf samples/client/petstore/java/retrofit2-play24/src/main
--- a/bin/java-petstore-retrofit2-play25.sh
+++ b/bin/java-petstore-retrofit2-play25.sh
@ -27,7 +27,7 @@ fi

 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-retrofit2-play25.json -o samples/client/petstore/java/retrofit2-play25 -DhideGenerationTimestamp=true"
+ags="$@ generate --artifact-id petstore-java-client-retrofit2-play25 -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-retrofit2-play25.json -o samples/client/petstore/java/retrofit2-play25 -DhideGenerationTimestamp=true"

 echo "Removing files and folders under samples/client/petstore/java/retrofit2-play25/src/main"
 rm -rf samples/client/petstore/java/retrofit2-play25/src/main
--- a/bin/java-petstore-retrofit2.json
+++ b/bin/java-petstore-retrofit2.json
@ -1,4 +1,4 @@
 {
    "library": "retrofit2",
-    "artifactId": "swagger-petstore-retrofit2"
+    "artifactId": "petstore-retrofit2"
 }
--- a/bin/java-petstore-retrofit2rx.json
+++ b/bin/java-petstore-retrofit2rx.json
@ -1,4 +1,4 @@
 {
  "library": "retrofit2",
-  "artifactId": "swagger-petstore-retrofit2-rx"
+  "artifactId": "petstore-retrofit2-rx"
 }
--- a/bin/java-petstore-retrofit2rx2.json
+++ b/bin/java-petstore-retrofit2rx2.json
@ -1,4 +1,4 @@
 {
  "library": "retrofit2",
-  "artifactId": "swagger-petstore-retrofit2-rx2"
+  "artifactId": "petstore-retrofit2-rx2"
 }
--- a/bin/java-petstore-vertx.json
+++ b/bin/java-petstore-vertx.json
@ -1,4 +1,4 @@
 {
    "library": "vertx",
-    "artifactId": "swagger-petstore-vertx"
+    "artifactId": "petstore-vertx"
 }
--- a/bin/java8-petstore-jersey2.json
+++ b/bin/java8-petstore-jersey2.json
@ -1,5 +1,5 @@
 {
    "library": "jersey2",
-    "artifactId": "swagger-petstore-jersey2",
+    "artifactId": "petstore-jersey2",
    "dateLibrary": "java8"
 }
--- a/bin/java8-petstore-jersey2.sh
+++ b/bin/java8-petstore-jersey2.sh
@ -27,7 +27,7 @@ fi

 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java8-petstore-jersey2.json -o samples/client/petstore/java/jersey2-java8 -DhideGenerationTimestamp=true"
+ags="$@ generate --artifact-id petstore-jersey2-java8 -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java8-petstore-jersey2.json -o samples/client/petstore/java/jersey2-java8 -DhideGenerationTimestamp=true"

 echo "Removing files and folders under samples/client/petstore/java/jersey2-java8/src/main"
 rm -rf samples/client/petstore/java/jersey2-java8/src/main
--- a/bin/spring-cloud-feign-petstore.json
+++ b/bin/spring-cloud-feign-petstore.json
@ -1,4 +1,4 @@
 {
    "library": "spring-cloud",
-    "artifactId": "swagger-petstore-spring-cloud"
+    "artifactId": "petstore-spring-cloud"
 }
--- a/bin/spring-mvc-petstore-j8-async.json
+++ b/bin/spring-mvc-petstore-j8-async.json
@ -2,5 +2,5 @@
    "java8": true,
    "async": true,
    "library": "spring-mvc",
-    "artifactId": "swagger-spring-mvc-server-j8-async"
+    "artifactId": "spring-mvc-server-j8-async"
 }
--- a/bin/spring-mvc-petstore-j8-localdatetime.json
+++ b/bin/spring-mvc-petstore-j8-localdatetime.json
@ -1,5 +1,5 @@
 {
    "library": "spring-mvc",
    "dateLibrary": "java8-localdatetime",
-    "artifactId": "swagger-spring-mvc-j8-localdatetime"
+    "artifactId": "spring-mvc-j8-localdatetime"
 }
--- a/bin/spring-mvc-petstore-server.json
+++ b/bin/spring-mvc-petstore-server.json
@ -1,4 +1,4 @@
 {
    "library": "spring-mvc",
-    "artifactId": "swagger-spring-mvc-server"
+    "artifactId": "spring-mvc-server"
 }
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play24/api.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play24/api.mustache
@ -8,6 +8,8 @@ import {{invokerPackage}}.CollectionFormats.*;
 import retrofit2.http.*;

 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
+import okhttp3.MultipartBody;

 {{#imports}}import {{import}};
 {{/imports}}
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play25/api.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play25/api.mustache
@ -8,6 +8,8 @@ import {{invokerPackage}}.CollectionFormats.*;
 import retrofit2.http.*;

 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
+import okhttp3.MultipartBody;

 {{#imports}}import {{import}};
 {{/imports}}
--- a/samples/client/petstore/java/feign/.openapi-generator-ignore
+++ b/samples/client/petstore/java/feign/.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/feign/README.md
+++ b/samples/client/petstore/java/feign/README.md
@ -1,4 +1,4 @@
-# swagger-petstore-feign
+# petstore-feign

 ## Requirements

@ -24,8 +24,8 @@ After the client library is installed/deployed, you can use it in your Maven pro

 ```xml
 <dependency>
-    <groupId>io.swagger</groupId>
-    <artifactId>swagger-petstore-feign</artifactId>
+    <groupId>org.openapitools</groupId>
+    <artifactId>petstore-feign</artifactId>
    <version>1.0.0</version>
    <scope>compile</scope>
 </dependency>
@ -34,7 +34,7 @@ After the client library is installed/deployed, you can use it in your Maven pro

 ## Recommendation

-It's recommended to create an instance of `ApiClient` per thread in a multithreaded environment to avoid any potential issue.
+It's recommended to create an instance of `ApiClient` per thread in a multithreaded environment to avoid any potential issues.

 ## Author

--- a/samples/client/petstore/java/feign/build.gradle
+++ b/samples/client/petstore/java/feign/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-feign'
+            pom.artifactId = 'petstore-feign'
        }
    }

--- a/samples/client/petstore/java/feign/build.sbt
+++ b/samples/client/petstore/java/feign/build.sbt
@ -1,7 +1,7 @@
 lazy val root = (project in file(".")).
  settings(
-    organization := "io.swagger",
-    name := "swagger-petstore-feign",
+    organization := "org.openapitools",
+    name := "petstore-feign",
    version := "1.0.0",
    scalaVersion := "2.11.4",
    scalacOptions ++= Seq("-feature"),
--- a/samples/client/petstore/java/feign/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/feign/docs/AdditionalPropertiesClass.md
@ -1,11 +0,0 @@
-
-# AdditionalPropertiesClass
-
-## Properties
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**mapProperty** | **Map&lt;String, String&gt;** |  |  [optional]
-**mapOfMapProperty** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/feign/docs/Animal.md
+++ b/samples/client/petstore/java/feign/docs/Animal.md
@ -1,11 +0,0 @@
-
-# Animal
-
-## Properties
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**className** | **String** |  | 
-**color** | **String** |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/feign/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/feign/docs/ArrayOfArrayOfNumberOnly.md
@ -1,10 +0,0 @@
-
-# ArrayOfArrayOfNumberOnly
-
-## Properties
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**arrayArrayNumber** | [**List&lt;List&lt;BigDecimal&gt;&gt;**](List.md) |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/feign/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/feign/docs/ArrayOfNumberOnly.md
@ -1,10 +0,0 @@
-
-# ArrayOfNumberOnly
-
-## Properties
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**arrayNumber** | [**List&lt;BigDecimal&gt;**](BigDecimal.md) |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/feign/docs/ArrayTest.md
+++ b/samples/client/petstore/java/feign/docs/ArrayTest.md
@ -1,12 +0,0 @@
-
-# ArrayTest
-
-## Properties
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**arrayOfString** | **List&lt;String&gt;** |  |  [optional]
-**arrayArrayOfInteger** | [**List&lt;List&lt;Long&gt;&gt;**](List.md) |  |  [optional]
-**arrayArrayOfModel** | [**List&lt;List&lt;ReadOnlyFirst&gt;&gt;**](List.md) |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/feign/docs/Cat.md
+++ b/samples/client/petstore/java/feign/docs/Cat.md
@ -1,12 +0,0 @@
-
-# Cat
-
-## Properties
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**className** | **String** |  | 
-**color** | **String** |  |  [optional]
-**declawed** | **Boolean** |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/feign/docs/Category.md
+++ b/samples/client/petstore/java/feign/docs/Category.md
@ -1,11 +0,0 @@
-
-# Category
-
-## Properties
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**id** | **Long** |  |  [optional]
-**name** | **String** |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/feign/docs/Dog.md
+++ b/samples/client/petstore/java/feign/docs/Dog.md
@ -1,12 +0,0 @@
-
-# Dog
-
-## Properties
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**className** | **String** |  | 
-**color** | **String** |  |  [optional]
-**breed** | **String** |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/feign/docs/EnumClass.md
+++ b/samples/client/petstore/java/feign/docs/EnumClass.md
@ -1,14 +0,0 @@
-
-# EnumClass
-
-## Enum
-
-
-* `_ABC` (value: `"_abc"`)
-
-* `_EFG` (value: `"-efg"`)
-
-* `_XYZ_` (value: `"(xyz)"`)
-
-
-
--- a/samples/client/petstore/java/feign/docs/EnumTest.md
+++ b/samples/client/petstore/java/feign/docs/EnumTest.md
@ -1,36 +0,0 @@
-
-# EnumTest
-
-## Properties
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**enumString** | [**EnumStringEnum**](#EnumStringEnum) |  |  [optional]
-**enumInteger** | [**EnumIntegerEnum**](#EnumIntegerEnum) |  |  [optional]
-**enumNumber** | [**EnumNumberEnum**](#EnumNumberEnum) |  |  [optional]
-
-
-<a name="EnumStringEnum"></a>
-## Enum: EnumStringEnum
-Name | Value
---- | -----
-UPPER | &quot;UPPER&quot;
-LOWER | &quot;lower&quot;
-
-
-<a name="EnumIntegerEnum"></a>
-## Enum: EnumIntegerEnum
-Name | Value
---- | -----
-NUMBER_1 | 1
-NUMBER_MINUS_1 | -1
-
-
-<a name="EnumNumberEnum"></a>
-## Enum: EnumNumberEnum
-Name | Value
---- | -----
-NUMBER_1_DOT_1 | 1.1
-NUMBER_MINUS_1_DOT_2 | -1.2
-
-
-
--- a/samples/client/petstore/java/feign/docs/FakeApi.md
+++ b/samples/client/petstore/java/feign/docs/FakeApi.md
@ -1,122 +0,0 @@
-# FakeApi
-
-All URIs are relative to *http://petstore.swagger.io/v2*
-
-Method | HTTP request | Description
------------- | ------------- | -------------
-[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-[**testEnumQueryParameters**](FakeApi.md#testEnumQueryParameters) | **GET** /fake | To test enum query parameters
-
-
-<a name="testEndpointParameters"></a>
-# **testEndpointParameters**
-> testEndpointParameters(number, _double, string, _byte, integer, int32, int64, _float, binary, date, dateTime, password)
-
-Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-
-Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-
-### Example
-```java
-// Import classes:
-//import io.swagger.client.ApiException;
-//import io.swagger.client.api.FakeApi;
-
-
-FakeApi apiInstance = new FakeApi();
-BigDecimal number = new BigDecimal(); // BigDecimal | None
-Double _double = 3.4D; // Double | None
-String string = "string_example"; // String | None
-byte[] _byte = B; // byte[] | None
-Integer integer = 56; // Integer | None
-Integer int32 = 56; // Integer | None
-Long int64 = 789L; // Long | None
-Float _float = 3.4F; // Float | None
-byte[] binary = B; // byte[] | None
-LocalDate date = new LocalDate(); // LocalDate | None
-DateTime dateTime = new DateTime(); // DateTime | None
-String password = "password_example"; // String | None
-try {
-    apiInstance.testEndpointParameters(number, _double, string, _byte, integer, int32, int64, _float, binary, date, dateTime, password);
-} catch (ApiException e) {
-    System.err.println("Exception when calling FakeApi#testEndpointParameters");
-    e.printStackTrace();
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
------------- | ------------- | ------------- | -------------
- **number** | **BigDecimal**| None |
- **_double** | **Double**| None |
- **string** | **String**| None |
- **_byte** | **byte[]**| None |
- **integer** | **Integer**| None | [optional]
- **int32** | **Integer**| None | [optional]
- **int64** | **Long**| None | [optional]
- **_float** | **Float**| None | [optional]
- **binary** | **byte[]**| None | [optional]
- **date** | **LocalDate**| None | [optional]
- **dateTime** | **DateTime**| None | [optional]
- **password** | **String**| None | [optional]
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### 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
-
-<a name="testEnumQueryParameters"></a>
-# **testEnumQueryParameters**
-> testEnumQueryParameters(enumQueryString, enumQueryInteger, enumQueryDouble)
-
-To test enum query parameters
-
-### Example
-```java
-// Import classes:
-//import io.swagger.client.ApiException;
-//import io.swagger.client.api.FakeApi;
-
-
-FakeApi apiInstance = new FakeApi();
-String enumQueryString = "-efg"; // String | Query parameter enum test (string)
-BigDecimal enumQueryInteger = new BigDecimal(); // BigDecimal | Query parameter enum test (double)
-Double enumQueryDouble = 3.4D; // Double | Query parameter enum test (double)
-try {
-    apiInstance.testEnumQueryParameters(enumQueryString, enumQueryInteger, enumQueryDouble);
-} catch (ApiException e) {
-    System.err.println("Exception when calling FakeApi#testEnumQueryParameters");
-    e.printStackTrace();
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
------------- | ------------- | ------------- | -------------
- **enumQueryString** | **String**| Query parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
- **enumQueryInteger** | **BigDecimal**| Query parameter enum test (double) | [optional]
- **enumQueryDouble** | **Double**| Query parameter enum test (double) | [optional]
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
--- a/samples/client/petstore/java/feign/docs/FormatTest.md
+++ b/samples/client/petstore/java/feign/docs/FormatTest.md
@ -1,22 +0,0 @@
-
-# FormatTest
-
-## Properties
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**integer** | **Integer** |  |  [optional]
-**int32** | **Integer** |  |  [optional]
-**int64** | **Long** |  |  [optional]
-**number** | [**BigDecimal**](BigDecimal.md) |  | 
-**_float** | **Float** |  |  [optional]
-**_double** | **Double** |  |  [optional]
-**string** | **String** |  |  [optional]
-**_byte** | **byte[]** |  | 
-**binary** | **byte[]** |  |  [optional]
-**date** | [**LocalDate**](LocalDate.md) |  | 
-**dateTime** | [**DateTime**](DateTime.md) |  |  [optional]
-**uuid** | **String** |  |  [optional]
-**password** | **String** |  | 
-
-
-
--- a/samples/client/petstore/java/feign/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/java/feign/docs/HasOnlyReadOnly.md
@ -1,11 +0,0 @@
-
-# HasOnlyReadOnly
-
-## Properties
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**bar** | **String** |  |  [optional]
-**foo** | **String** |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/feign/docs/MapTest.md
+++ b/samples/client/petstore/java/feign/docs/MapTest.md
@ -1,17 +0,0 @@
-
-# MapTest
-
-## Properties
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**mapMapOfString** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
-**mapOfEnumString** | [**Map&lt;String, InnerEnum&gt;**](#Map&lt;String, InnerEnum&gt;) |  |  [optional]
-
-
-<a name="Map<String, InnerEnum>"></a>
-## Enum: Map&lt;String, InnerEnum&gt;
-Name | Value
---- | -----
-
-
-
--- a/samples/client/petstore/java/feign/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/feign/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@ -1,12 +0,0 @@
-
-# MixedPropertiesAndAdditionalPropertiesClass
-
-## Properties
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**uuid** | **String** |  |  [optional]
-**dateTime** | [**DateTime**](DateTime.md) |  |  [optional]
-**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/feign/docs/Model200Response.md
+++ b/samples/client/petstore/java/feign/docs/Model200Response.md
@ -1,11 +0,0 @@
-
-# Model200Response
-
-## Properties
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**name** | **Integer** |  |  [optional]
-**PropertyClass** | **String** |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/feign/docs/ModelApiResponse.md
+++ b/samples/client/petstore/java/feign/docs/ModelApiResponse.md
@ -1,12 +0,0 @@
-
-# ModelApiResponse
-
-## Properties
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**code** | **Integer** |  |  [optional]
-**type** | **String** |  |  [optional]
-**message** | **String** |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/feign/docs/Name.md
+++ b/samples/client/petstore/java/feign/docs/Name.md
@ -1,13 +0,0 @@
-
-# Name
-
-## Properties
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**name** | **Integer** |  | 
-**snakeCase** | **Integer** |  |  [optional]
-**property** | **String** |  |  [optional]
-**_123Number** | **Integer** |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/feign/docs/NumberOnly.md
+++ b/samples/client/petstore/java/feign/docs/NumberOnly.md
@ -1,10 +0,0 @@
-
-# NumberOnly
-
-## Properties
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**justNumber** | [**BigDecimal**](BigDecimal.md) |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/feign/docs/Order.md
+++ b/samples/client/petstore/java/feign/docs/Order.md
@ -1,24 +0,0 @@
-
-# Order
-
-## Properties
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**id** | **Long** |  |  [optional]
-**petId** | **Long** |  |  [optional]
-**quantity** | **Integer** |  |  [optional]
-**shipDate** | [**DateTime**](DateTime.md) |  |  [optional]
-**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional]
-**complete** | **Boolean** |  |  [optional]
-
-
-<a name="StatusEnum"></a>
-## Enum: StatusEnum
-Name | Value
---- | -----
-PLACED | &quot;placed&quot;
-APPROVED | &quot;approved&quot;
-DELIVERED | &quot;delivered&quot;
-
-
-
--- a/samples/client/petstore/java/feign/docs/Pet.md
+++ b/samples/client/petstore/java/feign/docs/Pet.md
@ -1,24 +0,0 @@
-
-# Pet
-
-## Properties
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**id** | **Long** |  |  [optional]
-**category** | [**Category**](Category.md) |  |  [optional]
-**name** | **String** |  | 
-**photoUrls** | **List&lt;String&gt;** |  | 
-**tags** | [**List&lt;Tag&gt;**](Tag.md) |  |  [optional]
-**status** | [**StatusEnum**](#StatusEnum) | pet status in the store |  [optional]
-
-
-<a name="StatusEnum"></a>
-## Enum: StatusEnum
-Name | Value
---- | -----
-AVAILABLE | &quot;available&quot;
-PENDING | &quot;pending&quot;
-SOLD | &quot;sold&quot;
-
-
-
--- a/samples/client/petstore/java/feign/docs/PetApi.md
+++ b/samples/client/petstore/java/feign/docs/PetApi.md
@ -1,448 +0,0 @@
-# PetApi
-
-All URIs are relative to *http://petstore.swagger.io/v2*
-
-Method | HTTP request | Description
------------- | ------------- | -------------
-[**addPet**](PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
-[**deletePet**](PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
-[**findPetsByStatus**](PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status
-[**findPetsByTags**](PetApi.md#findPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags
-[**getPetById**](PetApi.md#getPetById) | **GET** /pet/{petId} | Find pet by ID
-[**updatePet**](PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
-[**updatePetWithForm**](PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
-[**uploadFile**](PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
-
-
-<a name="addPet"></a>
-# **addPet**
-> addPet(body)
-
-Add a new pet to the store
-
-
-
-### Example
-```java
-// Import classes:
-//import io.swagger.client.ApiClient;
-//import io.swagger.client.ApiException;
-//import io.swagger.client.Configuration;
-//import io.swagger.client.auth.*;
-//import io.swagger.client.api.PetApi;
-
-ApiClient defaultClient = Configuration.getDefaultApiClient();
-
-// Configure OAuth2 access token for authorization: petstore_auth
-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
-try {
-    apiInstance.addPet(body);
-} catch (ApiException e) {
-    System.err.println("Exception when calling PetApi#addPet");
-    e.printStackTrace();
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
------------- | ------------- | ------------- | -------------
- **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-[petstore_auth](../README.md#petstore_auth)
-
-### HTTP request headers
-
- - **Content-Type**: application/json, application/xml
- - **Accept**: application/xml, application/json
-
-<a name="deletePet"></a>
-# **deletePet**
-> deletePet(petId, apiKey)
-
-Deletes a pet
-
-
-
-### Example
-```java
-// Import classes:
-//import io.swagger.client.ApiClient;
-//import io.swagger.client.ApiException;
-//import io.swagger.client.Configuration;
-//import io.swagger.client.auth.*;
-//import io.swagger.client.api.PetApi;
-
-ApiClient defaultClient = Configuration.getDefaultApiClient();
-
-// Configure OAuth2 access token for authorization: petstore_auth
-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
-String apiKey = "apiKey_example"; // String | 
-try {
-    apiInstance.deletePet(petId, apiKey);
-} catch (ApiException e) {
-    System.err.println("Exception when calling PetApi#deletePet");
-    e.printStackTrace();
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
------------- | ------------- | ------------- | -------------
- **petId** | **Long**| Pet id to delete |
- **apiKey** | **String**|  | [optional]
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-[petstore_auth](../README.md#petstore_auth)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
-
-<a name="findPetsByStatus"></a>
-# **findPetsByStatus**
-> List&lt;Pet&gt; findPetsByStatus(status)
-
-Finds Pets by status
-
-Multiple status values can be provided with comma separated strings
-
-### Example
-```java
-// Import classes:
-//import io.swagger.client.ApiClient;
-//import io.swagger.client.ApiException;
-//import io.swagger.client.Configuration;
-//import io.swagger.client.auth.*;
-//import io.swagger.client.api.PetApi;
-
-ApiClient defaultClient = Configuration.getDefaultApiClient();
-
-// Configure OAuth2 access token for authorization: petstore_auth
-OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
-petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
-
-PetApi apiInstance = new PetApi();
-List<String> status = Arrays.asList("status_example"); // List<String> | Status values that need to be considered for filter
-try {
-    List<Pet> result = apiInstance.findPetsByStatus(status);
-    System.out.println(result);
-} catch (ApiException e) {
-    System.err.println("Exception when calling PetApi#findPetsByStatus");
-    e.printStackTrace();
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
------------- | ------------- | ------------- | -------------
- **status** | [**List&lt;String&gt;**](String.md)| Status values that need to be considered for filter |
-
-### Return type
-
-[**List&lt;Pet&gt;**](Pet.md)
-
-### Authorization
-
-[petstore_auth](../README.md#petstore_auth)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
-
-<a name="findPetsByTags"></a>
-# **findPetsByTags**
-> List&lt;Pet&gt; findPetsByTags(tags)
-
-Finds Pets by tags
-
-Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-
-### Example
-```java
-// Import classes:
-//import io.swagger.client.ApiClient;
-//import io.swagger.client.ApiException;
-//import io.swagger.client.Configuration;
-//import io.swagger.client.auth.*;
-//import io.swagger.client.api.PetApi;
-
-ApiClient defaultClient = Configuration.getDefaultApiClient();
-
-// Configure OAuth2 access token for authorization: petstore_auth
-OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
-petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
-
-PetApi apiInstance = new PetApi();
-List<String> tags = Arrays.asList("tags_example"); // List<String> | Tags to filter by
-try {
-    List<Pet> result = apiInstance.findPetsByTags(tags);
-    System.out.println(result);
-} catch (ApiException e) {
-    System.err.println("Exception when calling PetApi#findPetsByTags");
-    e.printStackTrace();
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
------------- | ------------- | ------------- | -------------
- **tags** | [**List&lt;String&gt;**](String.md)| Tags to filter by |
-
-### Return type
-
-[**List&lt;Pet&gt;**](Pet.md)
-
-### Authorization
-
-[petstore_auth](../README.md#petstore_auth)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
-
-<a name="getPetById"></a>
-# **getPetById**
-> Pet getPetById(petId)
-
-Find pet by ID
-
-Returns a single pet
-
-### Example
-```java
-// Import classes:
-//import io.swagger.client.ApiClient;
-//import io.swagger.client.ApiException;
-//import io.swagger.client.Configuration;
-//import io.swagger.client.auth.*;
-//import io.swagger.client.api.PetApi;
-
-ApiClient defaultClient = Configuration.getDefaultApiClient();
-
-// Configure API key authorization: api_key
-ApiKeyAuth api_key = (ApiKeyAuth) defaultClient.getAuthentication("api_key");
-api_key.setApiKey("YOUR API KEY");
-// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
-//api_key.setApiKeyPrefix("Token");
-
-PetApi apiInstance = new PetApi();
-Long petId = 789L; // Long | ID of pet to return
-try {
-    Pet result = apiInstance.getPetById(petId);
-    System.out.println(result);
-} catch (ApiException e) {
-    System.err.println("Exception when calling PetApi#getPetById");
-    e.printStackTrace();
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
------------- | ------------- | ------------- | -------------
- **petId** | **Long**| ID of pet to return |
-
-### Return type
-
-[**Pet**](Pet.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
-
-<a name="updatePet"></a>
-# **updatePet**
-> updatePet(body)
-
-Update an existing pet
-
-
-
-### Example
-```java
-// Import classes:
-//import io.swagger.client.ApiClient;
-//import io.swagger.client.ApiException;
-//import io.swagger.client.Configuration;
-//import io.swagger.client.auth.*;
-//import io.swagger.client.api.PetApi;
-
-ApiClient defaultClient = Configuration.getDefaultApiClient();
-
-// Configure OAuth2 access token for authorization: petstore_auth
-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
-try {
-    apiInstance.updatePet(body);
-} catch (ApiException e) {
-    System.err.println("Exception when calling PetApi#updatePet");
-    e.printStackTrace();
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
------------- | ------------- | ------------- | -------------
- **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-[petstore_auth](../README.md#petstore_auth)
-
-### HTTP request headers
-
- - **Content-Type**: application/json, application/xml
- - **Accept**: application/xml, application/json
-
-<a name="updatePetWithForm"></a>
-# **updatePetWithForm**
-> updatePetWithForm(petId, name, status)
-
-Updates a pet in the store with form data
-
-
-
-### Example
-```java
-// Import classes:
-//import io.swagger.client.ApiClient;
-//import io.swagger.client.ApiException;
-//import io.swagger.client.Configuration;
-//import io.swagger.client.auth.*;
-//import io.swagger.client.api.PetApi;
-
-ApiClient defaultClient = Configuration.getDefaultApiClient();
-
-// Configure OAuth2 access token for authorization: petstore_auth
-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
-String name = "name_example"; // String | Updated name of the pet
-String status = "status_example"; // String | Updated status of the pet
-try {
-    apiInstance.updatePetWithForm(petId, name, status);
-} catch (ApiException e) {
-    System.err.println("Exception when calling PetApi#updatePetWithForm");
-    e.printStackTrace();
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
------------- | ------------- | ------------- | -------------
- **petId** | **Long**| ID of pet that needs to be updated |
- **name** | **String**| Updated name of the pet | [optional]
- **status** | **String**| Updated status of the pet | [optional]
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-[petstore_auth](../README.md#petstore_auth)
-
-### HTTP request headers
-
- - **Content-Type**: application/x-www-form-urlencoded
- - **Accept**: application/xml, application/json
-
-<a name="uploadFile"></a>
-# **uploadFile**
-> ModelApiResponse uploadFile(petId, additionalMetadata, file)
-
-uploads an image
-
-
-
-### Example
-```java
-// Import classes:
-//import io.swagger.client.ApiClient;
-//import io.swagger.client.ApiException;
-//import io.swagger.client.Configuration;
-//import io.swagger.client.auth.*;
-//import io.swagger.client.api.PetApi;
-
-ApiClient defaultClient = Configuration.getDefaultApiClient();
-
-// Configure OAuth2 access token for authorization: petstore_auth
-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
-String additionalMetadata = "additionalMetadata_example"; // String | Additional data to pass to server
-File file = new File("/path/to/file.txt"); // File | file to upload
-try {
-    ModelApiResponse result = apiInstance.uploadFile(petId, additionalMetadata, file);
-    System.out.println(result);
-} catch (ApiException e) {
-    System.err.println("Exception when calling PetApi#uploadFile");
-    e.printStackTrace();
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
------------- | ------------- | ------------- | -------------
- **petId** | **Long**| ID of pet to update |
- **additionalMetadata** | **String**| Additional data to pass to server | [optional]
- **file** | **File**| file to upload | [optional]
-
-### Return type
-
-[**ModelApiResponse**](ModelApiResponse.md)
-
-### Authorization
-
-[petstore_auth](../README.md#petstore_auth)
-
-### HTTP request headers
-
- - **Content-Type**: multipart/form-data
- - **Accept**: application/json
-
--- a/samples/client/petstore/java/feign/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/java/feign/docs/ReadOnlyFirst.md
@ -1,11 +0,0 @@
-
-# ReadOnlyFirst
-
-## Properties
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**bar** | **String** |  |  [optional]
-**baz** | **String** |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/feign/docs/SpecialModelName.md
+++ b/samples/client/petstore/java/feign/docs/SpecialModelName.md
@ -1,10 +0,0 @@
-
-# SpecialModelName
-
-## Properties
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**specialPropertyName** | **Long** |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/feign/docs/StoreApi.md
+++ b/samples/client/petstore/java/feign/docs/StoreApi.md
@ -1,197 +0,0 @@
-# StoreApi
-
-All URIs are relative to *http://petstore.swagger.io/v2*
-
-Method | HTTP request | Description
------------- | ------------- | -------------
-[**deleteOrder**](StoreApi.md#deleteOrder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
-[**getInventory**](StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
-[**getOrderById**](StoreApi.md#getOrderById) | **GET** /store/order/{orderId} | Find purchase order by ID
-[**placeOrder**](StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet
-
-
-<a name="deleteOrder"></a>
-# **deleteOrder**
-> deleteOrder(orderId)
-
-Delete purchase order by ID
-
-For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-
-### Example
-```java
-// Import classes:
-//import io.swagger.client.ApiException;
-//import io.swagger.client.api.StoreApi;
-
-
-StoreApi apiInstance = new StoreApi();
-String orderId = "orderId_example"; // String | ID of the order that needs to be deleted
-try {
-    apiInstance.deleteOrder(orderId);
-} catch (ApiException e) {
-    System.err.println("Exception when calling StoreApi#deleteOrder");
-    e.printStackTrace();
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
------------- | ------------- | ------------- | -------------
- **orderId** | **String**| ID of the order that needs to be deleted |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
-
-<a name="getInventory"></a>
-# **getInventory**
-> Map&lt;String, Integer&gt; getInventory()
-
-Returns pet inventories by status
-
-Returns a map of status codes to quantities
-
-### Example
-```java
-// Import classes:
-//import io.swagger.client.ApiClient;
-//import io.swagger.client.ApiException;
-//import io.swagger.client.Configuration;
-//import io.swagger.client.auth.*;
-//import io.swagger.client.api.StoreApi;
-
-ApiClient defaultClient = Configuration.getDefaultApiClient();
-
-// Configure API key authorization: api_key
-ApiKeyAuth api_key = (ApiKeyAuth) defaultClient.getAuthentication("api_key");
-api_key.setApiKey("YOUR API KEY");
-// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
-//api_key.setApiKeyPrefix("Token");
-
-StoreApi apiInstance = new StoreApi();
-try {
-    Map<String, Integer> result = apiInstance.getInventory();
-    System.out.println(result);
-} catch (ApiException e) {
-    System.err.println("Exception when calling StoreApi#getInventory");
-    e.printStackTrace();
-}
-```
-
-### Parameters
-This endpoint does not need any parameter.
-
-### Return type
-
-[**Map&lt;String, Integer&gt;**](Map.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-<a name="getOrderById"></a>
-# **getOrderById**
-> Order getOrderById(orderId)
-
-Find purchase order by ID
-
-For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
-
-### Example
-```java
-// Import classes:
-//import io.swagger.client.ApiException;
-//import io.swagger.client.api.StoreApi;
-
-
-StoreApi apiInstance = new StoreApi();
-Long orderId = 789L; // Long | ID of pet that needs to be fetched
-try {
-    Order result = apiInstance.getOrderById(orderId);
-    System.out.println(result);
-} catch (ApiException e) {
-    System.err.println("Exception when calling StoreApi#getOrderById");
-    e.printStackTrace();
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
------------- | ------------- | ------------- | -------------
- **orderId** | **Long**| ID of pet that needs to be fetched |
-
-### Return type
-
-[**Order**](Order.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
-
-<a name="placeOrder"></a>
-# **placeOrder**
-> Order placeOrder(body)
-
-Place an order for a pet
-
-
-
-### Example
-```java
-// Import classes:
-//import io.swagger.client.ApiException;
-//import io.swagger.client.api.StoreApi;
-
-
-StoreApi apiInstance = new StoreApi();
-Order body = new Order(); // Order | order placed for purchasing the pet
-try {
-    Order result = apiInstance.placeOrder(body);
-    System.out.println(result);
-} catch (ApiException e) {
-    System.err.println("Exception when calling StoreApi#placeOrder");
-    e.printStackTrace();
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
------------- | ------------- | ------------- | -------------
- **body** | [**Order**](Order.md)| order placed for purchasing the pet |
-
-### Return type
-
-[**Order**](Order.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
-
--- a/samples/client/petstore/java/feign/docs/Tag.md
+++ b/samples/client/petstore/java/feign/docs/Tag.md
@ -1,11 +0,0 @@
-
-# Tag
-
-## Properties
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**id** | **Long** |  |  [optional]
-**name** | **String** |  |  [optional]
-
-
-
--- a/samples/client/petstore/java/feign/docs/User.md
+++ b/samples/client/petstore/java/feign/docs/User.md
@ -1,17 +0,0 @@
-
-# User
-
-## Properties
-Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**id** | **Long** |  |  [optional]
-**username** | **String** |  |  [optional]
-**firstName** | **String** |  |  [optional]
-**lastName** | **String** |  |  [optional]
-**email** | **String** |  |  [optional]
-**password** | **String** |  |  [optional]
-**phone** | **String** |  |  [optional]
-**userStatus** | **Integer** | User Status |  [optional]
-
-
-
--- a/samples/client/petstore/java/feign/docs/UserApi.md
+++ b/samples/client/petstore/java/feign/docs/UserApi.md
@ -1,370 +0,0 @@
-# UserApi
-
-All URIs are relative to *http://petstore.swagger.io/v2*
-
-Method | HTTP request | Description
------------- | ------------- | -------------
-[**createUser**](UserApi.md#createUser) | **POST** /user | Create user
-[**createUsersWithArrayInput**](UserApi.md#createUsersWithArrayInput) | **POST** /user/createWithArray | Creates list of users with given input array
-[**createUsersWithListInput**](UserApi.md#createUsersWithListInput) | **POST** /user/createWithList | Creates list of users with given input array
-[**deleteUser**](UserApi.md#deleteUser) | **DELETE** /user/{username} | Delete user
-[**getUserByName**](UserApi.md#getUserByName) | **GET** /user/{username} | Get user by user name
-[**loginUser**](UserApi.md#loginUser) | **GET** /user/login | Logs user into the system
-[**logoutUser**](UserApi.md#logoutUser) | **GET** /user/logout | Logs out current logged in user session
-[**updateUser**](UserApi.md#updateUser) | **PUT** /user/{username} | Updated user
-
-
-<a name="createUser"></a>
-# **createUser**
-> createUser(body)
-
-Create user
-
-This can only be done by the logged in user.
-
-### Example
-```java
-// Import classes:
-//import io.swagger.client.ApiException;
-//import io.swagger.client.api.UserApi;
-
-
-UserApi apiInstance = new UserApi();
-User body = new User(); // User | Created user object
-try {
-    apiInstance.createUser(body);
-} catch (ApiException e) {
-    System.err.println("Exception when calling UserApi#createUser");
-    e.printStackTrace();
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
------------- | ------------- | ------------- | -------------
- **body** | [**User**](User.md)| Created user object |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
-
-<a name="createUsersWithArrayInput"></a>
-# **createUsersWithArrayInput**
-> createUsersWithArrayInput(body)
-
-Creates list of users with given input array
-
-
-
-### Example
-```java
-// Import classes:
-//import io.swagger.client.ApiException;
-//import io.swagger.client.api.UserApi;
-
-
-UserApi apiInstance = new UserApi();
-List<User> body = Arrays.asList(new User()); // List<User> | List of user object
-try {
-    apiInstance.createUsersWithArrayInput(body);
-} catch (ApiException e) {
-    System.err.println("Exception when calling UserApi#createUsersWithArrayInput");
-    e.printStackTrace();
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
------------- | ------------- | ------------- | -------------
- **body** | [**List&lt;User&gt;**](User.md)| List of user object |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
-
-<a name="createUsersWithListInput"></a>
-# **createUsersWithListInput**
-> createUsersWithListInput(body)
-
-Creates list of users with given input array
-
-
-
-### Example
-```java
-// Import classes:
-//import io.swagger.client.ApiException;
-//import io.swagger.client.api.UserApi;
-
-
-UserApi apiInstance = new UserApi();
-List<User> body = Arrays.asList(new User()); // List<User> | List of user object
-try {
-    apiInstance.createUsersWithListInput(body);
-} catch (ApiException e) {
-    System.err.println("Exception when calling UserApi#createUsersWithListInput");
-    e.printStackTrace();
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
------------- | ------------- | ------------- | -------------
- **body** | [**List&lt;User&gt;**](User.md)| List of user object |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
-
-<a name="deleteUser"></a>
-# **deleteUser**
-> deleteUser(username)
-
-Delete user
-
-This can only be done by the logged in user.
-
-### Example
-```java
-// Import classes:
-//import io.swagger.client.ApiException;
-//import io.swagger.client.api.UserApi;
-
-
-UserApi apiInstance = new UserApi();
-String username = "username_example"; // String | The name that needs to be deleted
-try {
-    apiInstance.deleteUser(username);
-} catch (ApiException e) {
-    System.err.println("Exception when calling UserApi#deleteUser");
-    e.printStackTrace();
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
------------- | ------------- | ------------- | -------------
- **username** | **String**| The name that needs to be deleted |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
-
-<a name="getUserByName"></a>
-# **getUserByName**
-> User getUserByName(username)
-
-Get user by user name
-
-
-
-### Example
-```java
-// Import classes:
-//import io.swagger.client.ApiException;
-//import io.swagger.client.api.UserApi;
-
-
-UserApi apiInstance = new UserApi();
-String username = "username_example"; // String | The name that needs to be fetched. Use user1 for testing. 
-try {
-    User result = apiInstance.getUserByName(username);
-    System.out.println(result);
-} catch (ApiException e) {
-    System.err.println("Exception when calling UserApi#getUserByName");
-    e.printStackTrace();
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
------------- | ------------- | ------------- | -------------
- **username** | **String**| The name that needs to be fetched. Use user1 for testing.  |
-
-### Return type
-
-[**User**](User.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
-
-<a name="loginUser"></a>
-# **loginUser**
-> String loginUser(username, password)
-
-Logs user into the system
-
-
-
-### Example
-```java
-// Import classes:
-//import io.swagger.client.ApiException;
-//import io.swagger.client.api.UserApi;
-
-
-UserApi apiInstance = new UserApi();
-String username = "username_example"; // String | The user name for login
-String password = "password_example"; // String | The password for login in clear text
-try {
-    String result = apiInstance.loginUser(username, password);
-    System.out.println(result);
-} catch (ApiException e) {
-    System.err.println("Exception when calling UserApi#loginUser");
-    e.printStackTrace();
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
------------- | ------------- | ------------- | -------------
- **username** | **String**| The user name for login |
- **password** | **String**| The password for login in clear text |
-
-### Return type
-
-**String**
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
-
-<a name="logoutUser"></a>
-# **logoutUser**
-> logoutUser()
-
-Logs out current logged in user session
-
-
-
-### Example
-```java
-// Import classes:
-//import io.swagger.client.ApiException;
-//import io.swagger.client.api.UserApi;
-
-
-UserApi apiInstance = new UserApi();
-try {
-    apiInstance.logoutUser();
-} catch (ApiException e) {
-    System.err.println("Exception when calling UserApi#logoutUser");
-    e.printStackTrace();
-}
-```
-
-### Parameters
-This endpoint does not need any parameter.
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
-
-<a name="updateUser"></a>
-# **updateUser**
-> updateUser(username, body)
-
-Updated user
-
-This can only be done by the logged in user.
-
-### Example
-```java
-// Import classes:
-//import io.swagger.client.ApiException;
-//import io.swagger.client.api.UserApi;
-
-
-UserApi apiInstance = new UserApi();
-String username = "username_example"; // String | name that need to be deleted
-User body = new User(); // User | Updated user object
-try {
-    apiInstance.updateUser(username, body);
-} catch (ApiException e) {
-    System.err.println("Exception when calling UserApi#updateUser");
-    e.printStackTrace();
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
------------- | ------------- | ------------- | -------------
- **username** | **String**| name that need to be deleted |
- **body** | [**User**](User.md)| Updated user object |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
-
--- a/samples/client/petstore/java/feign/pom.xml
+++ b/samples/client/petstore/java/feign/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-feign</artifactId>
+    <groupId>org.openapitools</groupId>
+    <artifactId>petstore-feign</artifactId>
    <packaging>jar</packaging>
-    <name>swagger-petstore-feign</name>
+    <name>petstore-feign</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>

--- a/samples/client/petstore/java/feign/settings.gradle
+++ b/samples/client/petstore/java/feign/settings.gradle
@ -1 +1 @@
-rootProject.name = "swagger-petstore-feign"
+rootProject.name = "petstore-feign"
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/AnotherFakeApi.java
@ -18,7 +18,7 @@ public interface AnotherFakeApi extends ApiClient.Api {
  /**
   * To test special tags
   * To test special tags
-    * @param body client model (required)
+    * @param client client model (required)
   * @return Client
   */
  @RequestLine("PATCH /another-fake/dummy")
@ -26,5 +26,5 @@ public interface AnotherFakeApi extends ApiClient.Api {
    "Content-Type: application/json",
    "Accept: application/json",
  })
-  Client testSpecialTags(Client body);
+  Client testSpecialTags(Client client);
 }
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java
@ -5,9 +5,11 @@ import io.swagger.client.EncodingUtils;

 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 java.util.ArrayList;
 import java.util.HashMap;
@ -22,28 +24,28 @@ public interface FakeApi extends ApiClient.Api {
  /**
   * 
   * Test serialization of outer boolean types
-    * @param body Input boolean as post body (optional)
+    * @param booleanPostBody Input boolean as post body (optional)
   * @return Boolean
   */
  @RequestLine("POST /fake/outer/boolean")
  @Headers({
-    "Content-Type: application/json",
-    "Accept: application/json",
+    "Content-Type: */*",
+    "Accept: */*",
  })
-  Boolean fakeOuterBooleanSerialize(Boolean body);
+  Boolean fakeOuterBooleanSerialize(Boolean booleanPostBody);

  /**
   * 
   * Test serialization of object with outer number type
-    * @param body Input composite as post body (optional)
+    * @param outerComposite Input composite as post body (optional)
   * @return OuterComposite
   */
  @RequestLine("POST /fake/outer/composite")
  @Headers({
-    "Content-Type: application/json",
-    "Accept: application/json",
+    "Content-Type: */*",
+    "Accept: */*",
  })
-  OuterComposite fakeOuterCompositeSerialize(OuterComposite body);
+  OuterComposite fakeOuterCompositeSerialize(OuterComposite outerComposite);

  /**
   * 
@ -53,8 +55,8 @@ public interface FakeApi extends ApiClient.Api {
   */
  @RequestLine("POST /fake/outer/number")
  @Headers({
-    "Content-Type: application/json",
-    "Accept: application/json",
+    "Content-Type: */*",
+    "Accept: */*",
  })
  BigDecimal fakeOuterNumberSerialize(BigDecimal body);

@ -66,15 +68,61 @@ public interface FakeApi extends ApiClient.Api {
   */
  @RequestLine("POST /fake/outer/string")
  @Headers({
-    "Content-Type: application/json",
-    "Accept: application/json",
+    "Content-Type: */*",
+    "Accept: */*",
  })
  String fakeOuterStringSerialize(String body);

+  /**
+   * 
+   * 
+    * @param query  (required)
+    * @param user  (required)
+   */
+  @RequestLine("PUT /fake/body-with-query-params?query={query}")
+  @Headers({
+    "Content-Type: application/json",
+    "Accept: application/json",
+  })
+  void testBodyWithQueryParams(@Param("query") String query, User user);
+
+  /**
+   * 
+   * 
+   * Note, this is equivalent to the other <code>testBodyWithQueryParams</code> method,
+   * but with the query parameters collected into a single Map parameter. This
+   * is convenient for services with optional query parameters, especially when
+   * used with the {@link TestBodyWithQueryParamsQueryParams} class that allows for
+   * building up this map in a fluent style.
+   * @param user  (required)
+   * @param queryParams Map of query parameters as name-value pairs
+   *   <p>The following elements may be specified in the query map:</p>
+   *   <ul>
+   *   <li>query -  (required)</li>
+   *   </ul>
+   */
+  @RequestLine("PUT /fake/body-with-query-params?query={query}")
+  @Headers({
+  "Content-Type: application/json",
+  "Accept: application/json",
+  })
+  void testBodyWithQueryParams(User user, @QueryMap(encoded=true) Map<String, Object> queryParams);
+
+  /**
+   * A convenience class for generating query parameters for the
+   * <code>testBodyWithQueryParams</code> method in a fluent style.
+   */
+  public static class TestBodyWithQueryParamsQueryParams extends HashMap<String, Object> {
+    public TestBodyWithQueryParamsQueryParams query(final String value) {
+      put("query", EncodingUtils.encode(value));
+      return this;
+    }
+  }
+
  /**
   * To test \&quot;client\&quot; model
   * To test \&quot;client\&quot; model
-    * @param body client model (required)
+    * @param client client model (required)
   * @return Client
   */
  @RequestLine("PATCH /fake")
@ -82,7 +130,7 @@ public interface FakeApi extends ApiClient.Api {
    "Content-Type: application/json",
    "Accept: application/json",
  })
-  Client testClientModel(Client body);
+  Client testClientModel(Client client);

  /**
   * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@ -104,32 +152,32 @@ public interface FakeApi extends ApiClient.Api {
   */
  @RequestLine("POST /fake")
  @Headers({
-    "Content-Type: application/xml; charset&#x3D;utf-8",
-    "Accept: application/xml; charset&#x3D;utf-8,application/json; charset&#x3D;utf-8",
+    "Content-Type: application/x-www-form-urlencoded",
+    "Accept: application/json",
  })
-  void testEndpointParameters(@Param("number") BigDecimal number, @Param("_double") Double _double, @Param("patternWithoutDelimiter") String patternWithoutDelimiter, @Param("_byte") byte[] _byte, @Param("integer") Integer integer, @Param("int32") Integer int32, @Param("int64") Long int64, @Param("_float") Float _float, @Param("string") String string, @Param("binary") byte[] binary, @Param("date") LocalDate date, @Param("dateTime") OffsetDateTime dateTime, @Param("password") String password, @Param("paramCallback") String paramCallback);
+  void testEndpointParameters(@Param("number") BigDecimal number, @Param("_double") Double _double, @Param("patternWithoutDelimiter") String patternWithoutDelimiter, @Param("_byte") byte[] _byte, @Param("integer") Integer integer, @Param("int32") Integer int32, @Param("int64") Long int64, @Param("_float") Float _float, @Param("string") String string, @Param("binary") File binary, @Param("date") LocalDate date, @Param("dateTime") OffsetDateTime dateTime, @Param("password") String password, @Param("paramCallback") String paramCallback);

  /**
   * To test enum parameters
   * To test enum parameters
-    * @param enumFormStringArray Form parameter enum test (string array) (optional)
-    * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
    * @param enumHeaderStringArray Header parameter enum test (string array) (optional)
    * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg)
    * @param enumQueryStringArray Query parameter enum test (string array) (optional)
    * @param enumQueryString Query parameter enum test (string) (optional, default to -efg)
    * @param enumQueryInteger Query parameter enum test (double) (optional)
    * @param enumQueryDouble Query parameter enum test (double) (optional)
+    * @param enumFormStringArray Form parameter enum test (string array) (optional)
+    * @param enumFormString Form parameter enum test (string) (optional)
   */
-  @RequestLine("GET /fake?enum_query_string_array={enumQueryStringArray}&enum_query_string={enumQueryString}&enum_query_integer={enumQueryInteger}")
+  @RequestLine("GET /fake?enum_query_string_array={enumQueryStringArray}&enum_query_string={enumQueryString}&enum_query_integer={enumQueryInteger}&enum_query_double={enumQueryDouble}")
  @Headers({
-    "Content-Type: */*",
-    "Accept: */*",
+    "Content-Type: application/x-www-form-urlencoded",
+    "Accept: application/json",
    "enum_header_string_array: {enumHeaderStringArray}",
    
    "enum_header_string: {enumHeaderString}"
  })
-  void testEnumParameters(@Param("enumFormStringArray") List<String> enumFormStringArray, @Param("enumFormString") String enumFormString, @Param("enumHeaderStringArray") List<String> enumHeaderStringArray, @Param("enumHeaderString") String enumHeaderString, @Param("enumQueryStringArray") List<String> enumQueryStringArray, @Param("enumQueryString") String enumQueryString, @Param("enumQueryInteger") Integer enumQueryInteger, @Param("enumQueryDouble") Double enumQueryDouble);
+  void testEnumParameters(@Param("enumHeaderStringArray") List<String> enumHeaderStringArray, @Param("enumHeaderString") String enumHeaderString, @Param("enumQueryStringArray") List<String> enumQueryStringArray, @Param("enumQueryString") String enumQueryString, @Param("enumQueryInteger") Integer enumQueryInteger, @Param("enumQueryDouble") Double enumQueryDouble, @Param("enumFormStringArray") List<String> enumFormStringArray, @Param("enumFormString") String enumFormString);

  /**
   * To test enum parameters
@ -139,28 +187,28 @@ public interface FakeApi extends ApiClient.Api {
   * is convenient for services with optional query parameters, especially when
   * used with the {@link TestEnumParametersQueryParams} class that allows for
   * building up this map in a fluent style.
-   * @param enumFormStringArray Form parameter enum test (string array) (optional)
-   * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
   * @param enumHeaderStringArray Header parameter enum test (string array) (optional)
   * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg)
-   * @param enumQueryDouble Query parameter enum test (double) (optional)
+   * @param enumFormStringArray Form parameter enum test (string array) (optional)
+   * @param enumFormString Form parameter enum test (string) (optional)
   * @param queryParams Map of query parameters as name-value pairs
   *   <p>The following elements may be specified in the query map:</p>
   *   <ul>
   *   <li>enumQueryStringArray - Query parameter enum test (string array) (optional)</li>
   *   <li>enumQueryString - Query parameter enum test (string) (optional, default to -efg)</li>
   *   <li>enumQueryInteger - Query parameter enum test (double) (optional)</li>
+   *   <li>enumQueryDouble - Query parameter enum test (double) (optional)</li>
   *   </ul>
   */
-  @RequestLine("GET /fake?enum_query_string_array={enumQueryStringArray}&enum_query_string={enumQueryString}&enum_query_integer={enumQueryInteger}")
+  @RequestLine("GET /fake?enum_query_string_array={enumQueryStringArray}&enum_query_string={enumQueryString}&enum_query_integer={enumQueryInteger}&enum_query_double={enumQueryDouble}")
  @Headers({
-  "Content-Type: */*",
-  "Accept: */*",
+  "Content-Type: application/x-www-form-urlencoded",
+  "Accept: application/json",
      "enum_header_string_array: {enumHeaderStringArray}",
      
      "enum_header_string: {enumHeaderString}"
  })
-  void testEnumParameters(@Param("enumFormStringArray") List<String> enumFormStringArray, @Param("enumFormString") String enumFormString, @Param("enumHeaderStringArray") List<String> enumHeaderStringArray, @Param("enumHeaderString") String enumHeaderString, @Param("enumQueryDouble") Double enumQueryDouble, @QueryMap(encoded=true) Map<String, Object> queryParams);
+  void testEnumParameters(@Param("enumHeaderStringArray") List<String> enumHeaderStringArray, @Param("enumHeaderString") String enumHeaderString, @Param("enumFormStringArray") List<String> enumFormStringArray, @Param("enumFormString") String enumFormString, @QueryMap(encoded=true) Map<String, Object> queryParams);

  /**
   * A convenience class for generating query parameters for the
@ -179,19 +227,23 @@ public interface FakeApi extends ApiClient.Api {
      put("enum_query_integer", EncodingUtils.encode(value));
      return this;
    }
+    public TestEnumParametersQueryParams enumQueryDouble(final Double value) {
+      put("enum_query_double", EncodingUtils.encode(value));
+      return this;
+    }
  }

  /**
   * test inline additionalProperties
   * 
-    * @param param request body (required)
+    * @param requestBody request body (required)
   */
  @RequestLine("POST /fake/inline-additionalProperties")
  @Headers({
    "Content-Type: application/json",
    "Accept: application/json",
  })
-  void testInlineAdditionalProperties(Object param);
+  void testInlineAdditionalProperties(String requestBody);

  /**
   * test json serialization of form data
@ -201,7 +253,7 @@ public interface FakeApi extends ApiClient.Api {
   */
  @RequestLine("GET /fake/jsonFormData")
  @Headers({
-    "Content-Type: application/json",
+    "Content-Type: application/x-www-form-urlencoded",
    "Accept: application/json",
  })
  void testJsonFormData(@Param("param") String param, @Param("param2") String param2);
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java
@ -18,7 +18,7 @@ public interface FakeClassnameTags123Api extends ApiClient.Api {
  /**
   * To test class name in snake case
   * To test class name in snake case
-    * @param body client model (required)
+    * @param client client model (required)
   * @return Client
   */
  @RequestLine("PATCH /fake_classname_test")
@ -26,5 +26,5 @@ public interface FakeClassnameTags123Api extends ApiClient.Api {
    "Content-Type: application/json",
    "Accept: application/json",
  })
-  Client testClassname(Client body);
+  Client testClassname(Client client);
 }
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/PetApi.java
@ -20,14 +20,14 @@ public interface PetApi extends ApiClient.Api {
  /**
   * Add a new pet to the store
   * 
-    * @param body Pet object that needs to be added to the store (required)
+    * @param pet Pet object that needs to be added to the store (required)
   */
  @RequestLine("POST /pet")
  @Headers({
    "Content-Type: application/json",
    "Accept: application/json",
  })
-  void addPet(Pet body);
+  void addPet(Pet pet);

  /**
   * Deletes a pet
@ -145,14 +145,14 @@ public interface PetApi extends ApiClient.Api {
  /**
   * Update an existing pet
   * 
-    * @param body Pet object that needs to be added to the store (required)
+    * @param pet Pet object that needs to be added to the store (required)
   */
  @RequestLine("PUT /pet")
  @Headers({
    "Content-Type: application/json",
    "Accept: application/json",
  })
-  void updatePet(Pet body);
+  void updatePet(Pet pet);

  /**
   * Updates a pet in the store with form data
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/StoreApi.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/StoreApi.java
@ -52,13 +52,13 @@ public interface StoreApi extends ApiClient.Api {
  /**
   * Place an order for a pet
   * 
-    * @param body order placed for purchasing the pet (required)
+    * @param order order placed for purchasing the pet (required)
   * @return Order
   */
  @RequestLine("POST /store/order")
  @Headers({
-    "Content-Type: application/json",
+    "Content-Type: */*",
    "Accept: application/json",
  })
-  Order placeOrder(Order body);
+  Order placeOrder(Order order);
 }
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/UserApi.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/UserApi.java
@ -18,38 +18,38 @@ public interface UserApi extends ApiClient.Api {
  /**
   * Create user
   * This can only be done by the logged in user.
-    * @param body Created user object (required)
+    * @param user Created user object (required)
   */
  @RequestLine("POST /user")
  @Headers({
-    "Content-Type: application/json",
+    "Content-Type: */*",
    "Accept: application/json",
  })
-  void createUser(User body);
+  void createUser(User user);

  /**
   * Creates list of users with given input array
   * 
-    * @param body List of user object (required)
+    * @param user List of user object (required)
   */
  @RequestLine("POST /user/createWithArray")
  @Headers({
-    "Content-Type: application/json",
+    "Content-Type: */*",
    "Accept: application/json",
  })
-  void createUsersWithArrayInput(List<User> body);
+  void createUsersWithArrayInput(List<User> user);

  /**
   * Creates list of users with given input array
   * 
-    * @param body List of user object (required)
+    * @param user List of user object (required)
   */
  @RequestLine("POST /user/createWithList")
  @Headers({
-    "Content-Type: application/json",
+    "Content-Type: */*",
    "Accept: application/json",
  })
-  void createUsersWithListInput(List<User> body);
+  void createUsersWithListInput(List<User> user);

  /**
   * Delete user
@ -138,12 +138,12 @@ public interface UserApi extends ApiClient.Api {
   * Updated user
   * This can only be done by the logged in user.
    * @param username name that need to be deleted (required)
-    * @param body Updated user object (required)
+    * @param user Updated user object (required)
   */
  @RequestLine("PUT /user/{username}")
  @Headers({
-    "Content-Type: application/json",
+    "Content-Type: */*",
    "Accept: application/json",
  })
-  void updateUser(@Param("username") String username, User body);
+  void updateUser(@Param("username") String username, User user);
 }
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/feign/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/feign/src/main/java/io/swagger/client/model/FormatTest.java
+++ b/samples/client/petstore/java/feign/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/feign/src/main/java/io/swagger/client/model/Model200Response.java
+++ b/samples/client/petstore/java/feign/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/feign/src/main/java/io/swagger/client/model/Name.java
+++ b/samples/client/petstore/java/feign/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/feign/src/main/java/io/swagger/client/model/OuterBoolean.java
+++ b/samples/client/petstore/java/feign/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/feign/src/main/java/io/swagger/client/model/OuterNumber.java
+++ b/samples/client/petstore/java/feign/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/feign/src/main/java/io/swagger/client/model/OuterString.java
+++ b/samples/client/petstore/java/feign/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/feign/src/main/java/io/swagger/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/feign/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/feign/src/test/java/io/swagger/TestUtils.java
+++ b/samples/client/petstore/java/feign/src/test/java/io/swagger/TestUtils.java
@ -1,17 +0,0 @@
-package io.swagger;
-
-import java.util.Random;
-import java.util.concurrent.atomic.AtomicLong;
-
-public class TestUtils {
-    private static final AtomicLong atomicId = createAtomicId();
-
-    public static long nextId() {
-      return atomicId.getAndIncrement();
-    }
-
-    private static AtomicLong createAtomicId() {
-        int baseId = new Random(System.currentTimeMillis()).nextInt(1000000) + 20000;
-        return new AtomicLong((long) baseId);
-    }
-}
--- a/samples/client/petstore/java/feign/src/test/java/io/swagger/client/StringUtilTest.java
+++ b/samples/client/petstore/java/feign/src/test/java/io/swagger/client/StringUtilTest.java
@ -1,32 +0,0 @@
-package io.swagger.client;
-
-import org.junit.*;
-import static org.junit.Assert.*;
-
-public class StringUtilTest {
-    @Test
-    public void testContainsIgnoreCase() {
-        assertTrue(StringUtil.containsIgnoreCase(new String[]{"abc"}, "abc"));
-        assertTrue(StringUtil.containsIgnoreCase(new String[]{"abc"}, "ABC"));
-        assertTrue(StringUtil.containsIgnoreCase(new String[]{"ABC"}, "abc"));
-        assertTrue(StringUtil.containsIgnoreCase(new String[]{null, "abc"}, "ABC"));
-        assertTrue(StringUtil.containsIgnoreCase(new String[]{null, "abc"}, null));
-
-        assertFalse(StringUtil.containsIgnoreCase(new String[]{"abc"}, "def"));
-        assertFalse(StringUtil.containsIgnoreCase(new String[]{}, "ABC"));
-        assertFalse(StringUtil.containsIgnoreCase(new String[]{}, null));
-    }
-
-    @Test
-    public void testJoin() {
-        String[] array = {"aa", "bb", "cc"};
-        assertEquals("aa,bb,cc", StringUtil.join(array, ","));
-        assertEquals("aa, bb, cc", StringUtil.join(array, ", "));
-        assertEquals("aabbcc", StringUtil.join(array, ""));
-        assertEquals("aa bb cc", StringUtil.join(array, " "));
-        assertEquals("aa\nbb\ncc", StringUtil.join(array, "\n"));
-
-        assertEquals("", StringUtil.join(new String[]{}, ","));
-        assertEquals("abc", StringUtil.join(new String[]{"abc"}, ","));
-    }
-}
--- a/samples/client/petstore/java/feign/src/test/java/io/swagger/client/api/AnotherFakeApiTest.java
+++ b/samples/client/petstore/java/feign/src/test/java/io/swagger/client/api/AnotherFakeApiTest.java
@ -30,8 +30,8 @@ public class AnotherFakeApiTest {
     */
    @Test
    public void testSpecialTagsTest() {
-        Client body = null;
-        // Client response = api.testSpecialTags(body);
+        Client client = null;
+        // Client response = api.testSpecialTags(client);

        // TODO: test validations
    }
--- a/samples/client/petstore/java/feign/src/test/java/io/swagger/client/api/FakeApiTest.java
+++ b/samples/client/petstore/java/feign/src/test/java/io/swagger/client/api/FakeApiTest.java
@ -3,9 +3,11 @@ package io.swagger.client.api;
 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 org.junit.Before;
 import org.junit.Test;

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

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

        // TODO: test validations
    }
@ -83,6 +85,38 @@ public class FakeApiTest {
    }

    
+    /**
+     * 
+     *
+     * 
+     */
+    @Test
+    public void testBodyWithQueryParamsTest() {
+        String query = null;
+        User user = null;
+        // api.testBodyWithQueryParams(query, user);
+
+        // TODO: test validations
+    }
+
+    /**
+     * 
+     *
+     * 
+     *
+     * This tests the overload of the method that uses a Map for query parameters instead of
+     * listing them out individually.
+     */
+    @Test
+    public void testBodyWithQueryParamsTestQueryMap() {
+        User user = null;
+        FakeApi.TestBodyWithQueryParamsQueryParams queryParams = new FakeApi.TestBodyWithQueryParamsQueryParams()
+            .query(null);
+        // api.testBodyWithQueryParams(user, queryParams);
+
+    // TODO: test validations
+    }
+    
    /**
     * To test \&quot;client\&quot; model
     *
@ -90,8 +124,8 @@ public class FakeApiTest {
     */
    @Test
    public void testClientModelTest() {
-        Client body = null;
-        // Client response = api.testClientModel(body);
+        Client client = null;
+        // Client response = api.testClientModel(client);

        // TODO: test validations
    }
@ -113,7 +147,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;
@ -131,15 +165,15 @@ public class FakeApiTest {
     */
    @Test
    public void testEnumParametersTest() {
-        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
    }
@ -154,18 +188,47 @@ public class FakeApiTest {
     */
    @Test
    public void testEnumParametersTestQueryMap() {
-        List<String> enumFormStringArray = null;
-        String enumFormString = null;
        List<String> enumHeaderStringArray = null;
        String enumHeaderString = null;
-        Double enumQueryDouble = null;
+        List<String> enumFormStringArray = null;
+        String enumFormString = null;
        FakeApi.TestEnumParametersQueryParams queryParams = new FakeApi.TestEnumParametersQueryParams()
            .enumQueryStringArray(null)
            .enumQueryString(null)
-            .enumQueryInteger(null);
-        // api.testEnumParameters(enumFormStringArray, enumFormString, enumHeaderStringArray, enumHeaderString, enumQueryDouble, queryParams);
+            .enumQueryInteger(null)
+            .enumQueryDouble(null);
+        // api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumFormStringArray, enumFormString, queryParams);

    // TODO: test validations
    }
    
+    /**
+     * test inline additionalProperties
+     *
+     * 
+     */
+    @Test
+    public void testInlineAdditionalPropertiesTest() {
+        String requestBody = null;
+        // api.testInlineAdditionalProperties(requestBody);
+
+        // TODO: test validations
+    }
+
+    
+    /**
+     * test json serialization of form data
+     *
+     * 
+     */
+    @Test
+    public void testJsonFormDataTest() {
+        String param = null;
+        String param2 = null;
+        // api.testJsonFormData(param, param2);
+
+        // TODO: test validations
+    }
+
+    
 }
--- a/samples/client/petstore/java/feign/src/test/java/io/swagger/client/api/FakeClassnameTags123ApiTest.java
+++ b/samples/client/petstore/java/feign/src/test/java/io/swagger/client/api/FakeClassnameTags123ApiTest.java
@ -26,14 +26,15 @@ public class FakeClassnameTags123ApiTest {
    /**
     * To test class name in snake case
     *
-     * 
+     * To test class name in snake case
     */
    @Test
    public void testClassnameTest() {
-        Client body = null;
-        // Client response = api.testClassname(body);
+        Client client = null;
+        // Client response = api.testClassname(client);

        // TODO: test validations
    }
+
    
 }
--- a/samples/client/petstore/java/feign/src/test/java/io/swagger/client/api/PetApiTest.java
+++ b/samples/client/petstore/java/feign/src/test/java/io/swagger/client/api/PetApiTest.java
@ -1,251 +1,177 @@
 package io.swagger.client.api;

-import io.swagger.TestUtils;
-
 import io.swagger.client.ApiClient;
-import io.swagger.client.model.*;
-
-import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileWriter;
+import io.swagger.client.model.ModelApiResponse;
+import io.swagger.client.model.Pet;
+import org.junit.Before;
+import org.junit.Test;
+
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;

-import okhttp3.mockwebserver.MockResponse;
-import okhttp3.mockwebserver.MockWebServer;
-import okhttp3.mockwebserver.RecordedRequest;
-import org.junit.*;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.*;
-
+/**
+ * API tests for PetApi
+ */
 public class PetApiTest {
-    ApiClient apiClient;
-    PetApi api;
-    MockWebServer localServer;
-    ApiClient localClient;
+
+    private PetApi api;

    @Before
    public void setup() {
-        apiClient = new ApiClient();
-        api = apiClient.buildClient(PetApi.class);
-        localServer = new MockWebServer();
-        localClient = new ApiClient();
+        api = new ApiClient().buildClient(PetApi.class);
    }

+    
+    /**
+     * Add a new pet to the store
+     *
+     * 
+     */
    @Test
-    public void testApiClient() {
-        // the default api client is used
-        assertEquals("http://petstore.swagger.io:80/v2", apiClient.getBasePath());
+    public void addPetTest() {
+        Pet pet = null;
+        // api.addPet(pet);

-        ApiClient newClient = new ApiClient();
-        newClient.setBasePath("http://example.com");
-
-        assertEquals("http://example.com", newClient.getBasePath());
+        // TODO: test validations
    }

+    
+    /**
+     * Deletes a pet
+     *
+     * 
+     */
    @Test
-    public void testCreateAndGetPet() throws Exception {
-        Pet pet = createRandomPet();
-        api.addPet(pet);
+    public void deletePetTest() {
+        Long petId = null;
+        String apiKey = null;
+        // api.deletePet(petId, apiKey);

-        Pet fetched = api.getPetById(pet.getId());
-        assertNotNull(fetched);
-        assertEquals(pet.getId(), fetched.getId());
-        assertNotNull(fetched.getCategory());
-        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
+        // TODO: test validations
    }

+    
+    /**
+     * Finds Pets by status
+     *
+     * Multiple status values can be provided with comma separated strings
+     */
    @Test
-    public void testUpdatePet() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("programmer");
+    public void findPetsByStatusTest() {
+        List<String> status = null;
+        // List<Pet> response = api.findPetsByStatus(status);

-        api.updatePet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-        assertNotNull(fetched);
-        assertEquals(pet.getId(), fetched.getId());
-        assertNotNull(fetched.getCategory());
-        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
+        // TODO: test validations
    }

+    /**
+     * Finds Pets by status
+     *
+     * Multiple status values can be provided with comma separated strings
+     *
+     * This tests the overload of the method that uses a Map for query parameters instead of
+     * listing them out individually.
+     */
    @Test
-    public void testFindPetsByStatus() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("programmer");
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
-
-        api.updatePet(pet);
-
-        List<Pet> pets = api.findPetsByStatus(Collections.singletonList("available"));
-        assertNotNull(pets);
-
-        boolean found = false;
-        for (Pet fetched : pets) {
-            if (fetched.getId().equals(pet.getId())) {
-                found = true;
-                break;
-            }
-        }
-
-        assertTrue(found);
-
+    public void findPetsByStatusTestQueryMap() {
        PetApi.FindPetsByStatusQueryParams queryParams = new PetApi.FindPetsByStatusQueryParams()
-                .status(Arrays.asList(new String[]{"available"}));
-        pets = api.findPetsByStatus(queryParams);
-        assertNotNull(pets);
+            .status(null);
+        // List<Pet> response = api.findPetsByStatus(queryParams);

-        found = false;
-        for (Pet fetched : pets) {
-            if (fetched.getId().equals(pet.getId())) {
-                found = true;
-                break;
-            }
-        }
+    // TODO: test validations
+    }
+    
+    /**
+     * Finds Pets by tags
+     *
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     */
+    @Test
+    public void findPetsByTagsTest() {
+        List<String> tags = null;
+        // List<Pet> response = api.findPetsByTags(tags);

-        assertTrue(found);
+        // TODO: test validations
    }

+    /**
+     * Finds Pets by tags
+     *
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     *
+     * This tests the overload of the method that uses a Map for query parameters instead of
+     * listing them out individually.
+     */
    @Test
-    public void testFindPetsByTags() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("monster");
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
-
-        List<Tag> tags = new ArrayList<>();
-        Tag tag1 = new Tag();
-        tag1.setName("friendly");
-        tags.add(tag1);
-        pet.setTags(tags);
-
-        api.updatePet(pet);
-
-        List<Pet> pets = api.findPetsByTags(Collections.singletonList("friendly"));
-        assertNotNull(pets);
-
-        boolean found = false;
-        for (Pet fetched : pets) {
-            if (fetched.getId().equals(pet.getId())) {
-                found = true;
-                break;
-            }
-        }
-        assertTrue(found);
-
+    public void findPetsByTagsTestQueryMap() {
        PetApi.FindPetsByTagsQueryParams queryParams = new PetApi.FindPetsByTagsQueryParams()
-                .tags(Arrays.asList(new String[]{"friendly"}));
-        pets = api.findPetsByTags(queryParams);
-        assertNotNull(pets);
+            .tags(null);
+        // List<Pet> response = api.findPetsByTags(queryParams);

-        found = false;
-        for (Pet fetched : pets) {
-            if (fetched.getId().equals(pet.getId())) {
-                found = true;
-                break;
-            }
-        }
-        assertTrue(found);
+    // TODO: test validations
    }
-
+    
+    /**
+     * Find pet by ID
+     *
+     * Returns a single pet
+     */
    @Test
-    public void testUpdatePetWithForm() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("frank");
-        api.addPet(pet);
+    public void getPetByIdTest() {
+        Long petId = null;
+        // Pet response = api.getPetById(petId);

-        Pet fetched = api.getPetById(pet.getId());
-
-        api.updatePetWithForm(fetched.getId(), "furt", null);
-        Pet updated = api.getPetById(fetched.getId());
-
-        assertEquals(updated.getName(), "furt");
+        // TODO: test validations
    }

+    
+    /**
+     * Update an existing pet
+     *
+     * 
+     */
    @Test
-    public void testDeletePet() throws Exception {
-        Pet pet = createRandomPet();
-        api.addPet(pet);
+    public void updatePetTest() {
+        Pet pet = null;
+        // api.updatePet(pet);

-        Pet fetched = api.getPetById(pet.getId());
-        api.deletePet(fetched.getId(), null);
-
-        try {
-            api.getPetById(fetched.getId());
-            fail("expected an error");
-        } catch (Exception e) {
-//            assertEquals(404, e.getCode());
-        }
+        // TODO: test validations
    }

+    
+    /**
+     * Updates a pet in the store with form data
+     *
+     * 
+     */
    @Test
-    public void testUploadFile() throws Exception {
-        Pet pet = createRandomPet();
-        api.addPet(pet);
+    public void updatePetWithFormTest() {
+        Long petId = null;
+        String name = null;
+        String status = null;
+        // api.updatePetWithForm(petId, name, status);

-        File file = new File("hello.txt");
-        BufferedWriter writer = new BufferedWriter(new FileWriter(file));
-        writer.write("Hello world!");
-        writer.close();
-
-        api.uploadFile(pet.getId(), "a test file", new File(file.getAbsolutePath()));
+        // TODO: test validations
    }

+    
+    /**
+     * uploads an image
+     *
+     * 
+     */
    @Test
-    public void testEqualsAndHashCode() {
-        Pet pet1 = new Pet();
-        Pet pet2 = new Pet();
-        assertTrue(pet1.equals(pet2));
-        assertTrue(pet2.equals(pet1));
-        assertTrue(pet1.hashCode() == pet2.hashCode());
-        assertTrue(pet1.equals(pet1));
-        assertTrue(pet1.hashCode() == pet1.hashCode());
+    public void uploadFileTest() {
+        Long petId = null;
+        String additionalMetadata = null;
+        File file = null;
+        // ModelApiResponse response = api.uploadFile(petId, additionalMetadata, file);

-        pet2.setName("really-happy");
-        pet2.setPhotoUrls(Arrays.asList("http://foo.bar.com/1", "http://foo.bar.com/2"));
-        assertFalse(pet1.equals(pet2));
-        assertFalse(pet2.equals(pet1));
-        assertFalse(pet1.hashCode() == (pet2.hashCode()));
-        assertTrue(pet2.equals(pet2));
-        assertTrue(pet2.hashCode() == pet2.hashCode());
-
-        pet1.setName("really-happy");
-        pet1.setPhotoUrls(Arrays.asList("http://foo.bar.com/1", "http://foo.bar.com/2"));
-        assertTrue(pet1.equals(pet2));
-        assertTrue(pet2.equals(pet1));
-        assertTrue(pet1.hashCode() == pet2.hashCode());
-        assertTrue(pet1.equals(pet1));
-        assertTrue(pet1.hashCode() == pet1.hashCode());
+        // TODO: test validations
    }

-    @Test
-    public void testCSVDelimitedArray() throws Exception {
-        localServer.enqueue(new MockResponse().setBody("[{\"id\":5,\"name\":\"rocky\"}]"));
-        localServer.start();
-        PetApi api = localClient.setBasePath(localServer.url("/").toString()).buildClient(PetApi.class);
-        PetApi.FindPetsByTagsQueryParams queryParams = new PetApi.FindPetsByTagsQueryParams()
-                .tags(Arrays.asList("friendly","energetic"));
-        List<Pet> pets = api.findPetsByTags(queryParams);
-        assertNotNull(pets);
-        RecordedRequest request = localServer.takeRequest();
-        assertThat(request.getPath()).contains("tags=friendly,energetic");
-        localServer.shutdown();
-    }
-
-    private Pet createRandomPet() {
-        Pet pet = new Pet();
-        pet.setId(TestUtils.nextId());
-        pet.setName("gorilla");
-
-        Category category = new Category();
-        category.setName("really-happy");
-
-        pet.setCategory(category);
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
-        List<String> photos = Arrays.asList("http://foo.bar.com/1", "http://foo.bar.com/2");
-        pet.setPhotoUrls(photos);
-
-        return pet;
-    }
+    
 }
--- a/samples/client/petstore/java/feign/src/test/java/io/swagger/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/feign/src/test/java/io/swagger/client/api/StoreApiTest.java
@ -1,82 +1,81 @@
 package io.swagger.client.api;

-import feign.FeignException;
-
-import io.swagger.TestUtils;
-
 import io.swagger.client.ApiClient;
-import io.swagger.client.model.*;
+import io.swagger.client.model.Order;
+import org.junit.Before;
+import org.junit.Test;

-import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;

-import org.junit.*;
-import org.threeten.bp.OffsetDateTime;
-
-import static org.junit.Assert.*;
-
+/**
+ * API tests for StoreApi
+ */
 public class StoreApiTest {
+
    private StoreApi api;

    @Before
    public void setup() {
-        ApiClient apiClient = new ApiClient();
-        api = apiClient.buildClient(StoreApi.class);
+        api = new ApiClient().buildClient(StoreApi.class);
    }

+    
+    /**
+     * Delete purchase order by ID
+     *
+     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+     */
    @Test
-    public void testGetInventory() throws Exception {
-        Map<String, Integer> inventory = api.getInventory();
-        assertTrue(inventory.keySet().size() > 0);
+    public void deleteOrderTest() {
+        String orderId = null;
+        // api.deleteOrder(orderId);
+
+        // TODO: test validations
    }

+    
+    /**
+     * Returns pet inventories by status
+     *
+     * Returns a map of status codes to quantities
+     */
    @Test
-    public void testPlaceOrder() throws Exception {
-        Order order = createOrder();
-        api.placeOrder(order);
+    public void getInventoryTest() {
+        // Map<String, Integer> response = api.getInventory();

-        Order fetched = api.getOrderById(order.getId());
-        assertEquals(order.getId(), fetched.getId());
-        assertEquals(order.getPetId(), fetched.getPetId());
-        assertEquals(order.getQuantity(), fetched.getQuantity());
-        assertTrue(order.getShipDate().isEqual(fetched.getShipDate()));
+        // TODO: test validations
    }

+    
+    /**
+     * Find purchase order by ID
+     *
+     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+     */
    @Test
-    public void testDeleteOrder() throws Exception {
-        Order order = createOrder();
-        api.placeOrder(order);
+    public void getOrderByIdTest() {
+        Long orderId = null;
+        // Order response = api.getOrderById(orderId);

-        Order fetched = api.getOrderById(order.getId());
-        assertEquals(fetched.getId(), order.getId());
-
-        api.deleteOrder(order.getId().toString());
-
-        try {
-            api.getOrderById(order.getId());
-            fail("expected an error");
-        } catch (FeignException e) {
-            assertTrue(e.getMessage().startsWith("status 404 "));
-        }
+        // TODO: test validations
    }

-    private Order createOrder() {
-        Order order = new Order();
-        order.setPetId(200L);
-        order.setQuantity(13);
-        //Ensure 3 fractional digits because of a bug in the petstore server
-        order.setShipDate(OffsetDateTime.now().withNano(123000000));
-        order.setStatus(Order.StatusEnum.PLACED);
-        order.setComplete(true);
+    
+    /**
+     * Place an order for a pet
+     *
+     * 
+     */
+    @Test
+    public void placeOrderTest() {
+        Order order = null;
+        // Order response = api.placeOrder(order);

-        try {
-          Field idField = Order.class.getDeclaredField("id");
-          idField.setAccessible(true);
-          idField.set(order, TestUtils.nextId());
-        } catch (Exception e) {
-          throw new RuntimeException(e);
-        }
-
-        return order;
+        // TODO: test validations
    }
+
+    
 }
--- a/samples/client/petstore/java/feign/src/test/java/io/swagger/client/api/UserApiTest.java
+++ b/samples/client/petstore/java/feign/src/test/java/io/swagger/client/api/UserApiTest.java
@ -1,93 +1,156 @@
 package io.swagger.client.api;

-import io.swagger.TestUtils;
-
 import io.swagger.client.ApiClient;
-import io.swagger.client.model.*;
+import io.swagger.client.model.User;
+import org.junit.Before;
+import org.junit.Test;

-import java.util.Arrays;
-
-import org.junit.*;
-import static org.junit.Assert.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;

+/**
+ * API tests for UserApi
+ */
 public class UserApiTest {
+
    private UserApi api;

    @Before
    public void setup() {
-        ApiClient apiClient = new ApiClient();
-        api = apiClient.buildClient(UserApi.class);
+        api = new ApiClient().buildClient(UserApi.class);
    }

+    
+    /**
+     * Create user
+     *
+     * This can only be done by the logged in user.
+     */
    @Test
-    public void testCreateUser() throws Exception {
-        User user = createUser();
+    public void createUserTest() {
+        User user = null;
+        // api.createUser(user);

-        api.createUser(user);
-
-        User fetched = api.getUserByName(user.getUsername());
-        assertEquals(user.getId(), fetched.getId());
+        // TODO: test validations
    }

+    
+    /**
+     * Creates list of users with given input array
+     *
+     * 
+     */
    @Test
-    public void testCreateUsersWithArray() throws Exception {
-        User user1 = createUser();
-        user1.setUsername("user" + user1.getId());
-        User user2 = createUser();
-        user2.setUsername("user" + user2.getId());
+    public void createUsersWithArrayInputTest() {
+        List<User> user = null;
+        // api.createUsersWithArrayInput(user);

-        api.createUsersWithArrayInput(Arrays.asList(user1, user2));
-
-        User fetched = api.getUserByName(user1.getUsername());
-        assertEquals(user1.getId(), fetched.getId());
+        // TODO: test validations
    }

+    
+    /**
+     * Creates list of users with given input array
+     *
+     * 
+     */
    @Test
-    public void testCreateUsersWithList() throws Exception {
-        User user1 = createUser();
-        user1.setUsername("user" + user1.getId());
-        User user2 = createUser();
-        user2.setUsername("user" + user2.getId());
+    public void createUsersWithListInputTest() {
+        List<User> user = null;
+        // api.createUsersWithListInput(user);

-        api.createUsersWithListInput(Arrays.asList(user1, user2));
-
-        User fetched = api.getUserByName(user1.getUsername());
-        assertEquals(user1.getId(), fetched.getId());
+        // TODO: test validations
    }

-    // ignore for the time being, please refer to the following for more info:
-    // https://github.com/swagger-api/swagger-codegen/issues/1660
-    @Ignore @Test
-    public void testLoginUser() throws Exception {
-        User user = createUser();
-        api.createUser(user);
+    
+    /**
+     * Delete user
+     *
+     * This can only be done by the logged in user.
+     */
+    @Test
+    public void deleteUserTest() {
+        String username = null;
+        // api.deleteUser(username);

-        String token = api.loginUser(user.getUsername(), user.getPassword());
-        assertTrue(token.startsWith("logged in user session:"));
+        // TODO: test validations
+    }

+    
+    /**
+     * Get user by user name
+     *
+     * 
+     */
+    @Test
+    public void getUserByNameTest() {
+        String username = null;
+        // User response = api.getUserByName(username);
+
+        // TODO: test validations
+    }
+
+    
+    /**
+     * Logs user into the system
+     *
+     * 
+     */
+    @Test
+    public void loginUserTest() {
+        String username = null;
+        String password = null;
+        // String response = api.loginUser(username, password);
+
+        // TODO: test validations
+    }
+
+    /**
+     * Logs user into the system
+     *
+     * 
+     *
+     * This tests the overload of the method that uses a Map for query parameters instead of
+     * listing them out individually.
+     */
+    @Test
+    public void loginUserTestQueryMap() {
        UserApi.LoginUserQueryParams queryParams = new UserApi.LoginUserQueryParams()
-                .username(user.getUsername())
-                .password(user.getPassword());
-        token = api.loginUser(queryParams);
-        assertTrue(token.startsWith("logged in user session:"));
-    }
+            .username(null)
+            .password(null);
+        // String response = api.loginUser(queryParams);

+    // TODO: test validations
+    }
+    
+    /**
+     * Logs out current logged in user session
+     *
+     * 
+     */
    @Test
-    public void logoutUser() throws Exception {
-        api.logoutUser();
+    public void logoutUserTest() {
+        // api.logoutUser();
+
+        // TODO: test validations
    }

-    private User createUser() {
-        User user = new User();
-        user.setId(TestUtils.nextId());
-        user.setUsername("fred" + user.getId());
-        user.setFirstName("Fred");
-        user.setLastName("Meyer");
-        user.setEmail("fred@fredmeyer.com");
-        user.setPassword("xxXXxx");
-        user.setPhone("408-867-5309");
-        user.setUserStatus(123);
+    
+    /**
+     * Updated user
+     *
+     * This can only be done by the logged in user.
+     */
+    @Test
+    public void updateUserTest() {
+        String username = null;
+        User user = null;
+        // api.updateUser(username, user);

-        return user;
+        // TODO: test validations
    }
+
+    
 }
--- 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
@ -1,10 +1,9 @@

-# ModelReturn
+# OuterBoolean

 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**_return** | **Integer** |  |  [optional]



--- a/samples/client/petstore/java/google-api-client/docs/OuterNumber.md
+++ b/samples/client/petstore/java/google-api-client/docs/OuterNumber.md
@ -1,5 +1,5 @@

-# AnimalFarm
+# 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
@ -1,5 +1,5 @@

-# AnimalFarm
+# 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/Show More
+++ b/Show More