server: fixes in client generator

Author: imedina

opencga-server/src/main/java/org/opencb/opencga/server/generator/config/ApiConfig.java

@@ -9,6 +9,7 @@ public class ApiConfig {
     private List<Shortcut> shortcuts;
     private String executorsParentClass;
     private String optionsParserParentClass;
+    private String opencgaClientClassName;
 
     public ApiConfig() {
     }
@@ -17,13 +18,23 @@ public ApiConfig(List<CategoryConfig> categoryConfigList) {
         this.categoryConfigList = categoryConfigList;
     }
 
+    public ApiConfig(List<CategoryConfig> categoryConfigList, List<Shortcut> shortcuts, String executorsParentClass,
+                     String optionsParserParentClass, String opencgaClientClassName) {
+        this.categoryConfigList = categoryConfigList;
+        this.shortcuts = shortcuts;
+        this.executorsParentClass = executorsParentClass;
+        this.optionsParserParentClass = optionsParserParentClass;
+        this.opencgaClientClassName = opencgaClientClassName;
+    }
+
     @Override
     public String toString() {
         final StringBuilder sb = new StringBuilder("ApiConfig{");
         sb.append("categoryConfigList=").append(categoryConfigList);
         sb.append(", shortcuts=").append(shortcuts);
         sb.append(", executorsParentClass='").append(executorsParentClass).append('\'');
         sb.append(", optionsParserParentClass='").append(optionsParserParentClass).append('\'');
+        sb.append(", opencgaClientClassName='").append(opencgaClientClassName).append('\'');
         sb.append('}');
         return sb.toString();
     }
@@ -63,4 +74,13 @@ public ApiConfig setOptionsParserParentClass(String optionsParserParentClass) {
         this.optionsParserParentClass = optionsParserParentClass;
         return this;
     }
+
+    public String getOpencgaClientClassName() {
+        return opencgaClientClassName;
+    }
+
+    public ApiConfig setOpencgaClientClassName(String opencgaClientClassName) {
+        this.opencgaClientClassName = opencgaClientClassName;
+        return this;
+    }
 }

opencga-server/src/main/java/org/opencb/opencga/server/generator/writers/cli/ExecutorsCliRestApiWriter.java

@@ -217,16 +217,18 @@ private String methodExecute(RestCategory restCategory, CategoryConfig config) {
         return sb.toString();
     }
 
-    private String getExtendedClass(String name, CategoryConfig config) {
-        String res = "OpencgaCommandExecutor";
-        if (config.isExecutorExtended()) {
-            if (StringUtils.isNotEmpty(config.getExecutorExtendedClassName())) {
-                res = config.getExecutorExtendedClassName();
+    private String getExtendedClass(String name, CategoryConfig categoryConfig) {
+        String parentClass = StringUtils.isEmpty(this.config.getApiConfig().getExecutorsParentClass())
+                ? "OpencgaCommandExecutor"
+                : this.config.getApiConfig().getExecutorsParentClass();
+        if (categoryConfig.isExecutorExtended()) {
+            if (StringUtils.isNotEmpty(categoryConfig.getExecutorExtendedClassName())) {
+                parentClass = categoryConfig.getExecutorExtendedClassName();
             } else {
-                res = "Parent" + name + "CommandExecutor";
+                parentClass = "Parent" + name + "CommandExecutor";
             }
         }
-        return res;
+        return parentClass;
     }
 
     @Override
@@ -265,7 +267,12 @@ protected String getClassMethods(String key) {
     }
 
     private String getReturn(RestCategory restCategory, RestEndpoint restEndpoint, CategoryConfig config, String commandName) {
-        String res = "        return openCGAClient.get" + getAsClassName(config.getKey()) + "Client()."
+        String opencgaClientObjectName = StringUtils.isEmpty(this.config.getApiConfig().getOpencgaClientClassName())
+                ? "openCGAClient"
+                : this.config.getApiConfig().getOpencgaClientClassName().toLowerCase().charAt(0)
+                    + this.config.getApiConfig().getOpencgaClientClassName().substring(1);
+
+        String res = "        return " + opencgaClientObjectName + ".get" + getAsClassName(config.getKey()) + "Client()."
                 + getJavaMethodName(config, commandName) + "(";
         res += restEndpoint.getPathParams();
         res += restEndpoint.getMandatoryQueryParams(config, commandName);