Fixing some DMSDK issues

Doc fixes

Author: rjrudin

examples/local-testing-project/gradle.properties

@@ -1,6 +1,6 @@
 # Set this to the version you used when running
 # "gradle -Pversion=(something) publishToMavenLocal" on your local ml-gradle repo
-mlGradleVersion=2.9.0
+mlGradleVersion=3.0-beta1
 
 mlHost=localhost
 mlAppName=example

gradle.properties

@@ -1,5 +1,5 @@
 group=com.marklogic
-version=3.0-alpha3
-mlAppDeployerDependency=com.marklogic:ml-app-deployer:3.0-alpha3
+version=3.0-beta1
+mlAppDeployerDependency=com.marklogic:ml-app-deployer:3.0-beta1
 mlcpUtilDependency=com.marklogic:mlcp-util:0.3.0
 

src/main/groovy/com/marklogic/gradle/MarkLogicPlugin.groovy

@@ -27,6 +27,7 @@ import com.marklogic.gradle.task.datamovement.DeleteCollectionsTask
 import com.marklogic.gradle.task.datamovement.RemoveCollectionsTask
 import com.marklogic.gradle.task.datamovement.RemovePermissionsTask
 import com.marklogic.gradle.task.datamovement.SetCollectionsTask
+import com.marklogic.gradle.task.datamovement.SetPermissionsTask
 import com.marklogic.gradle.task.es.GenerateModelArtifactsTask
 import com.marklogic.gradle.task.export.ExportResourcesTask
 import com.marklogic.gradle.task.flexrep.*
