Fix sonar issues in RaptorObject

Change-Id: I146a5f6fbc51d320e3d93dc17f133d4e687e8a1f
Issue-ID: PORTAL-523
Signed-off-by: burdziak <olaf.burdziakowski@nokia.com>

diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/RaptorObject.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/RaptorObject.java
index 8b968cc..fd5fdba 100644 (file)
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/RaptorObject.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/RaptorObject.java
@@ -44,7 +44,7 @@ public class RaptorObject extends java.lang.Object {
        }
 
        protected String nvl(String s, String sDefault) {
-               return nvl(s).equals("") ? sDefault : s;
+               return nvl(s).isEmpty() ? sDefault : s;
        }
 
        protected static String nvls(String s) {
@@ -52,11 +52,11 @@ public class RaptorObject extends java.lang.Object {
        }
 
        protected static String nvls(String s, String sDefault) {
-               return nvls(s).equals("") ? sDefault : s;
+               return nvls(s).isEmpty() ? sDefault : s;
        }
        
        protected boolean getFlagInBoolean(String s) {
-               return nvl(s).toUpperCase().startsWith("Y") || nvl(s).toLowerCase().equals("true");
+               return nvl(s).toUpperCase().startsWith("Y") || "true".equalsIgnoreCase(nvl(s));
        }
 
 } // RaptorObject