code improvements-sonar fixes

Signed-off-by: SravanKumarGunda <sravan.kumar1@huawei.com>
Issue-ID: CLI-270
Change-Id: I3f663df51e27e7295f9cad51ace100d784ab94bb

diff --git a/framework/src/main/java/org/onap/cli/fw/error/OnapCommandInvalidRegistration.java b/framework/src/main/java/org/onap/cli/fw/error/OnapCommandInvalidRegistration.java
index 1c90e9a..90f8c46 100644 (file)
--- a/framework/src/main/java/org/onap/cli/fw/error/OnapCommandInvalidRegistration.java
+++ b/framework/src/main/java/org/onap/cli/fw/error/OnapCommandInvalidRegistration.java
@@ -26,7 +26,7 @@ public class OnapCommandInvalidRegistration extends OnapCommandException {
 
     private static final long serialVersionUID = 7722163282274482532L;
 
-    public OnapCommandInvalidRegistration(Class cls) {
+    public OnapCommandInvalidRegistration(Class<?> cls) {
         super("0x2001", "Invalid commad class " + cls.getCanonicalName() + " registration, it should be derived from "
                 + OnapCommand.class.getCanonicalName());
     }

diff --git a/framework/src/main/java/org/onap/cli/fw/output/print/OnapCommandPrint.java b/framework/src/main/java/org/onap/cli/fw/output/print/OnapCommandPrint.java
index 09050c6..c548f6d 100644 (file)
--- a/framework/src/main/java/org/onap/cli/fw/output/print/OnapCommandPrint.java
+++ b/framework/src/main/java/org/onap/cli/fw/output/print/OnapCommandPrint.java
@@ -290,6 +290,6 @@ public class OnapCommandPrint {
             throw new OnapCommandOutputPrintingFailed(e);  // NOSONAR
         }
      */
-     return "";
+     return ""; //NOSONAR
     }
 }

