Fixed Sonar issues mentioend in DMAAP-646

Fixed Sonar issues in NodeClass.java

Issue-ID: DMAAP-646
Change-Id: If2369d28376702c228035b5244273c954c418567
Signed-off-by: Amaresh Kumar <kamaresh@in.ibm.com>

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/NodeClass.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/NodeClass.java
index 28c3ec2..4c14049 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/NodeClass.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/NodeClass.java
@@ -3,7 +3,7 @@
  * * org.onap.dmaap\r
  * * ===========================================================================\r
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.\r
- * * ===========================================================================\r
+  * * ===========================================================================\r
  * * Licensed under the Apache License, Version 2.0 (the "License");\r
  * * you may not use this file except in compliance with the License.\r
  * * You may obtain a copy of the License at\r
@@ -44,7 +44,7 @@ import org.onap.dmaap.datarouter.provisioning.utils.DB;
  */\r
 public abstract class NodeClass extends Syncable {\r
     private static Map<String, Integer> map;\r
-\r
+    private static Logger intLogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");\r
     public NodeClass() {\r
         // init on first use\r
         if (map == null) {\r
@@ -68,11 +68,11 @@ public abstract class NodeClass extends Syncable {
                 nextid = n + 1;\r
         }\r
         // take | separated list, add domain if needed.\r
-        Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");\r
+\r
         for (String node : nodes) {\r
             node = normalizeNodename(node);\r
             if (!map.containsKey(node)) {\r
-                intlogger.info("..adding " + node + " to NODES with index " + nextid);\r
+                intLogger.info("..adding " + node + " to NODES with index " + nextid);\r
                 map.put(node, nextid);\r
                 PreparedStatement ps = null;\r
                 try {\r
@@ -86,13 +86,14 @@ public abstract class NodeClass extends Syncable {
                     ps.close();\r
                     db.release(conn);\r
                 } catch (SQLException e) {\r
-                    intlogger.warn("PROV0005 doInsert: " + e.getMessage());\r
-                    e.printStackTrace();\r
+                    intLogger.error("PROV0005 doInsert: " + e.getMessage(),e);\r
                 } finally {\r
                     try {\r
-                        ps.close();\r
+                        if(ps!=null){\r
+                            ps.close();\r
+                        }\r
                     } catch (SQLException e) {\r
-                        e.printStackTrace();\r
+                        intLogger.error("Error in closing PreparedStatement: " + e.getMessage(),e);\r
                     }\r
                 }\r
                 nextid++;\r
@@ -119,25 +120,28 @@ public abstract class NodeClass extends Syncable {
             ps.close();\r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            e.printStackTrace();\r
+            intLogger.error("PROV0005 doInsert: " + e.getMessage(),e);\r
         } finally {\r
             try {\r
-                ps.close();\r
+                if(ps!=null){\r
+                    ps.close();\r
+                }\r
+\r
             } catch (SQLException e) {\r
-                e.printStackTrace();\r
+                intLogger.error("PROV0005 doInsert: " + e.getMessage(),e);\r
             }\r
         }\r
         map = m;\r
     }\r
 \r
-    public static Integer lookupNodeName(final String name) throws IllegalArgumentException {\r
+    public static Integer lookupNodeName(final String name) {\r
         Integer n = map.get(name);\r
         if (n == null)\r
             throw new IllegalArgumentException("Invalid node name: " + name);\r
         return n;\r
     }\r
 \r
-    public static Collection<String> lookupNodeNames(String patt) throws IllegalArgumentException {\r
+    public static Collection<String> lookupNodeNames(String patt) {\r
         Collection<String> coll = new TreeSet<String>();\r
         final Set<String> keyset = map.keySet();\r
         for (String s : patt.toLowerCase().split(",")) {\r
@@ -173,7 +177,11 @@ public abstract class NodeClass extends Syncable {
                 String domain = p.getValue();\r
                 s += "." + domain;\r
             }\r
+            return s.toLowerCase();\r
         }\r
-        return s.toLowerCase();\r
+        else{\r
+            return s;\r
+        }\r
+\r
     }\r
 }\r