Making it easier to select types to include

Author: Rob Rudin

build.gradle

@@ -28,7 +28,7 @@ repositories {
 }
 
 dependencies {
-  compile 'com.marklogic:ml-javaclient-util:2.13.0'
+  compile 'com.marklogic:ml-javaclient-util:DEV'
   compile 'jaxen:jaxen:1.1.6'
   compile 'org.apache.httpcomponents:httpclient:4.3.5'
   compile 'org.springframework:spring-web:4.3.5.RELEASE'

gradle.properties

@@ -1,3 +1,3 @@
 group=com.marklogic
 javadocsDir=../gh-pages-marklogic-java/javadocs
-version=159
+version=DEV

src/main/java/com/marklogic/mgmt/selector/AbstractNameMatchingResourceSelector.java

@@ -11,6 +11,7 @@
 import com.marklogic.rest.util.ResourcesFragment;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 public abstract class AbstractNameMatchingResourceSelector implements ResourceSelector {
@@ -72,9 +73,15 @@ protected void select(MapResourceSelection selection, ResourceManager mgr, Strin
 		}
 	}
 
-	public void setIncludeTypes(String... includeTypes) {
+	public void setIncludeTypesAsString(String commaDelimitedTypes) {
+		if (commaDelimitedTypes != null) {
+			setIncludeTypes(commaDelimitedTypes.split(","));
+		}
+	}
+
+	public void setIncludeTypes(String... types) {
 		this.includeTypes = new ArrayList<>();
-		for (String type : includeTypes) {
+		for (String type : types) {
 			// Make it easy to specify the two types of privileges
 			if ("privileges".equals(type)) {
 				this.includeTypes.add(MapResourceSelection.PRIVILEGES_EXECUTE);

src/main/java/com/marklogic/mgmt/selector/MapResourceSelection.java

@@ -7,14 +7,6 @@
 
 public class MapResourceSelection implements ResourceSelection {
 
-	public final static String DATABASES = "databases";
-	public final static String PRIVILEGES_EXECUTE = "privilegesExecute";
-	public final static String PRIVILEGES_URI = "privilegesUri";
-	public final static String ROLES = "roles";
-	public final static String SERVERS = "servers";
-	public final static String TASKS = "tasks";
-	public final static String USERS = "users";
-
 	private Map<String, List<String>> selections = new HashMap<>();
 
 	public void select(String type, String name) {

src/main/java/com/marklogic/mgmt/selector/ResourceSelection.java

@@ -2,6 +2,14 @@
 
 public interface ResourceSelection {
 
+	String DATABASES = "databases";
+	String PRIVILEGES_EXECUTE = "privilegesExecute";
+	String PRIVILEGES_URI = "privilegesUri";
+	String ROLES = "roles";
+	String SERVERS = "servers";
+	String TASKS = "tasks";
+	String USERS = "users";
+
 	String[] getDatabaseNames();
 
 	String[] getPrivilegeExecuteNames();

src/test/java/com/marklogic/appdeployer/export/ExportTasksTest.java

@@ -1,7 +1,9 @@
 package com.marklogic.appdeployer.export;
 
 import com.marklogic.appdeployer.command.tasks.DeployScheduledTasksCommand;
+import com.marklogic.mgmt.selector.MapResourceSelection;
 import com.marklogic.mgmt.selector.PrefixResourceSelector;
+import com.marklogic.mgmt.selector.ResourceSelection;
 import com.marklogic.mgmt.tasks.TaskManager;
 import org.junit.After;
 import org.junit.Test;
@@ -19,7 +21,12 @@ public void test() {
 		deploySampleApp();
 
 		String taskPath = "/path/to/query.xqy";
-		ExportedResources resources = new Exporter(manageClient).select(new PrefixResourceSelector("/path")).export(exportDir);
+
+		// Get some test coverage of selectors, even though we don't care about users here
+		PrefixResourceSelector selector = new PrefixResourceSelector("/path");
+		selector.setIncludeTypesAsString(ResourceSelection.TASKS + "," + ResourceSelection.USERS);
+
+		ExportedResources resources = new Exporter(manageClient).select(selector).export(exportDir);
 		assertEquals(1, resources.getFiles().size());
 		assertEquals("query.xqy.json", resources.getFiles().get(0).getName());