rollback android template

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

@@ -58,17 +58,11 @@ import java.io.File;
     String path = "{{path}}".replaceAll("\\{format\\}","json"){{#pathParams}}.replaceAll("\\{" + "{{paramName}}" + "\\}", apiInvoker.escapeString({{{paramName}}}.toString())){{/pathParams}};
 
     // query params
-        Map
-        <String, String> queryParams = new HashMap
-        <String, String>();
+    Map<String, String> queryParams = new HashMap<String, String>();
     // header params
-        Map
-        <String, String> headerParams = new HashMap
-        <String, String>();
+    Map<String, String> headerParams = new HashMap<String, String>();
     // form params
-        Map
-        <String, String> formParams = new HashMap
-        <String, String>();
+    Map<String, String> formParams = new HashMap<String, String>();
 
     {{#queryParams}}if ({{paramName}} != null)
       queryParams.put("{{baseName}}", ApiInvoker.parameterToString({{paramName}}));

modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache

@@ -53,9 +53,7 @@ import com.google.gson.JsonParseException;
 
 public class ApiInvoker {
   private static ApiInvoker INSTANCE = new ApiInvoker();
-private Map
-<String, String> defaultHeaderMap = new HashMap
-<String, String>();
+  private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
 
   private HttpClient client = null;
 
@@ -186,10 +184,7 @@ throw new ApiException(500, e.getMessage());
     }
   }
 
-public String invokeAPI(String host, String path, String method, Map
-<String, String> queryParams, Object body, Map
-<String, String> headerParams, Map
-<String, String> formParams, String contentType) throws ApiException {
+  public String invokeAPI(String host, String path, String method, Map<String, String> queryParams, Object body, Map<String, String> headerParams, Map<String, String> formParams, String contentType) throws ApiException {
     HttpClient client = getClient(host);
 
     StringBuilder b = new StringBuilder();
@@ -205,9 +200,7 @@ b.append(escapeString(key)).append("=").append(escapeString(value));
     }
     String url = host + path + b.toString();
 
-HashMap
-<String, String> headers = new HashMap
-<String, String>();
+    HashMap<String, String> headers = new HashMap<String, String>();
 
     for(String key : headerParams.keySet()) {
       headers.put(key, headerParams.get(key));

modules/swagger-codegen/src/main/resources/android-java/jsonUtil.mustache

@@ -24,13 +24,11 @@ public static String serialize(Object obj){
     return getGson().toJson(obj);
   }
 
-public static
-<T> T deserializeToList(String jsonString, Class cls){
+  public static <T> T deserializeToList(String jsonString, Class cls){
     return getGson().fromJson(jsonString, getListTypeForDeserialization(cls));
   }
 
-    public static
-    <T> T deserializeToObject(String jsonString, Class cls){
+  public static <T> T deserializeToObject(String jsonString, Class cls){
     return getGson().fromJson(jsonString, getTypeForDeserialization(cls));
   }
 
@@ -38,14 +36,10 @@ public static
     String className = cls.getSimpleName();
     {{#models}}{{#model}}
     if ("{{classname}}".equalsIgnoreCase(className)) {
-            return new TypeToken
-            <List
-            <{{classname}}>>(){}.getType();
+      return new TypeToken<List<{{classname}}>>(){}.getType();
     }
     {{/model}}{{/models}}
-        return new TypeToken
-        <List
-        <Object>>(){}.getType();
+    return new TypeToken<List<Object>>(){}.getType();
   }
 
   public static Type getTypeForDeserialization(Class cls) {
@@ -55,8 +49,7 @@ public static
       return new TypeToken<{{classname}}>(){}.getType();
     }
     {{/model}}{{/models}}
-            return new TypeToken
-            <Object>(){}.getType();
+    return new TypeToken<Object>(){}.getType();
   }
 
 };

modules/swagger-codegen/src/main/resources/android-java/pom.mustache

@@ -77,8 +77,7 @@
             </goals>
             <configuration>
               <sources>
-                                <source>
-                                src/main/java</source>
+                <source>src/main/java</source>
               </sources>
             </configuration>
           </execution>
@@ -90,8 +89,7 @@
             </goals>
             <configuration>
               <sources>
-                                <source>
-                                src/test/java</source>
+                <source>src/test/java</source>
               </sources>
             </configuration>
           </execution>
@@ -102,8 +100,7 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.3.2</version>
         <configuration>
-                    <source>
-                    1.6</source>
+          <source>1.6</source>
           <target>1.6</target>
         </configuration>
       </plugin>