#77 Now supports properties starting with "marklogic."

Author: rjrudin

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

@@ -8,6 +8,7 @@
 public abstract class PropertySourceFactory extends LoggingObject {
 
     private PropertySource propertySource;
+    private boolean checkWithMarklogicPrefix = true;
 
     protected PropertySourceFactory() {
         this(new SystemPropertySource());
@@ -17,11 +18,31 @@ public PropertySourceFactory(PropertySource propertySource) {
         this.propertySource = propertySource;
     }
 
+    /**
+     * If checkWithMarklogicPrefix is set to true, and a property with the given name is not found, this method will
+     * check for a property with "marklogic." + the property name. This allows for Spring Boot-style properties, where
+     * it's usually helpful to be able to prefix everything with "marklogic.".
+     * 
+     * @param name
+     * @return
+     */
     protected String getProperty(String name) {
-        return propertySource.getProperty(name);
+        String val = propertySource.getProperty(name);
+        if (val != null) {
+            return val;
+        }
+        return checkWithMarklogicPrefix ? propertySource.getProperty("marklogic." + name) : null;
     }
 
     public void setPropertySource(PropertySource propertySource) {
         this.propertySource = propertySource;
     }
+
+    public boolean isCheckWithMarklogicPrefix() {
+        return checkWithMarklogicPrefix;
+    }
+
+    public void setCheckWithMarklogicPrefix(boolean applyMarklogicPrefix) {
+        this.checkWithMarklogicPrefix = applyMarklogicPrefix;
+    }
 }

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

@@ -0,0 +1,36 @@
+package com.marklogic.appdeployer;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.marklogic.mgmt.util.SimplePropertySource;
+
+public class DefaultAppConfigFactoryTest extends Assert {
+
+    private DefaultAppConfigFactory sut;
+
+    @Test
+    public void gradleStyleProperties() {
+        sut = new DefaultAppConfigFactory(new SimplePropertySource("mlHost", "somehost", "mlUsername", "someuser"));
+        AppConfig config = sut.newAppConfig();
+        assertEquals("somehost", config.getHost());
+        assertEquals("someuser", config.getRestAdminUsername());
+    }
+
+    @Test
+    public void springStyleProperties() {
+        sut = new DefaultAppConfigFactory(
+                new SimplePropertySource("marklogic.mlHost", "springhost", "marklogic.mlUsername", "springuser"));
+        AppConfig config = sut.newAppConfig();
+        assertEquals("springhost", config.getHost());
+        assertEquals("springuser", config.getRestAdminUsername());
+    }
+
+    @Test
+    public void unrecognizedProperties() {
+        sut = new DefaultAppConfigFactory(new SimplePropertySource("foo.mlHost", "host", "foo.mlUsername", "user"));
+        AppConfig config = sut.newAppConfig();
+        assertEquals("Should use default", "localhost", config.getHost());
+        assertEquals("Should use default", "admin", config.getRestAdminUsername());
+    }
+}