preliminary AAF changes for DR

[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..f3eb1eb
--- 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
@@ -32,7 +32,6 @@ import java.util.HashMap;
 import java.util.Map;\r
 import java.util.Set;\r
 import java.util.TreeSet;\r
-\r
 import org.apache.log4j.Logger;\r
 import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
 \r
@@ -43,6 +42,7 @@ 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
     public NodeClass() {\r
@@ -53,19 +53,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
@@ -136,8 +137,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 +150,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 +165,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 +179,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