[Android] update httpclient version, fix compilation issue in the sam…

…ple (#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/lib/*.jar
+- target/openapi-android-client-1.0.0.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,11 +1,14 @@
 
+
 # Category
 
 ## Properties
+
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **id** | **Long** |  |  [optional]
 **name** | **String** |  |  [optional]
 
 
 
+

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
 ---- | -----
 
 
 
+