Merge remote-tracking branch 'origin/binary' into binary

Conflicts:
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
	modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache
	modules/swagger-codegen/src/main/resources/Java/api.mustache

Author: b_sapir

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java

@@ -36,7 +36,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
     protected String sourceFolder = "src/main/java";
     protected String localVariablePrefix = "";
     protected Boolean serializableModel = false;
-    
+
     public JavaClientCodegen() {
         super();
         outputFolder = "generated-code/java";
@@ -138,7 +138,7 @@ public void processOpts() {
         if (additionalProperties.containsKey("localVariablePrefix")) {
             this.setLocalVariablePrefix((String) additionalProperties.get("localVariablePrefix"));
         }
-        
+
         if (additionalProperties.containsKey("serializableModel")) {
             this.setSerializableModel(Boolean.valueOf((String)additionalProperties.get("serializableModel").toString()));
         }
@@ -380,7 +380,7 @@ public void setSourceFolder(String sourceFolder) {
     public void setLocalVariablePrefix(String localVariablePrefix) {
         this.localVariablePrefix = localVariablePrefix;
     }
-    
+
 
     public Boolean getSerializableModel() {
         return serializableModel;
@@ -389,7 +389,7 @@ public Boolean getSerializableModel() {
     public void setSerializableModel(Boolean serializableModel) {
         this.serializableModel = serializableModel;
     }
-    
+
     private String sanitizePackageName(String packageName) {
         packageName = packageName.trim();
         packageName = packageName.replaceAll("[^a-zA-Z0-9_\\.]", "_");

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

@@ -84,17 +84,17 @@ public class {{classname}} {
       {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}}
     };
     final String {{localVariablePrefix}}contentType = {{localVariablePrefix}}apiClient.selectHeaderContentType({{localVariablePrefix}}contentTypes);
-  
+
     String[] {{localVariablePrefix}}authNames = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
     {{#responses}}
     {{#isDefault}}
-    
+
     {{#isBinary}}
     byte[] {{localVariablePrefix}}response = null;
     {{localVariablePrefix}}response = {{localVariablePrefix}}apiClient.invokeBinaryAPI({{localVariablePrefix}}path, "{{httpMethod}}", {{localVariablePrefix}}queryParams,{{localVariablePrefix}} postBody, {{localVariablePrefix}}postBinaryBody, {{localVariablePrefix}}headerParams, {{localVariablePrefix}}formParams, {{localVariablePrefix}}accept, {{localVariablePrefix}}contentType, {{localVariablePrefix}}authNames);
     return {{localVariablePrefix}}response;
     {{/isBinary}}
-    
+
     {{^isBinary}}
     {{#returnType}}
     TypeRef {{localVariablePrefix}}returnType = new TypeRef<{{{returnType}}}>() {};
@@ -103,9 +103,9 @@ public class {{classname}} {
     {{localVariablePrefix}}apiClient.invokeAPI({{localVariablePrefix}}path, "{{httpMethod}}", {{localVariablePrefix}}queryParams, {{localVariablePrefix}}postBody, {{localVariablePrefix}}postBinaryBody, {{localVariablePrefix}}headerParams, {{localVariablePrefix}}formParams, {{localVariablePrefix}}accept, {{localVariablePrefix}}contentType, {{localVariablePrefix}}authNames, null);
     {{/returnType}}
     {{/isBinary}}
-    
+
     {{/isDefault}}
-    {{/responses}}      
+    {{/responses}}
   }
   {{/operation}}
 }