fixed #547

Author: paxtonhare

.travis.yml

@@ -11,6 +11,7 @@ services:
   - docker
 
 before_install:
+ - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16"
  - ./.travis/download.sh
 
 script:

marklogic-data-hub/src/main/java/com/marklogic/hub/deploy/commands/LoadUserModulesCommand.java

@@ -188,7 +188,7 @@ else if (isEntityDir(dir, startPath.toAbsolutePath())) {
                                     InputStream inputStream = r.getInputStream();
                                     StringHandle handle = new StringHandle(IOUtils.toString(inputStream));
                                     inputStream.close();
-                                    entityDocMgr.write(URLEncoder.encode("/entities/" + r.getFilename(), "UTF-8"), meta, handle);
+                                    entityDocMgr.write("/entities/" + r.getFilename(), meta, handle);
                                     modulesManager.saveLastLoadedTimestamp(r.getFile(), new Date());
                                 }
                             }

ml-data-hub-plugin/src/main/groovy/com/marklogic/gradle/task/CreateFlowTask.groovy

@@ -6,9 +6,14 @@ import com.marklogic.hub.flow.CodeFormat
 import com.marklogic.hub.flow.DataFormat
 import com.marklogic.hub.flow.FlowType
 import com.marklogic.hub.scaffold.Scaffolding
+import org.gradle.api.tasks.Input
 
 abstract class CreateFlowTask extends HubTask {
 
+    @Input
+    public Boolean useES
+
+
     void createFlow(FlowType flowType) {
         def entityName = project.hasProperty("entityName") ? project.property("entityName") : null
         if (entityName == null) {
@@ -38,9 +43,14 @@ abstract class CreateFlowTask extends HubTask {
                 return
         }
 
+        if (useES == null) {
+            useES = project.hasProperty("useES") ?
+                Boolean.parseBoolean(project.property("useES")) : false
+        }
+
         def projectDir = getHubConfig().projectDir
         Scaffolding scaffolding = new Scaffolding(projectDir, getFinalClient())
         println "Creating an " + pluginFormat + " " + flowType + " flow named " + flowName + " for entity " + entityName
-        scaffolding.createFlow(entityName, flowName, flowType, pluginFormat, dataFormat)
+        scaffolding.createFlow(entityName, flowName, flowType, pluginFormat, dataFormat, useES)
     }
 }

ml-data-hub-plugin/src/test/groovy/com/marklogic/gradle/task/InstalledTests.groovy

@@ -5,11 +5,11 @@ import com.marklogic.client.io.DocumentMetadataHandle
 import com.marklogic.hub.Debugging
 import com.marklogic.hub.HubConfig
 import com.marklogic.hub.Tracing
-import com.marklogic.hub.error.LegacyFlowsException
-import org.apache.commons.io.FileUtils
 import org.gradle.testkit.runner.UnexpectedBuildFailure
 import org.gradle.testkit.runner.UnexpectedBuildSuccess
+
 import java.nio.file.Paths
+
 import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual
 import static org.gradle.testkit.runner.TaskOutcome.FAILED
 import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
@@ -158,4 +158,32 @@ class InstalledTests extends BaseTest {
         result.output.contains('legacy-test => legacy-input-flow')
         result.task(":mlLoadModules").outcome == FAILED
     }
+
+    def "createHarmonizeFlow with useES flag"() {
+        given:
+        propertiesFile << """
+            ext {
+                entityName=Employee
+                flowName=my-new-harmonize-flow
+                useES=true
+            }
+        """
+
+        when:
+        runTask('hubUpdate')
+        runTask('hubCreateEntity')
+        copyResourceToFile("employee.entity.json", Paths.get(testProjectDir.root.toString(), "plugins", "entities", "Employee", "Employee.entity.json").toFile())
+        runTask('mlLoadModules')
+        def result = runTask('hubCreateHarmonizeFlow')
+
+        then:
+        notThrown(UnexpectedBuildFailure)
+        result.task(":hubCreateHarmonizeFlow").outcome == SUCCESS
+
+        File entityDir = Paths.get(testProjectDir.root.toString(), "plugins", "entities", "Employee", "harmonize", "my-new-harmonize-flow").toFile()
+        entityDir.isDirectory() == true
+        File contentPlugin = Paths.get(testProjectDir.root.toString(), "plugins", "entities", "Employee", "harmonize", "my-new-harmonize-flow", "content.sjs").toFile()
+        contentPlugin.text.contains("extractInstanceEmployee")
+    }
+
 }

ml-data-hub-plugin/src/test/resources/employee.entity.json

@@ -0,0 +1,19 @@
+{
+  "info" : {
+    "title" : "Employee",
+    "version" : "0.0.1"
+  },
+  "definitions" : {
+    "Employee" : {
+      "required" : [ ],
+      "rangeIndex" : [ ],
+      "wordLexicon" : [ ],
+      "properties" : {
+        "name" : {
+          "datatype" : "string",
+          "collation" : "http://marklogic.com/collation/codepoint"
+        }
+      }
+    }
+  }
+}