Cleanup: Moved logic from the controller to service

Author: maeisabelle08

quick-start/src/main/java/com/marklogic/hub/service/FlowManagerService.java

@@ -4,31 +4,39 @@
 import java.io.IOException;
 import java.util.List;
 
+import org.codehaus.jettison.json.JSONException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.JobExecutionListener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import com.marklogic.client.DatabaseClient;
 import com.marklogic.client.DatabaseClientFactory;
 import com.marklogic.client.DatabaseClientFactory.Authentication;
 import com.marklogic.client.io.Format;
 import com.marklogic.hub.FlowManager;
+import com.marklogic.hub.Mlcp;
 import com.marklogic.hub.PluginFormat;
+import com.marklogic.hub.Mlcp.MlcpSource;
+import com.marklogic.hub.Mlcp.SourceOptions;
 import com.marklogic.hub.config.EnvironmentConfiguration;
 import com.marklogic.hub.exception.FlowManagerException;
 import com.marklogic.hub.factory.FlowModelFactory;
 import com.marklogic.hub.flow.Flow;
 import com.marklogic.hub.flow.FlowType;
 import com.marklogic.hub.model.FlowModel;
+import com.marklogic.hub.model.FlowOptionsModel;
 
 @Service
 public class FlowManagerService {
 
     private static final Logger LOGGER = LoggerFactory
             .getLogger(FlowManagerService.class);
+    
+    private static final String NEW_LINE = "\n";
 
     @Autowired
     private EnvironmentConfiguration environmentConfiguration;
@@ -98,4 +106,42 @@ public FlowModel createFlow(String entityName, String flowName,
         }
         return flowModel;
     }
+
+    public void loadData(FlowOptionsModel flowOptionsModel) throws IOException, JSONException {
+        SourceOptions sourceOptions = createSourceOptionsInstance(flowOptionsModel);
+        Mlcp mlcp = createMlcpInstance(flowOptionsModel,sourceOptions);
+        mlcp.loadContent();
+    }
+    
+    private SourceOptions createSourceOptionsInstance(FlowOptionsModel flowOptionsModel) {
+        Flow flow = getFlow(flowOptionsModel.getEntityName(), flowOptionsModel.getFlowName());
+        
+        SourceOptions sourceOptions = new SourceOptions(
+                flowOptionsModel.getEntityName(), flowOptionsModel.getFlowName(),
+                FlowType.INPUT.toString(),
+                flow.getDataFormat());
+
+        sourceOptions.setInputFileType(flowOptionsModel.getInputFileType());
+        sourceOptions.setOtherOptions(flowOptionsModel.getOtherOptions());
+        
+        return sourceOptions;
+    }
+    
+    private Mlcp createMlcpInstance(FlowOptionsModel flowOptionsModel, SourceOptions sourceOptions) throws IOException {
+        Mlcp mlcp = new Mlcp(
+                environmentConfiguration.getMLHost()
+                ,Integer.parseInt(environmentConfiguration.getMLStagingRestPort())
+                ,environmentConfiguration.getMLUsername()
+                ,environmentConfiguration.getMLPassword()
+                );
+        mlcp.addSourceDirectory(flowOptionsModel.getInputPath(), sourceOptions);
+        return mlcp;
+    }
+    
+    public String buildMlcpConfigContent(FlowOptionsModel flowOptionsModel) throws NumberFormatException, IOException, JSONException {
+        SourceOptions sourceOptions = createSourceOptionsInstance(flowOptionsModel);
+        Mlcp mlcp = createMlcpInstance(flowOptionsModel,sourceOptions);
+        List<String> mlcpOptions = mlcp.getMlcpOptions(new MlcpSource(flowOptionsModel.getInputPath(), sourceOptions));
+        return StringUtils.collectionToDelimitedString(mlcpOptions, NEW_LINE);
+    }
 }

quick-start/src/main/java/com/marklogic/hub/web/controller/api/FlowApiController.java

