Merge changes I12e68fee,I1a7790d5,I2b957490,Ie711ce9f,Ieab2c892, ...

* changes:
  Improve param cache with entrySet
  Fix build warnings in snmp profile
  Fix the samples in utils test
  Remove extra line into multiple
  Correct the order of imports in http conn
  Fix assertion in http inputoutput test
  Update cli utils test to std compliant
  Fix import warnings
  Fix intendation warning in main test
  Fix import warnings
  Fix validation test
  Fix the style warings reported in registrar
  Remove unsed vars from Print testing
  Make the conditional check shorter
  Fix assertness in Result test
  Remove extra line chars
  Remove the build warning reported
  Fix OnapCommandSample with coding std.

3 files changed, 42 insertions, 26 deletions

diff --git a/main/src/test/java/org/onap/cli/main/OnapCliMainTest.java b/main/src/test/java/org/onap/cli/main/OnapCliMainTest.java
index 6d7dbdd2..634a8d7a 100644
--- a/main/src/test/java/org/onap/cli/main/OnapCliMainTest.java
+++ b/main/src/test/java/org/onap/cli/main/OnapCliMainTest.java
@@ -16,22 +16,21 @@
 
 package org.onap.cli.main;
 
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+
+
 import jline.console.ConsoleReader;
 import mockit.Invocation;
 import mockit.Mock;
 import mockit.MockUp;
 import org.junit.Test;
-import org.onap.cli.fw.cmd.OnapCommand;
 import org.onap.cli.fw.error.OnapCommandException;
 import org.onap.cli.fw.error.OnapCommandHelpFailed;
 import org.onap.cli.fw.registrar.OnapCommandRegistrar;
-import org.onap.cli.fw.schema.OnapCommandSchemaLoader;
 
