update DR logging to log under one system

[dmaap/datarouter.git] / datarouter-prov / src / main / java / org / onap / dmaap / datarouter / provisioning / beans / NodeClass.java

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
old mode 100644 (file)
new mode 100755 (executable)
index 4c14049..f3ef5d6
--- 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
@@ -33,7 +33,8 @@ import java.util.Map;
 import java.util.Set;\r
 import java.util.TreeSet;\r
 \r
-import org.apache.log4j.Logger;\r
+import com.att.eelf.configuration.EELFLogger;\r
+import com.att.eelf.configuration.EELFManager;\r
 import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
 \r
 /**\r
@@ -43,8 +44,9 @@ import org.onap.dmaap.datarouter.provisioning.utils.DB;
  * @version $Id: NodeClass.java,v 1.2 2014/01/15 16:08:43 eby Exp $\r
  */\r
 public abstract class NodeClass extends Syncable {\r
+\r
     private static Map<String, Integer> map;\r
-    private static Logger intLogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");\r
+    private static EELFLogger intLogger = EELFManager.getInstance().getLogger("InternalLog");\r
     public NodeClass() {\r
         // init on first use\r
         if (map == null) {\r
@@ -53,19 +55,20 @@ public abstract class NodeClass extends Syncable {
     }\r
 \r
     /**\r
-     * Add nodes to the NODES table, when the NODES parameter value is changed.\r
-     * Nodes are only added to the table, they are never deleted.  The node name is normalized\r
-     * to contain the domain (if missing).\r
+     * Add nodes to the NODES table, when the NODES parameter value is changed. Nodes are only added to the table, they\r
+     * are never deleted.  The node name is normalized to contain the domain (if missing).\r
      *\r
      * @param nodes a pipe separated list of the current nodes\r
      */\r
     public static void setNodes(String[] nodes) {\r
-        if (map == null)\r
+        if (map == null) {\r
             reload();\r
+        }\r
         int nextid = 0;\r
         for (Integer n : map.values()) {\r
-            if (n >= nextid)\r
+            if (n >= nextid) {\r
                 nextid = n + 1;\r
+            }\r
         }\r
         // take | separated list, add domain if needed.\r
 \r
@@ -104,19 +107,20 @@ public abstract class NodeClass extends Syncable {
     public static void reload() {\r
         Map<String, Integer> m = new HashMap<String, Integer>();\r
         PreparedStatement ps = null;\r
+\r
         try {\r
             DB db = new DB();\r
             @SuppressWarnings("resource")\r
             Connection conn = db.getConnection();\r
             String sql = "select NODEID, NAME from NODES";\r
             ps = conn.prepareStatement(sql);\r
-            ResultSet rs = ps.executeQuery();\r
-            while (rs.next()) {\r
-                int id = rs.getInt("NODEID");\r
-                String name = rs.getString("NAME");\r
-                m.put(name, id);\r
+            try(ResultSet rs = ps.executeQuery()) {\r
+                while (rs.next()) {\r
+                    int id = rs.getInt("NODEID");\r
+                    String name = rs.getString("NAME");\r
+                    m.put(name, id);\r
+                }\r
             }\r
-            rs.close();\r
             ps.close();\r
             db.release(conn);\r
         } catch (SQLException e) {\r
@@ -126,7 +130,6 @@ public abstract class NodeClass extends Syncable {
                 if(ps!=null){\r
                     ps.close();\r
                 }\r
-\r
             } catch (SQLException e) {\r
                 intLogger.error("PROV0005 doInsert: " + e.getMessage(),e);\r
             }\r
@@ -136,8 +139,9 @@ public abstract class NodeClass extends Syncable {
 \r
     public static Integer lookupNodeName(final String name) {\r
         Integer n = map.get(name);\r
-        if (n == null)\r
+        if (n == null) {\r
             throw new IllegalArgumentException("Invalid node name: " + name);\r
+        }\r
         return n;\r
     }\r
 \r
@@ -148,8 +152,9 @@ public abstract class NodeClass extends Syncable {
             if (s.endsWith("*")) {\r
                 s = s.substring(0, s.length() - 1);\r
                 for (String s2 : keyset) {\r
-                    if (s2.startsWith(s))\r
+                    if (s2.startsWith(s)) {\r
                         coll.add(s2);\r
+                    }\r
                 }\r
             } else if (keyset.contains(s)) {\r
                 coll.add(s);\r
@@ -162,14 +167,6 @@ public abstract class NodeClass extends Syncable {
         return coll;\r
     }\r
 \r
-    protected String lookupNodeID(int n) {\r
-        for (String s : map.keySet()) {\r
-            if (map.get(s) == n)\r
-                return s;\r
-        }\r
-        return null;\r
-    }\r
-\r
     public static String normalizeNodename(String s) {\r
         if (s != null && s.indexOf('.') <= 0) {\r
             Parameters p = Parameters.getParameter(Parameters.PROV_DOMAIN);\r
@@ -184,4 +181,13 @@ public abstract class NodeClass extends Syncable {
         }\r
 \r
     }\r
+\r
+    protected String lookupNodeID(int n) {\r
+        for (String s : map.keySet()) {\r
+            if (map.get(s) == n) {\r
+                return s;\r
+            }\r
+        }\r
+        return null;\r
+    }\r
 }\r