update samples

bin/openapi3/elm.sh

@@ -27,6 +27,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -i modules/openapi-generator/src/test/resources/3_0/elm.yaml -g elm -t modules/openapi-generator/src/main/resources/elm -o samples/openapi3/client/elm $@"
+ags="generate -i modules/openapi-generator/src/test/resources/3_0/elm.yaml -g elm -t modules/openapi-generator/src/main/resources/elm -o samples/openapi3/client/elm --skip-validate-spec $@"
 
 java $JAVA_OPTS -jar $executable $ags

docs/generators/elm.md

@@ -5,13 +5,6 @@ sidebar_label: elm
 
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
-<<<<<<< HEAD
-=======
-|elmEnableCustomBasePaths|Enable setting the base path for each request| |false|
-|elmEnableHttpRequestTrackers|Enable adding a tracker to each http request| |false|
-|elmPrefixCustomTypeVariants|Prefix custom type variants| |false|
-|elmVersion|Elm version: 0.18, 0.19|<dl><dt>**0.19**</dt><dd>Elm 0.19</dd><dt>**0.18**</dt><dd>Elm 0.18</dd></dl>|0.19|
->>>>>>> origin/master
 
 ## IMPORT MAPPING
 

samples/client/petstore/R/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/apex/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/apex/README.md

@@ -1,12 +1,12 @@
 # OpenAPI Petstore API Client
 
