From: sindhu3672 <arcot.sindhuri@huawei.com>
Date: Thu, 8 Aug 2019 06:10:48 +0000 (+0530)
Subject: Shift string literal to left side of equals(avoid null pointer ex)
X-Git-Tag: 1.5.2~130^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F96%2F92996%2F1;p=so.git

Shift string literal to left side of equals(avoid null pointer ex)

Avoid null pointer exception mso-openstack-adapters classes

Issue-ID: SO-2187

Signed-off-by: sindhu3672 <arcot.sindhuri@huawei.com>
Change-Id: Ie7099318a79162aed26ec3a8e4a013cece367736
---

diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfCloudifyAdapterImpl.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfCloudifyAdapterImpl.java
index 96e5db7ce7..f09fa34cb9 100644
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfCloudifyAdapterImpl.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfCloudifyAdapterImpl.java
@@ -854,7 +854,7 @@ public class MsoVnfCloudifyAdapterImpl implements MsoVnfAdapter {
 
                     // Include aliases.
                     String alias = htp.getParamAlias();
-                    if (alias != null && !alias.equals("") && !params.containsKey(alias)) {
+                    if (alias != null && !"".equals(alias) && !params.containsKey(alias)) {
                         params.put(alias, htp);
                     }
                 }
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfPluginAdapterImpl.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfPluginAdapterImpl.java
index d5fe285274..41bcc8c481 100644
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfPluginAdapterImpl.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfPluginAdapterImpl.java
@@ -323,7 +323,7 @@ public class MsoVnfPluginAdapterImpl implements MsoVnfAdapter {
         String type = templateParam.getParamType();
         logger.debug("Parameter: {} is of type ", templateParam.getParamName(), type);
 
-        if (type.equalsIgnoreCase("number")) {
+        if ("number".equalsIgnoreCase(type)) {
             try {
                 return Integer.valueOf(inputValue.toString());
             } catch (Exception e) {