#183 Added mlForestsPerHost

Author: rjrudin

gradle.properties

@@ -1,4 +1,4 @@
 group=com.marklogic
 javadocsDir=../gh-pages-marklogic-java/javadocs
-version=3.0-alpha3
-mlJavaclientUtilVersion=3.0-alpha3
+version=3.0-beta1
+mlJavaclientUtilVersion=3.0-beta1

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

@@ -231,6 +231,18 @@ public AppConfig newAppConfig() {
 			c.setContentForestsPerHost(Integer.parseInt(prop));
 		}
 
+		/**
+		 * For any database besides the content database, configure the number of forests per host.
+		 */
+		prop = getProperty("mlForestsPerHost");
+		if (prop != null) {
+			logger.info("Forests per host: " + prop);
+			String[] tokens = prop.split(",");
+			for (int i = 0; i < tokens.length; i += 2) {
+				c.getForestCounts().put(tokens[i], Integer.parseInt(tokens[i + 1]));
+			}
+		}
+
 		/**
 		 * This property can specify a comma-delimited list of database names and replica counts as a simple way of
 		 * setting up forest replicas - e.g. Documents,1,Security,2.

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

@@ -1,6 +1,7 @@
 package com.marklogic.appdeployer;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 
 import com.marklogic.client.DatabaseClientFactory;
@@ -102,6 +103,7 @@ public void allProperties() {
 	    p.setProperty("mlAppServicesSimpleSsl", "true");
 
 	    p.setProperty("mlContentForestsPerHost", "17");
+	    p.setProperty("mlForestsPerHost", "some-db,2,other-db,3");
         p.setProperty("mlModulePermissions", "some-perm,read,some-perm,update");
         p.setProperty("mlAdditionalBinaryExtensions", ".gradle,.properties");
         p.setProperty("mlConfigPath", "src/test/resources/sample-app/empty-ml-config");
@@ -167,6 +169,9 @@ public void allProperties() {
 	    assertEquals(DatabaseClientFactory.SSLHostnameVerifier.ANY, config.getAppServicesSslHostnameVerifier());
 
 	    assertEquals((Integer) 17, config.getContentForestsPerHost());
+	    Map<String, Integer> forestCounts = config.getForestCounts();
+	    assertEquals(2, (int)forestCounts.get("some-db"));
+	    assertEquals(3, (int)forestCounts.get("other-db"));
         assertEquals("some-perm,read,some-perm,update", config.getModulePermissions());
         String[] extensions = config.getAdditionalBinaryExtensions();
         assertEquals(".gradle", extensions[0]);