DHFPROD-4500: Fixing dynamic params for client JAR

Author: rjrudin

marklogic-data-hub/src/main/java/com/marklogic/hub/cli/client/RunFlowCommand.java

@@ -12,6 +12,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 
+import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Stream;
 
@@ -40,7 +41,7 @@ public class RunFlowCommand extends CommandLineFlowInputs implements Runnable {
         names = "-P",
         description = "Override any Data Hub property; e.g. -PmlStagingPort=8410 -PmlFinalPort=8411. See https://docs.marklogic.com/datahub/tools/gradle/gradle-properties.html for a full list."
     )
-    private Map<String, String> params;
+    private Map<String, String> params = new HashMap<>();
 
     @Override
     public void run() {

marklogic-data-hub/src/test/java/com/marklogic/hub/cli/client/RunFlowViaMainTest.java

@@ -2,6 +2,7 @@
 
 import com.marklogic.bootstrap.Installer;
 import com.marklogic.hub.ApplicationConfig;
+import com.marklogic.hub.DatabaseKind;
 import com.marklogic.hub.HubTestBase;
 import org.custommonkey.xmlunit.XMLUnit;
 import org.junit.jupiter.api.AfterAll;
@@ -11,6 +12,10 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = ApplicationConfig.class)
 public class RunFlowViaMainTest extends HubTestBase {
@@ -39,9 +44,18 @@ public void testRunFlow() {
             "-host", host,
             "-username", flowRunnerUser,
             "-password", flowRunnerPassword,
-            "-flowName", flowName
+            "-flowName", flowName,
+            // Including this to verify that -P flags don't break things
+            "-PmlStagingPort=" + adminHubConfig.getPort(DatabaseKind.STAGING)
         });
 
         verifyCollectionCountsFromRunningTestFlow();
     }
+
+    @Test
+    void paramsMapHasToBeNonNull() {
+        Map<String, String> params = new RunFlowCommand().getParams();
+        assertNotNull(params, "jcommander requires that the map backing a DynamicParameter annotation not be null; " +
+            "if it is null, then jcommander will throw a null-pointer exception");
+    }
 }