@@ -56,8 +56,6 @@ public class FlowApiController extends BaseController {
 
     private static final String MLCP_OPTIONS_FILENAME = "mlcpOptions.txt";
 
-    private static final String NEW_LINE = "\n";
-
     @Autowired
     private EnvironmentConfiguration environmentConfiguration;
 
@@ -216,9 +214,7 @@ public void cancel(BasicFuture<?> resultFuture) {
             @Override
             public void run(BasicFuture<?> resultFuture) {
                 try {
-                    SourceOptions sourceOptions = createSourceOptionsInstance(flowOptionsModel);
-                	Mlcp mlcp = createMlcpInstance(flowOptionsModel,sourceOptions);
-                    mlcp.loadContent();
+                    flowManagerService.loadData(flowOptionsModel);
 
                     resultFuture.completed(null);
                 }
@@ -235,31 +231,6 @@ public void run(BasicFuture<?> resultFuture) {
         return taskManagerService.addTask(task);
     }
 
-    protected Mlcp createMlcpInstance(FlowOptionsModel flowOptionsModel, SourceOptions sourceOptions) throws NumberFormatException, IOException {
-        Mlcp mlcp = new Mlcp(
-                environmentConfiguration.getMLHost()
-                ,Integer.parseInt(environmentConfiguration.getMLStagingRestPort())
-                ,environmentConfiguration.getMLUsername()
-                ,environmentConfiguration.getMLPassword()
-                );
-        mlcp.addSourceDirectory(flowOptionsModel.getInputPath(), sourceOptions);
-        return mlcp;
-    }
-    
-    protected SourceOptions createSourceOptionsInstance(FlowOptionsModel flowOptionsModel) throws NumberFormatException, IOException {
-        Flow flow = flowManagerService.getFlow(flowOptionsModel.getEntityName(), flowOptionsModel.getFlowName());
-        
-        SourceOptions sourceOptions = new SourceOptions(
-                flowOptionsModel.getEntityName(), flowOptionsModel.getFlowName(),
-                FlowType.INPUT.toString(),
-                flow.getDataFormat());
-
-        sourceOptions.setInputFileType(flowOptionsModel.getInputFileType());
-        sourceOptions.setOtherOptions(flowOptionsModel.getOtherOptions());
-        
-        return sourceOptions;
-    }
-
     @RequestMapping(value = "/input-path", method = RequestMethod.GET, produces = { MediaType.TEXT_PLAIN_VALUE })
     @ResponseBody
     public String getPreviousInputPath(HttpServletRequest request) {
@@ -292,7 +263,7 @@ public void runFlowsInParallel(HttpServletRequest request) {
 
     @RequestMapping(value = "/options/download", method = RequestMethod.POST, consumes = { MediaType.APPLICATION_JSON_UTF8_VALUE }, produces = { MediaType.TEXT_PLAIN_VALUE })
     public ResponseEntity<InputStreamResource> downloadMlcpConfig(@RequestBody FlowOptionsModel flowOptionsModel) throws IOException, NumberFormatException, JSONException {
-        String mlcpConfigContent = buildMlcpConfigContent(flowOptionsModel);
+        String mlcpConfigContent = flowManagerService.buildMlcpConfigContent(flowOptionsModel);
         byte[] contentBytes = mlcpConfigContent.getBytes(StandardCharsets.UTF_8);
         InputStream inputStream = new ByteArrayInputStream(contentBytes);
         HttpHeaders headers = new HttpHeaders();
@@ -306,13 +277,6 @@ public ResponseEntity<InputStreamResource> downloadMlcpConfig(@RequestBody FlowO
               .body(new InputStreamResource(inputStream));
     }
 
-    private String buildMlcpConfigContent(FlowOptionsModel flowOptionsModel) throws NumberFormatException, IOException, JSONException {
-        SourceOptions sourceOptions = createSourceOptionsInstance(flowOptionsModel);
-        Mlcp mlcp = createMlcpInstance(flowOptionsModel,sourceOptions);
-        List<String> mlcpOptions = mlcp.getMlcpOptions(new MlcpSource(flowOptionsModel.getInputPath(), sourceOptions));
-        return StringUtils.collectionToDelimitedString(mlcpOptions, NEW_LINE);
-    }
-
     private void addRemoveCachingInHeaders(HttpHeaders headers) {
         headers.add("Cache-Control", "no-cache, no-store, must-revalidate");
         headers.add("Pragma", "no-cache");