-import java.io.IOException;
-import java.util.List;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 public class OnapCliMainTest {
 
@@ -87,7 +86,7 @@ public class OnapCliMainTest {
     }
 
     @Test
-    public void testHandleSampleCommandFailure() throws OnapCommandException{
+    public void testHandleSampleCommandFailure() throws OnapCommandException {
         this.handle(new String[] { "sample-test", "--string-param"});
     }
 
@@ -211,7 +210,7 @@ public class OnapCliMainTest {
         try {
             OnapCli.getDirectiveHelp();
         } catch (OnapCommandHelpFailed e) {
-             fail("Directive help failed to run");
+            fail("Directive help failed to run");
         }
     }
 }
diff --git a/main/src/test/java/org/onap/cli/main/interactive/StringCompleterTest.java b/main/src/test/java/org/onap/cli/main/interactive/StringCompleterTest.java
index 9d5cbf17..32f3be8a 100644
--- a/main/src/test/java/org/onap/cli/main/interactive/StringCompleterTest.java
+++ b/main/src/test/java/org/onap/cli/main/interactive/StringCompleterTest.java
@@ -18,11 +18,11 @@ package org.onap.cli.main.interactive;
 
 import static org.junit.Assert.assertTrue;
 
-import org.junit.Test;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 
+import org.junit.Test;
+
 public class StringCompleterTest {
 
     @Test
diff --git a/main/src/test/java/org/onap/cli/main/utils/OnapCliUtilsTest.java b/main/src/test/java/org/onap/cli/main/utils/OnapCliUtilsTest.java
index c3627ca2..2c74cf05 100644
--- a/main/src/test/java/org/onap/cli/main/utils/OnapCliUtilsTest.java
+++ b/main/src/test/java/org/onap/cli/main/utils/OnapCliUtilsTest.java
@@ -17,12 +17,9 @@
 package org.onap.cli.main.utils;
 
 import java.io.File;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 
 import org.junit.Assert;
@@ -65,8 +62,13 @@ public class OnapCliUtilsTest {
         paramslist.add(param4);
         paramslist.add(param5);
 
-        String[] args = new String[] { "sample-create", "--host-username", "admin", "--host-password", "123",
-                "--host-url", "a@b.com", "--string-param", "blah", "--long-opt", "10" };
+        String[] args = new String[] {
+            "sample-create",
+            "--host-username", "admin",
+            "--host-password", "123",
+            "--host-url", "a@b.com",
+            "--string-param", "blah",
+            "--long-opt", "10" };
         OnapCliArgsParser.populateParams(paramslist, Arrays.asList(args));
         List<String> expectedList = Arrays.asList(args);
 
@@ -214,8 +216,13 @@ public class OnapCliUtilsTest {
         paramslist.add(param4);
         paramslist.add(param5);
 
-        String[] args11 = new String[] { "sample-create", "-u", "admin", "-p", "123", "-r", "a@b.com", "-c", "blah",
-                "-l", "10", };
+        String[] args11 = new String[] {
+            "sample-create",
+            "-u", "admin",
+            "-p", "123",
+            "-r", "a@b.com",
+            "-c", "blah",
+            "-l", "10", };
         OnapCliArgsParser.populateParams(paramslist, Arrays.asList(args11));
 
         List<String> expectedList = Arrays.asList(args11);
@@ -257,7 +264,8 @@ public class OnapCliUtilsTest {
         OnapCliArgsParser.populateParams(paramslist,
                 Arrays.asList("show", "--map", "param1=value1", "--map", "param2=value2"));
 
-        Assert.assertEquals("{param1=value1, param2=value2}", paramslist.iterator().next().getValue().toString());
+        Assert.assertEquals("{param1=value1, param2=value2}",
+            paramslist.iterator().next().getValue().toString());
     }
 
     @Test(expected = OnapCliInvalidArgument.class)
@@ -270,8 +278,10 @@ public class OnapCliUtilsTest {
         paramslist.add(param1);
 
         param1.setParameterType(OnapCommandParameterType.MAP);
-        OnapCliArgsParser.populateParams(paramslist, Arrays.asList("show", "--map", "param1=value1", "--map", "param2"));
-        Assert.assertEquals("{\"param1\":\"value1\",\"param2\"}", paramslist.iterator().next().getValue().toString());
+        OnapCliArgsParser.populateParams(paramslist,
+                Arrays.asList("show", "--map", "param1=value1", "--map", "param2"));
+        Assert.assertEquals("{\"param1\":\"value1\",\"param2\"}",
+                paramslist.iterator().next().getValue().toString());
     }
 
     @Test(expected = OnapCliInvalidArgument.class)
@@ -283,8 +293,10 @@ public class OnapCliUtilsTest {
         Set<OnapCommandParameter> paramslist = new HashSet<>();
         paramslist.add(param1);
         param1.setParameterType(OnapCommandParameterType.MAP);
-        OnapCliArgsParser.populateParams(paramslist, Arrays.asList("show", "-o", "param1=value1", "-o", "param2"));
-        Assert.assertEquals("{\"param1\":\"value1\",\"param2\"}", paramslist.iterator().next().getValue().toString());
+        OnapCliArgsParser.populateParams(paramslist,
+                Arrays.asList("show", "-o", "param1=value1", "-o", "param2"));
+        Assert.assertEquals("{\"param1\":\"value1\",\"param2\"}",
+                paramslist.iterator().next().getValue().toString());
     }
 
     @Test(expected = OnapCliInvalidArgument.class)
@@ -293,12 +305,15 @@ public class OnapCliUtilsTest {
         paramargs.setName("http://localhost:8082/file.txt");
         Set<OnapCommandParameter> paramslist = new HashSet<>();
         paramslist.add(paramargs);
-        String[] args = new String[] { "positional-args", "http://localhost:8082/file.txt",
-                "http://localhost:8082/file.txt" };
+        String[] args = new String[] {
+            "positional-args",
+            "http://localhost:8082/file.txt",
+            "http://localhost:8082/file.txt" };
         paramargs.setParameterType(OnapCommandParameterType.STRING);
         OnapCliArgsParser.populateParams(paramslist, Arrays.asList(args));
         List<String> expectedList = Arrays.asList(args);
-        Assert.assertEquals("positional-args", expectedList.get(1), paramslist.iterator().next().getValue());
+        Assert.assertEquals("positional-args",
+                expectedList.get(1), paramslist.iterator().next().getValue());
     }
 
     @Test(expected = OnapCliInvalidArgument.class)
@@ -339,7 +354,9 @@ public class OnapCliUtilsTest {
         Set<OnapCommandParameter> paramslist = new HashSet<>();
         paramslist.add(jsonparam);
         File resourcesDirectory = new File("src/test/resources/sampletest.json");
-        String[] args = new String[] { "sample-create", "--json-param", "file:" + resourcesDirectory, "--json-param" };
+        String[] args = new String[] {
+            "sample-create", "--json-param",
+            "file:" + resourcesDirectory, "--json-param" };
         jsonparam.setParameterType(OnapCommandParameterType.JSON);
         OnapCliArgsParser.populateParams(paramslist, Arrays.asList(args));
         List<String> expectedList = Arrays.asList(args);