1 files changed, 19 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("-");
+    }
 }