#382 Fix for setting mlDatabaseGroups and mlDatabasesWithForestsOnOneHost

Author: rjrudin

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

@@ -1128,6 +1128,13 @@ public void setCatchUndeployExceptions(boolean catchUndeployExceptions) {
 		this.catchUndeployExceptions = catchUndeployExceptions;
 	}
 
+	public boolean isDatabaseWithForestsOnOneHost(String databaseName) {
+    	if (databasesWithForestsOnOneHost == null) {
+    		return false;
+	    }
+    	return databasesWithForestsOnOneHost.contains(databaseName);
+	}
+
 	public Set<String> getDatabasesWithForestsOnOneHost() {
 		return databasesWithForestsOnOneHost;
 	}

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

@@ -20,6 +20,9 @@ public DefaultHostCalculator(HostNameProvider hostNameProvider) {
 	public List<String> calculateHostNames(String databaseName, CommandContext context) {
 		List<String> hostNamesFromDatabaseGroups = determineHostsNamesBasedOnDatabaseGroups(databaseName, context);
 		if (hostNamesFromDatabaseGroups != null) {
+			if (hostNamesFromDatabaseGroups.size() > 1 && context.getAppConfig().isDatabaseWithForestsOnOneHost(databaseName)) {
+				return hostNamesFromDatabaseGroups.subList(0, 1);
+			}
 			return hostNamesFromDatabaseGroups;
 		}
 

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

@@ -49,4 +49,22 @@ public void test() {
 		assertTrue(hostNames.contains("name4"));
 		assertTrue(hostNames.contains("name5"));
 	}
+
+	@Test
+	public void databaseWithForestOnOneHost() {
+		TestHostNameProvider hostNameProvider = new TestHostNameProvider("name1", "name2", "name3");
+		hostNameProvider.addGroupHostNames("group1", "name1");
+		hostNameProvider.addGroupHostNames("group2", "name2", "name3");
+
+		DefaultHostCalculator hostCalculator = new DefaultHostCalculator(hostNameProvider);
+
+		Properties props = new Properties();
+		props.setProperty("mlDatabaseGroups", "test-db,group2");
+		props.setProperty("mlDatabasesWithForestsOnOneHost", "test-db");
+
+		CommandContext context = new CommandContext(new DefaultAppConfigFactory(new SimplePropertySource(props)).newAppConfig(), null, null);
+		List<String> hostNames = hostCalculator.calculateHostNames("test-db", context);
+		assertEquals("The database should only have a forest on the first host", 1, hostNames.size());
+		assertEquals("name2", hostNames.get(0));
+	}
 }