import java.sql.PreparedStatement;\r
import java.sql.ResultSet;\r
import java.sql.SQLException;\r
-import java.sql.Statement;\r
import java.util.Objects;\r
import java.util.SortedSet;\r
import java.util.TreeSet;\r
import org.json.JSONObject;\r
-import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
+import org.onap.dmaap.datarouter.provisioning.utils.ProvDbUtils;\r
\r
/**\r
* The representation of one route in the Network Route Table.\r
private final int tonode;\r
private final int vianode;\r
\r
+ /**\r
+ * NetworkRoute Constructor.\r
+ * @param fromnode node source\r
+ * @param tonode node destination\r
+ */\r
public NetworkRoute(String fromnode, String tonode) {\r
this.fromnode = lookupNodeName(fromnode);\r
this.tonode = lookupNodeName(tonode);\r
this.vianode = -1;\r
}\r
\r
+ /**\r
+ * NetworkRoute Constructor.\r
+ * @param fromnode node source\r
+ * @param tonode node destination\r
+ * @param vianode via node\r
+ */\r
public NetworkRoute(String fromnode, String tonode, String vianode) {\r
this.fromnode = lookupNodeName(fromnode);\r
this.tonode = lookupNodeName(tonode);\r
this.vianode = lookupNodeName(vianode);\r
}\r
\r
+ /**\r
+ * NetworkRoute Constructor.\r
+ * @param jo JSONObject of attributes\r
+ */\r
public NetworkRoute(JSONObject jo) {\r
this.fromnode = lookupNodeName(jo.getString("from"));\r
this.tonode = lookupNodeName(jo.getString("to"));\r
this.vianode = lookupNodeName(jo.getString("via"));\r
}\r
\r
+ /**\r
+ * NetworkRoute Constructor.\r
+ * @param fromnode integer source node\r
+ * @param tonode integer destination node\r
+ * @param vianode integer via node\r
+ */\r
private NetworkRoute(int fromnode, int tonode, int vianode) {\r
this.fromnode = fromnode;\r
this.tonode = tonode;\r
*/\r
public static SortedSet<NetworkRoute> getAllNetworkRoutes() {\r
SortedSet<NetworkRoute> set = new TreeSet<>();\r
- try {\r
- DB db = new DB();\r
- @SuppressWarnings("resource")\r
- Connection conn = db.getConnection();\r
- try (Statement stmt = conn.createStatement()) {\r
- try (ResultSet rs = stmt.executeQuery("select FROMNODE, TONODE, VIANODE from NETWORK_ROUTES")) {\r
- addNetworkRouteToSet(set, rs);\r
- }\r
- } finally {\r
- db.release(conn);\r
- }\r
+ try (Connection conn = ProvDbUtils.getInstance().getConnection();\r
+ PreparedStatement ps = conn.prepareStatement("select FROMNODE, TONODE, VIANODE from NETWORK_ROUTES");\r
+ ResultSet rs = ps.executeQuery()) {\r
+ addNetworkRouteToSet(set, rs);\r
} catch (SQLException e) {\r
intlogger.error(SQLEXCEPTION + e.getMessage(), e);\r
}\r
return tonode;\r
}\r
\r
- public int getVianode() {\r
+ int getVianode() {\r
return vianode;\r
}\r
\r
@Override\r
- public boolean doDelete(Connection c) {\r
+ public boolean doDelete(Connection conn) {\r
boolean rv = true;\r
- String sql = "delete from NETWORK_ROUTES where FROMNODE = ? AND TONODE = ?";\r
- try (PreparedStatement ps = c.prepareStatement(sql)) {\r
+ try (PreparedStatement ps = conn.prepareStatement(\r
+ "delete from NETWORK_ROUTES where FROMNODE = ? AND TONODE = ?")) {\r
ps.setInt(1, fromnode);\r
ps.setInt(2, tonode);\r
ps.execute();\r
}\r
\r
@Override\r
- public boolean doInsert(Connection c) {\r
+ public boolean doInsert(Connection conn) {\r
boolean rv = false;\r
- String sql = "insert into NETWORK_ROUTES (FROMNODE, TONODE, VIANODE) values (?, ?, ?)";\r
if (this.vianode >= 0) {\r
- try (PreparedStatement ps = c.prepareStatement(sql)) {\r
+ try (PreparedStatement ps = conn.prepareStatement(\r
+ "insert into NETWORK_ROUTES (FROMNODE, TONODE, VIANODE) values (?, ?, ?)")) {\r
// Create the NETWORK_ROUTES row\r
ps.setInt(1, this.fromnode);\r
ps.setInt(2, this.tonode);\r
}\r
\r
@Override\r
- public boolean doUpdate(Connection c) {\r
+ public boolean doUpdate(Connection conn) {\r
boolean rv = true;\r
- String sql = "update NETWORK_ROUTES set VIANODE = ? where FROMNODE = ? and TONODE = ?";\r
- try (PreparedStatement ps = c.prepareStatement(sql)) {\r
+ try (PreparedStatement ps = conn.prepareStatement(\r
+ "update NETWORK_ROUTES set VIANODE = ? where FROMNODE = ? and TONODE = ?")) {\r
ps.setInt(1, vianode);\r
ps.setInt(2, fromnode);\r
ps.setInt(3, tonode);\r
}\r
\r
@Override\r
- public int compareTo(NetworkRoute o) {\r
- if (this.fromnode == o.fromnode) {\r
- if (this.tonode == o.tonode) {\r
- return this.vianode - o.vianode;\r
+ public int compareTo(NetworkRoute nr) {\r
+ if (this.fromnode == nr.fromnode) {\r
+ if (this.tonode == nr.tonode) {\r
+ return this.vianode - nr.vianode;\r
}\r
- return this.tonode - o.tonode;\r
+ return this.tonode - nr.tonode;\r
}\r
- return this.fromnode - o.fromnode;\r
+ return this.fromnode - nr.fromnode;\r
}\r
\r
@Override\r