[Android] add windows batch, better code foramt (#5496)

* remove trailing space in cpprest, update samples

* add android batch files, better code format, sync petstore.json with
petstore.yaml

* restore petstore.json and sync it to petstore.yaml

* update circleci pom.xml

* add new android files

* add new android files

bin/windows/android-petstore-all.bat

@@ -0,0 +1,2 @@
+call .\bin\windows\android-petstore-volley.bat
+call .\bin\windows\android-petstore-httpclient.bat

bin/windows/android-petstore-httpclient.bat

@@ -0,0 +1,10 @@
+set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar
+
+If Not Exist %executable% (
+  mvn clean package
+)
+
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l android -o samples\client\petstore\android\httpclient-Dlibrary=httpclient
+
+java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/android-petstore-volley.bat

@@ -0,0 +1,10 @@
+set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar
+
+If Not Exist %executable% (
+  mvn clean package
+)
+
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l android -o samples\client\petstore\android\volley
+
+java %JAVA_OPTS% -jar %executable% %ags%

modules/swagger-codegen/src/main/resources/android/api.mustache

@@ -48,12 +48,14 @@ public class {{classname}} {
    */
   public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException {
     Object localVarPostBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
-    {{#allParams}}{{#required}}
+    {{#allParams}}
+    {{#required}}
     // verify the required parameter '{{paramName}}' is set
     if ({{paramName}} == null) {
        throw new ApiException(400, "Missing the required parameter '{{paramName}}' when calling {{nickname}}");
     }
-    {{/required}}{{/allParams}}
+    {{/required}}
+    {{/allParams}}
 
     // create path and map variables
     String localVarPath = "{{{path}}}".replaceAll("\\{format\\}","json"){{#pathParams}}.replaceAll("\\{" + "{{baseName}}" + "\\}", apiInvoker.escapeString({{{paramName}}}.toString())){{/pathParams}};

modules/swagger-codegen/src/main/resources/android/libraries/volley/api.mustache

@@ -127,15 +127,15 @@ public class {{classname}} {
     } catch (InterruptedException ex) {
        throw ex;
     } catch (ExecutionException ex) {
-       if (ex.getCause() instanceof VolleyError) {
-         VolleyError volleyError = (VolleyError)ex.getCause();
-         if (volleyError.networkResponse != null) {
-           throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage());
-         }
-       }
-       throw ex;
+      if (ex.getCause() instanceof VolleyError) {
+        VolleyError volleyError = (VolleyError)ex.getCause();
+        if (volleyError.networkResponse != null) {
+          throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage());
+        }
+      }
+      throw ex;
     } catch (TimeoutException ex) {
-       throw ex;
+      throw ex;
     }
   }
 
@@ -147,13 +147,15 @@ public class {{classname}} {
   public void {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{^hasMore}}, {{/hasMore}}{{/allParams}}final Response.Listener<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}String{{/returnType}}> responseListener, final Response.ErrorListener errorListener) {
     Object postBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
 
-  {{#allParams}}{{#required}}
+    {{#allParams}}
+    {{#required}}
     // verify the required parameter '{{paramName}}' is set
     if ({{paramName}} == null) {
-       VolleyError error = new VolleyError("Missing the required parameter '{{paramName}}' when calling {{nickname}}",
-         new ApiException(400, "Missing the required parameter '{{paramName}}' when calling {{nickname}}"));
+      VolleyError error = new VolleyError("Missing the required parameter '{{paramName}}' when calling {{nickname}}",
+        new ApiException(400, "Missing the required parameter '{{paramName}}' when calling {{nickname}}"));
     }
-    {{/required}}{{/allParams}}
+    {{/required}}
+    {{/allParams}}
 
     // create path and map variables
     String path = "{{{path}}}".replaceAll("\\{format\\}","json"){{#pathParams}}.replaceAll("\\{" + "{{baseName}}" + "\\}", apiInvoker.escapeString({{{paramName}}}.toString())){{/pathParams}};
@@ -199,7 +201,7 @@ public class {{classname}} {
       {{/formParams}}
     }
 
-      String[] authNames = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
+    String[] authNames = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
 
     try {
       apiInvoker.invokeAPI(basePath, path, "{{httpMethod}}", queryParams, postBody, headerParams, formParams, contentType, authNames,

modules/swagger-codegen/src/test/resources/2_0/petstore.json

@@ -1,4 +1,3 @@
-
 {
   "swagger": "2.0",
   "info": {