X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2Fbeans%2FNodeClass.java;h=f3ef5d6a295275cc6bea87ffe4c3aa58b1f3ba4c;hb=b60213dc26540543f500b3442b061565907c3cf8;hp=4c140490621710bcc84f7c88517d402253f125f0;hpb=8a27631d961de4dfcace31a0107a701b735f6959;p=dmaap%2Fdatarouter.git

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