#374 Database resources can now be associated with a database via a matching filename

rjrudin · rjrudin · commit 4188b49dbffb · 2019-07-29T09:04:19.000-04:00
diff --git a/src/main/java/com/marklogic/appdeployer/command/AbstractCommand.java b/src/main/java/com/marklogic/appdeployer/command/AbstractCommand.java
@@ -1,6 +1,7 @@
 package com.marklogic.appdeployer.command;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.marklogic.appdeployer.ConfigDir;
 import com.marklogic.client.ext.helper.LoggingObject;
 import com.marklogic.mgmt.PayloadParser;
 import com.marklogic.mgmt.SaveReceipt;
@@ -13,6 +14,7 @@
 import com.marklogic.mgmt.mapper.DefaultResourceMapper;
 import com.marklogic.mgmt.mapper.ResourceMapper;
 import com.marklogic.mgmt.resource.ResourceManager;
+import com.marklogic.mgmt.resource.databases.DatabaseManager;
 import com.marklogic.mgmt.util.ObjectMapperFactory;
 import com.marklogic.rest.util.JsonNodeUtil;
 import com.marklogic.rest.util.PropertyBasedBiPredicate;
@@ -504,6 +506,44 @@ protected void setIncrementalMode(boolean incrementalMode) {
 		}
 	}
 
+	/**
+	 * By default, the name of a database resource directory is assumed to be the name of the database that the resources
+	 * within the directory should be associated with. But starting in 3.16.0, if the name of the directory doesn't
+	 * match that of an existing database, then a check is made to see if there's a database file in the given ConfigDir
+	 * that has the same name, minus its extension, as the database directory name. If so, then the database-name is
+	 * extracted from that file and used as the database name. If not, an exception is thrown.
+	 *
+	 * @param context
+	 * @param configDir
+	 * @param databaseResourceDir
+	 * @return
+	 */
+	protected String determineDatabaseNameForDatabaseResourceDirectory(CommandContext context, ConfigDir configDir, File databaseResourceDir) {
+		final String dirName = databaseResourceDir.getName();
+
+		if (new DatabaseManager(context.getManageClient()).exists(dirName)) {
+			return dirName;
+		}
+
+		File databasesDir = configDir.getDatabasesDir();
+		for (File f : listFilesInDirectory(databasesDir)) {
+			String name = f.getName();
+			int index = name.lastIndexOf('.');
+			name = index > 0 ? name.substring(0, index) : name;
+			if (dirName.equals(name)) {
+				logger.info("Found database file with same name, minus its extension, as the database resource directory; " +
+					"file: " + f);
+				String payload = copyFileToString(f, context);
+				String databaseName = new PayloadParser().getPayloadFieldValue(payload, "database-name");
+				logger.info("Associating database resource directory with database: " + databaseName);
+				return databaseName;
+			}
+		}
+
+		throw new RuntimeException("Could not determine database to associate with database resource directory: " +
+			databaseResourceDir);
+	}
+
 	public void setPayloadTokenReplacer(PayloadTokenReplacer payloadTokenReplacer) {
 		this.payloadTokenReplacer = payloadTokenReplacer;
 	}
diff --git a/src/main/java/com/marklogic/appdeployer/command/AbstractResourceCommand.java b/src/main/java/com/marklogic/appdeployer/command/AbstractResourceCommand.java
@@ -5,7 +5,6 @@
 import com.marklogic.appdeployer.ConfigDir;
 import com.marklogic.mgmt.SaveReceipt;
 import com.marklogic.mgmt.api.configuration.Configuration;
-import com.marklogic.mgmt.api.configuration.Configurations;
 import com.marklogic.mgmt.resource.ResourceManager;
 
 import java.io.File;
