re visit a block of commented-out lines of code

[cli.git] / framework / src / main / java / org / onap / cli / fw / registrar / OnapCommandRegistrar.java

diff --git a/framework/src/main/java/org/onap/cli/fw/registrar/OnapCommandRegistrar.java b/framework/src/main/java/org/onap/cli/fw/registrar/OnapCommandRegistrar.java
index 6771bfe..de462b4 100644 (file)
--- a/framework/src/main/java/org/onap/cli/fw/registrar/OnapCommandRegistrar.java
+++ b/framework/src/main/java/org/onap/cli/fw/registrar/OnapCommandRegistrar.java
@@ -17,6 +17,7 @@
 package org.onap.cli.fw.registrar;
 
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -25,6 +26,7 @@ import java.util.Set;
 
 import org.apache.commons.io.IOUtils;
 import org.onap.cli.fw.cmd.OnapCommand;
+import org.onap.cli.fw.cmd.OnapCommandType;
 import org.onap.cli.fw.cmd.dummy.OnapCommandDummy;
 import org.onap.cli.fw.conf.OnapCommandConfig;
 import org.onap.cli.fw.conf.OnapCommandConstants;
@@ -129,7 +131,7 @@ public class OnapCommandRegistrar {
         }
 
         this.registry.put(name + ":" + version, cmd);
-        log.info("REGISITER : " + name + ":" + version + " = " + cmd.getCanonicalName());
+        log.info("REGISITER : {} : {} = {}", name, version, cmd.getCanonicalName());
         this.availableProductVersions.add(version);
 
     }
@@ -292,7 +294,7 @@ public class OnapCommandRegistrar {
 
         for (OnapCommandSchemaInfo schema : schemas) {
             if (schema.isIgnore()) {
-                log.info("Ignoring schema " + schema.getSchemaURI());
+                log.info("Ignoring schema {}", schema.getSchemaURI());
                 continue;
             }
 
@@ -332,7 +334,7 @@ public class OnapCommandRegistrar {
 
         String versionInfo = "";
         try {
-            versionInfo = IOUtils.toString(this.getClass().getClassLoader().getResourceAsStream(OnapCommandConstants.VERSION_INFO));
+            versionInfo = IOUtils.toString((this.getClass().getClassLoader().getResourceAsStream(OnapCommandConstants.VERSION_INFO)), (Charset) null);
         } catch (IOException e) { // NOSONAR
             //Never occurs
         }
@@ -412,9 +414,9 @@ public class OnapCommandRegistrar {
                 }
 
                 //don't expose system commands for user usage
-                //if (cmd.getInfo().getCommandType().name().equalsIgnoreCase(OnapCommandType.SYSTEM.name())) {
-                //    continue;
-                //}
+                if (cmd.getInfo().getCommandType().name().equalsIgnoreCase(OnapCommandType.SYSTEM.name())) {
+                    continue;
+                }
 
                 attrSrv.getValues().add(cmd.getInfo().getService());
                 attrDesc.getValues().add(cmd.getDescription());
@@ -431,7 +433,7 @@ public class OnapCommandRegistrar {
         }
     }
 
-    public List<Map<String, ?>> getTestSuite(String cmd, String product) throws OnapCommandException {
+    public List<Map<String, Object>> getTestSuite(String cmd, String product) throws OnapCommandException {
         return OnapCommandDiscoveryUtils.createTestSuite(cmd, product);
     }