#328 The default schema and triggers database names default to forests on one host

Author: rjrudin

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

@@ -669,9 +669,30 @@ public AppConfig newAppConfig() {
 				propertyConsumerMap.get(propertyName).accept(appConfig, value);
 			}
 		}
+
+		setDefaultsForDatabasesWithForestsOnOneHost(appConfig);
+
 		return appConfig;
 	}
 
+	protected void setDefaultsForDatabasesWithForestsOnOneHost(AppConfig appConfig) {
+		Set<String> set = appConfig.getDatabasesWithForestsOnOneHost();
+		if (set == null || set.isEmpty()) {
+			set = new HashSet<>();
+			final String triggersName = appConfig.getTriggersDatabaseName();
+			if (triggersName != null) {
+				set.add(triggersName);
+			}
+			final String schemasName = appConfig.getSchemasDatabaseName();
+			if (schemasName != null) {
+				set.add(schemasName);
+			}
+			if (!set.isEmpty()) {
+				appConfig.setDatabasesWithForestsOnOneHost(set);
+			}
+		}
+	}
+
 	protected Map<String, String> buildMapFromCommaDelimitedString(String str) {
 		Map<String, String> map = new HashMap<>();
 		String[] tokens = str.split(",");

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

@@ -386,4 +386,32 @@ public void mlUsernameAndPassword() {
         assertNull("SSL context should be null by default", config.getRestSslContext());
         assertNull("SSL hostname verifier should be null by default", config.getRestSslHostnameVerifier());
     }
+
+    @Test
+	public void schemasAndTriggerDatabaseNamesShouldBeInSetOfDatabasesWithForestsOnOneHost() {
+	    sut = new DefaultAppConfigFactory(new SimplePropertySource("mlAppName", "example"));
+	    AppConfig config = sut.newAppConfig();
+	    assertEquals("example-triggers", config.getTriggersDatabaseName());
+	    assertEquals("example-schemas", config.getSchemasDatabaseName());
+
+	    Set<String> set = config.getDatabasesWithForestsOnOneHost();
+	    assertTrue(set.contains("example-triggers"));
+	    assertTrue(set.contains("example-schemas"));
+    }
+
+    @Test
+	public void dontModifySetOfDatabasesWithForestsOnOneHostIfItsBeenConfigured() {
+	    sut = new DefaultAppConfigFactory(new SimplePropertySource("mlAppName", "example", "mlDatabasesWithForestsOnOneHost", "db1,db2"));
+	    AppConfig config = sut.newAppConfig();
+
+	    Set<String> set = config.getDatabasesWithForestsOnOneHost();
+	    assertEquals(2, set.size());
+	    assertTrue(set.contains("db1"));
+	    assertTrue(set.contains("db2"));
+
+	    final String message = "If the user has configured the set of databases, then the default schema and trigger databases names should not be added automatically";
+	    assertFalse(message, set.contains("example-triggers"));
+	    assertFalse(message, set.contains("example-schemas"));
+
+    }
 }