diff --git a/src/main/java/com/marklogic/appdeployer/command/alert/DeployAlertActionsCommand.java b/src/main/java/com/marklogic/appdeployer/command/alert/DeployAlertActionsCommand.java
@@ -33,9 +33,9 @@ public void execute(CommandContext context) {
 		AppConfig appConfig = context.getAppConfig();
 		for (ConfigDir configDir : appConfig.getConfigDirs()) {
 			deployActions(context, configDir, appConfig.getContentDatabaseName());
-
 			for (File dir : configDir.getDatabaseResourceDirectories()) {
-				deployActions(context, new ConfigDir(dir), dir.getName());
+				String databaseName = determineDatabaseNameForDatabaseResourceDirectory(context, configDir, dir);
+				deployActions(context, new ConfigDir(dir), databaseName);
 			}
 		}
 	}
diff --git a/src/main/java/com/marklogic/appdeployer/command/alert/DeployAlertConfigsCommand.java b/src/main/java/com/marklogic/appdeployer/command/alert/DeployAlertConfigsCommand.java
@@ -25,7 +25,8 @@ public void execute(CommandContext context) {
 		for (ConfigDir configDir : appConfig.getConfigDirs()) {
 			deployAlertConfigs(context, configDir, appConfig.getContentDatabaseName());
 			for (File dir : configDir.getDatabaseResourceDirectories()) {
-				deployAlertConfigs(context, new ConfigDir(dir), dir.getName());
+				String databaseName = determineDatabaseNameForDatabaseResourceDirectory(context, configDir, dir);
+				deployAlertConfigs(context, new ConfigDir(dir), databaseName);
 			}
 		}
 	}
diff --git a/src/main/java/com/marklogic/appdeployer/command/alert/DeployAlertRulesCommand.java b/src/main/java/com/marklogic/appdeployer/command/alert/DeployAlertRulesCommand.java
@@ -27,7 +27,8 @@ public void execute(CommandContext context) {
 		for (ConfigDir configDir : appConfig.getConfigDirs()) {
 			deployRules(context, configDir, appConfig.getContentDatabaseName());
 			for (File dir : configDir.getDatabaseResourceDirectories()) {
-				deployRules(context, new ConfigDir(dir), dir.getName());
+				String databaseName = determineDatabaseNameForDatabaseResourceDirectory(context, configDir, dir);
+				deployRules(context, new ConfigDir(dir), databaseName);
 			}
 		}
 	}
diff --git a/src/main/java/com/marklogic/appdeployer/command/flexrep/DeployConfigsCommand.java b/src/main/java/com/marklogic/appdeployer/command/flexrep/DeployConfigsCommand.java
@@ -32,7 +32,8 @@ public void execute(CommandContext context) {
 		for (ConfigDir configDir : appConfig.getConfigDirs()) {
 			deployConfigs(context, configDir, appConfig.getContentDatabaseName());
 			for (File dir : configDir.getDatabaseResourceDirectories()) {
-				deployConfigs(context, new ConfigDir(dir), dir.getName());
+				String databaseName = determineDatabaseNameForDatabaseResourceDirectory(context, configDir, dir);
+				deployConfigs(context, new ConfigDir(dir), databaseName);
 			}
 		}
 	}
diff --git a/src/main/java/com/marklogic/appdeployer/command/flexrep/DeployPullsCommand.java b/src/main/java/com/marklogic/appdeployer/command/flexrep/DeployPullsCommand.java
@@ -34,7 +34,8 @@ public void execute(CommandContext context) {
 		for (ConfigDir configDir : appConfig.getConfigDirs()) {
 			deployFlexRepPulls(context, configDir, appConfig.getContentDatabaseName());
 			for (File dir : configDir.getDatabaseResourceDirectories()) {
-				deployFlexRepPulls(context, new ConfigDir(dir), dir.getName());
+				String databaseName = determineDatabaseNameForDatabaseResourceDirectory(context, configDir, dir);
+				deployFlexRepPulls(context, new ConfigDir(dir), databaseName);
 			}
 		}
 	}
diff --git a/src/main/java/com/marklogic/appdeployer/command/flexrep/DeployTargetsCommand.java b/src/main/java/com/marklogic/appdeployer/command/flexrep/DeployTargetsCommand.java
@@ -36,7 +36,8 @@ public void execute(CommandContext context) {
 		for (ConfigDir configDir : appConfig.getConfigDirs()) {
 			deployTargets(context, configDir, appConfig.getContentDatabaseName());
 			for (File dir : configDir.getDatabaseResourceDirectories()) {
-				deployTargets(context, new ConfigDir(dir), dir.getName());
+				String databaseName = determineDatabaseNameForDatabaseResourceDirectory(context, configDir, dir);
+				deployTargets(context, new ConfigDir(dir), databaseName);
 			}
 		}
 	}