@@ -128,7 +129,7 @@ class MarkLogicPlugin implements Plugin<Project> {
 		project.task("mlSetContentUpdatesAllowed", type: SetContentUpdatesAllowedTask, group: dbGroup, description: "Sets updated-allowed on each primary forest for the content database; must set the mode via e.g. -Pmode=flash-backup")
 
 		String dmGroup = "ml-Gradle Data Movement"
-		String dmGroupMessage = "; can also set the properties threadCount, batchSize, applyConsistentSnapshot, awaitCompletion, stopJob, " +
+		String dmGroupMessage = "; can also set the properties threadCount, batchSize, applyConsistentSnapshot, " +
 			"jobName, and logBatches to configure how the Data Movement QueryBatcher operates.";
 		project.task("mlAddCollections", type: AddCollectionsTask, group: dmGroup, description: "Add all documents, either in a comma-separated list of " +
 			"collection names specified by the 'whereCollections' property or matching a URI pattern specified by the 'whereUriPattern' property, " +
@@ -147,7 +148,7 @@ class MarkLogicPlugin implements Plugin<Project> {
 			"to all documents either in the set of collection names specified by the 'collections' property or with URIs matching the pattern specified by the 'whereUriPattern' property" + dmGroupMessage)
 		project.task("mlRemovePermissions", type: RemovePermissionsTask, group: dmGroup, description: "Remove permissions, specified as a comma-separated list of roles and capabilities via the 'permissions' property, " +
 			"from all documents either in the set of collection names specified by the 'collections' property or with URIs matching the pattern specified by the 'whereUriPattern' property" + dmGroupMessage)
-		project.task("mlSetPermissions", type: AddPermissionsTask, group: dmGroup, description: "Set permissions, specified as a comma-separated list of roles and capabilities via the 'permissions' property, " +
+		project.task("mlSetPermissions", type: SetPermissionsTask, group: dmGroup, description: "Set permissions, specified as a comma-separated list of roles and capabilities via the 'permissions' property, " +
 			"on all documents in the set of collection names specified by the 'collections' property or with URIs matching the pattern specified by the 'whereUriPattern' property" + dmGroupMessage)
 
 		String devGroup = "ml-gradle Development"

src/main/groovy/com/marklogic/gradle/task/datamovement/AddCollectionsTask.groovy

@@ -13,7 +13,7 @@ class AddCollectionsTask extends DataMovementTask {
 		(!project.hasProperty("whereCollections") && !project.hasProperty("whereUriPattern")) ||
 			!project.hasProperty("collections")
 		) {
-			println "Invalid inputs; " + getDescription()
+			println "Invalid inputs; task description: " + getDescription()
 			return;
 		}
 

src/main/groovy/com/marklogic/gradle/task/datamovement/AddPermissionsTask.groovy

@@ -10,7 +10,7 @@ class AddPermissionsTask extends DataMovementTask {
 	@TaskAction
 	void addPermissions() {
 		if ((!project.hasProperty("whereCollections") && !project.hasProperty("whereUriPattern")) || !project.hasProperty("permissions")) {
-			println "Invalid input; " + getDescription()
+			println "Invalid input; task description: " + getDescription()
 			return;
 		}
 

src/main/groovy/com/marklogic/gradle/task/datamovement/DataMovementTask.groovy

@@ -64,10 +64,9 @@ class DataMovementTask extends MarkLogicTask {
 	 * - threadCount
 	 * - batchSize
 	 * - applyConsistentSnapshot
-	 * - awaitCompletion
-	 * - stopJob
 	 * - jobName
-	 *
+	 * - logBatches
+	 * 
 	 * Can override this method in a subclass to further configure the QueryBatcherTemplate that's returned.
 	 *
 	 * @param client
@@ -84,12 +83,6 @@ class DataMovementTask extends MarkLogicTask {
 		if (project.hasProperty("applyConsistentSnapshot")) {
 			t.setApplyConsistentSnapshot(Boolean.parseBoolean(project.property("applyConsistentSnapshot")))
 		}
-		if (project.hasProperty("awaitCompletion")) {
-			t.setAwaitCompletion(Boolean.parseBoolean(project.property("awaitCompletion")))
-		}
-		if (project.hasProperty("stopJob")) {
-			t.setStopJob(Boolean.parseBoolean(project.property("stopJob")))
-		}
 		if (project.hasProperty("jobName")) {
 			t.setJobName(project.property("jobName"))
 		}
@@ -103,7 +96,7 @@ class DataMovementTask extends MarkLogicTask {
 				}
 			})
 		}
-		
+
 		return t
 	}
 }

src/main/groovy/com/marklogic/gradle/task/datamovement/DeleteCollectionsTask.groovy

@@ -8,7 +8,7 @@ class DeleteCollectionsTask extends DataMovementTask {
 	@TaskAction
 	void deleteCollections() {
 		if (!project.hasProperty("collections")) {
-			println "Invalid inputs; " + getDescription()
+			println "Invalid inputs; task description: " + getDescription()
 			return
 		}
 

src/main/groovy/com/marklogic/gradle/task/datamovement/RemoveCollectionsTask.groovy

@@ -1,6 +1,7 @@
 package com.marklogic.gradle.task.datamovement
 
 import com.marklogic.client.datamovement.QueryBatchListener
+import com.marklogic.client.ext.datamovement.CollectionsQueryBatcherBuilder
 import com.marklogic.client.ext.datamovement.QueryBatcherBuilder
 import com.marklogic.client.ext.datamovement.listener.RemoveCollectionsListener
 import org.gradle.api.tasks.TaskAction
@@ -15,7 +16,7 @@ class RemoveCollectionsTask extends DataMovementTask {
 	@TaskAction
 	void removeCollections() {
 		if (!project.hasProperty("collections")) {
-			println "Invalid inputs; " + getDescription()
+			println "Invalid inputs; task description: " + getDescription()
 			return;
 		}
 
@@ -29,9 +30,11 @@ class RemoveCollectionsTask extends DataMovementTask {
 			message = "documents matching URI pattern " + this.whereUriPattern + message
 		}
 		else {
-			this.whereCollections = collections
 			if (hasWhereCollectionsProperty()) {
 				builder = constructBuilderFromWhereCollections()
+			} else {
+				this.whereCollections = collections
+				builder = new CollectionsQueryBatcherBuilder(this.whereCollections)
 			}
 			message = "documents in collections " + Arrays.asList(this.whereCollections) + message
 		}

src/main/groovy/com/marklogic/gradle/task/datamovement/RemovePermissionsTask.groovy

@@ -11,8 +11,8 @@ class RemovePermissionsTask extends DataMovementTask {
 
 	@TaskAction
 	void removePermissions() {
-		if ((!project.hasProperty("collections") && !project.hasProperty("uriPattern")) || !project.hasProperty("permissions")) {
-			println "Invalid input; " + getDescription()
+		if ((!project.hasProperty("whereCollections") && !project.hasProperty("whereUriPattern")) || !project.hasProperty("permissions")) {
+			println "Invalid input; task description: " + getDescription()
 			return;
 		}
 

src/main/groovy/com/marklogic/gradle/task/datamovement/SetCollectionsTask.groovy

@@ -13,7 +13,7 @@ class SetCollectionsTask extends DataMovementTask {
 		(!project.hasProperty("whereCollections") && !project.hasProperty("pattern")) ||
 			!project.hasProperty("collections")
 		) {
-			println "Invalid inputs; " + getDescription()
+			println "Invalid inputs; task description: " + getDescription()
 			return;
 		}