X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fdatarouter.git;a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2Fbeans%2FNetworkRoute.java;h=2ada1ff9e2d2b0495f746c1ef3047f63ed3890bf;hp=fa3d4e0e5bade9b74eee03c32cfc8d49a89684d4;hb=68a9ca240970fceaf12bbe91b7bad8e1d98ecd93;hpb=f20778ffa99aa9c6f30a0f84112a5392b259ea63

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/NetworkRoute.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/NetworkRoute.java
index fa3d4e0e..2ada1ff9 100644
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/NetworkRoute.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/NetworkRoute.java
@@ -30,12 +30,11 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
 import java.util.Objects;
 import java.util.SortedSet;
 import java.util.TreeSet;
 import org.json.JSONObject;
-import org.onap.dmaap.datarouter.provisioning.utils.DB;
+import org.onap.dmaap.datarouter.provisioning.utils.ProvDbUtils;
 
 /**
  * The representation of one route in the Network Route Table.
@@ -51,24 +50,45 @@ public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute>
     private final int tonode;
     private final int vianode;
 
+    /**
+     * NetworkRoute Constructor.
+     * @param fromnode node source
+     * @param tonode node destination
+     */
     public NetworkRoute(String fromnode, String tonode) {
         this.fromnode = lookupNodeName(fromnode);
         this.tonode = lookupNodeName(tonode);
         this.vianode = -1;
     }
 
+    /**
+     * NetworkRoute Constructor.
+     * @param fromnode node source
+     * @param tonode node destination
+     * @param vianode via node
+     */
     public NetworkRoute(String fromnode, String tonode, String vianode) {
         this.fromnode = lookupNodeName(fromnode);
         this.tonode = lookupNodeName(tonode);
         this.vianode = lookupNodeName(vianode);
     }
 
+    /**
+     * NetworkRoute Constructor.
+     * @param jo JSONObject of attributes
+     */
     public NetworkRoute(JSONObject jo) {
         this.fromnode = lookupNodeName(jo.getString("from"));
         this.tonode = lookupNodeName(jo.getString("to"));
         this.vianode = lookupNodeName(jo.getString("via"));
     }
 
+    /**
+     * NetworkRoute Constructor.
+     * @param fromnode integer source node
+     * @param tonode integer destination node
+     * @param vianode integer via node
+     */
     private NetworkRoute(int fromnode, int tonode, int vianode) {
         this.fromnode = fromnode;
         this.tonode = tonode;
@@ -83,17 +103,10 @@ public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute>
      */
     public static SortedSet<NetworkRoute> getAllNetworkRoutes() {
         SortedSet<NetworkRoute> set = new TreeSet<>();
-        try {
-            DB db = new DB();
-            @SuppressWarnings("resource")
-            Connection conn = db.getConnection();
-            try (Statement stmt = conn.createStatement()) {
-                try (ResultSet rs = stmt.executeQuery("select FROMNODE, TONODE, VIANODE from NETWORK_ROUTES")) {
-                    addNetworkRouteToSet(set, rs);
-                }
-            } finally {
-                db.release(conn);
-            }
+        try (Connection conn = ProvDbUtils.getInstance().getConnection();
+            PreparedStatement ps = conn.prepareStatement("select FROMNODE, TONODE, VIANODE from NETWORK_ROUTES");
+            ResultSet rs = ps.executeQuery()) {
+            addNetworkRouteToSet(set, rs);
         } catch (SQLException e) {
             intlogger.error(SQLEXCEPTION + e.getMessage(), e);
         }
@@ -117,15 +130,15 @@ public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute>
         return tonode;
     }
 
-    public int getVianode() {
+    int getVianode() {
         return vianode;
     }
 
     @Override
-    public boolean doDelete(Connection c) {
+    public boolean doDelete(Connection conn) {
         boolean rv = true;
-        String sql = "delete from NETWORK_ROUTES where FROMNODE = ? AND TONODE = ?";
-        try (PreparedStatement ps = c.prepareStatement(sql)) {
+        try (PreparedStatement ps = conn.prepareStatement(
+            "delete from NETWORK_ROUTES where FROMNODE = ? AND TONODE = ?")) {
             ps.setInt(1, fromnode);
             ps.setInt(2, tonode);
             ps.execute();
@@ -137,11 +150,11 @@ public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute>
     }
 
     @Override
-    public boolean doInsert(Connection c) {
+    public boolean doInsert(Connection conn) {
         boolean rv = false;
-        String sql = "insert into NETWORK_ROUTES (FROMNODE, TONODE, VIANODE) values (?, ?, ?)";
         if (this.vianode >= 0) {
-            try (PreparedStatement ps = c.prepareStatement(sql)) {
+            try (PreparedStatement ps = conn.prepareStatement(
+                "insert into NETWORK_ROUTES (FROMNODE, TONODE, VIANODE) values (?, ?, ?)")) {
                 // Create the NETWORK_ROUTES row
                 ps.setInt(1, this.fromnode);
                 ps.setInt(2, this.tonode);
@@ -156,10 +169,10 @@ public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute>
     }
 
     @Override
-    public boolean doUpdate(Connection c) {
+    public boolean doUpdate(Connection conn) {
         boolean rv = true;
-        String sql = "update NETWORK_ROUTES set VIANODE = ? where FROMNODE = ? and TONODE = ?";
-        try (PreparedStatement ps = c.prepareStatement(sql)) {
+        try (PreparedStatement ps = conn.prepareStatement(
+            "update NETWORK_ROUTES set VIANODE = ? where FROMNODE = ? and TONODE = ?")) {
             ps.setInt(1, vianode);
             ps.setInt(2, fromnode);
             ps.setInt(3, tonode);
@@ -200,14 +213,14 @@ public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute>
     }
 
     @Override
-    public int compareTo(NetworkRoute o) {
-        if (this.fromnode == o.fromnode) {
-            if (this.tonode == o.tonode) {
-                return this.vianode - o.vianode;
+    public int compareTo(NetworkRoute nr) {
+        if (this.fromnode == nr.fromnode) {
+            if (this.tonode == nr.tonode) {
+                return this.vianode - nr.vianode;
             }
-            return this.tonode - o.tonode;
+            return this.tonode - nr.tonode;
         }
-        return this.fromnode - o.fromnode;
+        return this.fromnode - nr.fromnode;
     }
 
     @Override