[Android] update httpclient version, fix compilation issue in the sample (#9728)

* update httpclient version, fix compilation issue in the sample

* add new file

modules/openapi-generator/src/main/resources/android/build.mustache

@@ -89,7 +89,7 @@ android {
 ext {
     swagger_annotations_version = "1.5.0"
     gson_version = "2.3.1"
-    httpclient_version = "4.5.2"
+    httpclient_version = "4.5.13"
     httpcore_version = "4.4.4"
     junit_version = "4.13"
 }

modules/openapi-generator/src/main/resources/android/jsonUtil.mustache

@@ -5,9 +5,7 @@ import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.List;
-{{#hasModel}}
 import {{modelPackage}}.*;
-{{/hasModel}}
 
 public class JsonUtil {
   public static GsonBuilder gsonBuilder;

modules/openapi-generator/src/main/resources/android/pom.mustache

@@ -176,6 +176,6 @@
         <junit-version>4.13.1</junit-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.8.1</junit-version>
-        <httpclient-version>4.3.6</httpclient-version>
+        <httpclient-version>4.5.13</httpclient-version>
     </properties>
 </project>

samples/client/petstore/android/httpclient/.openapi-generator/FILES

@@ -0,0 +1,34 @@
+.gitignore
+README.md
+build.gradle
+docs/ApiResponse.md
+docs/Category.md
+docs/Order.md
+docs/Pet.md
+docs/PetApi.md
+docs/StoreApi.md
+docs/Tag.md
+docs/User.md
+docs/UserApi.md
+git_push.sh
+gradle/wrapper/gradle-wrapper.jar
+gradle/wrapper/gradle-wrapper.properties
+gradlew
+gradlew.bat
+pom.xml
+settings.gradle
+src/main/AndroidManifest.xml
+src/main/java/org/openapitools/client/ApiException.java
+src/main/java/org/openapitools/client/ApiInvoker.java
+src/main/java/org/openapitools/client/HttpPatch.java
+src/main/java/org/openapitools/client/JsonUtil.java
+src/main/java/org/openapitools/client/Pair.java
+src/main/java/org/openapitools/client/api/PetApi.java
+src/main/java/org/openapitools/client/api/StoreApi.java
+src/main/java/org/openapitools/client/api/UserApi.java
+src/main/java/org/openapitools/client/model/ApiResponse.java
+src/main/java/org/openapitools/client/model/Category.java
+src/main/java/org/openapitools/client/model/Order.java
+src/main/java/org/openapitools/client/model/Pet.java
+src/main/java/org/openapitools/client/model/Tag.java
+src/main/java/org/openapitools/client/model/User.java

samples/client/petstore/android/httpclient/.openapi-generator/VERSION

@@ -1 +1 @@
-4.0.0-SNAPSHOT
+5.2.0-SNAPSHOT

samples/client/petstore/android/httpclient/README.md

@@ -49,8 +49,8 @@ At first generate the JAR by executing:
 
 Then manually install the following JARs:
 
-* target/openapi-android-client-1.0.0.jar
+- target/openapi-android-client-1.0.0.jar
-* target/lib/*.jar
+- target/lib/*.jar
 
 ## Getting Started
 
@@ -64,9 +64,9 @@ public class PetApiExample {
 
     public static void main(String[] args) {
         PetApi apiInstance = new PetApi();
-        Pet pet = new Pet(); // Pet | Pet object that needs to be added to the store
+        Pet body = new Pet(); // Pet | Pet object that needs to be added to the store
         try {
-            apiInstance.addPet(pet);
+            apiInstance.addPet(body);
         } catch (ApiException e) {
             System.err.println("Exception when calling PetApi#addPet");
             e.printStackTrace();
@@ -120,11 +120,13 @@ Authentication schemes defined for the API:
 ### api_key
 
 - **Type**: API key
+
 - **API key parameter name**: api_key
 - **Location**: HTTP header
 
 ### petstore_auth
 
+
 - **Type**: OAuth
 - **Flow**: implicit
 - **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog

samples/client/petstore/android/httpclient/build.gradle

@@ -3,7 +3,7 @@ project.version = '1.0.0'
 
 buildscript {
     repositories {
-        mavenCentral()
+        maven { url "https://repo1.maven.org/maven2" }
         jcenter()
     }
     dependencies {
@@ -51,7 +51,7 @@ android {
 ext {
     swagger_annotations_version = "1.5.0"
     gson_version = "2.3.1"
-    httpclient_version = "4.5.2"
+    httpclient_version = "4.5.13"
     httpcore_version = "4.4.4"
     junit_version = "4.13"
 }

samples/client/petstore/android/httpclient/docs/ApiResponse.md

@@ -1,7 +1,9 @@
 
+
 # ApiResponse
 
 ## Properties
+
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **code** | **Integer** |  |  [optional]
@@ -10,3 +12,4 @@ Name | Type | Description | Notes
 
 
 
+

samples/client/petstore/android/httpclient/docs/Category.md

@@ -1,7 +1,9 @@
 
+
 # Category
 
 ## Properties
+
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **id** | **Long** |  |  [optional]
@@ -9,3 +11,4 @@ Name | Type | Description | Notes
 
 
 
+

samples/client/petstore/android/httpclient/docs/Order.md

@@ -1,7 +1,9 @@
 
+
 # Order
 
 ## Properties
+
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **id** | **Long** |  |  [optional]
@@ -12,10 +14,11 @@ Name | Type | Description | Notes
 **complete** | **Boolean** |  |  [optional]
 
 
-<a name="StatusEnum"></a>
 ## Enum: StatusEnum
+
 Name | Value
 ---- | -----
 
 
 
+

samples/client/petstore/android/httpclient/docs/Pet.md

@@ -1,7 +1,9 @@
 
+
 # Pet
 
 ## Properties
+
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **id** | **Long** |  |  [optional]
@@ -12,10 +14,11 @@ Name | Type | Description | Notes
 **status** | [**StatusEnum**](#StatusEnum) | pet status in the store |  [optional]
 
 
-<a name="StatusEnum"></a>
 ## Enum: StatusEnum
+
 Name | Value
 ---- | -----
 
 
 
+

samples/client/petstore/android/httpclient/docs/PetApi.md

@@ -14,21 +14,23 @@ Method | HTTP request | Description
 [**uploadFile**](PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
 
 
-<a name="addPet"></a>
+
-# **addPet**
+## addPet
-> addPet(pet)
+
+> addPet(body)
 
 Add a new pet to the store
 
 ### Example
+
 ```java
 // Import classes:
 //import org.openapitools.client.api.PetApi;
 
 PetApi apiInstance = new PetApi();
-Pet pet = new Pet(); // Pet | Pet object that needs to be added to the store
+Pet body = new Pet(); // Pet | Pet object that needs to be added to the store
 try {
-    apiInstance.addPet(pet);
+    apiInstance.addPet(body);
 } catch (ApiException e) {
     System.err.println("Exception when calling PetApi#addPet");
     e.printStackTrace();
@@ -37,9 +39,10 @@ try {
 
 ### Parameters
 
+
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **pet** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |
 
 ### Return type
 
@@ -51,16 +54,18 @@ null (empty response body)
 
 ### HTTP request headers
 
- - **Content-Type**: application/json, application/xml
+- **Content-Type**: application/json, application/xml
- - **Accept**: Not defined
+- **Accept**: Not defined
+
+
+## deletePet
 
-<a name="deletePet"></a>
-# **deletePet**
 > deletePet(petId, apiKey)
 
 Deletes a pet
 
 ### Example
+
 ```java
 // Import classes:
 //import org.openapitools.client.api.PetApi;
@@ -78,6 +83,7 @@ try {
 
 ### Parameters
 
+
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **petId** | **Long**| Pet id to delete | [default to null]
@@ -93,11 +99,12 @@ null (empty response body)
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+- **Content-Type**: Not defined
- - **Accept**: Not defined
+- **Accept**: Not defined
+
+
+## findPetsByStatus
 
-<a name="findPetsByStatus"></a>
-# **findPetsByStatus**
 > List&lt;Pet&gt; findPetsByStatus(status)
 
 Finds Pets by status
@@ -105,6 +112,7 @@ Finds Pets by status
 Multiple status values can be provided with comma separated strings
 
 ### Example
+
 ```java
 // Import classes:
 //import org.openapitools.client.api.PetApi;
@@ -122,6 +130,7 @@ try {
 
 ### Parameters
 
+
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **status** | [**List&lt;String&gt;**](String.md)| Status values that need to be considered for filter | [default to null] [enum: available, pending, sold]
@@ -136,11 +145,12 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+- **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
+- **Accept**: application/xml, application/json
+
+
+## findPetsByTags
 
-<a name="findPetsByTags"></a>
-# **findPetsByTags**
 > List&lt;Pet&gt; findPetsByTags(tags)
 
 Finds Pets by tags
@@ -148,6 +158,7 @@ Finds Pets by tags
 Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
 
 ### Example
+
 ```java
 // Import classes:
 //import org.openapitools.client.api.PetApi;
@@ -165,6 +176,7 @@ try {
 
 ### Parameters
 
+
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **tags** | [**List&lt;String&gt;**](String.md)| Tags to filter by | [default to null]
@@ -179,11 +191,12 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+- **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
+- **Accept**: application/xml, application/json
+
+
+## getPetById
 
-<a name="getPetById"></a>
-# **getPetById**
 > Pet getPetById(petId)
 
 Find pet by ID
@@ -191,6 +204,7 @@ Find pet by ID
 Returns a single pet
 
 ### Example
+
 ```java
 // Import classes:
 //import org.openapitools.client.api.PetApi;
@@ -208,6 +222,7 @@ try {
 
 ### Parameters
 
+
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **petId** | **Long**| ID of pet to return | [default to null]
@@ -222,24 +237,26 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+- **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
+- **Accept**: application/xml, application/json
 
-<a name="updatePet"></a>
+
-# **updatePet**
+## updatePet
-> updatePet(pet)
+
+> updatePet(body)
 
 Update an existing pet
 
 ### Example
+
 ```java
 // Import classes:
 //import org.openapitools.client.api.PetApi;
 
 PetApi apiInstance = new PetApi();
-Pet pet = new Pet(); // Pet | Pet object that needs to be added to the store
+Pet body = new Pet(); // Pet | Pet object that needs to be added to the store
 try {
-    apiInstance.updatePet(pet);
+    apiInstance.updatePet(body);
 } catch (ApiException e) {
     System.err.println("Exception when calling PetApi#updatePet");
     e.printStackTrace();
@@ -248,9 +265,10 @@ try {
 
 ### Parameters
 
+
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **pet** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |
 
 ### Return type
 
@@ -262,16 +280,18 @@ null (empty response body)
 
 ### HTTP request headers
 
- - **Content-Type**: application/json, application/xml
+- **Content-Type**: application/json, application/xml
- - **Accept**: Not defined
+- **Accept**: Not defined
+
+
+## updatePetWithForm
 
-<a name="updatePetWithForm"></a>
-# **updatePetWithForm**
 > updatePetWithForm(petId, name, status)
 
 Updates a pet in the store with form data
 
 ### Example
+
 ```java
 // Import classes:
 //import org.openapitools.client.api.PetApi;
@@ -290,6 +310,7 @@ try {
 
 ### Parameters
 
+
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **petId** | **Long**| ID of pet that needs to be updated | [default to null]
@@ -306,16 +327,18 @@ null (empty response body)
 
 ### HTTP request headers
 
- - **Content-Type**: application/x-www-form-urlencoded
+- **Content-Type**: application/x-www-form-urlencoded
- - **Accept**: Not defined
+- **Accept**: Not defined
+
+
+## uploadFile
 
-<a name="uploadFile"></a>
-# **uploadFile**
 > ApiResponse uploadFile(petId, additionalMetadata, file)
 
 uploads an image
 
 ### Example
+
 ```java
 // Import classes:
 //import org.openapitools.client.api.PetApi;
@@ -335,6 +358,7 @@ try {
 
 ### Parameters
 
+
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **petId** | **Long**| ID of pet to update | [default to null]
@@ -351,6 +375,6 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: multipart/form-data
+- **Content-Type**: multipart/form-data
- - **Accept**: application/json
+- **Accept**: application/json
 

samples/client/petstore/android/httpclient/docs/StoreApi.md

@@ -10,8 +10,9 @@ Method | HTTP request | Description
 [**placeOrder**](StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet
 
 
-<a name="deleteOrder"></a>
+
-# **deleteOrder**
+## deleteOrder
+
 > deleteOrder(orderId)
 
 Delete purchase order by ID
@@ -19,6 +20,7 @@ Delete purchase order by ID
 For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
 
 ### Example
+
 ```java
 // Import classes:
 //import org.openapitools.client.api.StoreApi;
@@ -35,6 +37,7 @@ try {
 
 ### Parameters
 
+
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **orderId** | **String**| ID of the order that needs to be deleted | [default to null]
@@ -49,11 +52,12 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+- **Content-Type**: Not defined
- - **Accept**: Not defined
+- **Accept**: Not defined
+
+
+## getInventory
 
-<a name="getInventory"></a>
-# **getInventory**
 > Map&lt;String, Integer&gt; getInventory()
 
 Returns pet inventories by status
@@ -61,6 +65,7 @@ Returns pet inventories by status
 Returns a map of status codes to quantities
 
 ### Example
+
 ```java
 // Import classes:
 //import org.openapitools.client.api.StoreApi;
@@ -76,6 +81,7 @@ try {
 ```
 
 ### Parameters
+
 This endpoint does not need any parameter.
 
 ### Return type
@@ -88,11 +94,12 @@ This endpoint does not need any parameter.
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+- **Content-Type**: Not defined
- - **Accept**: application/json
+- **Accept**: application/json
+
+
+## getOrderById
 
-<a name="getOrderById"></a>
-# **getOrderById**
 > Order getOrderById(orderId)
 
 Find purchase order by ID
@@ -100,6 +107,7 @@ Find purchase order by ID
 For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
 
 ### Example
+
 ```java
 // Import classes:
 //import org.openapitools.client.api.StoreApi;
@@ -117,6 +125,7 @@ try {
 
 ### Parameters
 
+
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **orderId** | **Long**| ID of pet that needs to be fetched | [default to null]
@@ -131,24 +140,26 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+- **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
+- **Accept**: application/xml, application/json
 
-<a name="placeOrder"></a>
+
-# **placeOrder**
+## placeOrder
-> Order placeOrder(order)
+
+> Order placeOrder(body)
 
 Place an order for a pet
 
 ### Example
+
 ```java
 // Import classes:
 //import org.openapitools.client.api.StoreApi;
 
 StoreApi apiInstance = new StoreApi();
-Order order = new Order(); // Order | order placed for purchasing the pet
+Order body = new Order(); // Order | order placed for purchasing the pet
 try {
-    Order result = apiInstance.placeOrder(order);
+    Order result = apiInstance.placeOrder(body);
     System.out.println(result);
 } catch (ApiException e) {
     System.err.println("Exception when calling StoreApi#placeOrder");
@@ -158,9 +169,10 @@ try {
 
 ### Parameters
 
+
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **order** | [**Order**](Order.md)| order placed for purchasing the pet |
+ **body** | [**Order**](Order.md)| order placed for purchasing the pet |
 
 ### Return type
 
@@ -172,6 +184,6 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+- **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
+- **Accept**: application/xml, application/json
 

samples/client/petstore/android/httpclient/docs/Tag.md

@@ -1,7 +1,9 @@
 
+
 # Tag
 
 ## Properties
+
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **id** | **Long** |  |  [optional]
@@ -9,3 +11,4 @@ Name | Type | Description | Notes
 
 
 
+

samples/client/petstore/android/httpclient/docs/User.md

@@ -1,7 +1,9 @@
 
+
 # User
 
 ## Properties
+
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **id** | **Long** |  |  [optional]
@@ -15,3 +17,4 @@ Name | Type | Description | Notes
 
 
 
+

samples/client/petstore/android/httpclient/docs/UserApi.md

@@ -14,23 +14,25 @@ Method | HTTP request | Description
 [**updateUser**](UserApi.md#updateUser) | **PUT** /user/{username} | Updated user
 
 
-<a name="createUser"></a>
+
-# **createUser**
+## createUser
-> createUser(user)
+
+> createUser(body)
 
 Create user
 
 This can only be done by the logged in user.
 
 ### Example
+
 ```java
 // Import classes:
 //import org.openapitools.client.api.UserApi;
 
 UserApi apiInstance = new UserApi();
-User user = new User(); // User | Created user object
+User body = new User(); // User | Created user object
 try {
-    apiInstance.createUser(user);
+    apiInstance.createUser(body);
 } catch (ApiException e) {
     System.err.println("Exception when calling UserApi#createUser");
     e.printStackTrace();
@@ -39,9 +41,10 @@ try {
 
 ### Parameters
 
+
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **user** | [**User**](User.md)| Created user object |
+ **body** | [**User**](User.md)| Created user object |
 
 ### Return type
 
@@ -53,24 +56,26 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+- **Content-Type**: Not defined
- - **Accept**: Not defined
+- **Accept**: Not defined
 
-<a name="createUsersWithArrayInput"></a>
+
-# **createUsersWithArrayInput**
+## createUsersWithArrayInput
-> createUsersWithArrayInput(user)
+
+> createUsersWithArrayInput(body)
 
 Creates list of users with given input array
 
 ### Example
+
 ```java
 // Import classes:
 //import org.openapitools.client.api.UserApi;
 
 UserApi apiInstance = new UserApi();
-List<User> user = Arrays.asList(new List()); // List<User> | List of user object
+List<User> body = Arrays.asList(new User()); // List<User> | List of user object
 try {
-    apiInstance.createUsersWithArrayInput(user);
+    apiInstance.createUsersWithArrayInput(body);
 } catch (ApiException e) {
     System.err.println("Exception when calling UserApi#createUsersWithArrayInput");
     e.printStackTrace();
@@ -79,9 +84,10 @@ try {
 
 ### Parameters
 
+
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **user** | [**List&lt;User&gt;**](List.md)| List of user object |
+ **body** | [**List&lt;User&gt;**](User.md)| List of user object |
 
 ### Return type
 
@@ -93,24 +99,26 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+- **Content-Type**: Not defined
- - **Accept**: Not defined
+- **Accept**: Not defined
 
-<a name="createUsersWithListInput"></a>
+
-# **createUsersWithListInput**
+## createUsersWithListInput
-> createUsersWithListInput(user)
+
+> createUsersWithListInput(body)
 
 Creates list of users with given input array
 
 ### Example
+
 ```java
 // Import classes:
 //import org.openapitools.client.api.UserApi;
 
 UserApi apiInstance = new UserApi();
-List<User> user = Arrays.asList(new List()); // List<User> | List of user object
+List<User> body = Arrays.asList(new User()); // List<User> | List of user object
 try {
-    apiInstance.createUsersWithListInput(user);
+    apiInstance.createUsersWithListInput(body);
 } catch (ApiException e) {
     System.err.println("Exception when calling UserApi#createUsersWithListInput");
     e.printStackTrace();
@@ -119,9 +127,10 @@ try {
 
 ### Parameters
 
+
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **user** | [**List&lt;User&gt;**](List.md)| List of user object |
+ **body** | [**List&lt;User&gt;**](User.md)| List of user object |
 
 ### Return type
 
@@ -133,11 +142,12 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+- **Content-Type**: Not defined
- - **Accept**: Not defined
+- **Accept**: Not defined
+
+
+## deleteUser
 
-<a name="deleteUser"></a>
-# **deleteUser**
 > deleteUser(username)
 
 Delete user
@@ -145,6 +155,7 @@ Delete user
 This can only be done by the logged in user.
 
 ### Example
+
 ```java
 // Import classes:
 //import org.openapitools.client.api.UserApi;
@@ -161,6 +172,7 @@ try {
 
 ### Parameters
 
+
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **username** | **String**| The name that needs to be deleted | [default to null]
@@ -175,16 +187,18 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+- **Content-Type**: Not defined
- - **Accept**: Not defined
+- **Accept**: Not defined
+
+
+## getUserByName
 
-<a name="getUserByName"></a>
-# **getUserByName**
 > User getUserByName(username)
 
 Get user by user name
 
 ### Example
+
 ```java
 // Import classes:
 //import org.openapitools.client.api.UserApi;
@@ -202,6 +216,7 @@ try {
 
 ### Parameters
 
+
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **username** | **String**| The name that needs to be fetched. Use user1 for testing. | [default to null]
@@ -216,16 +231,18 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+- **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
+- **Accept**: application/xml, application/json
+
+
+## loginUser
 
-<a name="loginUser"></a>
-# **loginUser**
 > String loginUser(username, password)
 
 Logs user into the system
 
 ### Example
+
 ```java
 // Import classes:
 //import org.openapitools.client.api.UserApi;
@@ -244,6 +261,7 @@ try {
 
 ### Parameters
 
+
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **username** | **String**| The user name for login | [default to null]
@@ -259,16 +277,18 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+- **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
+- **Accept**: application/xml, application/json
+
+
+## logoutUser
 
-<a name="logoutUser"></a>
-# **logoutUser**
 > logoutUser()
 
 Logs out current logged in user session
 
 ### Example
+
 ```java
 // Import classes:
 //import org.openapitools.client.api.UserApi;
@@ -283,6 +303,7 @@ try {
 ```
 
 ### Parameters
+
 This endpoint does not need any parameter.
 
 ### Return type
@@ -295,27 +316,29 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+- **Content-Type**: Not defined
- - **Accept**: Not defined
+- **Accept**: Not defined
 
-<a name="updateUser"></a>
+
-# **updateUser**
+## updateUser
-> updateUser(username, user)
+
+> updateUser(username, body)
 
 Updated user
 
 This can only be done by the logged in user.
 
 ### Example
+
 ```java
 // Import classes:
 //import org.openapitools.client.api.UserApi;
 
 UserApi apiInstance = new UserApi();
 String username = null; // String | name that need to be deleted
-User user = new User(); // User | Updated user object
+User body = new User(); // User | Updated user object
 try {
-    apiInstance.updateUser(username, user);
+    apiInstance.updateUser(username, body);
 } catch (ApiException e) {
     System.err.println("Exception when calling UserApi#updateUser");
     e.printStackTrace();
@@ -324,10 +347,11 @@ try {
 
 ### Parameters
 
+
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **username** | **String**| name that need to be deleted | [default to null]
- **user** | [**User**](User.md)| Updated user object |
+ **body** | [**User**](User.md)| Updated user object |
 
 ### Return type
 
@@ -339,6 +363,6 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+- **Content-Type**: Not defined
- - **Accept**: Not defined
+- **Accept**: Not defined
 

samples/client/petstore/android/httpclient/git_push.sh

@@ -1,11 +1,17 @@
 #!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
 
 git_user_id=$1
 git_repo_id=$2
 release_note=$3
+git_host=$4
+
+if [ "$git_host" = "" ]; then
+    git_host="github.com"
+    echo "[INFO] No command line input provided. Set \$git_host to $git_host"
+fi
 
 if [ "$git_user_id" = "" ]; then
     git_user_id="GIT_USER_ID"
@@ -37,9 +43,9 @@ if [ "$git_remote" = "" ]; then # git remote not defined
 
     if [ "$GIT_TOKEN" = "" ]; then
         echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
-        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+        git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git
     else
-        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@${git_host}/${git_user_id}/${git_repo_id}.git
     fi
 
 fi
@@ -47,6 +53,6 @@ fi
 git pull origin master
 
 # Pushes (Forces) the changes in the local repository up to the remote repository
-echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
 git push origin master 2>&1 | grep -v 'To https'
 

samples/client/petstore/android/httpclient/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

samples/client/petstore/android/httpclient/gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -66,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
+# For Cygwin or MSYS, switch paths to Windows format before running java
-if $cygwin ; then
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -138,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
+        0) set -- ;;
-        (1) set -- "$args0" ;;
+        1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
+        2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -159,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

samples/client/petstore/android/httpclient/gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

samples/client/petstore/android/httpclient/pom.xml

@@ -173,9 +173,9 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <swagger-core-version>1.5.18</swagger-core-version>
         <gson-version>2.3.1</gson-version>
-        <junit-version>4.8.1</junit-version>
+        <junit-version>4.13.1</junit-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.8.1</junit-version>
-        <httpclient-version>4.3.6</httpclient-version>
+        <httpclient-version>4.5.13</httpclient-version>
     </properties>
 </project>

samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/ApiException.java

@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/ApiInvoker.java

@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/HttpPatch.java

@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/JsonUtil.java

@@ -5,6 +5,7 @@ import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.List;
+import org.openapitools.client.model.*;
 
 public class JsonUtil {
   public static GsonBuilder gsonBuilder;

samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/Pair.java

@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/api/PetApi.java

@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -53,14 +53,14 @@ public class PetApi {
   /**
    * Add a new pet to the store
    * 
-   * @param pet Pet object that needs to be added to the store
+   * @param body Pet object that needs to be added to the store
    * @return void
    */
-  public void  addPet (Pet pet) throws ApiException {
+  public void  addPet (Pet body) throws ApiException {
-    Object localVarPostBody = pet;
+    Object localVarPostBody = body;
-    // verify the required parameter 'pet' is set
+    // verify the required parameter 'body' is set
-    if (pet == null) {
+    if (body == null) {
-       throw new ApiException(400, "Missing the required parameter 'pet' when calling addPet");
+       throw new ApiException(400, "Missing the required parameter 'body' when calling addPet");
     }
 
     // create path and map variables
@@ -317,14 +317,14 @@ public class PetApi {
   /**
    * Update an existing pet
    * 
-   * @param pet Pet object that needs to be added to the store
+   * @param body Pet object that needs to be added to the store
    * @return void
    */
-  public void  updatePet (Pet pet) throws ApiException {
+  public void  updatePet (Pet body) throws ApiException {
-    Object localVarPostBody = pet;
+    Object localVarPostBody = body;
-    // verify the required parameter 'pet' is set
+    // verify the required parameter 'body' is set
-    if (pet == null) {
+    if (body == null) {
-       throw new ApiException(400, "Missing the required parameter 'pet' when calling updatePet");
+       throw new ApiException(400, "Missing the required parameter 'body' when calling updatePet");
     }
 
     // create path and map variables

samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/api/StoreApi.java

@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -203,14 +203,14 @@ public class StoreApi {
   /**
    * Place an order for a pet
    * 
-   * @param order order placed for purchasing the pet
+   * @param body order placed for purchasing the pet
    * @return Order
    */
-  public Order  placeOrder (Order order) throws ApiException {
+  public Order  placeOrder (Order body) throws ApiException {
-    Object localVarPostBody = order;
+    Object localVarPostBody = body;
-    // verify the required parameter 'order' is set
+    // verify the required parameter 'body' is set
-    if (order == null) {
+    if (body == null) {
-       throw new ApiException(400, "Missing the required parameter 'order' when calling placeOrder");
+       throw new ApiException(400, "Missing the required parameter 'body' when calling placeOrder");
     }
 
     // create path and map variables

samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/api/UserApi.java

@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -52,14 +52,14 @@ public class UserApi {
   /**
    * Create user
    * This can only be done by the logged in user.
-   * @param user Created user object
+   * @param body Created user object
    * @return void
    */
-  public void  createUser (User user) throws ApiException {
+  public void  createUser (User body) throws ApiException {
-    Object localVarPostBody = user;
+    Object localVarPostBody = body;
-    // verify the required parameter 'user' is set
+    // verify the required parameter 'body' is set
-    if (user == null) {
+    if (body == null) {
-       throw new ApiException(400, "Missing the required parameter 'user' when calling createUser");
+       throw new ApiException(400, "Missing the required parameter 'body' when calling createUser");
     }
 
     // create path and map variables
@@ -104,14 +104,14 @@ public class UserApi {
   /**
    * Creates list of users with given input array
    * 
-   * @param user List of user object
+   * @param body List of user object
    * @return void
    */
-  public void  createUsersWithArrayInput (List<User> user) throws ApiException {
+  public void  createUsersWithArrayInput (List<User> body) throws ApiException {
-    Object localVarPostBody = user;
+    Object localVarPostBody = body;
-    // verify the required parameter 'user' is set
+    // verify the required parameter 'body' is set
-    if (user == null) {
+    if (body == null) {
-       throw new ApiException(400, "Missing the required parameter 'user' when calling createUsersWithArrayInput");
+       throw new ApiException(400, "Missing the required parameter 'body' when calling createUsersWithArrayInput");
     }
 
     // create path and map variables
@@ -156,14 +156,14 @@ public class UserApi {
   /**
    * Creates list of users with given input array
    * 
-   * @param user List of user object
+   * @param body List of user object
    * @return void
    */
-  public void  createUsersWithListInput (List<User> user) throws ApiException {
+  public void  createUsersWithListInput (List<User> body) throws ApiException {
-    Object localVarPostBody = user;
+    Object localVarPostBody = body;
-    // verify the required parameter 'user' is set
+    // verify the required parameter 'body' is set
-    if (user == null) {
+    if (body == null) {
-       throw new ApiException(400, "Missing the required parameter 'user' when calling createUsersWithListInput");
+       throw new ApiException(400, "Missing the required parameter 'body' when calling createUsersWithListInput");
     }
 
     // create path and map variables
@@ -419,18 +419,18 @@ public class UserApi {
    * Updated user
    * This can only be done by the logged in user.
    * @param username name that need to be deleted
-   * @param user Updated user object
+   * @param body Updated user object
    * @return void
    */
-  public void  updateUser (String username, User user) throws ApiException {
+  public void  updateUser (String username, User body) throws ApiException {
-    Object localVarPostBody = user;
+    Object localVarPostBody = body;
     // verify the required parameter 'username' is set
     if (username == null) {
        throw new ApiException(400, "Missing the required parameter 'username' when calling updateUser");
     }
-    // verify the required parameter 'user' is set
+    // verify the required parameter 'body' is set
-    if (user == null) {
+    if (body == null) {
-       throw new ApiException(400, "Missing the required parameter 'user' when calling updateUser");
+       throw new ApiException(400, "Missing the required parameter 'body' when calling updateUser");
     }
 
     // create path and map variables

samples/client/petstore/android/volley/.openapi-generator/VERSION

@@ -1 +1 @@
-5.1.0-SNAPSHOT
+5.2.0-SNAPSHOT