Merge "Simplify cli parser logic"

2 files changed, 76 insertions, 18 deletions

diff --git a/src/main/java/org/onap/dcae/CLIUtils.java b/src/main/java/org/onap/dcae/CLIUtils.java
index 6764d5b2..40cbb6be 100644
--- a/src/main/java/org/onap/dcae/CLIUtils.java
+++ b/src/main/java/org/onap/dcae/CLIUtils.java
@@ -21,33 +21,34 @@
 
 package org.onap.dcae;
 
+import io.vavr.collection.Map;
+
 import java.util.HashMap;
 
-/**
- * CLIUtils extracted from nsaServerLibrary this implementation will be removed once we switch to different API library
- */
 public class CLIUtils {
 
-    public static io.vavr.collection.HashMap<String, String> processCmdLine(String[] args) {
-        final HashMap<String, String> map = new HashMap<String, String>();
+    public static Map<String, String> processCmdLine(String[] args) {
+        final java.util.Map<String, String> map = new HashMap<>();
+
+        String argumentName = null;
 
-        String lastKey = null;
         for (String arg : args) {
-            if (arg.startsWith("-")) {
-                if (lastKey != null) {
-                    map.put(lastKey.substring(1), "");
-                }
-                lastKey = arg;
+            if (isArgumentName(arg)) {
+                argumentName = resolveArgumentName(arg);
+                map.put(argumentName, "");
             } else {
-                if (lastKey != null) {
-                    map.put(lastKey.substring(1), arg);
-                }
-                lastKey = null;
+                map.put(argumentName, arg);
             }
         }
-        if (lastKey != null) {
-            map.put(lastKey.substring(1), "");
-        }
+
         return io.vavr.collection.HashMap.ofAll(map);
     }
+
+    private static String resolveArgumentName(String arg) {
+        return arg.substring(1);
+    }
+
+    private static boolean isArgumentName(String arg) {
+        return arg.startsWith("-");
+    }
 }
diff --git a/src/test/java/org/onap/dcae/CLIUtilsTest.java b/src/test/java/org/onap/dcae/CLIUtilsTest.java
new file mode 100644
index 00000000..07f116a3
--- /dev/null
+++ b/src/test/java/org/onap/dcae/CLIUtilsTest.java
@@ -0,0 +1,57 @@
+/*
+ * ============LICENSE_START=======================================================
+ * PROJECT
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018 Nokia. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.dcae;
+
+import io.vavr.collection.Map;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class CLIUtilsTest {
+
+    @Test
+    public void shouldConvertArgsToPropertiesMap() {
+        // given
+        String[] args = {"-withOutValue", "-collector.service.port", "8000", "-collector.service.secure.port", "8443"};
+
+        //when
+        Map<String, String> properties = CLIUtils.processCmdLine(args);
+
+        //then
+        assertThat(properties.get("collector.service.port").get()).isEqualTo("8000");
+        assertThat(properties.get("collector.service.secure.port").get()).isEqualTo("8443");
+        assertThat(properties.get("withOutValue").get()).isEqualTo("");
+    }
+
+    @Test
+    public void shouldReturnEmptyMapIfThereIsNoArgs() {
+        //given
+        String[] args = {};
+
+        //when
+        Map<String, String> properties = CLIUtils.processCmdLine(args);
+
+        //then
+        assertThat(properties).isEmpty();
+    }
+
+}
\ No newline at end of file