#241 Added CPF database name property

Author: rjrudin

src/main/java/com/marklogic/appdeployer/AppConfig.java

@@ -104,6 +104,7 @@ public class AppConfig {
     private String testContentDatabaseName;
     private String modulesDatabaseName;
     private String triggersDatabaseName;
+    private String cpfDatabaseName;
     private String schemasDatabaseName;
 
     private List<String> modulePaths;
@@ -1204,4 +1205,12 @@ public String getModelsDatabase() {
 	public void setModelsDatabase(String modelsDatabase) {
 		this.modelsDatabase = modelsDatabase;
 	}
+
+	public String getCpfDatabaseName() {
+		return cpfDatabaseName != null ? cpfDatabaseName : getTriggersDatabaseName();
+	}
+
+	public void setCpfDatabaseName(String cpfDatabaseName) {
+		this.cpfDatabaseName = cpfDatabaseName;
+	}
 }

src/main/java/com/marklogic/appdeployer/DefaultAppConfigFactory.java

@@ -105,6 +105,12 @@ public AppConfig newAppConfig() {
 			c.setTriggersDatabaseName(prop);
 		}
 
+		prop = getProperty("mlCpfDatabaseName");
+		if (prop != null) {
+			logger.info("CPF database name: " + prop);
+			c.setCpfDatabaseName(prop);
+		}
+
 		/**
 		 * Defines the MarkLogic host that requests should be sent to. Defaults to localhost.
 		 */

src/main/java/com/marklogic/appdeployer/command/cpf/AbstractCpfResourceCommand.java

@@ -8,26 +8,38 @@
 
 import java.io.File;
 
+/**
+ * Base class for commands that deploy CPF resources. By default, this will use getCpfDatabaseName on AppConfig to
+ * determine what database to deploy CPF resources to. That can be overridden via the setDatabaseIdOrName method
+ * on this class.
+ */
 public abstract class AbstractCpfResourceCommand extends AbstractCommand {
 
-    protected abstract File getCpfResourceDir(ConfigDir configDir);
-
-    protected abstract AbstractCpfResourceManager getResourceManager(CommandContext context, String databaseIdOrName);
-
-    @Override
-    public void execute(CommandContext context) {
-        AppConfig config = context.getAppConfig();
-        for (ConfigDir configDir : config.getConfigDirs()) {
-	        File dir = getCpfResourceDir(configDir);
-	        if (dir.exists()) {
-		        AbstractCpfResourceManager mgr = getResourceManager(context, config.getTriggersDatabaseName());
-		        for (File f : listFilesInDirectory(dir)) {
-			        String payload = copyFileToString(f, context);
-			        mgr.save(payload);
-		        }
-	        } else {
-		        logResourceDirectoryNotFound(dir);
-	        }
-        }
-    }
+	private String databaseIdOrName;
+
+	protected abstract File getCpfResourceDir(ConfigDir configDir);
+
+	protected abstract AbstractCpfResourceManager getResourceManager(CommandContext context, String databaseIdOrName);
+
+	@Override
+	public void execute(CommandContext context) {
+		AppConfig config = context.getAppConfig();
+		for (ConfigDir configDir : config.getConfigDirs()) {
+			File dir = getCpfResourceDir(configDir);
+			if (dir.exists()) {
+				final String db = databaseIdOrName != null ? databaseIdOrName : config.getCpfDatabaseName();
+				AbstractCpfResourceManager mgr = getResourceManager(context, db);
+				for (File f : listFilesInDirectory(dir)) {
+					String payload = copyFileToString(f, context);
+					mgr.save(payload);
+				}
+			} else {
+				logResourceDirectoryNotFound(dir);
+			}
+		}
+	}
+
+	public void setDatabaseIdOrName(String databaseIdOrName) {
+		this.databaseIdOrName = databaseIdOrName;
+	}
 }

src/main/java/com/marklogic/appdeployer/command/cpf/DeployDefaultPipelinesCommand.java

@@ -13,7 +13,7 @@ public DeployDefaultPipelinesCommand() {
 
 	@Override
 	public void execute(CommandContext context) {
-		new PipelineManager(context.getManageClient(), context.getAppConfig().getTriggersDatabaseName())
+		new PipelineManager(context.getManageClient(), context.getAppConfig().getCpfDatabaseName())
 			.loadDefaultPipelines();
 	}
 

src/test/java/com/marklogic/appdeployer/DefaultAppConfigFactoryTest.java

@@ -81,6 +81,20 @@ public void appServicesDiffersFromRestAdmin() {
 		assertEquals("appword", config.getAppServicesPassword());
 	}
 
+	@Test
+	public void cpfDatabaseName() {
+    	sut = new DefaultAppConfigFactory(new SimplePropertySource("mlAppName", "test"));
+    	AppConfig config = sut.newAppConfig();
+    	assertEquals("test-triggers", config.getTriggersDatabaseName());
+    	assertEquals("CPF database should default to the triggers database when not specified",
+		    "test-triggers", config.getCpfDatabaseName());
+
+		sut = new DefaultAppConfigFactory(new SimplePropertySource("mlAppName", "test", "mlCpfDatabaseName", "my-cpf-db"));
+		config = sut.newAppConfig();
+		assertEquals("test-triggers", config.getTriggersDatabaseName());
+		assertEquals("my-cpf-db", config.getCpfDatabaseName());
+	}
+
     @Test
     public void allProperties() {
         Properties p = new Properties();