* * 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
\r
package org.onap.dmaap.datarouter.provisioning.beans;\r
\r
+import com.att.eelf.configuration.EELFLogger;\r
+import com.att.eelf.configuration.EELFManager;\r
import java.sql.Connection;\r
import java.sql.PreparedStatement;\r
import java.sql.ResultSet;\r
import java.util.Map;\r
import java.util.Set;\r
import java.util.TreeSet;\r
-import org.apache.log4j.Logger;\r
-import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
+import org.onap.dmaap.datarouter.provisioning.utils.ProvDbUtils;\r
\r
/**\r
* This class is used to aid in the mapping of node names from/to node IDs.\r
* @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 Map<String, Integer> map;\r
- private static Logger intLogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");\r
- public NodeClass() {\r
+ private static final String PROV_0005_DO_INSERT = "PROV0005 doInsert: ";\r
+ private static Map<String, Integer> nodesMap;\r
+ private static EELFLogger intLogger = EELFManager.getInstance().getLogger("InternalLog");\r
+\r
+ NodeClass() {\r
// init on first use\r
- if (map == null) {\r
+ if (nodesMap == null) {\r
reload();\r
}\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 (nodesMap == null) {\r
reload();\r
}\r
int nextid = 0;\r
- for (Integer n : map.values()) {\r
+ for (Integer n : nodesMap.values()) {\r
if (n >= nextid) {\r
nextid = n + 1;\r
}\r
\r
for (String node : nodes) {\r
node = normalizeNodename(node);\r
- if (!map.containsKey(node)) {\r
+ if (!nodesMap.containsKey(node)) {\r
intLogger.info("..adding " + node + " to NODES with index " + nextid);\r
- map.put(node, nextid);\r
- PreparedStatement ps = null;\r
- try {\r
- DB db = new DB();\r
- @SuppressWarnings("resource")\r
- Connection conn = db.getConnection();\r
- ps = conn.prepareStatement("insert into NODES (NODEID, NAME, ACTIVE) values (?, ?, 1)");\r
- ps.setInt(1, nextid);\r
- ps.setString(2, node);\r
- ps.execute();\r
- ps.close();\r
- db.release(conn);\r
- } catch (SQLException e) {\r
- intLogger.error("PROV0005 doInsert: " + e.getMessage(),e);\r
- } finally {\r
- try {\r
- if(ps!=null){\r
- ps.close();\r
- }\r
- } catch (SQLException e) {\r
- intLogger.error("Error in closing PreparedStatement: " + e.getMessage(),e);\r
- }\r
- }\r
+ nodesMap.put(node, nextid);\r
+ insertNodesToTable(nextid, node);\r
nextid++;\r
}\r
}\r
}\r
\r
- 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
- 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
- ps.close();\r
- db.release(conn);\r
+ private static void insertNodesToTable(int nextid, String node) {\r
+ try (Connection conn = ProvDbUtils.getInstance().getConnection();\r
+ PreparedStatement ps = conn.prepareStatement(\r
+ "insert into NODES (NODEID, NAME, ACTIVE) values (?, ?, 1)")) {\r
+ ps.setInt(1, nextid);\r
+ ps.setString(2, node);\r
+ ps.execute();\r
} catch (SQLException e) {\r
- intLogger.error("PROV0005 doInsert: " + e.getMessage(),e);\r
- } finally {\r
- try {\r
- if(ps!=null){\r
- ps.close();\r
- }\r
- } catch (SQLException e) {\r
- intLogger.error("PROV0005 doInsert: " + e.getMessage(),e);\r
+ intLogger.error(PROV_0005_DO_INSERT + e.getMessage(), e);\r
+ }\r
+ }\r
+\r
+ private static void reload() {\r
+ Map<String, Integer> tmpNodesMap = new HashMap<>();\r
+ try (Connection conn = ProvDbUtils.getInstance().getConnection();\r
+ PreparedStatement ps = conn.prepareStatement("select NODEID, NAME from NODES");\r
+ ResultSet rs = ps.executeQuery()) {\r
+ while (rs.next()) {\r
+ int id = rs.getInt("NODEID");\r
+ String name = rs.getString("NAME");\r
+ tmpNodesMap.put(name, id);\r
}\r
+ } catch (SQLException e) {\r
+ intLogger.error(PROV_0005_DO_INSERT + e.getMessage(),e);\r
}\r
- map = m;\r
+ nodesMap = tmpNodesMap;\r
}\r
\r
- public static Integer lookupNodeName(final String name) {\r
- Integer n = map.get(name);\r
- if (n == null) {\r
+ static Integer lookupNodeName(final String name) {\r
+ Integer nodeName = nodesMap.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<String>();\r
- final Set<String> keyset = map.keySet();\r
+ Collection<String> coll = new TreeSet<>();\r
+ final Set<String> keyset = nodesMap.keySet();\r
for (String s : patt.toLowerCase().split(",")) {\r
if (s.endsWith("*")) {\r
- s = s.substring(0, s.length() - 1);\r
- for (String s2 : keyset) {\r
- if (s2.startsWith(s)) {\r
- coll.add(s2);\r
- }\r
- }\r
+ addNodeToCollection(coll, keyset, s);\r
} else if (keyset.contains(s)) {\r
coll.add(s);\r
} else if (keyset.contains(normalizeNodename(s))) {\r
return coll;\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
+ 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(str)) {\r
+ coll.add(s2);\r
}\r
- return s.toLowerCase();\r
}\r
- else{\r
- return s;\r
+ }\r
+\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 str.toLowerCase();\r
+ } else {\r
+ return str;\r
}\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
+ String lookupNodeID(int node) {\r
+ for (Map.Entry<String, Integer> entry : nodesMap.entrySet()) {\r
+ if (entry.getValue() == node) {\r
+ return entry.getKey();\r
}\r
}\r
return null;\r
Code Review / dmaap / datarouter.git / blobdiff