#238 Fix for exporting CPF/triggers

Author: rjrudin

gradle.properties

@@ -1,6 +1,6 @@
 group=com.marklogic
 javadocsDir=../gh-pages-marklogic-java/javadocs
-version=3.4.1
-mlJavaclientUtilVersion=3.4.0
+version=3.5.0
+mlJavaclientUtilVersion=3.5.0
 mlJunitVersion=3.1.0
 

src/main/java/com/marklogic/appdeployer/export/Exporter.java

@@ -6,6 +6,7 @@
 import com.marklogic.appdeployer.export.cpf.PipelineExporter;
 import com.marklogic.appdeployer.export.databases.DatabaseExporter;
 import com.marklogic.appdeployer.export.groups.GroupExporter;
+import com.marklogic.appdeployer.export.impl.AbstractNamedResourceExporter;
 import com.marklogic.appdeployer.export.impl.CompositeResourceExporter;
 import com.marklogic.appdeployer.export.security.AmpExporter;
 import com.marklogic.appdeployer.export.security.PrivilegeExporter;
@@ -15,6 +16,7 @@
 import com.marklogic.appdeployer.export.triggers.TriggerExporter;
 import com.marklogic.client.ext.helper.LoggingObject;
 import com.marklogic.mgmt.ManageClient;
+import com.marklogic.mgmt.selector.AbstractNameMatchingResourceSelector;
 import com.marklogic.mgmt.selector.ResourceSelection;
 import com.marklogic.mgmt.selector.ResourceSelector;
 
@@ -51,6 +53,11 @@ public Exporter(ManageClient manageClient, String groupName) {
 	}
 
 	public Exporter select(ResourceSelector selector) {
+		// TODO A bit hacky here... may want an interface of e.g. TriggersDatabaseAware
+		if (selector instanceof AbstractNameMatchingResourceSelector) {
+			((AbstractNameMatchingResourceSelector)selector).setTriggersDatabase(triggersDatabase);
+		}
+
 		ResourceSelection selection = selector.selectResources(manageClient);
 		amps(selection.getAmpUriRefs());
 		cpfConfigs(triggersDatabase, selection.getCpfConfigNames());

src/main/java/com/marklogic/appdeployer/export/impl/CompositeResourceExporter.java

@@ -44,6 +44,9 @@ public ExportedResources exportResources(File baseDir) {
 				resources.add(er);
 			}
 		}
+		if (resources == null) {
+			resources = new ExportedResources(new ArrayList<>(), new String[]{});
+		}
 		return resources;
 	}
 

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

@@ -3,13 +3,17 @@
 import com.marklogic.mgmt.ManageClient;
 import com.marklogic.mgmt.resource.ResourceManager;
 import com.marklogic.mgmt.resource.appservers.ServerManager;
+import com.marklogic.mgmt.resource.cpf.CpfConfigManager;
+import com.marklogic.mgmt.resource.cpf.DomainManager;
+import com.marklogic.mgmt.resource.cpf.PipelineManager;
 import com.marklogic.mgmt.resource.databases.DatabaseManager;
 import com.marklogic.mgmt.resource.groups.GroupManager;
 import com.marklogic.mgmt.resource.security.AmpManager;
 import com.marklogic.mgmt.resource.security.PrivilegeManager;
 import com.marklogic.mgmt.resource.security.RoleManager;
 import com.marklogic.mgmt.resource.security.UserManager;
 import com.marklogic.mgmt.resource.tasks.TaskManager;
+import com.marklogic.mgmt.resource.triggers.TriggerManager;
 import com.marklogic.rest.util.ResourcesFragment;
 import org.jdom2.Element;
 import org.jdom2.Namespace;
@@ -20,6 +24,7 @@
 public abstract class AbstractNameMatchingResourceSelector implements ResourceSelector {
 
 	private List<String> includeTypes;
+	private String triggersDatabase;
 
 	protected abstract boolean nameMatches(String resourceName);
 
@@ -32,6 +37,14 @@ public ResourceSelection selectResources(ManageClient manageClient) {
 		select(selection, new RoleManager(manageClient), MapResourceSelection.ROLES);
 		select(selection, new UserManager(manageClient), MapResourceSelection.USERS);
 		select(selection, new GroupManager(manageClient), MapResourceSelection.GROUPS);
+
+		if (triggersDatabase != null) {
+			select(selection, new CpfConfigManager(manageClient, triggersDatabase), MapResourceSelection.CPF_CONFIGS);
+			select(selection, new DomainManager(manageClient, triggersDatabase), MapResourceSelection.DOMAINS);
+			select(selection, new PipelineManager(manageClient, triggersDatabase), MapResourceSelection.PIPELINES);
+			select(selection, new TriggerManager(manageClient, triggersDatabase), MapResourceSelection.TRIGGERS);
+		}
+
 		selectPrivileges(selection, manageClient);
 		selectTasks(selection, manageClient);
 		selectAmps(selection, manageClient);
@@ -84,8 +97,8 @@ protected void selectPrivileges(MapResourceSelection selection, ManageClient man
 
 	protected void select(MapResourceSelection selection, ResourceManager mgr, String type) {
 		if (includeTypes == null || includeTypes.contains(type)) {
-			ResourcesFragment databases = mgr.getAsXml();
-			for (String name : databases.getListItemNameRefs()) {
+			ResourcesFragment resources = mgr.getAsXml();
+			for (String name : resources.getListItemNameRefs()) {
 				if (nameMatches(name)) {
 					selection.select(type, name);
 				}
@@ -111,4 +124,12 @@ public void setIncludeTypes(String... types) {
 			}
 		}
 	}
+
+	public String getTriggersDatabase() {
+		return triggersDatabase;
+	}
+
+	public void setTriggersDatabase(String triggersDatabase) {
+		this.triggersDatabase = triggersDatabase;
+	}
 }

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

@@ -5,7 +5,9 @@
 import com.marklogic.appdeployer.command.databases.DeploySchemasDatabaseCommand;
 import com.marklogic.appdeployer.command.databases.DeployTriggersDatabaseCommand;
 import com.marklogic.appdeployer.command.triggers.DeployTriggersCommand;
+import com.marklogic.mgmt.selector.PrefixResourceSelector;
 import com.marklogic.mgmt.selector.PropertiesResourceSelector;
+import com.marklogic.mgmt.selector.RegexResourceSelector;
 import org.junit.After;
 import org.junit.Test;
 
@@ -29,10 +31,27 @@ public void test() throws Exception {
 		props.setProperty("triggers", "my-trigger");
 
 		ExportedResources resources = new Exporter(manageClient)
+			.withTriggersDatabase(appConfig.getTriggersDatabaseName())
+			.select(new RegexResourceSelector("my-trigger"))
+			.export(exportDir);
+		verifyExportedResources(resources);
+
+		initializeExportDir();
+		resources = new Exporter(manageClient)
+			.withTriggersDatabase(appConfig.getTriggersDatabaseName())
+			.select(new PrefixResourceSelector("my-trig"))
+			.export(exportDir);
+		verifyExportedResources(resources);
+
+		initializeExportDir();
+		resources = new Exporter(manageClient)
 			.withTriggersDatabase(appConfig.getTriggersDatabaseName())
 			.select(new PropertiesResourceSelector(props))
 			.export(exportDir);
+		verifyExportedResources(resources);
+	}
 
+	private void verifyExportedResources(ExportedResources resources) throws Exception {
 		assertEquals(1, resources.getMessages().size());
 		assertEquals("Each exported trigger has the 'id' field removed from it, as that field should be generated by MarkLogic.",
 			resources.getMessages().get(0));