diff --git a/src/main/java/com/marklogic/appdeployer/command/schemas/LoadSchemasCommand.java b/src/main/java/com/marklogic/appdeployer/command/schemas/LoadSchemasCommand.java
@@ -54,7 +54,8 @@ protected void loadSchemasFromDatabaseSpecificPaths(CommandContext context) {
 			configDir.getDatabaseResourceDirectories().forEach(dir -> {
 				File schemasDir = new File(dir, "schemas");
 				if (schemasDir.exists()) {
-					loadSchemas(schemasDir.getAbsolutePath(), dir.getName(), context);
+					String databaseName = determineDatabaseNameForDatabaseResourceDirectory(context, configDir, dir);
+					loadSchemas(schemasDir.getAbsolutePath(), databaseName, context);
 				}
 			});
 		});
diff --git a/src/main/java/com/marklogic/appdeployer/command/temporal/DeployTemporalAxesCommand.java b/src/main/java/com/marklogic/appdeployer/command/temporal/DeployTemporalAxesCommand.java
@@ -27,7 +27,8 @@ public void execute(CommandContext context) {
 		for (ConfigDir configDir : appConfig.getConfigDirs()) {
 			deployTemporalAxes(context, configDir, appConfig.getContentDatabaseName());
 			for (File dir : configDir.getDatabaseResourceDirectories()) {
-				deployTemporalAxes(context, new ConfigDir(dir), dir.getName());
+				String databaseName = determineDatabaseNameForDatabaseResourceDirectory(context, configDir, dir);
+				deployTemporalAxes(context, new ConfigDir(dir), databaseName);
 			}
 		}
 	}
diff --git a/src/main/java/com/marklogic/appdeployer/command/temporal/DeployTemporalCollectionsCommand.java b/src/main/java/com/marklogic/appdeployer/command/temporal/DeployTemporalCollectionsCommand.java
@@ -28,7 +28,8 @@ public void execute(CommandContext context) {
 		for (ConfigDir configDir : appConfig.getConfigDirs()) {
 			deployTemporalCollections(context, configDir, appConfig.getContentDatabaseName());
 			for (File dir : configDir.getDatabaseResourceDirectories()) {
-				deployTemporalCollections(context, new ConfigDir(dir), dir.getName());
+				String databaseName = determineDatabaseNameForDatabaseResourceDirectory(context, configDir, dir);
+				deployTemporalCollections(context, new ConfigDir(dir), databaseName);
 			}
 		}
 	}
diff --git a/src/main/java/com/marklogic/appdeployer/command/temporal/DeployTemporalCollectionsLSQTCommand.java b/src/main/java/com/marklogic/appdeployer/command/temporal/DeployTemporalCollectionsLSQTCommand.java
@@ -19,7 +19,8 @@ public void execute(CommandContext context) {
 		for (ConfigDir configDir : appConfig.getConfigDirs()) {
 			deployTemporalCollectionsLsqt(context, configDir, appConfig.getContentDatabaseName());
 			for (File dir : configDir.getDatabaseResourceDirectories()) {
-				deployTemporalCollectionsLsqt(context, new ConfigDir(dir), dir.getName());
+				String databaseName = determineDatabaseNameForDatabaseResourceDirectory(context, configDir, dir);
+				deployTemporalCollectionsLsqt(context, new ConfigDir(dir), databaseName);
 			}
 		}
 	}
diff --git a/src/main/java/com/marklogic/appdeployer/command/triggers/DeployTriggersCommand.java b/src/main/java/com/marklogic/appdeployer/command/triggers/DeployTriggersCommand.java
@@ -5,7 +5,9 @@
 import com.marklogic.appdeployer.command.AbstractResourceCommand;
 import com.marklogic.appdeployer.command.CommandContext;
 import com.marklogic.appdeployer.command.SortOrderConstants;
