Code improvement for pending sonar issues

Issue-ID: CLI-270

Signed-off-by: jitendra007 <jitendra.sharma1@huawei.com>
Change-Id: Ie27d3ff077fa1ef4d13788849aa82d695f183eeb

16 files changed, 98 insertions, 94 deletions

diff --git a/framework/src/main/java/org/onap/cli/fw/cmd/product/OnapServiceListCommand.java b/framework/src/main/java/org/onap/cli/fw/cmd/product/OnapServiceListCommand.java
index 880f83ea..36c701ce 100644
--- a/framework/src/main/java/org/onap/cli/fw/cmd/product/OnapServiceListCommand.java
+++ b/framework/src/main/java/org/onap/cli/fw/cmd/product/OnapServiceListCommand.java
@@ -51,7 +51,7 @@ public class OnapServiceListCommand extends OnapCommand {
             }
 
             if (!rslt.containsKey(schema.getProduct())) {
-                rslt.put(schema.getProduct(), new HashSet<String>());
+                rslt.put(schema.getProduct(), new HashSet<>());
             }
             rslt.get(schema.getProduct()).add(schema.getService());
         }
@@ -71,7 +71,7 @@ public class OnapServiceListCommand extends OnapCommand {
             }
         }
 
-        for (String service : rslt.getOrDefault(product, new HashSet<String>())) {
+        for (String service : rslt.getOrDefault(product, new HashSet<>())) {
             this.getResult().getRecordsMap().get("product").getValues().add(product);
             this.getResult().getRecordsMap().get("service").getValues().add(service);
             this.getResult().getRecordsMap().get("description").getValues().add(
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 c2ae189b..9a6a4e78 100644
--- a/framework/src/main/java/org/onap/cli/fw/schema/OnapCommandSchemaMerger.java
+++ b/framework/src/main/java/org/onap/cli/fw/schema/OnapCommandSchemaMerger.java
@@ -33,13 +33,13 @@ import org.slf4j.LoggerFactory;
  */
 public class OnapCommandSchemaMerger {
 
-    static Logger LOG = LoggerFactory.getLogger(OnapCommandSchemaMerger.class);
+    static Logger logger = LoggerFactory.getLogger(OnapCommandSchemaMerger.class);
 
-    public static Map<String, ?> mergeSchemas(OnapCommand cmd) throws OnapCommandException {
-        Map<String, Object> mergedResult = new LinkedHashMap<String, Object>();
+    public static Map<String, Object> mergeSchemas(OnapCommand cmd) throws OnapCommandException {
+        Map<String, Object> mergedResult = new LinkedHashMap<>();
 
         for (String schema: cmd.getSchemas()) {
-            Map<String , Object> schemaMap = (Map<String, Object>) OnapCommandSchemaLoader.validateSchemaVersion(schema, cmd.getSchemaVersion());
+            Map<String , Object> schemaMap = OnapCommandSchemaLoader.validateSchemaVersion(schema, cmd.getSchemaVersion());
             mergeYamlMap(mergedResult, schemaMap);
         }
 
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 7352eced..839d1427 100644
--- a/framework/src/main/java/org/onap/cli/fw/store/OnapCommandExecutionStore.java
+++ b/framework/src/main/java/org/onap/cli/fw/store/OnapCommandExecutionStore.java
@@ -41,20 +41,20 @@ import org.slf4j.LoggerFactory;
 public class OnapCommandExecutionStore {
     private static Logger log = LoggerFactory.getLogger(OnapCommandExecutionStore.class);
 
-    private static boolean storeReady = false;
-    private static String REQUEST_ID = "requestId";
-    private static String EXECUTION_ID = "executionId";
-    private static String INPUT = "input";
-    private static String STDOUT = "stdout";
-    private static String STDERR = "stderr";
-    private static String DEBUG = "debug";
-    private static String IN_PROGRESS = "in-progress";
-    private static String OUTPUT = "output";
-    private static String ERROR = "error";
-    private static String COMPLETED = "completed";
-    private static String FAILED = "failed";
-    private static String EXECUTIONID = "execution-id";
-    private static String REQUESTID = "request-id";
+    private static boolean storeReady = false; // NOSONAR
+    private static final String REQUEST_ID = "requestId";
+    private static final String EXECUTION_ID = "executionId";
+    private static final String INPUT = "input";
+    private static final String STDOUT = "stdout";
+    private static final String STDERR = "stderr";
+    private static final String DEBUG = "debug";
+    private static final String IN_PROGRESS = "in-progress";
+    private static final String OUTPUT = "output";
+    private static final String ERROR = "error";
+    private static final String COMPLETED = "completed";
+    private static final String FAILED = "failed";
+    private static final String EXECUTIONID = "execution-id";
+    private static final String REQUESTID = "request-id";
 
     private SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS", Locale.US);
 
diff --git a/framework/src/main/java/org/onap/cli/fw/store/OnapCommandProfileStore.java b/framework/src/main/java/org/onap/cli/fw/store/OnapCommandProfileStore.java
index 39645120..732ad002 100644
--- a/framework/src/main/java/org/onap/cli/fw/store/OnapCommandProfileStore.java
+++ b/framework/src/main/java/org/onap/cli/fw/store/OnapCommandProfileStore.java
@@ -88,7 +88,7 @@ public class OnapCommandProfileStore {
     public void add(String productVersion, String paramName, String paramValue) {
 
         if (!paramCache.containsKey(productVersion)) {
-            paramCache.put(productVersion, new HashMap<String, String>());
+            paramCache.put(productVersion, new HashMap<>());
         }
 
         paramCache.get(productVersion).put(paramName, paramValue);
diff --git a/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java b/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java
index 58fe7df6..dab6669c 100644
--- a/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java
+++ b/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java
@@ -190,7 +190,7 @@ public class OnapCommandUtils {
      * @return
      */
     public static String replaceLineForSpecialValues(String lineSpl) {
-        return replaceLineForSpecialValues(lineSpl, new HashMap<String, String>());
+        return replaceLineForSpecialValues(lineSpl, new HashMap<>());
     }
 
     /**
@@ -410,7 +410,7 @@ public class OnapCommandUtils {
     }
 
     public static void copyParamsFrom(OnapCommand from, OnapCommand to) throws OnapCommandInvalidParameterValue {
-        copyParamsFrom(from, to, new HashMap<String, String>());
+        copyParamsFrom(from, to, new HashMap<>());
     }
 
     /**
diff --git a/grpc/grpc-client/src/main/java/org/open/infc/grpc/client/OpenInterfaceGrpcClient.java b/grpc/grpc-client/src/main/java/org/open/infc/grpc/client/OpenInterfaceGrpcClient.java
index efc941f9..fc007a01 100644
--- a/grpc/grpc-client/src/main/java/org/open/infc/grpc/client/OpenInterfaceGrpcClient.java
+++ b/grpc/grpc-client/src/main/java/org/open/infc/grpc/client/OpenInterfaceGrpcClient.java
@@ -43,8 +43,7 @@ public class OpenInterfaceGrpcClient {
       public static class OpenInterfaceGrpcExecption extends Exception {
           private static final long serialVersionUID = -8755636432217894246L;
 
-          private int errorCode = -1;
-
+          private int errorCode = -1; //NOSONAR
           public OpenInterfaceGrpcExecption(int errorCode, String message) {
               super(message);
               this.errorCode = errorCode;
@@ -52,10 +51,10 @@ public class OpenInterfaceGrpcClient {
       }
 
       public static class OpenInterfaceGrpcTimeoutExecption extends OpenInterfaceGrpcExecption {
-          private static int errorCode = 1;
+          private static final int ERROR_CODE = 1;
 
           public OpenInterfaceGrpcTimeoutExecption(String message) {
-              super(errorCode, message);
+              super(ERROR_CODE, message);
           }
       }
 
diff --git a/grpc/grpc-server/src/main/java/org/open/infc/grpc/server/OpenInterfaceGrpcServer.java b/grpc/grpc-server/src/main/java/org/open/infc/grpc/server/OpenInterfaceGrpcServer.java
index a7c0b175..c2a61320 100644
--- a/grpc/grpc-server/src/main/java/org/open/infc/grpc/server/OpenInterfaceGrpcServer.java
+++ b/grpc/grpc-server/src/main/java/org/open/infc/grpc/server/OpenInterfaceGrpcServer.java
@@ -159,8 +159,8 @@ public class OpenInterfaceGrpcServer {
                         //Set the profile to current one
                         OnapCommandRegistrar.getRegistrar().setProfile(
                                 profile,
-                                new ArrayList<String>(),
-                                new ArrayList<String>());
+                                new ArrayList<>(),
+                                new ArrayList<>());
 
                         //fill from profile
                         Map<String, String> cache= OnapCommandRegistrar.getRegistrar().getParamCache(product);
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 061c1f7b..1c27205f 100644
--- a/main/src/main/java/org/onap/cli/main/OnapCli.java
+++ b/main/src/main/java/org/onap/cli/main/OnapCli.java
@@ -225,8 +225,8 @@ public class OnapCli {
             if (this.profile != null) {
                 OnapCommandRegistrar.getRegistrar().setProfile(
                         this.profile,
-                        new ArrayList<String>(),
-                        new ArrayList<String>());
+                        new ArrayList<>(),
+                        new ArrayList<>());
             }
         } catch (Exception e) {
             this.print(e);
@@ -378,10 +378,9 @@ public class OnapCli {
                         break;
                     } else if (OnapCliConstants.PARAM_INTERACTIVE_CLEAR.equalsIgnoreCase(line)) {
                         console.clearScreen();
-                        continue;
-                    }
-                    this.args = new ArrayList<>();
-                    this.args.addAll(Arrays.asList(line.split(OnapCliConstants.PARAM_INTERACTIVE_ARG_SPLIT_PATTERN)));
+                    } else {
+                        this.args = new ArrayList<>();
+                        this.args.addAll(Arrays.asList(line.split(OnapCliConstants.PARAM_INTERACTIVE_ARG_SPLIT_PATTERN)));
 
                     if (!args.isEmpty() && this.args.get(0).equals(OnapCliConstants.PARAM_INTERACTIVE_USE)) {
                         if (args.size() == 1) {
@@ -397,53 +396,46 @@ public class OnapCli {
                         }
 
                     } else if (!args.isEmpty() && this.args.get(0).equals(OnapCliConstants.PARAM_INTERACTIVE_HELP)) {
-                        try {
-                            this.print(OnapCommandRegistrar.getRegistrar().getHelpForEnabledProductVersion());
-                            this.print(OnapCli.getDirectiveHelp());
-                        } catch (OnapCommandException e) {
-                            this.print(e);
-                        }
-
-                    } else if (!args.isEmpty() && this.args.get(0).equals(OnapCliConstants.PARAM_INTERACTIVE_VERSION)) {
-                        this.printVersion = true;
-                        handleVersion();
-
-                    } else if (!args.isEmpty() && this.args.get(0).equals(OnapCliConstants.PARAM_INTERACTIVE_PROFILE)) {
-                        if (args.size() == 1) {
-                            this.print("Please use it in the form of 'profile <profile-name>'\n");
-                            this.print("Available profiles: ");
-                            this.print(OnapCommandRegistrar.getRegistrar().getUserProfiles().toString());
-                        } else {
-                            this.profile = args.get(1);
-                            handleProfile();
-                        }
+                        this.print(OnapCommandRegistrar.getRegistrar().getHelpForEnabledProductVersion());
+                        this.print(OnapCli.getDirectiveHelp());
+                        } else if (!args.isEmpty() && this.args.get(0).equals(OnapCliConstants.PARAM_INTERACTIVE_VERSION)) {
+                            this.printVersion = true;
+                            handleVersion();
+
+                        } else if (!args.isEmpty() && this.args.get(0).equals(OnapCliConstants.PARAM_INTERACTIVE_PROFILE)) {
+                            if (args.size() == 1) {
+                                this.print("Please use it in the form of 'profile <profile-name>'\n");
+                                this.print("Available profiles: ");
+                                this.print(OnapCommandRegistrar.getRegistrar().getUserProfiles().toString());
+                            } else {
+                                this.profile = args.get(1);
+                                handleProfile();
+                            }
 
-                    } else if (!args.isEmpty() && this.args.get(0).equals(OnapCliConstants.PARAM_INTERACTIVE_SET)) {
-                        if (args.size() > 1) {
-                            String [] paramEntry = args.get(1).trim().split("=", 2);
-                            if (paramEntry.length == 2) {
-                                OnapCommandRegistrar.getRegistrar().addParamCache(paramEntry[0].trim(), paramEntry[1].trim());
+                        } else if (!args.isEmpty() && this.args.get(0).equals(OnapCliConstants.PARAM_INTERACTIVE_SET)) {
+                            if (args.size() > 1) {
+                                String[] paramEntry = args.get(1).trim().split("=", 2);
+                                if (paramEntry.length == 2) {
+                                    OnapCommandRegistrar.getRegistrar().addParamCache(paramEntry[0].trim(), paramEntry[1].trim());
+                                } else {
+                                    this.print("Please use it in the form of 'set <param-name>=<param-value>'");
+                                }
                             } else {
-                                this.print("Please use it in the form of 'set <param-name>=<param-value>'");
+                                this.print(OnapCommandRegistrar.getRegistrar().getParamCache().toString());
                             }
-                        } else {
-                            this.print(OnapCommandRegistrar.getRegistrar().getParamCache().toString());
-                        }
 
-                    } else if (!args.isEmpty() && this.args.get(0).equals(OnapCliConstants.PARAM_INTERACTIVE_UNSET)) {
-                        if (args.size() > 1) {
-                            for (int i = 1; i <args.size(); i++) {
-                                OnapCommandRegistrar.getRegistrar().removeParamCache(args.get(i));
+                        } else if (!args.isEmpty() && this.args.get(0).equals(OnapCliConstants.PARAM_INTERACTIVE_UNSET)) {
+                            if (args.size() > 1) {
+                                for (int i = 1; i < args.size(); i++) {
+                                    OnapCommandRegistrar.getRegistrar().removeParamCache(args.get(i));
+                                }
+                            }
+                        } else {
+                            if (!(args.size() == 1 && args.get(0).trim().isEmpty())) {
+                                this.setArgs(this.args.toArray(new String[]{}));
+                                handleCommand();
                             }
                         }
-                    } else {
-                        if (args.size() == 1 && args.get(0).trim().isEmpty()) {
-                            //Ignore blanks // NOSONAR
-                            continue;
-                        }
-
-                        this.setArgs(this.args.toArray(new String [] {}));
-                        handleCommand();
                     }
                 }
             } catch (IOException e) { // NOSONAR
diff --git a/profiles/command/src/main/java/org/onap/cli/fw/cmd/schema/OnapCommandSchemaCmdLoader.java b/profiles/command/src/main/java/org/onap/cli/fw/cmd/schema/OnapCommandSchemaCmdLoader.java
index 2d408065..8c2c4eba 100644
--- a/profiles/command/src/main/java/org/onap/cli/fw/cmd/schema/OnapCommandSchemaCmdLoader.java
+++ b/profiles/command/src/main/java/org/onap/cli/fw/cmd/schema/OnapCommandSchemaCmdLoader.java
@@ -92,7 +92,7 @@ public class OnapCommandSchemaCmdLoader {
 
                     case OnapCommandCmdConstants.SUCCESS_EXIT_CODE:
                         List<String> list = (ArrayList) valMap.get(key1);
-                        cmd.setSuccessStatusCodes(list.stream().map(s -> Integer.parseInt(s)).collect(Collectors.toList()));
+                        cmd.setSuccessStatusCodes(list.stream().map(Integer::parseInt).collect(Collectors.toList()));
                         break;
 
                     case OnapCommandCmdConstants.PASS_CODE:
diff --git a/profiles/http/src/main/java/org/onap/cli/fw/http/auth/OnapCommandHttpAuthClient.java b/profiles/http/src/main/java/org/onap/cli/fw/http/auth/OnapCommandHttpAuthClient.java
index e5f17bec..075c1304 100644
--- a/profiles/http/src/main/java/org/onap/cli/fw/http/auth/OnapCommandHttpAuthClient.java
+++ b/profiles/http/src/main/java/org/onap/cli/fw/http/auth/OnapCommandHttpAuthClient.java
@@ -32,6 +32,10 @@ import org.onap.cli.fw.http.schema.OnapCommandSchemaHttpLoader;
 import org.onap.cli.fw.output.OnapCommandResultAttribute;
 import org.onap.cli.fw.registrar.OnapCommandRegistrar;
 import org.onap.cli.fw.utils.OnapCommandUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import java.io.IOException;
+import org.onap.cli.fw.http.error.OnapCommandLoginFailed;
 
 /**
  * Oclip Auth client helps to do login and logout.
@@ -39,6 +43,7 @@ import org.onap.cli.fw.utils.OnapCommandUtils;
  */
 public class OnapCommandHttpAuthClient {
 
+    private static Logger logger = LoggerFactory.getLogger(OnapCommandHttpAuthClient.class); //NOSONAR
     private OnapHttpCommand cmd = null;
 
     private OnapHttpConnection http = null;
@@ -98,7 +103,11 @@ public class OnapCommandHttpAuthClient {
 
         logout.execute();
 
-        this.http.close();
+        try {
+            this.http.close();
+        } catch (IOException e) {
+            throw new OnapCommandLoginFailed("Exception when closing httpclient");
+        }
     }
 
     /**
diff --git a/profiles/http/src/main/java/org/onap/cli/fw/http/connect/OnapHttpConnection.java b/profiles/http/src/main/java/org/onap/cli/fw/http/connect/OnapHttpConnection.java
index 732e6c0a..95ad7266 100644
--- a/profiles/http/src/main/java/org/onap/cli/fw/http/connect/OnapHttpConnection.java
+++ b/profiles/http/src/main/java/org/onap/cli/fw/http/connect/OnapHttpConnection.java
@@ -38,7 +38,6 @@ import org.apache.http.HttpResponse;
 import org.apache.http.annotation.Contract;
 import org.apache.http.annotation.ThreadingBehavior;
 import org.apache.http.client.CookieStore;
-import org.apache.http.client.HttpClient;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.HttpDelete;
 import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
@@ -47,14 +46,11 @@ import org.apache.http.client.methods.HttpPatch;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.methods.HttpPut;
 import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.http.client.protocol.ClientContext;
 import org.apache.http.config.Registry;
 import org.apache.http.config.RegistryBuilder;
 import org.apache.http.conn.HttpClientConnectionManager;
 import org.apache.http.conn.socket.ConnectionSocketFactory;
-import org.apache.http.conn.ssl.AllowAllHostnameVerifier;
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.conn.ssl.X509HostnameVerifier;
 import org.apache.http.cookie.Cookie;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
@@ -71,7 +67,10 @@ import org.onap.cli.fw.http.conf.OnapCommandHttpConstants;
 import org.onap.cli.fw.http.error.OnapCommandHttpFailure;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.conn.ssl.NoopHostnameVerifier;
+import org.apache.http.impl.client.CloseableHttpClient;
+import javax.net.ssl.HostnameVerifier;
 /**
  * Helps to make http connection.<br>
  */
@@ -79,7 +78,7 @@ public class OnapHttpConnection {
 
     private static Logger log = LoggerFactory.getLogger(OnapHttpConnection.class);
 
-    private HttpClient httpClient = null;
+    private CloseableHttpClient httpClient = null;
 
     Map<String, String> mapCommonHeaders = new HashMap<> ();
 
@@ -108,7 +107,7 @@ public class OnapHttpConnection {
                     SSLContext sslContext = SSLContext.getInstance(OnapCommandHttpConstants.SSLCONTEST_TLS);
                     sslContext.init(null, new TrustManager[] { new TrustAllX509TrustManager() },
                             new java.security.SecureRandom());
-                    X509HostnameVerifier hostnameVerifier = new AllowAllHostnameVerifier();
+                    HostnameVerifier hostnameVerifier = new NoopHostnameVerifier();
                     Registry<ConnectionSocketFactory> socketFactoryRegistry = RegistryBuilder
                             .<ConnectionSocketFactory>create()
                             .register("https", new SSLConnectionSocketFactory(sslContext, hostnameVerifier)).build();
@@ -320,7 +319,7 @@ public class OnapHttpConnection {
             CookieStore cookieStore = new BasicCookieStore();
             updateInputFromCookies(input, cookieStore);
             HttpContext localContext = new BasicHttpContext();
-            localContext.setAttribute(ClientContext.COOKIE_STORE, cookieStore);
+            localContext.setAttribute(HttpClientContext.COOKIE_STORE, cookieStore);
 
             this.initHttpClient(input.getUri().startsWith("https"));
 
@@ -337,11 +336,10 @@ public class OnapHttpConnection {
         return result;
     }
 
-    @SuppressWarnings("deprecation")
-    public void close() {
+    public void close() throws IOException {
         this.mapCommonHeaders.clear();
         if (this.httpClient != null) {
-            this.httpClient.getConnectionManager().shutdown();
+            this.httpClient.close();
         }
     }
 
diff --git a/profiles/http/src/main/java/org/onap/cli/fw/http/schema/OnapCommandSchemaHttpLoader.java b/profiles/http/src/main/java/org/onap/cli/fw/http/schema/OnapCommandSchemaHttpLoader.java
index e7a643ad..35501208 100644
--- a/profiles/http/src/main/java/org/onap/cli/fw/http/schema/OnapCommandSchemaHttpLoader.java
+++ b/profiles/http/src/main/java/org/onap/cli/fw/http/schema/OnapCommandSchemaHttpLoader.java
@@ -246,7 +246,7 @@ public class OnapCommandSchemaHttpLoader {
                                 validateHttpSccessCodes(errorList, (List<Object>) valMap.get(key1));
                             }
                             List<String> list = (ArrayList) valMap.get(key1);
-                            cmd.setSuccessStatusCodes(list.stream().map(s -> Integer.parseInt(s)).collect(Collectors.toList()));
+                            cmd.setSuccessStatusCodes(list.stream().map(Integer::parseInt).collect(Collectors.toList()));
                             break;
 
                         case OnapCommandHttpConstants.RESULT_MAP:
diff --git a/profiles/http/src/test/java/org/onap/cli/fw/http/OnapHttpConnectionTest.java b/profiles/http/src/test/java/org/onap/cli/fw/http/OnapHttpConnectionTest.java
index 2860388b..68995dba 100644
--- a/profiles/http/src/test/java/org/onap/cli/fw/http/OnapHttpConnectionTest.java
+++ b/profiles/http/src/test/java/org/onap/cli/fw/http/OnapHttpConnectionTest.java
@@ -216,7 +216,7 @@ public class OnapHttpConnectionTest {
     }
 
     @Test()
-    public void httpUnSecuredCloseExceptionTest() throws OnapCommandHttpFailure {
+    public void httpUnSecuredCloseExceptionTest() throws IOException {
         inp.setMethod("other");
         con = new OnapHttpConnection();
         con.close();
diff --git a/profiles/http/src/test/java/org/onap/cli/fw/http/error/OnapCommandErrorTest.java b/profiles/http/src/test/java/org/onap/cli/fw/http/error/OnapCommandErrorTest.java
index cd2131e9..e007af15 100644
--- a/profiles/http/src/test/java/org/onap/cli/fw/http/error/OnapCommandErrorTest.java
+++ b/profiles/http/src/test/java/org/onap/cli/fw/http/error/OnapCommandErrorTest.java
@@ -52,6 +52,13 @@ public class OnapCommandErrorTest {
     }
 
     @Test
+    public void oclipCommandLoginFailedTest3() {
+        OnapCommandLoginFailed failed = new OnapCommandLoginFailed("Failed");
+
+        assertEquals("0x4001::Login failed, Failed", failed.getMessage());
+    }
+
+    @Test
     public void oclipCommandLoginFailedTest1() {
         OnapCommandLoginFailed failed = new OnapCommandLoginFailed(new Exception("Failed"));
 
diff --git a/profiles/snmp/src/main/java/org/onap/cli/fw/snmp/cmd/OnapSnmpCommand.java b/profiles/snmp/src/main/java/org/onap/cli/fw/snmp/cmd/OnapSnmpCommand.java
index 4fc47538..08837a0f 100644
--- a/profiles/snmp/src/main/java/org/onap/cli/fw/snmp/cmd/OnapSnmpCommand.java
+++ b/profiles/snmp/src/main/java/org/onap/cli/fw/snmp/cmd/OnapSnmpCommand.java
@@ -41,7 +41,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Vector;
 
 /**
  * Oclip snmp Command.
@@ -120,7 +119,7 @@ public class OnapSnmpCommand extends OnapCommand {
                     ResponseEvent responseEvent = snmp.send(getPDU(PDU.GET, oidStrArr), getTarget(), null);
                     if ( responseEvent != null) {
                         if (responseEvent.getResponse().getErrorStatus() == PDU.noError) {
-                            Vector<? extends VariableBinding> variableBindings = responseEvent.
+                            List<? extends VariableBinding> variableBindings = responseEvent.
                                     getResponse().getVariableBindings();
                             variableBindings.stream().forEach(varBinding -> { //NOSONAR
                                 String key = getKeyForValue(varBinding.getOid().toString());
diff --git a/validate/sample-yaml-generator/src/main/java/org/onap/cli/sample/yaml/SampleYamlGenerator.java b/validate/sample-yaml-generator/src/main/java/org/onap/cli/sample/yaml/SampleYamlGenerator.java
index 3436a50f..7e20fc87 100644
--- a/validate/sample-yaml-generator/src/main/java/org/onap/cli/sample/yaml/SampleYamlGenerator.java
+++ b/validate/sample-yaml-generator/src/main/java/org/onap/cli/sample/yaml/SampleYamlGenerator.java
@@ -67,7 +67,7 @@ public class SampleYamlGenerator {
     }
 
     private static String printTabs() {
-        StringBuffer spaces = new StringBuffer();
+        StringBuilder spaces = new StringBuilder();
         for (int i=0; i < nTab; i++) {
             spaces.append("  ");
         }