Code style cleanup for prov authz and beans

[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
index d11c20f..ef491ca 100755 (executable)
--- 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
@@ -42,6 +42,7 @@ import org.onap.dmaap.datarouter.provisioning.utils.DB;
  * @author Robert P. Eby\r
  * @version $Id: NodeClass.java,v 1.2 2014/01/15 16:08:43 eby Exp $\r
  */\r
+\r
 public abstract class NodeClass extends Syncable {\r
 \r
     private static final String PROV_0005_DO_INSERT = "PROV0005 doInsert: ";\r
@@ -101,7 +102,7 @@ public abstract class NodeClass extends Syncable {
     }\r
 \r
     private static void reload() {\r
-        Map<String, Integer> m = new HashMap<>();\r
+        Map<String, Integer> hmap = new HashMap<>();\r
         String sql = "select NODEID, NAME from NODES";\r
         DB db = new DB();\r
         try (Connection conn = db.getConnection();\r
@@ -110,7 +111,7 @@ public abstract class NodeClass extends Syncable {
                 while (rs.next()) {\r
                     int id = rs.getInt("NODEID");\r
                     String name = rs.getString("NAME");\r
-                    m.put(name, id);\r
+                    hmap.put(name, id);\r
                 }\r
             } finally {\r
                 db.release(conn);\r
@@ -118,17 +119,22 @@ public abstract class NodeClass extends Syncable {
         } catch (SQLException e) {\r
             intLogger.error(PROV_0005_DO_INSERT + e.getMessage(),e);\r
         }\r
-        map = m;\r
+        map = hmap;\r
     }\r
 \r
     static Integer lookupNodeName(final String name) {\r
-        Integer n = map.get(name);\r
-        if (n == null) {\r
+        Integer nodeName = map.get(name);\r
+        if (nodeName == null) {\r
             throw new IllegalArgumentException("Invalid node name: " + name);\r
         }\r
-        return n;\r
+        return nodeName;\r
     }\r
 \r
+    /**\r
+     * Get node names.\r
+     * @param patt pattern to search\r
+     * @return collection of node names\r
+     */\r
     public static Collection<String> lookupNodeNames(String patt) {\r
         Collection<String> coll = new TreeSet<>();\r
         final Set<String> keyset = map.keySet();\r
@@ -146,32 +152,37 @@ public abstract class NodeClass extends Syncable {
         return coll;\r
     }\r
 \r
-    private static void addNodeToCollection(Collection<String> coll, Set<String> keyset, String s) {\r
-        s = s.substring(0, s.length() - 1);\r
+    private static void addNodeToCollection(Collection<String> coll, Set<String> keyset, String str) {\r
+        str = str.substring(0, str.length() - 1);\r
         for (String s2 : keyset) {\r
-            if (s2.startsWith(s)) {\r
+            if (s2.startsWith(str)) {\r
                 coll.add(s2);\r
             }\r
         }\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
-            if (p != null) {\r
-                String domain = p.getValue();\r
-                s += "." + domain;\r
+    /**\r
+     * Method to add domain name.\r
+     * @param str nde name string\r
+     * @return normalized node name\r
+     */\r
+    public static String normalizeNodename(String str) {\r
+        if (str != null && str.indexOf('.') <= 0) {\r
+            Parameters param = Parameters.getParameter(Parameters.PROV_DOMAIN);\r
+            if (param != null) {\r
+                String domain = param.getValue();\r
+                str += "." + domain;\r
             }\r
-            return s.toLowerCase();\r
+            return str.toLowerCase();\r
         } else {\r
-            return s;\r
+            return str;\r
         }\r
 \r
     }\r
 \r
-    String lookupNodeID(int n) {\r
+    String lookupNodeID(int node) {\r
         for (Map.Entry<String, Integer> entry : map.entrySet()) {\r
-            if (entry.getValue() == n) {\r
+            if (entry.getValue() == node) {\r
                 return entry.getKey();\r
             }\r
         }\r