Sonar violation fixes for Parameterized tests and Lambda Expressions

[cli.git] / main / src / main / java / org / onap / cli / main / OnapCli.java

diff --git a/main/src/main/java/org/onap/cli/main/OnapCli.java b/main/src/main/java/org/onap/cli/main/OnapCli.java
index 08ef640..6d6e4ff 100644 (file)
--- a/main/src/main/java/org/onap/cli/main/OnapCli.java
+++ b/main/src/main/java/org/onap/cli/main/OnapCli.java
@@ -241,38 +241,7 @@ public class OnapCli {
     public void handleBatchCommand() {
         try { //NOSONAR
             if (this.paramFile != null) {
-                //Read YAML and loop thru it
-                // one
-                // - param-long-option-1: value
-                // - param-long-option-1: value
-                // - positional-arg1
-                // - positional-arg2
-                // two
-                // - param-long-option-1: value
-                // - param-long-option-1: value
-                // - positional-arg1
-                // - positional-arg2
-                try {
-                    Map<String, Object> values = OnapCommandDiscoveryUtils.loadYaml(this.paramFile);
-
-                    for (Entry<String, Object> cmdsParam: values.entrySet()) {
-                        for (Object param: (List)cmdsParam.getValue()) {
-                            if (param instanceof Map) { //optional args
-                                Map <String, String> paramMap = (Map<String, String>) param;
-                                String paramName = paramMap.keySet().iterator().next();
-                                Object paramValue = paramMap.get(paramName);
-                                argsParamFile.add(this.getLongOption(paramName));
-                                argsParamFile.add(paramValue.toString());
-                            } else { //positional args
-                                argsParamFile.add(param.toString());
-                            }
-                        }
-                    }
-
-                } catch (Exception e) { // NOSONAR
-                    this.print("Failed to read param file " + this.paramFile);
-                    this.print(e);
-                }
+                handleBatchCommandUtil();
             }
         } catch (Exception e) {
             this.print(e);
@@ -280,6 +249,41 @@ public class OnapCli {
         }
     }
 
+    private void handleBatchCommandUtil() {
+        //Read YAML and loop thru it
+        // one
+        // - param-long-option-1: value
+        // - param-long-option-1: value
+        // - positional-arg1
+        // - positional-arg2
+        // two
+        // - param-long-option-1: value
+        // - param-long-option-1: value
+        // - positional-arg1
+        // - positional-arg2
+        try {
+            Map<String, Object> values = OnapCommandDiscoveryUtils.loadYaml(this.paramFile);
+
+            for (Entry<String, Object> cmdsParam: values.entrySet()) {
+                for (Object param: (List)cmdsParam.getValue()) {
+                    if (param instanceof Map) { //optional args
+                        Map <String, String> paramMap = (Map<String, String>) param;
+                        String paramName = paramMap.keySet().iterator().next();
+                        Object paramValue = paramMap.get(paramName);
+                        argsParamFile.add(this.getLongOption(paramName));
+                        argsParamFile.add(paramValue.toString());
+                    } else { //positional args
+                        argsParamFile.add(param.toString());
+                    }
+                }
+            }
+
+        } catch (Exception e) { // NOSONAR
+            this.print("Failed to read param file " + this.paramFile);
+            this.print(e);
+        }
+    }
+
     public void verifyCommand(OnapCommand cmd) throws OnapCommandException {
 
         OnapCliArgsParser.populateParams(cmd.getParameters(), args);