Changed logic for dealing with mlLoadBalancerHosts and mlIsHostLoadBalancer (#1386)

Author: akshaysonvane

marklogic-data-hub/src/main/java/com/marklogic/hub/impl/HubConfigImpl.java

@@ -928,18 +928,43 @@ public void loadConfigurationFromProperties(Properties environmentProperties) {
             mlUsername = getEnvPropString(environmentProperties, "mlUsername", mlUsername);
             mlPassword = getEnvPropString(environmentProperties, "mlPassword", mlPassword);
 
-            isHostLoadBalancer = getEnvPropBoolean(environmentProperties, "mlIsHostLoadBalancer", false);
+            isHostLoadBalancer = getEnvPropBoolean(environmentProperties, "mlIsHostLoadBalancer");
             String mlHost = getEnvPropString(environmentProperties, "mlHost", null);
             String lbh = getEnvPropString(environmentProperties, "mlLoadBalancerHosts", null);
-            if (isHostLoadBalancer) {
-                if (mlHost != null && lbh != null && !mlHost.equals(lbh)){
-                    throw new DataHubConfigurationException("mlLoadBalancerHosts must be the same as mlHost");
+            if (isHostLoadBalancer != null){
+                if (isHostLoadBalancer) {
+                    if (mlHost != null && lbh != null){
+                        logger.warn("\"mlLoadBalancerHosts\" is a deprecated property. When \"mlIsHostLoadBalancer\" is set to \"true\", the value specified for \"mlHost\" will be used as the load balancer.");
+                        if (!mlHost.equals(lbh)) {
+                            throw new DataHubConfigurationException("\"mlLoadBalancerHosts\" must be the same as \"mlHost\"");
+                        }
+                        else {
+                            loadBalancerHost = mlHost;
+                        }
+                    }
+                }
+                else {
+                    if (lbh != null){
+                        throw new DataHubConfigurationException("\"mlIsHostLoadBalancer\" must not be false if you are using \"mlLoadBalancerHosts\"");
+                    }
+                }
+            }
+            else{
+                if (mlHost != null && lbh != null){
+                    if (!mlHost.equals(lbh)) {
+                        throw new DataHubConfigurationException("\"mlLoadBalancerHosts\" must be the same as \"mlHost\"");
+                    }
+                    else {
+                        isHostLoadBalancer = true;
+                        loadBalancerHost = mlHost;
+                    }
                 }
                 else {
-                    loadBalancerHost = mlHost;
+                    isHostLoadBalancer = false;
                 }
             }
 
+
             isProvisionedEnvironment = getEnvPropBoolean(environmentProperties, "mlIsProvisionedEnvironment", false);
 
             projectDir = getEnvPropString(environmentProperties, "hubProjectDir", projectDir);
@@ -1462,6 +1487,18 @@ private boolean getEnvPropBoolean(Properties environmentProperties, String key,
         return res;
     }
 
+    private Boolean getEnvPropBoolean(Properties environmentProperties, String key) {
+        String value = environmentProperties.getProperty(key);
+        Boolean res;
+        if (value != null) {
+            res = Boolean.parseBoolean(value);
+        }
+        else {
+            res = null;
+        }
+        return res;
+    }
+
     @JsonIgnore
     public String getInfo()
     {

marklogic-data-hub/src/test/java/com/marklogic/hub/core/HubConfigTest.java

@@ -82,9 +82,10 @@ public void testLoadBalancerProps() {
             getHubFlowRunnerConfig();
         }
         catch (DataHubConfigurationException e){
-            assertEquals( "mlLoadBalancerHosts must be the same as mlHost", e.getMessage());
+            assertEquals( "\"mlLoadBalancerHosts\" must be the same as \"mlHost\"", e.getMessage());
         }
 
+        deleteProp("mlLoadBalancerHosts");
         deleteProp("mlIsHostLoadBalancer");
         assertFalse(getHubFlowRunnerConfig().getIsHostLoadBalancer());
     }