Merge pull request #3219 from wing328/android_gradle_update

wing328 · web-flow · commit bee05f008690 · 2016-06-27T11:59:42.000+08:00
[Android][Volley] add http client dependency to android volley
diff --git a/modules/swagger-codegen/src/main/resources/android/libraries/volley/build.mustache b/modules/swagger-codegen/src/main/resources/android/libraries/volley/build.mustache
@@ -59,8 +59,9 @@ android {
 ext {
     swagger_annotations_version = "1.5.0"
     gson_version = "2.3.1"
-    httpclient_version = "4.5.2"
+    httpmime_version = "4.5.2"
     httpcore_version = "4.4.4"
+    httpclient_version = "4.3.3"
     volley_version = "1.0.19"
     junit_version = "4.12"
     robolectric_version = "3.0"
@@ -71,7 +72,8 @@ dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
     compile "com.google.code.gson:gson:$gson_version"
     compile "org.apache.httpcomponents:httpcore:$httpcore_version"
-    compile "org.apache.httpcomponents:httpmime:$httpclient_version"
+    compile "org.apache.httpcomponents:httpmime:$httpmime_version"
+    compile "org.apache.httpcomponents:httpclient-android:$httpclient_version"
     compile "com.mcxiaoke.volley:library:${volley_version}@aar"
     testCompile "junit:junit:$junit_version"
     testCompile "org.robolectric:robolectric:${robolectric_version}"
diff --git a/modules/swagger-codegen/src/main/resources/android/libraries/volley/pom.mustache b/modules/swagger-codegen/src/main/resources/android/libraries/volley/pom.mustache
@@ -16,6 +16,11 @@
       <artifactId>httpcore</artifactId>
       <version>${httpcomponents-httpcore-version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient-android</artifactId>
+      <version>${httpcomponents-httpclient-version}</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpmime</artifactId>
@@ -54,6 +59,7 @@
     <swagger-annotations-version>1.5.8</swagger-annotations-version>
     <httpcomponents-httpcore-version>4.4.4</httpcomponents-httpcore-version>
     <httpcomponents-httpmime-version>4.5.2</httpcomponents-httpmime-version>
+    <httpcomponents-httpclient-version>4.3.3</httpcomponents-httpclient-version>
     <google-code-gson-version>2.6.2</google-code-gson-version>
     <volley-library-version>1.0.19</volley-library-version>
     <android-platform-version>4.1.1.4</android-platform-version>
diff --git a/pom.xml b/pom.xml
@@ -569,8 +569,8 @@
             <modules>
                 <!-- run ruby test first which has a random delay script to
                      avoid issues with running 2 CI jobs in parallel.       -->
-                <module>samples/client/petstore/python</module>
                 <module>samples/client/petstore/ruby</module>
+                <module>samples/client/petstore/python</module>
                 <module>samples/client/petstore/typescript-fetch/tests/default</module>
                 <module>samples/client/petstore/typescript-fetch/builds/default</module>
                 <module>samples/client/petstore/typescript-fetch/builds/es6-target</module>
diff --git a/samples/client/petstore/android/volley/.gitignore b/samples/client/petstore/android/volley/.gitignore
@@ -36,4 +36,4 @@ captures/
 *.iml
 
 # Keystore files
-*.jks
+*.jks
diff --git a/samples/client/petstore/android/volley/README.md b/samples/client/petstore/android/volley/README.md
@@ -116,6 +116,12 @@ Class | Method | HTTP request | Description
 ## Documentation for Authorization
 
 Authentication schemes defined for the API:
+### api_key
+
+- **Type**: API key
+- **API key parameter name**: api_key
+- **Location**: HTTP header
+
 ### petstore_auth
 
 - **Type**: OAuth
@@ -125,12 +131,6 @@ Authentication schemes defined for the API:
   - write:pets: modify pets in your account
   - read:pets: read your pets
 
-### api_key
-
-- **Type**: API key
-- **API key parameter name**: api_key
-- **Location**: HTTP header
-
 
 ## Recommendation
 
diff --git a/samples/client/petstore/android/volley/build.gradle b/samples/client/petstore/android/volley/build.gradle
@@ -53,8 +53,9 @@ android {
 ext {
     swagger_annotations_version = "1.5.0"
     gson_version = "2.3.1"
-    httpclient_version = "4.5.2"
+    httpmime_version = "4.5.2"
     httpcore_version = "4.4.4"
+    httpclient_version = "4.3.3"
     volley_version = "1.0.19"
     junit_version = "4.12"
     robolectric_version = "3.0"
@@ -65,7 +66,8 @@ dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
     compile "com.google.code.gson:gson:$gson_version"
     compile "org.apache.httpcomponents:httpcore:$httpcore_version"
-    compile "org.apache.httpcomponents:httpmime:$httpclient_version"
+    compile "org.apache.httpcomponents:httpmime:$httpmime_version"
+    compile "org.apache.httpcomponents:httpclient-android:$httpclient_version"
     compile "com.mcxiaoke.volley:library:${volley_version}@aar"
     testCompile "junit:junit:$junit_version"
     testCompile "org.robolectric:robolectric:${robolectric_version}"
diff --git a/samples/client/petstore/android/volley/gradle/wrapper/gradle-wrapper.properties b/samples/client/petstore/android/volley/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Mon May 16 21:00:31 CST 2016
+#Mon May 16 21:00:11 CST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/samples/client/petstore/android/volley/pom.xml b/samples/client/petstore/android/volley/pom.xml
@@ -16,6 +16,11 @@
       <artifactId>httpcore</artifactId>
       <version>${httpcomponents-httpcore-version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient-android</artifactId>
+      <version>${httpcomponents-httpclient-version}</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpmime</artifactId>
@@ -54,6 +59,7 @@
     <swagger-annotations-version>1.5.8</swagger-annotations-version>
     <httpcomponents-httpcore-version>4.4.4</httpcomponents-httpcore-version>
     <httpcomponents-httpmime-version>4.5.2</httpcomponents-httpmime-version>
+    <httpcomponents-httpclient-version>4.3.3</httpcomponents-httpclient-version>
     <google-code-gson-version>2.6.2</google-code-gson-version>
     <volley-library-version>1.0.19</volley-library-version>
     <android-platform-version>4.1.1.4</android-platform-version>
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/ApiException.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/ApiException.java
@@ -14,16 +14,16 @@ public ApiException(int code, String message) {
   public int getCode() {
     return code;
   }
-  
+
   public void setCode(int code) {
     this.code = code;
   }
-  
+
   public String getMessage() {
     return message;
   }
-  
+
   public void setMessage(String message) {
     this.message = message;
   }
-}
+}
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Category.java
@@ -47,7 +47,7 @@ public boolean equals(Object o) {
         (name == null ? category.name == null : name.equals(category.name));
   }
 
-  @Override 
+  @Override
   public int hashCode() {
     int result = 17;
     result = 31 * result + (id == null ? 0: id.hashCode());
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Order.java
@@ -104,7 +104,7 @@ public boolean equals(Object o) {
         (complete == null ? order.complete == null : complete.equals(order.complete));
   }
 
-  @Override 
+  @Override
   public int hashCode() {
     int result = 17;
     result = 31 * result + (id == null ? 0: id.hashCode());
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Pet.java
@@ -106,7 +106,7 @@ public boolean equals(Object o) {
         (status == null ? pet.status == null : status.equals(pet.status));
   }
 
-  @Override 
+  @Override
   public int hashCode() {
     int result = 17;
     result = 31 * result + (id == null ? 0: id.hashCode());
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Tag.java
@@ -47,7 +47,7 @@ public boolean equals(Object o) {
         (name == null ? tag.name == null : name.equals(tag.name));
   }
 
-  @Override 
+  @Override
   public int hashCode() {
     int result = 17;
     result = 31 * result + (id == null ? 0: id.hashCode());
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/User.java
@@ -126,7 +126,7 @@ public boolean equals(Object o) {
         (userStatus == null ? user.userStatus == null : userStatus.equals(user.userStatus));
   }
 
-  @Override 
+  @Override
   public int hashCode() {
     int result = 17;
     result = 31 * result + (id == null ? 0: id.hashCode());
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/request/DeleteRequest.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/request/DeleteRequest.java
@@ -89,4 +89,4 @@ public Map<String, String> getHeaders() throws AuthFailureError {
 
         return headers;
     }
-}
+}
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/request/GetRequest.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/request/GetRequest.java
@@ -36,4 +36,4 @@ public Map<String, String> getHeaders() throws AuthFailureError {
 
     return headers;
   }
-}
+}
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/request/PatchRequest.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/request/PatchRequest.java
@@ -89,4 +89,4 @@ public Map<String, String> getHeaders() throws AuthFailureError {
 
         return headers;
     }
-}
+}
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/request/PostRequest.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/request/PostRequest.java
@@ -89,4 +89,4 @@ public Map<String, String> getHeaders() throws AuthFailureError {
 
         return headers;
     }
-}
+}
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/request/PutRequest.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/request/PutRequest.java
@@ -89,4 +89,4 @@ public Map<String, String> getHeaders() throws AuthFailureError {
 
         return headers;
     }
-}
+}

