#78 Fixed issue with mlContentForestsPerHost not being supported

Author: rjrudin

CHANGELOG.mdown

@@ -1,5 +1,10 @@
 # ml-app-deployer releases
 
+## 2.0rc4 - TBD
+
+* [#78](https://github.com/rjrudin/ml-app-deployer/issues/78) Added support for mlContentForestsPerHost
+* [#77](https://github.com/rjrudin/ml-app-deployer/issues/77) Support Spring Boot-style properties with a "marklogic." prefix
+
 ## 2.0rc3 - 2016-01-17
 
 * [#74](https://github.com/rjrudin/ml-app-deployer/issues/74) New command for verifying that MarkLogic version is at least 8

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

@@ -70,6 +70,12 @@ public AppConfig newAppConfig() {
             c.setRestAdminPassword(mlPassword);
         }
 
+        prop = getProperty("mlContentForestsPerHost");
+        if (prop != null) {
+            logger.info("Content forests per host: " + prop);
+            c.setContentForestsPerHost(Integer.parseInt(prop));
+        }
+
         prop = getProperty("mlModulePermissions");
         if (prop != null) {
             logger.info("Module permissions: " + prop);
@@ -84,7 +90,8 @@ public AppConfig newAppConfig() {
         }
 
         if (getProperty("mlSimpleSsl") != null) {
-            logger.info("Using simple SSL context and 'ANY' hostname verifier for authenticating against client REST API server");
+            logger.info(
+                    "Using simple SSL context and 'ANY' hostname verifier for authenticating against client REST API server");
             c.setSimpleSslConfig();
         }
 

src/main/java/com/marklogic/mgmt/util/SimplePropertySource.java

@@ -13,6 +13,10 @@ public SimplePropertySource(String... propNamesAndValues) {
         }
     }
 
+    public SimplePropertySource(Properties props) {
+        this.props = props;
+    }
+
     @Override
     public String getProperty(String name) {
         return props.getProperty(name);

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

@@ -1,5 +1,7 @@
 package com.marklogic.appdeployer;
 
+import java.util.Properties;
+
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -33,4 +35,58 @@ public void unrecognizedProperties() {
         assertEquals("Should use default", "localhost", config.getHost());
         assertEquals("Should use default", "admin", config.getRestAdminUsername());
     }
+
+    /**
+     * As of 2016-01-18
+     */
+    @Test
+    public void allProperties() {
+        Properties p = new Properties();
+        p.setProperty("mlHost", "prophost");
+        p.setProperty("mlAppName", "propname");
+        p.setProperty("mlRestPort", "4321");
+        p.setProperty("mlTestRestPort", "8765");
+        p.setProperty("mlUsername", "propuser1");
+        p.setProperty("mlPassword", "proppassword");
+        p.setProperty("mlRestAdminUsername", "propuser2");
+        p.setProperty("mlRestAdminPassword", "proppassword2");
+        p.setProperty("mlContentForestsPerHost", "17");
+        p.setProperty("mlModulePermissions", "some-perm,read,some-perm,update");
+        p.setProperty("mlAdditionalBinaryExtensions", ".gradle,.properties");
+        p.setProperty("mlConfigDir", "src/test/resources/sample-app/empty-ml-config");
+        p.setProperty("mlSimpleSsl", "anyvalue");
+
+        sut = new DefaultAppConfigFactory(new SimplePropertySource(p));
+        AppConfig config = sut.newAppConfig();
+
+        assertEquals("prophost", config.getHost());
+        assertEquals("propname", config.getName());
+        assertEquals((Integer) 4321, config.getRestPort());
+        assertEquals((Integer) 8765, config.getTestRestPort());
+        assertEquals("propuser2", config.getRestAdminUsername());
+        assertEquals("proppassword2", config.getRestAdminPassword());
+        assertEquals((Integer) 17, config.getContentForestsPerHost());
+        assertEquals("some-perm,read,some-perm,update", config.getModulePermissions());
+        String[] extensions = config.getAdditionalBinaryExtensions();
+        assertEquals(".gradle", extensions[0]);
+        assertEquals(".properties", extensions[1]);
+        assertTrue(config.getConfigDir().getBaseDir().getAbsolutePath().contains("empty-ml-config"));
+        assertNotNull(config.getRestSslContext());
+        assertNotNull(config.getRestSslHostnameVerifier());
+    }
+
+    @Test
+    public void mlUsernameAndPassword() {
+        sut = new DefaultAppConfigFactory(
+                new SimplePropertySource("mlUsername", "customuser", "mlPassword", "custompassword"));
+        AppConfig config = sut.newAppConfig();
+
+        assertEquals("When mlRestAdminUsername is not set, mlUsername should be used", "customuser",
+                config.getRestAdminUsername());
+        assertEquals("When mlRestAdminPassword is not set, mlPassword should be used", "custompassword",
+                config.getRestAdminPassword());
+
+        assertNull("SSL context should be null by default", config.getRestSslContext());
+        assertNull("SSL hostname verifier should be null by default", config.getRestSslHostnameVerifier());
+    }
 }