#204 Replica directories now default to primary directories

Author: rjrudin

src/main/java/com/marklogic/appdeployer/command/forests/ConfigureForestReplicasCommand.java

@@ -240,10 +240,42 @@ protected ForestReplica buildForestReplica(String databaseName, String name, Str
 		ForestReplica replica = new ForestReplica();
 		replica.setHost(replicaHostId);
 		replica.setReplicaName(name);
-		replica.setDataDirectory(appConfig.getReplicaForestDataDirectory());
-		replica.setLargeDataDirectory(appConfig.getReplicaForestLargeDataDirectory());
-		replica.setFastDataDirectory(appConfig.getReplicaForestFastDataDirectory());
 
+		// First set to the database-agnostic forest directories
+		replica.setDataDirectory(appConfig.getForestDataDirectory());
+		replica.setFastDataDirectory(appConfig.getForestFastDataDirectory());
+		replica.setLargeDataDirectory(appConfig.getForestLargeDataDirectory());
+
+		// Now set to the database-specific forest directories if set
+		if (databaseName != null) {
+			Map<String, String> map = appConfig.getDatabaseDataDirectories();
+			if (map != null && map.containsKey(databaseName)) {
+				replica.setDataDirectory(map.get(databaseName));
+			}
+
+			map = appConfig.getDatabaseFastDataDirectories();
+			if (map != null && map.containsKey(databaseName)) {
+				replica.setFastDataDirectory(map.get(databaseName));
+			}
+
+			map = appConfig.getDatabaseLargeDataDirectories();
+			if (map != null && map.containsKey(databaseName)) {
+				replica.setLargeDataDirectory(map.get(databaseName));
+			}
+		}
+
+		// Now set to the replica forest directories if set
+		if (appConfig.getReplicaForestDataDirectory() != null) {
+			replica.setDataDirectory(appConfig.getReplicaForestDataDirectory());
+		}
+		if (appConfig.getReplicaForestFastDataDirectory() != null) {
+			replica.setFastDataDirectory(appConfig.getReplicaForestFastDataDirectory());
+		}
+		if (appConfig.getReplicaForestLargeDataDirectory() != null) {
+			replica.setLargeDataDirectory(appConfig.getReplicaForestLargeDataDirectory());
+		}
+
+		// And now set to the database-specific replica forest directories if set
 		if (databaseName != null) {
 			Map<String, String> map = appConfig.getDatabaseReplicaDataDirectories();
 			if (map != null && map.containsKey(databaseName)) {

src/test/java/com/marklogic/appdeployer/command/forests/BuildForestReplicaTest.java

@@ -10,40 +10,84 @@
 public class BuildForestReplicaTest extends Assert {
 
 	@Test
-	public void databaseAgnosticReplicaDirectories() {
-		AppConfig config = new AppConfig();
-		config.setReplicaForestFastDataDirectory("/var/fast");
-		config.setReplicaForestLargeDataDirectory("/var/large");
-		config.setReplicaForestDataDirectory("/var/data");
+	public void databaseAgnosticDirectories() {
+		ForestReplica replica = buildForestReplica(
+			"mlForestDataDirectory", "/var/data",
+			"mlForestFastDataDirectory", "/var/fast",
+			"mlForestLargeDataDirectory", "/var/large"
+		);
 
-		ConfigureForestReplicasCommand command = new ConfigureForestReplicasCommand();
-		ForestReplica replica = command.buildForestReplica(null, "test-name", "host-1", config);
-		assertEquals("test-name", replica.getReplicaName());
-		assertEquals("host-1", replica.getHost());
 		assertEquals("/var/data", replica.getDataDirectory());
 		assertEquals("/var/fast", replica.getFastDataDirectory());
 		assertEquals("/var/large", replica.getLargeDataDirectory());
 	}
 
+	@Test
+	public void databaseSpecificDirectories() {
+		ForestReplica replica = buildForestReplica(
+			"mlForestDataDirectory", "/var/data",
+			"mlForestFastDataDirectory", "/var/fast",
+			"mlForestLargeDataDirectory", "/var/large",
+			"mlDatabaseDataDirectories", "my-database,/my/data",
+			"mlDatabaseFastDataDirectories", "my-database,/my/fast",
+			"mlDatabaseLargeDataDirectories", "my-database,/my/large"
+		);
+
+		assertEquals("/my/data", replica.getDataDirectory());
+		assertEquals("/my/fast", replica.getFastDataDirectory());
+		assertEquals("/my/large", replica.getLargeDataDirectory());
+	}
+
+	@Test
+	public void databaseAgnosticReplicaDirectories() {
+		ForestReplica replica = buildForestReplica(
+			"mlDatabaseDataDirectories", "my-database,/my/data",
+			"mlDatabaseFastDataDirectories", "my-database,/my/fast",
+			"mlDatabaseLargeDataDirectories", "my-database,/my/large",
+			"mlForestDataDirectory", "/var/data",
+			"mlForestFastDataDirectory", "/var/fast",
+			"mlForestLargeDataDirectory", "/var/large",
+			"mlReplicaForestDataDirectory", "/replica/data",
+			"mlReplicaForestFastDataDirectory", "/replica/fast",
+			"mlReplicaForestLargeDataDirectory", "/replica/large"
+		);
+
+		assertEquals("/replica/data", replica.getDataDirectory());
+		assertEquals("/replica/fast", replica.getFastDataDirectory());
+		assertEquals("/replica/large", replica.getLargeDataDirectory());
+	}
+
 	@Test
 	public void databaseSpecificReplicaDirectories() {
-		SimplePropertySource source = new SimplePropertySource(
-			"mlReplicaForestDataDirectory", "/var/data",
-			"mlReplicaForestFastDataDirectory", "/var/fast",
-			"mlReplicaForestLargeDataDirectory", "/var/large",
-			"mlDatabaseReplicaDataDirectories", "my-database,/opt/data",
-			"mlDatabaseReplicaFastDataDirectories", "my-database,/opt/fast",
-			"mlDatabaseReplicaLargeDataDirectories", "my-database,/opt/large"
+		ForestReplica replica = buildForestReplica(
+			"mlForestDataDirectory", "/var/data",
+			"mlForestFastDataDirectory", "/var/fast",
+			"mlForestLargeDataDirectory", "/var/large",
+			"mlDatabaseDataDirectories", "my-database,/my/data",
+			"mlDatabaseFastDataDirectories", "my-database,/my/fast",
+			"mlDatabaseLargeDataDirectories", "my-database,/my/large",
+			"mlReplicaForestDataDirectory", "/replica/data",
+			"mlReplicaForestFastDataDirectory", "/replica/fast",
+			"mlReplicaForestLargeDataDirectory", "/replica/large",
+			"mlDatabaseReplicaDataDirectories", "my-database,/my/replica/data",
+			"mlDatabaseReplicaFastDataDirectories", "my-database,/my/replica/fast",
+			"mlDatabaseReplicaLargeDataDirectories", "my-database,/my/replica/large"
 		);
+
+		assertEquals("/my/replica/data", replica.getDataDirectory());
+		assertEquals("/my/replica/fast", replica.getFastDataDirectory());
+		assertEquals("/my/replica/large", replica.getLargeDataDirectory());
+	}
+
+	private ForestReplica buildForestReplica(String... propertyNamesAndValues) {
+		SimplePropertySource source = new SimplePropertySource(propertyNamesAndValues);
 		DefaultAppConfigFactory f = new DefaultAppConfigFactory(source);
 		AppConfig config = f.newAppConfig();
 
 		ConfigureForestReplicasCommand command = new ConfigureForestReplicasCommand();
 		ForestReplica replica = command.buildForestReplica("my-database", "test-name", "host-1", config);
 		assertEquals("test-name", replica.getReplicaName());
 		assertEquals("host-1", replica.getHost());
-		assertEquals("/opt/data", replica.getDataDirectory());
-		assertEquals("/opt/fast", replica.getFastDataDirectory());
-		assertEquals("/opt/large", replica.getLargeDataDirectory());
+		return replica;
 	}
 }