diff --git a/framework/src/main/java/org/onap/cli/fw/schema/OnapCommandSchemaMerger.java b/framework/src/main/java/org/onap/cli/fw/schema/OnapCommandSchemaMerger.java
index 9a6a4e7..0712603 100644 (file)
--- a/framework/src/main/java/org/onap/cli/fw/schema/OnapCommandSchemaMerger.java
+++ b/framework/src/main/java/org/onap/cli/fw/schema/OnapCommandSchemaMerger.java
@@ -35,6 +35,10 @@ public class OnapCommandSchemaMerger {
 
     static Logger logger = LoggerFactory.getLogger(OnapCommandSchemaMerger.class);
 
+    private OnapCommandSchemaMerger(){
+        //It is made private in order to resolve: Utility classes should not have public constructors
+    }
+
     public static Map<String, Object> mergeSchemas(OnapCommand cmd) throws OnapCommandException {
         Map<String, Object> mergedResult = new LinkedHashMap<>();
 

diff --git a/framework/src/main/java/org/onap/cli/fw/store/OnapCommandExecutionStore.java b/framework/src/main/java/org/onap/cli/fw/store/OnapCommandExecutionStore.java
index 839d142..774e1fd 100644 (file)
--- a/framework/src/main/java/org/onap/cli/fw/store/OnapCommandExecutionStore.java
+++ b/framework/src/main/java/org/onap/cli/fw/store/OnapCommandExecutionStore.java
@@ -453,8 +453,7 @@ public class OnapCommandExecutionStore {
 
     private File getExecutionDir(String executionId) throws OnapCommandExecutionNotFound {
         File []f =  new File(getBasePath()).listFiles((dir, name) -> {
-            if (name.startsWith(executionId)) return true;
-            return false;
+            return name.startsWith(executionId);
         });
 
         if (f.length == 0) {

diff --git a/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandDiscoveryUtils.java b/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandDiscoveryUtils.java
index 614eb2a..923ae24 100644 (file)
--- a/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandDiscoveryUtils.java
+++ b/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandDiscoveryUtils.java
@@ -480,7 +480,7 @@ public class OnapCommandDiscoveryUtils {
 
     public static List<Map<String, Object>> createTestSuite(String cmd, String version) throws OnapCommandException {
 
-        ArrayList<Map<String, Object>> testSamples = new ArrayList();
+        ArrayList<Map<String, Object>> testSamples = new ArrayList<>();
 
 
         List<Resource> resources = new ArrayList<>();

diff --git a/framework/src/test/java/org/onap/cli/fw/schema/ValidateSchemaTest.java b/framework/src/test/java/org/onap/cli/fw/schema/ValidateSchemaTest.java
index 6d9b2d2..507490c 100644 (file)
--- a/framework/src/test/java/org/onap/cli/fw/schema/ValidateSchemaTest.java
+++ b/framework/src/test/java/org/onap/cli/fw/schema/ValidateSchemaTest.java
@@ -154,7 +154,7 @@ public class ValidateSchemaTest {
         paraValues.put("is_default_param","yes");
         list.add(paraValues);
         values.put("parameters",list);
-        assertTrue(OnapCommandSchemaLoader.parseSchema(cmd,values,true).size()==2);
+        assertEquals(2, OnapCommandSchemaLoader.parseSchema(cmd,values,true).size());
 
     }
     @Test
@@ -172,7 +172,7 @@ public class ValidateSchemaTest {
         list.add(paraValues);
         attributesValues.put("attributes",list);
         values.put("results",attributesValues);
-        assertTrue(OnapCommandSchemaLoader.parseSchema(cmd,values,true).size()==2);
+        assertEquals(2, OnapCommandSchemaLoader.parseSchema(cmd,values,true).size());
 
     }
 }

diff --git a/framework/src/test/java/org/onap/cli/fw/utils/OnapCommandUtilsTest.java b/framework/src/test/java/org/onap/cli/fw/utils/OnapCommandUtilsTest.java
index 44c1819..e5fa45b 100644 (file)
--- a/framework/src/test/java/org/onap/cli/fw/utils/OnapCommandUtilsTest.java
+++ b/framework/src/test/java/org/onap/cli/fw/utils/OnapCommandUtilsTest.java
@@ -546,8 +546,8 @@ public class OnapCommandUtilsTest {
           mapExample.put("key1", "paramA");
           mapExample.put("key2", "paramB");
           OnapCommandUtils.replaceLineFromResults("line $r{paramA} line $r{paramB}", mapExample);
-          assertTrue(mapExample.get("key1").equals("paramA"));
-          assertTrue(mapExample.get("key2").equals("paramB"));
+          assertEquals("paramA", mapExample.get("key1"));
+          assertEquals("paramB", mapExample.get("key2"));
    }
 
     @Test

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 1c27205..4d7e97a 100644 (file)
--- a/main/src/main/java/org/onap/cli/main/OnapCli.java
+++ b/main/src/main/java/org/onap/cli/main/OnapCli.java
@@ -252,7 +252,7 @@ public class OnapCli {
                 // - positional-arg1
                 // - positional-arg2
                 try {
-                    Map<String, Object> values = (Map<String, Object>) OnapCommandDiscoveryUtils.loadYaml(this.paramFile);
+                    Map<String, Object> values = OnapCommandDiscoveryUtils.loadYaml(this.paramFile);
 
                     for (Entry<String, Object> cmdsParam: values.entrySet()) {
                         for (Object param: (List)cmdsParam.getValue()) {

diff --git a/profiles/http/src/test/java/org/onap/cli/fw/http/utils/OnapCommandUtilsTest.java b/profiles/http/src/test/java/org/onap/cli/fw/http/utils/OnapCommandUtilsTest.java
index 7ad3c3f..89504fb 100644 (file)
--- a/profiles/http/src/test/java/org/onap/cli/fw/http/utils/OnapCommandUtilsTest.java
+++ b/profiles/http/src/test/java/org/onap/cli/fw/http/utils/OnapCommandUtilsTest.java
@@ -223,7 +223,7 @@ public class OnapCommandUtilsTest {
         HttpInput httpInput = new HttpInput();
         httpInput.setMultiparts(multiparts);
         HttpInput input = OnapCommandHttpUtils.populateParameters(params, httpInput);
-        assertTrue(input != null);
+        assertNotNull(input);
     }
 
 }