#507 Creating transforms and resources in first valid module path

Author: rjrudin

examples/unit-test-project/gradle.properties

@@ -1,4 +1,4 @@
-mlGradleVersion=3.15.2
+mlGradleVersion=3.16.3
 marklogicUnitTestVersion=1.0.beta
 
 mlHost=localhost

src/main/groovy/com/marklogic/gradle/task/client/AbstractModuleCreationTask.groovy

@@ -0,0 +1,31 @@
+package com.marklogic.gradle.task.client
+
+import com.marklogic.gradle.task.MarkLogicTask
+
+class AbstractModuleCreationTask extends MarkLogicTask{
+
+	/**
+	 * Select the first modules path that is a valid location for creating a new module. Intent is to filter out
+	 * paths containing "mlRestApi" or "mlBundle" as those almost certainly point to directories where bundles have been
+	 * unzipped to, and we don't want to create new modules in those directories.
+	 *
+	 * @return
+	 */
+	String selectModulesPath() {
+		String path
+		List<String> modulePaths = getAppConfig().getModulePaths()
+		for (String modulePath : modulePaths) {
+			if (modulePath != null && !modulePath.contains("mlRestApi") && !modulePath.contains("mlBundle")) {
+				path = modulePath
+				break
+			}
+		}
+
+		// Should never get here, but need to pick a path if we do
+		if (path == null) {
+			path = modulePaths.get(modulePaths.size() - 1)
+		}
+
+		return path
+	}
+}

src/main/groovy/com/marklogic/gradle/task/client/CreateResourceTask.groovy

@@ -4,7 +4,7 @@ import org.gradle.api.tasks.TaskAction
 
 import com.marklogic.gradle.task.MarkLogicTask
 
-class CreateResourceTask extends MarkLogicTask {
+class CreateResourceTask extends AbstractModuleCreationTask {
 
     final static String SJS_RESOURCE_TEMPLATE =
 '''function get(context, params) {
@@ -92,11 +92,7 @@ declare function delete(
         if (getProject().hasProperty(propName)) {
 	        String servicesPath = servicesDir
 	        if (!servicesPath) {
-		        List<String> modulePaths = getAppConfig().getModulePaths()
-		        if (modulePaths != null && !modulePaths.isEmpty()) {
-			        // Use the last path so modules aren't written to e.g. mlBundle paths
-			        servicesPath = modulePaths.get(modulePaths.size() - 1) + "/services"
-		        }
+		        servicesPath = selectModulesPath() + "/services"
 	        }
 
             String name = getProject().getProperties().get(propName)

src/main/groovy/com/marklogic/gradle/task/client/CreateTransformTask.groovy

@@ -3,7 +3,7 @@ package com.marklogic.gradle.task.client
 import com.marklogic.gradle.task.MarkLogicTask
 import org.gradle.api.tasks.TaskAction
 
-class CreateTransformTask extends MarkLogicTask {
+class CreateTransformTask extends AbstractModuleCreationTask {
 
     final static String XQUERY_TEMPLATE = '''xquery version "1.0-ml";
 
@@ -54,11 +54,7 @@ exports.transform = transform;
         if (getProject().hasProperty(propName)) {
 	        String transformsPath = transformsDir
 	        if (!transformsPath) {
-		        List<String> modulePaths = getAppConfig().getModulePaths()
-		        if (modulePaths != null && !modulePaths.isEmpty()) {
-			        // Use the last path so modules aren't written to e.g. mlBundle paths
-			        transformsPath = modulePaths.get(modulePaths.size() - 1) + "/transforms"
-		        }
+		        transformsPath = selectModulesPath() + "/transforms"
 	        }
 
             String name = getProject().getProperties().get(propName)