+import com.marklogic.mgmt.PayloadParser;
 import com.marklogic.mgmt.resource.ResourceManager;
+import com.marklogic.mgmt.resource.databases.DatabaseManager;
 import com.marklogic.mgmt.resource.triggers.TriggerManager;
 
 import java.io.File;
@@ -33,8 +35,9 @@ public void execute(CommandContext context) {
 		for (ConfigDir configDir : appConfig.getConfigDirs()) {
 			final String initialTriggersDatabaseName = databaseIdOrName != null ? databaseIdOrName : appConfig.getTriggersDatabaseName();
 			deployTriggers(context, configDir, initialTriggersDatabaseName);
-			for (File databaseResourceDir : configDir.getDatabaseResourceDirectories()) {
-				deployTriggers(context, new ConfigDir(databaseResourceDir), databaseResourceDir.getName());
+			for (File dir : configDir.getDatabaseResourceDirectories()) {
+				String databaseName = determineDatabaseNameForDatabaseResourceDirectory(context, configDir, dir);
+				deployTriggers(context, new ConfigDir(dir), databaseName);
 			}
 		}
 	}
diff --git a/src/main/java/com/marklogic/appdeployer/command/viewschemas/DeployViewSchemasCommand.java b/src/main/java/com/marklogic/appdeployer/command/viewschemas/DeployViewSchemasCommand.java
@@ -40,7 +40,8 @@ public void execute(CommandContext context) {
 		for (ConfigDir configDir : appConfig.getConfigDirs()) {
 			deployViewSchemas(context, configDir, appConfig.getContentDatabaseName());
 			for (File dir : configDir.getDatabaseResourceDirectories()) {
-				deployViewSchemas(context, new ConfigDir(dir), dir.getName());
+				String databaseName = determineDatabaseNameForDatabaseResourceDirectory(context, configDir, dir);
+				deployViewSchemas(context, new ConfigDir(dir), databaseName);
 			}
 		}
 	}
diff --git a/src/test/java/com/marklogic/appdeployer/command/databases/DeployTriggersToMultipleDatabasesTest.java b/src/test/java/com/marklogic/appdeployer/command/databases/DeployTriggersToMultipleDatabasesTest.java
@@ -29,5 +29,8 @@ public void test() {
 
 		triggerManager = new TriggerManager(manageClient, "other-" + appConfig.getTriggersDatabaseName());
 		assertTrue(triggerManager.exists("other-trigger"));
+
+		triggerManager = new TriggerManager(manageClient, "third-" + appConfig.getTriggersDatabaseName());
+		assertTrue(triggerManager.exists("third-trigger"));
 	}
 }
