Merge pull request #791 from xhh/java-api-client

[Java] Make API client more pluggable

Author: fehguy

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JavaClientCodegen.java

@@ -36,12 +36,12 @@ public JavaClientCodegen() {
 
     reservedWords = new HashSet<String> (
       Arrays.asList(
-        "abstract", "continue", "for", "new", "switch", "assert", 
-        "default", "if", "package", "synchronized", "boolean", "do", "goto", "private", 
-        "this", "break", "double", "implements", "protected", "throw", "byte", "else", 
-        "import", "public", "throws", "case", "enum", "instanceof", "return", "transient", 
-        "catch", "extends", "int", "short", "try", "char", "final", "interface", "static", 
-        "void", "class", "finally", "long", "strictfp", "volatile", "const", "float", 
+        "abstract", "continue", "for", "new", "switch", "assert",
+        "default", "if", "package", "synchronized", "boolean", "do", "goto", "private",
+        "this", "break", "double", "implements", "protected", "throw", "byte", "else",
+        "import", "public", "throws", "case", "enum", "instanceof", "return", "transient",
+        "catch", "extends", "int", "short", "try", "char", "final", "interface", "static",
+        "void", "class", "finally", "long", "strictfp", "volatile", "const", "float",
         "native", "super", "while")
     );
 
@@ -58,7 +58,7 @@ public JavaClientCodegen() {
       );
     instantiationTypes.put("array", "ArrayList");
     instantiationTypes.put("map", "HashMap");
-    
+
     cliOptions.add(new CliOption("invokerPackage", "root package for generated code"));
     cliOptions.add(new CliOption("groupId", "groupId in generated pom.xml"));
     cliOptions.add(new CliOption("artifactId", "artifactId in generated pom.xml"));
@@ -69,53 +69,55 @@ public JavaClientCodegen() {
   @Override
   public void processOpts() {
     super.processOpts();
-    
+
     if(additionalProperties.containsKey("invokerPackage")) {
       this.setInvokerPackage((String)additionalProperties.get("invokerPackage"));
     }
     else{
       //not set, use default to be passed to template
       additionalProperties.put("invokerPackage", invokerPackage);
     }
-    
+
     if(additionalProperties.containsKey("groupId")) {
       this.setGroupId((String)additionalProperties.get("groupId"));
     }
     else{
       //not set, use to be passed to template
       additionalProperties.put("groupId", groupId);
     }
-    
+
     if(additionalProperties.containsKey("artifactId")) {
       this.setArtifactId((String)additionalProperties.get("artifactId"));
     }
     else{
       //not set, use to be passed to template
       additionalProperties.put("artifactId", artifactId);
     }
-    
+
     if(additionalProperties.containsKey("artifactVersion")) {
       this.setArtifactVersion((String)additionalProperties.get("artifactVersion"));
     }
     else{
       //not set, use to be passed to template
       additionalProperties.put("artifactVersion", artifactVersion);
     }
-    
+
     if(additionalProperties.containsKey("sourceFolder")) {
       this.setSourceFolder((String)additionalProperties.get("sourceFolder"));
     }
 
     supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
-    supportingFiles.add(new SupportingFile("apiInvoker.mustache", 
-      (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiInvoker.java"));
-    supportingFiles.add(new SupportingFile("JsonUtil.mustache", 
+    supportingFiles.add(new SupportingFile("ApiClient.mustache",
+      (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiClient.java"));
+    supportingFiles.add(new SupportingFile("Configuration.mustache",
+      (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "Configuration.java"));
+    supportingFiles.add(new SupportingFile("JsonUtil.mustache",
       (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "JsonUtil.java"));
-    supportingFiles.add(new SupportingFile("apiException.mustache", 
+    supportingFiles.add(new SupportingFile("apiException.mustache",
       (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiException.java"));
   }
-  
-  
+
+
 
   @Override
   public String escapeReservedWord(String name) {