fixing some bugs in tests

Author: paxtonhare

marklogic-data-hub/src/main/java/com/marklogic/hub/FlowManager.java

@@ -237,6 +237,7 @@ public void runInputFlow(Flow flow, HubConfig config) {
                     flow.getEntityName(), flow.getName(),
                     FlowType.INPUT.toString(),
                     flow.getDataFormat());
+            sourceOptions.setInputFileType("documents");
             mlcp.addSourceDirectory(config.modulesPath, sourceOptions);
             mlcp.loadContent();
         }

marklogic-data-hub/src/main/java/com/marklogic/hub/Mlcp.java

@@ -30,7 +30,7 @@
 import com.marklogic.client.io.Format;
 
 public class Mlcp {
-    
+
     public static final String DOCUMENT_TYPE_KEY = "-document_type";
     public static final String INPUT_FILE_PATH_KEY = "-input_file_path";
     public static final String INPUT_FILE_TYPE_KEY = "-input_file_type";
@@ -40,7 +40,7 @@ public class Mlcp {
     public static final String PORT_KEY = "-port";
     public static final String USERNAME_KEY = "-username";
     public static final String PASSWORD_KEY = "-password";
-    
+
    	private static final Logger LOGGER = LoggerFactory.getLogger(Mlcp.class);
 	private static final String DEFAULT_HADOOP_HOME_DIR = "./hadoop/";
 
@@ -109,24 +109,36 @@ public List<String> getMlcpArguments() throws IOException, JSONException {
 			String canonicalPath = file.getCanonicalPath();
 
 			List<String> arguments = new ArrayList<>();
-			
+
 			arguments.add(INPUT_FILE_PATH_KEY);
 			arguments.add(canonicalPath);
-			
+
 			arguments.add(OUTPUT_URI_REPLACE_KEY);
 			arguments.add("\""+canonicalPath+",''\"");
-			
+
 			arguments.add(INPUT_FILE_TYPE_KEY);
             arguments.add(sourceOptions.getInputFileType());
 
-			addOtherArguments(arguments, sourceOptions.getOtherOptions());
-			
+
+            String other = sourceOptions.getOtherOptions();
+            if (other != null) {
+                addOtherArguments(arguments, other);
+            }
+
 			//add document type only if it does not exist in the list
 			if(!arguments.contains(DOCUMENT_TYPE_KEY)) {
 			    arguments.add(DOCUMENT_TYPE_KEY);
 			    arguments.add(sourceOptions.getDataFormat());
 			}
-            
+
+			arguments.add("-transform_module");
+	        arguments.add("/com.marklogic.hub/mlcp-flow-transform.xqy");
+	        arguments.add("-transform_namespace");
+	        arguments.add("http://marklogic.com/data-hub/mlcp-flow-transform");
+	        arguments.add("-transform_param");
+	        arguments.add("\"" + sourceOptions.getTransformParams() + "\"");
+
+
 			return arguments;
 		}
 
@@ -142,9 +154,9 @@ private void addOtherArguments(List<String> arguments,
                     arguments.add(key);
                     arguments.add(jsonObject.getString(key));
                 }
-                
+
             }
-            
+
         }
 	}
 
@@ -191,14 +203,20 @@ public String getInputFileType() {
 		public void setInputFileType(String inputFileType) {
 			this.inputFileType = inputFileType;
 		}
-		
+
 		public String getOtherOptions() {
             return otherOptions;
         }
 
         public void setOtherOptions(String otherOptions) {
             this.otherOptions = otherOptions;
         }
+
+        protected String getTransformParams() {
+            return String.format(
+                    "<params><entity-name>%s</entity-name><flow-name>%s</flow-name><flow-type>%s</flow-type></params>",
+                    entityName, flowName, flowType);
+        }
 	}
 
     public List<String> getMlcpOptions(MlcpSource source) throws IOException, JSONException {
@@ -218,7 +236,7 @@ public List<String> getMlcpOptions(MlcpSource source) throws IOException, JSONEx
 
         List<String> sourceArguments = source.getMlcpArguments();
         mlcpOptions.addAll(sourceArguments);
-        
+
         return mlcpOptions;
     }
 }

quick-start/src/main/java/com/marklogic/hub/config/EnvironmentConfiguration.java

@@ -45,7 +45,6 @@ public class EnvironmentConfiguration {
 	private static final String ML_AUTH = "mlAuth";
 	private static final String USER_PLUGIN_DIR = "userPluginDir";
 	private static final String ASSET_INSTALL_TIME_FILE = "assetInstallTimeFile";
-	private static final String MLCP_OPTIONS_DIR = "mlcp-options";
 
 	@Autowired
 	private Environment environment;
@@ -255,7 +254,7 @@ public void saveOrUpdateFlowMlcpOptionsToFile(String entityName, String flowName
     }
 
 	private String getMlcpOptionsFilePath(String entityName, String flowName) {
-	    return "." + File.separator + MLCP_OPTIONS_DIR + File.separator + entityName + "-" + flowName + ".txt";
+	    return "." + File.separator + entityName + "-" + flowName + ".txt";
     }
 
     public String getFlowMlcpOptionsFromFile(String entityName, String flowName) throws IOException {