-Original file line number
+Diff line change
 *.iml
 # Keystore files
 -*.jks
 +*.jks
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#Mon May 16 21:00:31 CST 2016`
	`1`	`+#Mon May 16 21:00:11 CST 2016`
`2`	`2`	`distributionBase=GRADLE_USER_HOME`
`3`	`3`	`distributionPath=wrapper/dists`
`4`	`4`	`zipStoreBase=GRADLE_USER_HOME`
Original file line number	Diff line number	Diff line change
`@@ -14,16 +14,16 @@ public ApiException(int code, String message) {`
`14`	`14`	`public int getCode() {`
`15`	`15`	`return code;`
`16`	`16`	`}`
`17`		`-`
	`17`	`+`
`18`	`18`	`public void setCode(int code) {`
`19`	`19`	`this.code = code;`
`20`	`20`	`}`
`21`		`-`
	`21`	`+`
`22`	`22`	`public String getMessage() {`
`23`	`23`	`return message;`
`24`	`24`	`}`
`25`		`-`
	`25`	`+`
`26`	`26`	`public void setMessage(String message) {`
`27`	`27`	`this.message = message;`
`28`	`28`	`}`
`29`		`-}`
	`29`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public boolean equals(Object o) {`
`47`	`47`	`(name == null ? category.name == null : name.equals(category.name));`
`48`	`48`	`}`
`49`	`49`
`50`		`- @Override`
	`50`	`+ @Override`
`51`	`51`	`public int hashCode() {`
`52`	`52`	`int result = 17;`
`53`	`53`	`result = 31 * result + (id == null ? 0: id.hashCode());`