Refactor Prov DB handling

[dmaap/datarouter.git] / datarouter-prov / src / main / java / org / onap / dmaap / datarouter / provisioning / beans / NetworkRoute.java

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 dd9a624..2ada1ff 100644 (file)
--- 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;\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
@@ -104,17 +103,10 @@ public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute>
      */\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
@@ -138,15 +130,15 @@ public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute>
         return tonode;\r
     }\r
 \r
-    public int getVianode() {\r
+    int getVianode() {\r
         return vianode;\r
     }\r
 \r
     @Override\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 = conn.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
@@ -160,9 +152,9 @@ public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute>
     @Override\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 = conn.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
@@ -179,8 +171,8 @@ public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute>
     @Override\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 = conn.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