From 9fefd1e7e5610133d635f47d6826a2b109fd5517 Mon Sep 17 00:00:00 2001
From: Shyri Villar <igs.villar@gmail.com>
Date: Thu, 7 Jan 2016 17:53:06 +0100
Subject: [PATCH] Fixed android-volley-library responses when
 additionalProperties is present. Clean responses mechanism using volley
 default's

---
 .../languages/AndroidClientCodegen.java       |  4 ----
 .../android/libraries/volley/api.mustache     |  2 +-
 .../libraries/volley/responses.mustache       | 24 -------------------
 3 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 modules/swagger-codegen/src/main/resources/android/libraries/volley/responses.mustache

diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java
index 8137dbb9793..7fc9033f59d 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java
@@ -281,10 +281,6 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi
         supportingFiles.add(new SupportingFile("manifest.mustache", projectFolder, "AndroidManifest.xml"));
         supportingFiles.add(new SupportingFile("apiInvoker.mustache",
                 (sourceFolder + File.separator + invokerPackage).replace(".", File.separator), "ApiInvoker.java"));
-        supportingFiles.add(new SupportingFile("responses.mustache",
-                (sourceFolder + File.separator + invokerPackage).replace(".", File.separator), "Responses.java"));
-        // supportingFiles.add(new SupportingFile("httpPatch.mustache",
-        //        (sourceFolder + File.separator + invokerPackage).replace(".", File.separator), "HttpPatch.java"));
         supportingFiles.add(new SupportingFile("jsonUtil.mustache",
                 (sourceFolder + File.separator + invokerPackage).replace(".", File.separator), "JsonUtil.java"));
         supportingFiles.add(new SupportingFile("apiException.mustache",
diff --git a/modules/swagger-codegen/src/main/resources/android/libraries/volley/api.mustache b/modules/swagger-codegen/src/main/resources/android/libraries/volley/api.mustache
index ccd12fd67c5..a327eaad659 100644
--- a/modules/swagger-codegen/src/main/resources/android/libraries/volley/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/android/libraries/volley/api.mustache
@@ -50,7 +50,7 @@ public class {{classname}} {
 {{#allParams}}   * @param {{paramName}} {{description}}
 {{/allParams}}   * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
    */
-  public void {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{^hasMore}}, {{/hasMore}}{{/allParams}}final {{#returnBaseType}}Responses.{{returnBaseType}}{{#isListContainer}}List{{/isListContainer}}Response{{/returnBaseType}}{{^returnBaseType}}Responses.StringResponse{{/returnBaseType}} responseListener, final Response.ErrorListener errorListener) {
+  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}}
diff --git a/modules/swagger-codegen/src/main/resources/android/libraries/volley/responses.mustache b/modules/swagger-codegen/src/main/resources/android/libraries/volley/responses.mustache
deleted file mode 100644
index 7cb955f7239..00000000000
--- a/modules/swagger-codegen/src/main/resources/android/libraries/volley/responses.mustache
+++ /dev/null
@@ -1,24 +0,0 @@
-package {{invokerPackage}};
-
-import java.util.List;
-import {{modelPackage}}.*;
-
-public class Responses {
-  {{#models}}
-  {{#model}}
-    public static interface {{classname}}Response {
-        public void onResponse({{classname}} {{classVarName}});
-    }
-    public static interface {{classname}}ListResponse {
-        public void onResponse(List<{{classname}}> {{classVarName}}List);
-    }
-    {{/model}}
-  {{/models}}
-    public static interface StringResponse {
-        public void onResponse(String response);
-    }
-
-    public static interface StringListResponse {
-        public void onResponse(List<String> stringList);
-    }
-}
\ No newline at end of file