+
 This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
 
 ## Requirements
 
 - [Salesforce DX](https://www.salesforce.com/products/platform/products/salesforce-dx/)
 
-
 If everything is set correctly:
 
 - Running `sfdx version` in a command prompt should output something like:
@@ -15,28 +15,28 @@ If everything is set correctly:
   sfdx-cli/5.7.5-05549de (darwin-amd64) go1.7.5 sfdxstable
   ```
 
-
 ## Installation
 
 1. Copy the output into your Salesforce DX folder - or alternatively deploy the output directly into the workspace.
 2. Deploy the code via Salesforce DX to your Scratch Org
 
    ```bash
-   $ sfdx force:source:push
+      sfdx force:source:push
    ```
+
 3. If the API needs authentication update the Named Credential in Setup.
 4. Run your Apex tests using
 
    ```bash
-    $ sfdx sfdx force:apex:test:run
+       sfdx sfdx force:apex:test:run
    ```
+
 5. Retrieve the job id from the console and check the test results.
 
   ```bash
-  $ sfdx force:apex:test:report -i theJobId
+  sfdx force:apex:test:report -i theJobId
   ```
 
-
 ## Getting Started
 
 Please follow the [installation](#installation) instruction and execute the following Apex code:
@@ -47,7 +47,7 @@ OASClient client = api.getClient();
 
 
 Map<String, Object> params = new Map<String, Object>{
-    'oaSPet' => OASPet.getExample()
+    'body' => ''
 };
 
 try {
@@ -101,6 +101,7 @@ Class | Method | HTTP request | Description
 Authentication schemes defined for the API:
 ### api_key
 
+
 - **Type**: API key
 - **API key parameter name**: api_key
 - **Location**: HTTP header

samples/client/petstore/cpp-restsdk/client/.openapi-generator/VERSION

@@ -1 +1 @@
-4.3.1-SNAPSHOT
+5.0.0-SNAPSHOT

samples/client/petstore/cpp-restsdk/client/ApiClient.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/ApiClient.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/ApiConfiguration.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/ApiConfiguration.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/ApiException.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/ApiException.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/HttpContent.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/HttpContent.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/IHttpBody.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/JsonBody.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/JsonBody.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/ModelBase.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/ModelBase.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/MultipartFormData.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/MultipartFormData.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/Object.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/Object.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/api/PetApi.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/api/PetApi.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/api/StoreApi.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/api/StoreApi.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/api/UserApi.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/api/UserApi.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/ApiResponse.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/ApiResponse.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/Category.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/Category.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/Order.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/Order.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/Pet.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/Pet.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/Tag.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/Tag.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/User.cpp

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/User.h

@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/dart-jaguar/flutter_petstore/openapi/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/dart-jaguar/openapi/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/dart-jaguar/openapi_proto/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/dart/flutter_petstore/openapi/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/dart/openapi-browser-client/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/dart/openapi/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/dart2/petstore_client_lib/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/elixir/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/go-experimental/go-petstore/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/go/go-petstore-withXml/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/go/go-petstore/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/groovy/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/haskell-http-client/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/feign/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/feign10x/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/feign10x/README.md

@@ -1,4 +1,4 @@
-# petstore-feign
+# petstore-feign-10x
 
 ## Requirements
 
@@ -25,7 +25,7 @@ After the client library is installed/deployed, you can use it in your Maven pro
 ```xml
 <dependency>
     <groupId>org.openapitools</groupId>
-    <artifactId>petstore-feign</artifactId>
+    <artifactId>petstore-feign-10x</artifactId>
     <version>1.0.0</version>
     <scope>compile</scope>
 </dependency>

samples/client/petstore/java/google-api-client/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/google-api-client/README.md

@@ -1,6 +1,7 @@
 # petstore-google-api-client
 
 OpenAPI 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: \" \\
@@ -8,10 +9,10 @@ This spec is mainly for testing Petstore server and contains fake endpoints, mod
 
 *Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
 
-
 ## Requirements
 
 Building the API client library requires:
+
 1. Java 1.7+
 2. Maven/Gradle
 
@@ -62,8 +63,8 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/petstore-google-api-client-1.0.0.jar`
+- `target/petstore-google-api-client-1.0.0.jar`
-* `target/lib/*.jar`
+- `target/lib/*.jar`
 
 ## Getting Started
 
@@ -76,20 +77,22 @@ import org.openapitools.client.auth.*;
 import org.openapitools.client.model.*;
 import org.openapitools.client.api.AnotherFakeApi;
 
-import java.io.File;
-import java.util.*;
-
 public class AnotherFakeApiExample {
 
     public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
         
-        AnotherFakeApi apiInstance = new AnotherFakeApi();
+        AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
-        Client client = new Client(); // Client | client model
+        Client body = new Client(); // Client | client model
         try {
-            Client result = apiInstance.testSpecialTags(client);
+            Client result = apiInstance.call123testSpecialTags(body);
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling AnotherFakeApi#testSpecialTags");
+            System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
             e.printStackTrace();
         }
     }
@@ -103,17 +106,21 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**testSpecialTags**](docs/AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*FakeApi* | [**createXmlItem**](docs/FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem
 *FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
 *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* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 *FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \"client\" 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
+*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
 *FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
 *FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
 *FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
 *PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
 *PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
@@ -123,6 +130,7 @@ Class | Method | HTTP request | Description
 *PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 *PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 *StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
 *StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
 *StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
@@ -139,21 +147,32 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
+ - [AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md)
+ - [AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md)
+ - [AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md)
  - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md)
+ - [AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md)
+ - [AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md)
+ - [AdditionalPropertiesString](docs/AdditionalPropertiesString.md)
  - [Animal](docs/Animal.md)
- - [AnimalFarm](docs/AnimalFarm.md)
  - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
+ - [BigCat](docs/BigCat.md)
+ - [BigCatAllOf](docs/BigCatAllOf.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
+ - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
  - [FormatTest](docs/FormatTest.md)
  - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [MapTest](docs/MapTest.md)
@@ -170,7 +189,10 @@ Class | Method | HTTP request | Description
  - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [SpecialModelName](docs/SpecialModelName.md)
  - [Tag](docs/Tag.md)
+ - [TypeHolderDefault](docs/TypeHolderDefault.md)
+ - [TypeHolderExample](docs/TypeHolderExample.md)
  - [User](docs/User.md)
+ - [XmlItem](docs/XmlItem.md)
 
 
 ## Documentation for Authorization
@@ -178,22 +200,26 @@ Class | Method | HTTP request | Description
 Authentication schemes defined for the API:
 ### api_key
 
+
 - **Type**: API key
 - **API key parameter name**: api_key
 - **Location**: HTTP header
 
 ### api_key_query
 
+
 - **Type**: API key
 - **API key parameter name**: api_key_query
 - **Location**: URL query string
 
 ### http_basic_test
 
+
 - **Type**: HTTP basic authentication
 
 ### petstore_auth
 
+
 - **Type**: OAuth
 - **Flow**: implicit
 - **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog

samples/client/petstore/java/jersey1/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/jersey1/README.md

@@ -1,6 +1,7 @@
 # petstore-java-client-jersey1
 
 OpenAPI 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: \" \\
@@ -8,10 +9,10 @@ This spec is mainly for testing Petstore server and contains fake endpoints, mod
 
 *Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
 
-
 ## Requirements
 
 Building the API client library requires:
+
 1. Java 1.7+
 2. Maven/Gradle
 
@@ -62,8 +63,8 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/petstore-java-client-jersey1-1.0.0.jar`
+- `target/petstore-java-client-jersey1-1.0.0.jar`
-* `target/lib/*.jar`
+- `target/lib/*.jar`
 
 ## Getting Started
 
@@ -76,20 +77,22 @@ import org.openapitools.client.auth.*;
 import org.openapitools.client.model.*;
 import org.openapitools.client.api.AnotherFakeApi;
 
-import java.io.File;
-import java.util.*;
-
 public class AnotherFakeApiExample {
 
     public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
         
-        AnotherFakeApi apiInstance = new AnotherFakeApi();
+        AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
-        Client client = new Client(); // Client | client model
+        Client body = new Client(); // Client | client model
         try {
-            Client result = apiInstance.testSpecialTags(client);
+            Client result = apiInstance.call123testSpecialTags(body);
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling AnotherFakeApi#testSpecialTags");
+            System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
             e.printStackTrace();
         }
     }
@@ -103,17 +106,21 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**testSpecialTags**](docs/AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*FakeApi* | [**createXmlItem**](docs/FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem
 *FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
 *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* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 *FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \"client\" 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
+*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
 *FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
 *FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
 *FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
 *PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
 *PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
@@ -123,6 +130,7 @@ Class | Method | HTTP request | Description
 *PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 *PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 *StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
 *StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
 *StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
@@ -139,21 +147,32 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
+ - [AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md)
+ - [AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md)
+ - [AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md)
  - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md)
+ - [AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md)
+ - [AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md)
+ - [AdditionalPropertiesString](docs/AdditionalPropertiesString.md)
  - [Animal](docs/Animal.md)
- - [AnimalFarm](docs/AnimalFarm.md)
  - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
+ - [BigCat](docs/BigCat.md)
+ - [BigCatAllOf](docs/BigCatAllOf.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
+ - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
  - [FormatTest](docs/FormatTest.md)
  - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [MapTest](docs/MapTest.md)
@@ -170,7 +189,10 @@ Class | Method | HTTP request | Description
  - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [SpecialModelName](docs/SpecialModelName.md)
  - [Tag](docs/Tag.md)
+ - [TypeHolderDefault](docs/TypeHolderDefault.md)
+ - [TypeHolderExample](docs/TypeHolderExample.md)
  - [User](docs/User.md)
+ - [XmlItem](docs/XmlItem.md)
 
 
 ## Documentation for Authorization
@@ -178,22 +200,26 @@ Class | Method | HTTP request | Description
 Authentication schemes defined for the API:
 ### api_key
 
+
 - **Type**: API key
 - **API key parameter name**: api_key
 - **Location**: HTTP header
 
 ### api_key_query
 
+
 - **Type**: API key
 - **API key parameter name**: api_key_query
 - **Location**: URL query string
 
 ### http_basic_test
 
+
 - **Type**: HTTP basic authentication
 
 ### petstore_auth
 
+
 - **Type**: OAuth
 - **Flow**: implicit
 - **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog

samples/client/petstore/java/jersey2-java6/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/jersey2-java6/README.md

@@ -1,6 +1,7 @@
 # petstore-jersey2-java6
 
 OpenAPI 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: \" \\
@@ -8,10 +9,10 @@ This spec is mainly for testing Petstore server and contains fake endpoints, mod
 
 *Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
 
-
 ## Requirements
 
 Building the API client library requires:
+
 1. Java 1.6+
 2. Maven/Gradle
 
@@ -62,8 +63,8 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/petstore-jersey2-java6-1.0.0.jar`
+- `target/petstore-jersey2-java6-1.0.0.jar`
-* `target/lib/*.jar`
+- `target/lib/*.jar`
 
 ## Getting Started
 
@@ -76,20 +77,22 @@ import org.openapitools.client.auth.*;
 import org.openapitools.client.model.*;
 import org.openapitools.client.api.AnotherFakeApi;
 
-import java.io.File;
-import java.util.*;
-
 public class AnotherFakeApiExample {
 
     public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
         
-        AnotherFakeApi apiInstance = new AnotherFakeApi();
+        AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
-        Client client = new Client(); // Client | client model
+        Client body = new Client(); // Client | client model
         try {
-            Client result = apiInstance.testSpecialTags(client);
+            Client result = apiInstance.call123testSpecialTags(body);
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling AnotherFakeApi#testSpecialTags");
+            System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
             e.printStackTrace();
         }
     }
@@ -103,7 +106,8 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**testSpecialTags**](docs/AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*FakeApi* | [**createXmlItem**](docs/FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem
 *FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
 *FakeApi* | [**fakeOuterCompositeSerialize**](docs/FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 *FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
@@ -113,8 +117,10 @@ Class | Method | HTTP request | Description
 *FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \"client\" 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
+*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
 *FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
 *FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
 *FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
 *PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
 *PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
@@ -141,18 +147,28 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
+ - [AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md)
+ - [AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md)
+ - [AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md)
  - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md)
+ - [AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md)
+ - [AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md)
+ - [AdditionalPropertiesString](docs/AdditionalPropertiesString.md)
  - [Animal](docs/Animal.md)
- - [AnimalFarm](docs/AnimalFarm.md)
  - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
+ - [BigCat](docs/BigCat.md)
+ - [BigCatAllOf](docs/BigCatAllOf.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
@@ -172,9 +188,11 @@ Class | Method | HTTP request | Description
  - [Pet](docs/Pet.md)
  - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [SpecialModelName](docs/SpecialModelName.md)
- - [StringBooleanMap](docs/StringBooleanMap.md)
  - [Tag](docs/Tag.md)
+ - [TypeHolderDefault](docs/TypeHolderDefault.md)
+ - [TypeHolderExample](docs/TypeHolderExample.md)
  - [User](docs/User.md)
+ - [XmlItem](docs/XmlItem.md)
 
 
 ## Documentation for Authorization
@@ -182,22 +200,26 @@ Class | Method | HTTP request | Description
 Authentication schemes defined for the API:
 ### api_key
 
+
 - **Type**: API key
 - **API key parameter name**: api_key
 - **Location**: HTTP header
 
 ### api_key_query
 
+
 - **Type**: API key
 - **API key parameter name**: api_key_query
 - **Location**: URL query string
 
 ### http_basic_test
 
+
 - **Type**: HTTP basic authentication
 
 ### petstore_auth
 
+
 - **Type**: OAuth
 - **Flow**: implicit
 - **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog

samples/client/petstore/java/jersey2-java6/build.gradle

@@ -6,9 +6,8 @@ version = '1.0.0'
 
 buildscript {
     repositories {
-        jcenter {
+        maven { url "https://repo1.maven.org/maven2" }
-            url "https://jcenter.bintray.com/"
+        jcenter()
-        }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.+'
@@ -17,9 +16,7 @@ buildscript {
 }
 
 repositories {
-    jcenter {
+    jcenter()
-        url "http://jcenter.bintray.com/"
-    }
 }
 
 
@@ -97,26 +94,34 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
-    swagger_annotations_version = "1.5.20"
+    swagger_annotations_version = "1.5.22"
-    jackson_version = "2.9.6"
+    jackson_version = "2.10.3"
+    jackson_databind_version = "2.10.3"
+    jackson_databind_nullable_version = "0.2.1"
     jersey_version = "2.6"
     commons_io_version=2.5
     commons_lang3_version=3.6
     junit_version = "4.13"
-    threetenbp_version = "2.6.4"
+    threetenbp_version = "2.9.10"
 }
 
 dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile "org.glassfish.jersey.core:jersey-client:$jersey_version"
     compile "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version"
     compile "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version"
     compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
     compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
-    compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
+    compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
+    compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
     compile "commons-io:commons-io:$commons_io_version"
     compile "org.apache.commons:commons-lang3:$commons_lang3_version"
     compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version"
     compile "com.brsanthu:migbase64:2.2"
     testCompile "junit:junit:$junit_version"
 }
+
+javadoc {
+    options.tags = [ "http.response.details:a:Http Response Details" ]
+}

samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/jersey2-java8/README.md

@@ -1,6 +1,7 @@
 # petstore-jersey2-java8
 
 OpenAPI 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: \" \\
@@ -8,10 +9,10 @@ This spec is mainly for testing Petstore server and contains fake endpoints, mod
 
 *Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
 
-
 ## Requirements
 
 Building the API client library requires:
+
 1. Java 1.8+
 2. Maven/Gradle
 
@@ -62,8 +63,8 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/petstore-jersey2-java8-1.0.0.jar`
+- `target/petstore-jersey2-java8-1.0.0.jar`
-* `target/lib/*.jar`
+- `target/lib/*.jar`
 
 ## Getting Started
 
@@ -76,20 +77,22 @@ import org.openapitools.client.auth.*;
 import org.openapitools.client.model.*;
 import org.openapitools.client.api.AnotherFakeApi;
 
-import java.io.File;
-import java.util.*;
-
 public class AnotherFakeApiExample {
 
     public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
         
-        AnotherFakeApi apiInstance = new AnotherFakeApi();
+        AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
-        Client client = new Client(); // Client | client model
+        Client body = new Client(); // Client | client model
         try {
-            Client result = apiInstance.testSpecialTags(client);
+            Client result = apiInstance.call123testSpecialTags(body);
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling AnotherFakeApi#testSpecialTags");
+            System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
             e.printStackTrace();
         }
     }
@@ -103,17 +106,21 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**testSpecialTags**](docs/AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*FakeApi* | [**createXmlItem**](docs/FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem
 *FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
 *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* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 *FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \"client\" 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
+*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
 *FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
 *FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
 *FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
 *PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
 *PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
@@ -123,6 +130,7 @@ Class | Method | HTTP request | Description
 *PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 *PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 *StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
 *StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
 *StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
@@ -139,21 +147,32 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
+ - [AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md)
+ - [AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md)
+ - [AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md)
  - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md)
+ - [AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md)
+ - [AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md)
+ - [AdditionalPropertiesString](docs/AdditionalPropertiesString.md)
  - [Animal](docs/Animal.md)
- - [AnimalFarm](docs/AnimalFarm.md)
  - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
+ - [BigCat](docs/BigCat.md)
+ - [BigCatAllOf](docs/BigCatAllOf.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
+ - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
  - [FormatTest](docs/FormatTest.md)
  - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [MapTest](docs/MapTest.md)
@@ -170,7 +189,10 @@ Class | Method | HTTP request | Description
  - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [SpecialModelName](docs/SpecialModelName.md)
  - [Tag](docs/Tag.md)
+ - [TypeHolderDefault](docs/TypeHolderDefault.md)
+ - [TypeHolderExample](docs/TypeHolderExample.md)
  - [User](docs/User.md)
+ - [XmlItem](docs/XmlItem.md)
 
 
 ## Documentation for Authorization
@@ -178,22 +200,26 @@ Class | Method | HTTP request | Description
 Authentication schemes defined for the API:
 ### api_key
 
+
 - **Type**: API key
 - **API key parameter name**: api_key
 - **Location**: HTTP header
 
 ### api_key_query
 
+
 - **Type**: API key
 - **API key parameter name**: api_key_query
 - **Location**: URL query string
 
 ### http_basic_test
 
+
 - **Type**: HTTP basic authentication
 
 ### petstore_auth
 
+
 - **Type**: OAuth
 - **Flow**: implicit
 - **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog

samples/client/petstore/java/jersey2/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/jersey2/README.md

@@ -1,6 +1,7 @@
 # petstore-jersey2
 
 OpenAPI 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: \" \\
@@ -8,10 +9,10 @@ This spec is mainly for testing Petstore server and contains fake endpoints, mod
 
 *Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
 
-
 ## Requirements
 
 Building the API client library requires:
+
 1. Java 1.7+
 2. Maven/Gradle
 
@@ -62,8 +63,8 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/petstore-jersey2-1.0.0.jar`
+- `target/petstore-jersey2-1.0.0.jar`
-* `target/lib/*.jar`
+- `target/lib/*.jar`
 
 ## Getting Started
 
@@ -76,20 +77,22 @@ import org.openapitools.client.auth.*;
 import org.openapitools.client.model.*;
 import org.openapitools.client.api.AnotherFakeApi;
 
-import java.io.File;
-import java.util.*;
-
 public class AnotherFakeApiExample {
 
     public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
         
-        AnotherFakeApi apiInstance = new AnotherFakeApi();
+        AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
-        Client client = new Client(); // Client | client model
+        Client body = new Client(); // Client | client model
         try {
-            Client result = apiInstance.testSpecialTags(client);
+            Client result = apiInstance.call123testSpecialTags(body);
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling AnotherFakeApi#testSpecialTags");
+            System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
             e.printStackTrace();
         }
     }
@@ -103,17 +106,21 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**testSpecialTags**](docs/AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*FakeApi* | [**createXmlItem**](docs/FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem
 *FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
 *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* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 *FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \"client\" 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
+*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
 *FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
 *FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
 *FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
 *PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
 *PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
@@ -123,6 +130,7 @@ Class | Method | HTTP request | Description
 *PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 *PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 *StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
 *StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
 *StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
@@ -139,21 +147,32 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
+ - [AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md)
+ - [AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md)
+ - [AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md)
  - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md)
+ - [AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md)
+ - [AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md)
+ - [AdditionalPropertiesString](docs/AdditionalPropertiesString.md)
  - [Animal](docs/Animal.md)
- - [AnimalFarm](docs/AnimalFarm.md)
  - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
+ - [BigCat](docs/BigCat.md)
+ - [BigCatAllOf](docs/BigCatAllOf.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
+ - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
  - [FormatTest](docs/FormatTest.md)
  - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [MapTest](docs/MapTest.md)
@@ -170,7 +189,10 @@ Class | Method | HTTP request | Description
  - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [SpecialModelName](docs/SpecialModelName.md)
  - [Tag](docs/Tag.md)
+ - [TypeHolderDefault](docs/TypeHolderDefault.md)
+ - [TypeHolderExample](docs/TypeHolderExample.md)
  - [User](docs/User.md)
+ - [XmlItem](docs/XmlItem.md)
 
 
 ## Documentation for Authorization
@@ -178,22 +200,26 @@ Class | Method | HTTP request | Description
 Authentication schemes defined for the API:
 ### api_key
 
+
 - **Type**: API key
 - **API key parameter name**: api_key
 - **Location**: HTTP header
 
 ### api_key_query
 
+
 - **Type**: API key
 - **API key parameter name**: api_key_query
 - **Location**: URL query string
 
 ### http_basic_test
 
+
 - **Type**: HTTP basic authentication
 
 ### petstore_auth
 
+
 - **Type**: OAuth
 - **Flow**: implicit
 - **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog

samples/client/petstore/java/microprofile-rest-client/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/native/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/native/README.md

@@ -119,6 +119,7 @@ Class | Method | HTTP request | Description
 *FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
 *FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
 *FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
 *FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
 *PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
 *PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
@@ -157,6 +158,8 @@ Class | Method | HTTP request | Description
  - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
+ - [BigCat](docs/BigCat.md)
+ - [BigCatAllOf](docs/BigCatAllOf.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
  - [CatAllOf](docs/CatAllOf.md)

samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/okhttp-gson-parcelableModel/README.md

@@ -71,25 +71,28 @@ Please follow the [installation](#installation) instruction and execute the foll
 
 ```java
 
-import org.openapitools.client.*;
+// Import classes:
-import org.openapitools.client.auth.*;
+import org.openapitools.client.ApiClient;
-import org.openapitools.client.model.*;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
 import org.openapitools.client.api.AnotherFakeApi;
 
-import java.io.File;
+public class Example {
-import java.util.*;
-
-public class AnotherFakeApiExample {
-
   public static void main(String[] args) {
+    ApiClient defaultClient = Configuration.getDefaultApiClient();
+    defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
 
-        AnotherFakeApi apiInstance = new AnotherFakeApi();
+    AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
-        Client client = new Client(); // Client | client model
+    Client body = new Client(); // Client | client model
     try {
-            Client result = apiInstance.testSpecialTags(client);
+      Client result = apiInstance.call123testSpecialTags(body);
       System.out.println(result);
     } catch (ApiException e) {
-            System.err.println("Exception when calling AnotherFakeApi#testSpecialTags");
+      System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
+      System.err.println("Status code: " + e.getCode());
+      System.err.println("Reason: " + e.getResponseBody());
+      System.err.println("Response headers: " + e.getResponseHeaders());
       e.printStackTrace();
     }
   }
@@ -103,17 +106,21 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**testSpecialTags**](docs/AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*FakeApi* | [**createXmlItem**](docs/FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem
 *FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
 *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* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 *FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \"client\" 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
+*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
 *FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
 *FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
 *FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
 *PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
 *PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
@@ -123,6 +130,7 @@ Class | Method | HTTP request | Description
 *PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 *PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 *StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
 *StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
 *StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
@@ -139,21 +147,32 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
+ - [AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md)
+ - [AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md)
+ - [AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md)
  - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md)
+ - [AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md)
+ - [AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md)
+ - [AdditionalPropertiesString](docs/AdditionalPropertiesString.md)
  - [Animal](docs/Animal.md)
- - [AnimalFarm](docs/AnimalFarm.md)
  - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
+ - [BigCat](docs/BigCat.md)
+ - [BigCatAllOf](docs/BigCatAllOf.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
+ - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
  - [FormatTest](docs/FormatTest.md)
  - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [MapTest](docs/MapTest.md)
@@ -170,7 +189,10 @@ Class | Method | HTTP request | Description
  - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [SpecialModelName](docs/SpecialModelName.md)
  - [Tag](docs/Tag.md)
+ - [TypeHolderDefault](docs/TypeHolderDefault.md)
+ - [TypeHolderExample](docs/TypeHolderExample.md)
  - [User](docs/User.md)
+ - [XmlItem](docs/XmlItem.md)
 
 
 ## Documentation for Authorization

samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/okhttp-gson/README.md

@@ -71,25 +71,28 @@ Please follow the [installation](#installation) instruction and execute the foll
 
 ```java
 
-import org.openapitools.client.*;
+// Import classes:
-import org.openapitools.client.auth.*;
+import org.openapitools.client.ApiClient;
-import org.openapitools.client.model.*;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
 import org.openapitools.client.api.AnotherFakeApi;
 
-import java.io.File;
+public class Example {
-import java.util.*;
-
-public class AnotherFakeApiExample {
-
   public static void main(String[] args) {
+    ApiClient defaultClient = Configuration.getDefaultApiClient();
+    defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
 
-        AnotherFakeApi apiInstance = new AnotherFakeApi();
+    AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
-        Client client = new Client(); // Client | client model
+    Client body = new Client(); // Client | client model
     try {
-            Client result = apiInstance.testSpecialTags(client);
+      Client result = apiInstance.call123testSpecialTags(body);
       System.out.println(result);
     } catch (ApiException e) {
-            System.err.println("Exception when calling AnotherFakeApi#testSpecialTags");
+      System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
+      System.err.println("Status code: " + e.getCode());
+      System.err.println("Reason: " + e.getResponseBody());
+      System.err.println("Response headers: " + e.getResponseHeaders());
       e.printStackTrace();
     }
   }
@@ -103,17 +106,21 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**testSpecialTags**](docs/AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*FakeApi* | [**createXmlItem**](docs/FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem
 *FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
 *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* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 *FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \"client\" 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
+*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
 *FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
 *FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
 *FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
 *PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
 *PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
@@ -123,6 +130,7 @@ Class | Method | HTTP request | Description
 *PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 *PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 *StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
 *StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
 *StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
@@ -139,21 +147,32 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
+ - [AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md)
+ - [AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md)
+ - [AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md)
  - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md)
+ - [AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md)
+ - [AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md)
+ - [AdditionalPropertiesString](docs/AdditionalPropertiesString.md)
  - [Animal](docs/Animal.md)
- - [AnimalFarm](docs/AnimalFarm.md)
  - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
+ - [BigCat](docs/BigCat.md)
+ - [BigCatAllOf](docs/BigCatAllOf.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
+ - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
  - [FormatTest](docs/FormatTest.md)
  - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [MapTest](docs/MapTest.md)
@@ -170,7 +189,10 @@ Class | Method | HTTP request | Description
  - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [SpecialModelName](docs/SpecialModelName.md)
  - [Tag](docs/Tag.md)
+ - [TypeHolderDefault](docs/TypeHolderDefault.md)
+ - [TypeHolderExample](docs/TypeHolderExample.md)
  - [User](docs/User.md)
+ - [XmlItem](docs/XmlItem.md)
 
 
 ## Documentation for Authorization

samples/client/petstore/java/rest-assured/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/resteasy/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/resteasy/README.md

@@ -1,6 +1,7 @@
 # petstore-resteasy
 
 OpenAPI 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: \" \\
@@ -8,10 +9,10 @@ This spec is mainly for testing Petstore server and contains fake endpoints, mod
 
 *Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
 
-
 ## Requirements
 
 Building the API client library requires:
+
 1. Java 1.7+
 2. Maven/Gradle
 
@@ -62,8 +63,8 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/petstore-resteasy-1.0.0.jar`
+- `target/petstore-resteasy-1.0.0.jar`
-* `target/lib/*.jar`
+- `target/lib/*.jar`
 
 ## Getting Started
 
@@ -76,20 +77,22 @@ import org.openapitools.client.auth.*;
 import org.openapitools.client.model.*;
 import org.openapitools.client.api.AnotherFakeApi;
 
-import java.io.File;
-import java.util.*;
-
 public class AnotherFakeApiExample {
 
     public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
         
-        AnotherFakeApi apiInstance = new AnotherFakeApi();
+        AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
-        Client client = new Client(); // Client | client model
+        Client body = new Client(); // Client | client model
         try {
-            Client result = apiInstance.testSpecialTags(client);
+            Client result = apiInstance.call123testSpecialTags(body);
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling AnotherFakeApi#testSpecialTags");
+            System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
             e.printStackTrace();
         }
     }
@@ -103,17 +106,21 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**testSpecialTags**](docs/AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*FakeApi* | [**createXmlItem**](docs/FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem
 *FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
 *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* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 *FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \"client\" 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
+*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
 *FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
 *FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
 *FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
 *PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
 *PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
@@ -123,6 +130,7 @@ Class | Method | HTTP request | Description
 *PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 *PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 *StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
 *StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
 *StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
@@ -139,21 +147,32 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
+ - [AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md)
+ - [AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md)
+ - [AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md)
  - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md)
+ - [AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md)
+ - [AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md)
+ - [AdditionalPropertiesString](docs/AdditionalPropertiesString.md)
  - [Animal](docs/Animal.md)
- - [AnimalFarm](docs/AnimalFarm.md)
  - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
+ - [BigCat](docs/BigCat.md)
+ - [BigCatAllOf](docs/BigCatAllOf.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
+ - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
  - [FormatTest](docs/FormatTest.md)
  - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [MapTest](docs/MapTest.md)
@@ -170,7 +189,10 @@ Class | Method | HTTP request | Description
  - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [SpecialModelName](docs/SpecialModelName.md)
  - [Tag](docs/Tag.md)
+ - [TypeHolderDefault](docs/TypeHolderDefault.md)
+ - [TypeHolderExample](docs/TypeHolderExample.md)
  - [User](docs/User.md)
+ - [XmlItem](docs/XmlItem.md)
 
 
 ## Documentation for Authorization
@@ -178,22 +200,26 @@ Class | Method | HTTP request | Description
 Authentication schemes defined for the API:
 ### api_key
 
+
 - **Type**: API key
 - **API key parameter name**: api_key
 - **Location**: HTTP header
 
 ### api_key_query
 
+
 - **Type**: API key
 - **API key parameter name**: api_key_query
 - **Location**: URL query string
 
 ### http_basic_test
 
+
 - **Type**: HTTP basic authentication
 
 ### petstore_auth
 
+
 - **Type**: OAuth
 - **Flow**: implicit
 - **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog

samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/resttemplate-withXml/README.md

@@ -1,6 +1,7 @@
-# pestore-resttemplate-withxml
+# petstore-resttemplate-withxml
 
 OpenAPI 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: \" \\
@@ -8,10 +9,10 @@ This spec is mainly for testing Petstore server and contains fake endpoints, mod
 
 *Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
 
-
 ## Requirements
 
 Building the API client library requires:
+
 1. Java 1.7+
 2. Maven/Gradle
 
@@ -38,7 +39,7 @@ Add this dependency to your project's POM:
 ```xml
 <dependency>
   <groupId>org.openapitools</groupId>
-  <artifactId>pestore-resttemplate-withxml</artifactId>
+  <artifactId>petstore-resttemplate-withxml</artifactId>
   <version>1.0.0</version>
   <scope>compile</scope>
 </dependency>
@@ -49,7 +50,7 @@ Add this dependency to your project's POM:
 Add this dependency to your project's build file:
 
 ```groovy
-compile "org.openapitools:pestore-resttemplate-withxml:1.0.0"
+compile "org.openapitools:petstore-resttemplate-withxml:1.0.0"
 ```
 
 ### Others
@@ -62,8 +63,8 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/pestore-resttemplate-withxml-1.0.0.jar`
+- `target/petstore-resttemplate-withxml-1.0.0.jar`
-* `target/lib/*.jar`
+- `target/lib/*.jar`
 
 ## Getting Started
 
@@ -76,20 +77,22 @@ import org.openapitools.client.auth.*;
 import org.openapitools.client.model.*;
 import org.openapitools.client.api.AnotherFakeApi;
 
-import java.io.File;
-import java.util.*;
-
 public class AnotherFakeApiExample {
 
     public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
         
-        AnotherFakeApi apiInstance = new AnotherFakeApi();
+        AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
-        Client client = new Client(); // Client | client model
+        Client body = new Client(); // Client | client model
         try {
-            Client result = apiInstance.testSpecialTags(client);
+            Client result = apiInstance.call123testSpecialTags(body);
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling AnotherFakeApi#testSpecialTags");
+            System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
             e.printStackTrace();
         }
     }
@@ -103,17 +106,21 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**testSpecialTags**](docs/AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*FakeApi* | [**createXmlItem**](docs/FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem
 *FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
 *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* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 *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
+*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
 *FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
 *FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
 *FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
 *PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
 *PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
@@ -123,6 +130,7 @@ Class | Method | HTTP request | Description
 *PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 *PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 *StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
 *StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
 *StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
@@ -139,21 +147,32 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
+ - [AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md)
+ - [AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md)
+ - [AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md)
  - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md)
+ - [AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md)
+ - [AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md)
+ - [AdditionalPropertiesString](docs/AdditionalPropertiesString.md)
  - [Animal](docs/Animal.md)
- - [AnimalFarm](docs/AnimalFarm.md)
  - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
+ - [BigCat](docs/BigCat.md)
+ - [BigCatAllOf](docs/BigCatAllOf.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
+ - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
  - [FormatTest](docs/FormatTest.md)
  - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [MapTest](docs/MapTest.md)
@@ -170,7 +189,10 @@ Class | Method | HTTP request | Description
  - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [SpecialModelName](docs/SpecialModelName.md)
  - [Tag](docs/Tag.md)
+ - [TypeHolderDefault](docs/TypeHolderDefault.md)
+ - [TypeHolderExample](docs/TypeHolderExample.md)
  - [User](docs/User.md)
+ - [XmlItem](docs/XmlItem.md)
 
 
 ## Documentation for Authorization
@@ -178,22 +200,26 @@ Class | Method | HTTP request | Description
 Authentication schemes defined for the API:
 ### api_key
 
+
 - **Type**: API key
 - **API key parameter name**: api_key
 - **Location**: HTTP header
 
 ### api_key_query
 
+
 - **Type**: API key
 - **API key parameter name**: api_key_query
 - **Location**: URL query string
 
 ### http_basic_test
 
+
 - **Type**: HTTP basic authentication
 
 ### petstore_auth
 
+
 - **Type**: OAuth
 - **Flow**: implicit
 - **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog

samples/client/petstore/java/resttemplate/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/resttemplate/README.md

@@ -1,6 +1,7 @@
 # petstore-resttemplate
 
 OpenAPI 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: \" \\
@@ -8,10 +9,10 @@ This spec is mainly for testing Petstore server and contains fake endpoints, mod
 
 *Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
 
-
 ## Requirements
 
 Building the API client library requires:
+
 1. Java 1.7+
 2. Maven/Gradle
 
@@ -62,8 +63,8 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/petstore-resttemplate-1.0.0.jar`
+- `target/petstore-resttemplate-1.0.0.jar`
-* `target/lib/*.jar`
+- `target/lib/*.jar`
 
 ## Getting Started
 
@@ -76,20 +77,22 @@ import org.openapitools.client.auth.*;
 import org.openapitools.client.model.*;
 import org.openapitools.client.api.AnotherFakeApi;
 
-import java.io.File;
-import java.util.*;
-
 public class AnotherFakeApiExample {
 
     public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
         
-        AnotherFakeApi apiInstance = new AnotherFakeApi();
+        AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
-        Client client = new Client(); // Client | client model
+        Client body = new Client(); // Client | client model
         try {
-            Client result = apiInstance.testSpecialTags(client);
+            Client result = apiInstance.call123testSpecialTags(body);
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling AnotherFakeApi#testSpecialTags");
+            System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
             e.printStackTrace();
         }
     }
@@ -103,17 +106,21 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**testSpecialTags**](docs/AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*FakeApi* | [**createXmlItem**](docs/FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem
 *FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
 *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* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 *FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \"client\" 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
+*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
 *FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
 *FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
 *FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
 *PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
 *PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
@@ -123,6 +130,7 @@ Class | Method | HTTP request | Description
 *PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 *PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 *StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
 *StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
 *StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
@@ -139,21 +147,32 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
+ - [AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md)
+ - [AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md)
+ - [AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md)
  - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md)
+ - [AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md)
+ - [AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md)
+ - [AdditionalPropertiesString](docs/AdditionalPropertiesString.md)
  - [Animal](docs/Animal.md)
- - [AnimalFarm](docs/AnimalFarm.md)
  - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
+ - [BigCat](docs/BigCat.md)
+ - [BigCatAllOf](docs/BigCatAllOf.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
+ - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
  - [FormatTest](docs/FormatTest.md)
  - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [MapTest](docs/MapTest.md)
@@ -170,7 +189,10 @@ Class | Method | HTTP request | Description
  - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [SpecialModelName](docs/SpecialModelName.md)
  - [Tag](docs/Tag.md)
+ - [TypeHolderDefault](docs/TypeHolderDefault.md)
+ - [TypeHolderExample](docs/TypeHolderExample.md)
  - [User](docs/User.md)
+ - [XmlItem](docs/XmlItem.md)
 
 
 ## Documentation for Authorization
@@ -178,22 +200,26 @@ Class | Method | HTTP request | Description
 Authentication schemes defined for the API:
 ### api_key
 
+
 - **Type**: API key
 - **API key parameter name**: api_key
 - **Location**: HTTP header
 
 ### api_key_query
 
+
 - **Type**: API key
 - **API key parameter name**: api_key_query
 - **Location**: URL query string
 
 ### http_basic_test
 
+
 - **Type**: HTTP basic authentication
 
 ### petstore_auth
 
+
 - **Type**: OAuth
 - **Flow**: implicit
 - **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog

samples/client/petstore/java/retrofit/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/retrofit2-play24/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/retrofit2-play25/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/retrofit2/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/retrofit2rx/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/vertx/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/vertx/README.md

@@ -1,6 +1,7 @@
 # petstore-vertx
 
 OpenAPI 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: \" \\
@@ -8,10 +9,10 @@ This spec is mainly for testing Petstore server and contains fake endpoints, mod
 
 *Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
 
-
 ## Requirements
 
 Building the API client library requires:
+
 1. Java 1.8+
 2. Maven/Gradle
 
@@ -62,8 +63,8 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/petstore-vertx-1.0.0.jar`
+- `target/petstore-vertx-1.0.0.jar`
-* `target/lib/*.jar`
+- `target/lib/*.jar`
 
 ## Getting Started
 
@@ -76,20 +77,22 @@ import org.openapitools.client.auth.*;
 import org.openapitools.client.model.*;
 import org.openapitools.client.api.AnotherFakeApi;
 
-import java.io.File;
-import java.util.*;
-
 public class AnotherFakeApiExample {
 
     public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
         
-        AnotherFakeApi apiInstance = new AnotherFakeApi();
+        AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
-        Client client = new Client(); // Client | client model
+        Client body = new Client(); // Client | client model
         try {
-            Client result = apiInstance.testSpecialTags(client);
+            Client result = apiInstance.call123testSpecialTags(body);
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling AnotherFakeApi#testSpecialTags");
+            System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
             e.printStackTrace();
         }
     }
@@ -103,17 +106,21 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**testSpecialTags**](docs/AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*FakeApi* | [**createXmlItem**](docs/FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem
 *FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
 *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* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 *FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \"client\" 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
+*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
 *FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
 *FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
 *FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
 *PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
 *PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
@@ -123,6 +130,7 @@ Class | Method | HTTP request | Description
 *PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 *PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 *StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
 *StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
 *StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
@@ -139,21 +147,32 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
+ - [AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md)
+ - [AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md)
+ - [AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md)
  - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md)
+ - [AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md)
+ - [AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md)
+ - [AdditionalPropertiesString](docs/AdditionalPropertiesString.md)
  - [Animal](docs/Animal.md)
- - [AnimalFarm](docs/AnimalFarm.md)
  - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
+ - [BigCat](docs/BigCat.md)
+ - [BigCatAllOf](docs/BigCatAllOf.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
+ - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
  - [FormatTest](docs/FormatTest.md)
  - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [MapTest](docs/MapTest.md)
@@ -170,7 +189,10 @@ Class | Method | HTTP request | Description
  - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [SpecialModelName](docs/SpecialModelName.md)
  - [Tag](docs/Tag.md)
+ - [TypeHolderDefault](docs/TypeHolderDefault.md)
+ - [TypeHolderExample](docs/TypeHolderExample.md)
  - [User](docs/User.md)
+ - [XmlItem](docs/XmlItem.md)
 
 
 ## Documentation for Authorization
@@ -178,22 +200,26 @@ Class | Method | HTTP request | Description
 Authentication schemes defined for the API:
 ### api_key
 
+
 - **Type**: API key
 - **API key parameter name**: api_key
 - **Location**: HTTP header
 
 ### api_key_query
 
+
 - **Type**: API key
 - **API key parameter name**: api_key_query
 - **Location**: URL query string
 
 ### http_basic_test
 
+
 - **Type**: HTTP basic authentication
 
 ### petstore_auth
 
+
 - **Type**: OAuth
 - **Flow**: implicit
 - **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog

samples/client/petstore/java/webclient/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/webclient/README.md

@@ -1,6 +1,7 @@
 # petstore-webclient
 
 OpenAPI 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: \" \\
@@ -8,10 +9,10 @@ This spec is mainly for testing Petstore server and contains fake endpoints, mod
 
 *Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
 
-
 ## Requirements
 
 Building the API client library requires:
+
 1. Java 1.8+
 2. Maven/Gradle
 
@@ -62,8 +63,8 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/petstore-webclient-1.0.0.jar`
+- `target/petstore-webclient-1.0.0.jar`
-* `target/lib/*.jar`
+- `target/lib/*.jar`
 
 ## Getting Started
 
@@ -76,20 +77,22 @@ import org.openapitools.client.auth.*;
 import org.openapitools.client.model.*;
 import org.openapitools.client.api.AnotherFakeApi;
 
-import java.io.File;
-import java.util.*;
-
 public class AnotherFakeApiExample {
 
     public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
         
-        AnotherFakeApi apiInstance = new AnotherFakeApi();
+        AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
-        Client client = new Client(); // Client | client model
+        Client body = new Client(); // Client | client model
         try {
-            Client result = apiInstance.testSpecialTags(client);
+            Client result = apiInstance.call123testSpecialTags(body);
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling AnotherFakeApi#testSpecialTags");
+            System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
             e.printStackTrace();
         }
     }
@@ -103,17 +106,21 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**testSpecialTags**](docs/AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*FakeApi* | [**createXmlItem**](docs/FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem
 *FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
 *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* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 *FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \"client\" 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
+*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
 *FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
 *FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
 *FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
 *PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
 *PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
@@ -140,21 +147,32 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
+ - [AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md)
+ - [AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md)
+ - [AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md)
  - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md)
+ - [AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md)
+ - [AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md)
+ - [AdditionalPropertiesString](docs/AdditionalPropertiesString.md)
  - [Animal](docs/Animal.md)
- - [AnimalFarm](docs/AnimalFarm.md)
  - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
+ - [BigCat](docs/BigCat.md)
+ - [BigCatAllOf](docs/BigCatAllOf.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
+ - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
  - [FormatTest](docs/FormatTest.md)
  - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [MapTest](docs/MapTest.md)
@@ -170,9 +188,11 @@ Class | Method | HTTP request | Description
  - [Pet](docs/Pet.md)
  - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [SpecialModelName](docs/SpecialModelName.md)
- - [StringBooleanMap](docs/StringBooleanMap.md)
  - [Tag](docs/Tag.md)
+ - [TypeHolderDefault](docs/TypeHolderDefault.md)
+ - [TypeHolderExample](docs/TypeHolderExample.md)
  - [User](docs/User.md)
+ - [XmlItem](docs/XmlItem.md)
 
 
 ## Documentation for Authorization
@@ -180,22 +200,26 @@ Class | Method | HTTP request | Description
 Authentication schemes defined for the API:
 ### api_key
 
+
 - **Type**: API key
 - **API key parameter name**: api_key
 - **Location**: HTTP header
 
 ### api_key_query
 
+
 - **Type**: API key
 - **API key parameter name**: api_key_query
 - **Location**: URL query string
 
 ### http_basic_test
 
+
 - **Type**: HTTP basic authentication
 
 ### petstore_auth
 
+
 - **Type**: OAuth
 - **Flow**: implicit
 - **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog

samples/client/petstore/javascript-es6/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/javascript-promise/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master