diff --git a/src/test/resources/sample-app/multiple-triggers-databases/databases/third-triggers-database.json b/src/test/resources/sample-app/multiple-triggers-databases/databases/third-triggers-database.json
@@ -0,0 +1,3 @@
+{
+	"database-name": "third-%%TRIGGERS_DATABASE%%"
+}
diff --git a/src/test/resources/sample-app/multiple-triggers-databases/databases/third-triggers-database/triggers/third-trigger.json b/src/test/resources/sample-app/multiple-triggers-databases/databases/third-triggers-database/triggers/third-trigger.json
@@ -0,0 +1,23 @@
+{
+	"name": "third-trigger",
+	"description": "third trigger",
+	"event": {
+		"data-event": {
+			"directory-scope": {
+				"uri": "/thirdDir/",
+				"depth": "1"
+			},
+			"document-content": {
+				"update-kind": "create"
+			},
+			"when": "post-commit"
+		}
+	},
+	"module": "/test.xqy",
+	"module-db": "Modules",
+	"module-root": "/modules/",
+	"enabled": true,
+	"recursive": true,
+	"task-priority": "normal"
+}
+

Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,9 @@ public void execute(CommandContext context) {`
`33`	`33`	`AppConfig appConfig = context.getAppConfig();`
`34`	`34`	`for (ConfigDir configDir : appConfig.getConfigDirs()) {`
`35`	`35`	`deployActions(context, configDir, appConfig.getContentDatabaseName());`
`36`		`-`
`37`	`36`	`for (File dir : configDir.getDatabaseResourceDirectories()) {`
`38`		`- deployActions(context, new ConfigDir(dir), dir.getName());`
	`37`	`+ String databaseName = determineDatabaseNameForDatabaseResourceDirectory(context, configDir, dir);`
	`38`	`+ deployActions(context, new ConfigDir(dir), databaseName);`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,8 @@ public void execute(CommandContext context) {`
`25`	`25`	`for (ConfigDir configDir : appConfig.getConfigDirs()) {`
`26`	`26`	`deployAlertConfigs(context, configDir, appConfig.getContentDatabaseName());`
`27`	`27`	`for (File dir : configDir.getDatabaseResourceDirectories()) {`
`28`		`- deployAlertConfigs(context, new ConfigDir(dir), dir.getName());`
	`28`	`+ String databaseName = determineDatabaseNameForDatabaseResourceDirectory(context, configDir, dir);`
	`29`	`+ deployAlertConfigs(context, new ConfigDir(dir), databaseName);`
`29`	`30`	`}`
`30`	`31`	`}`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,8 @@ public void execute(CommandContext context) {`
`27`	`27`	`for (ConfigDir configDir : appConfig.getConfigDirs()) {`
`28`	`28`	`deployRules(context, configDir, appConfig.getContentDatabaseName());`
`29`	`29`	`for (File dir : configDir.getDatabaseResourceDirectories()) {`
`30`		`- deployRules(context, new ConfigDir(dir), dir.getName());`
	`30`	`+ String databaseName = determineDatabaseNameForDatabaseResourceDirectory(context, configDir, dir);`
	`31`	`+ deployRules(context, new ConfigDir(dir), databaseName);`
`31`	`32`	`}`
`32`	`33`	`}`
`33`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,8 @@ public void execute(CommandContext context) {`
`32`	`32`	`for (ConfigDir configDir : appConfig.getConfigDirs()) {`
`33`	`33`	`deployConfigs(context, configDir, appConfig.getContentDatabaseName());`
`34`	`34`	`for (File dir : configDir.getDatabaseResourceDirectories()) {`
`35`		`- deployConfigs(context, new ConfigDir(dir), dir.getName());`
	`35`	`+ String databaseName = determineDatabaseNameForDatabaseResourceDirectory(context, configDir, dir);`
	`36`	`+ deployConfigs(context, new ConfigDir(dir), databaseName);`
`36`	`37`	`}`
`37`	`38`	`}`
`38`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,8 @@ public void execute(CommandContext context) {`
`34`	`34`	`for (ConfigDir configDir : appConfig.getConfigDirs()) {`
`35`	`35`	`deployFlexRepPulls(context, configDir, appConfig.getContentDatabaseName());`
`36`	`36`	`for (File dir : configDir.getDatabaseResourceDirectories()) {`
`37`		`- deployFlexRepPulls(context, new ConfigDir(dir), dir.getName());`
	`37`	`+ String databaseName = determineDatabaseNameForDatabaseResourceDirectory(context, configDir, dir);`
	`38`	`+ deployFlexRepPulls(context, new ConfigDir(dir), databaseName);`
`38`	`39`	`}`
`39`	`40`	`}`
`40`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,8 @@ public void execute(CommandContext context) {`
`36`	`36`	`for (ConfigDir configDir : appConfig.getConfigDirs()) {`
`37`	`37`	`deployTargets(context, configDir, appConfig.getContentDatabaseName());`
`38`	`38`	`for (File dir : configDir.getDatabaseResourceDirectories()) {`
`39`		`- deployTargets(context, new ConfigDir(dir), dir.getName());`
	`39`	`+ String databaseName = determineDatabaseNameForDatabaseResourceDirectory(context, configDir, dir);`
	`40`	`+ deployTargets(context, new ConfigDir(dir), databaseName);`
`40`	`41`	`}`
`41`	`42`	`}`
`42`	`43`	`}`