Refactor Prov DB handling

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

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/EgressRoute.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/EgressRoute.java
index 2b6462d..8cd1986 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/EgressRoute.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/EgressRoute.java
@@ -35,7 +35,7 @@ import java.util.Objects;
 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 Egress Route Table.\r
@@ -71,16 +71,10 @@ public class EgressRoute extends NodeClass implements Comparable<EgressRoute> {
      */\r
     public static SortedSet<EgressRoute> getAllEgressRoutes() {\r
         SortedSet<EgressRoute> set = new TreeSet<>();\r
-        DB db = new DB();\r
-        String sql = "select SUBID, NODEID from EGRESS_ROUTES";\r
-        try (Connection conn = db.getConnection()) {\r
-            try (Statement stmt = conn.createStatement()) {\r
-                try (ResultSet rs = stmt.executeQuery(sql)) {\r
-                    addEgressRouteToSet(set, rs);\r
-                }\r
-            } finally {\r
-                db.release(conn);\r
-            }\r
+        try (Connection conn = ProvDbUtils.getInstance().getConnection();\r
+            Statement stmt = conn.createStatement();\r
+            ResultSet rs = stmt.executeQuery("select SUBID, NODEID from EGRESS_ROUTES")) {\r
+            addEgressRouteToSet(set, rs);\r
         } catch (SQLException e) {\r
             intlogger.error("PROV0008 EgressRoute.getAllEgressRoutes: " + e.getMessage(), e);\r
         }\r
@@ -103,18 +97,13 @@ public class EgressRoute extends NodeClass implements Comparable<EgressRoute> {
      */\r
     public static EgressRoute getEgressRoute(int sub) {\r
         EgressRoute er = null;\r
-        DB db = new DB();\r
-        String sql = "select NODEID from EGRESS_ROUTES where SUBID = ?";\r
-        try (Connection conn = db.getConnection();\r
-                PreparedStatement ps = conn.prepareStatement(sql)) {\r
+        try (Connection conn = ProvDbUtils.getInstance().getConnection();\r
+            PreparedStatement ps = conn.prepareStatement("select NODEID from EGRESS_ROUTES where SUBID = ?")) {\r
             ps.setInt(1, sub);\r
-            try (ResultSet rs = ps.executeQuery()) {\r
-                if (rs.next()) {\r
-                    int node = rs.getInt("NODEID");\r
-                    er = new EgressRoute(sub, node);\r
-                }\r
-            } finally {\r
-                db.release(conn);\r
+            ResultSet rs = ps.executeQuery();\r
+            if (rs.next()) {\r
+                int node = rs.getInt("NODEID");\r
+                er = new EgressRoute(sub, node);\r
             }\r
         } catch (SQLException e) {\r
             intlogger.error("PROV0009 EgressRoute.getEgressRoute: " + e.getMessage(), e);\r
@@ -125,8 +114,7 @@ public class EgressRoute extends NodeClass implements Comparable<EgressRoute> {
     @Override\r
     public boolean doDelete(Connection conn) {\r
         boolean rv = true;\r
-        String sql = "delete from EGRESS_ROUTES where SUBID = ?";\r
-        try (PreparedStatement ps = conn.prepareStatement(sql)) {\r
+        try (PreparedStatement ps = conn.prepareStatement("delete from EGRESS_ROUTES where SUBID = ?")) {\r
             ps.setInt(1, subid);\r
             ps.execute();\r
         } catch (SQLException e) {\r
@@ -139,9 +127,7 @@ public class EgressRoute extends NodeClass implements Comparable<EgressRoute> {
     @Override\r
     public boolean doInsert(Connection conn) {\r
         boolean rv = false;\r
-        String sql = "insert into EGRESS_ROUTES (SUBID, NODEID) values (?, ?)";\r
-        try (PreparedStatement ps = conn.prepareStatement(sql)) {\r
-            // Create the NETWORK_ROUTES row\r
+        try (PreparedStatement ps = conn.prepareStatement("insert into EGRESS_ROUTES (SUBID, NODEID) values (?, ?)")) {\r
             ps.setInt(1, this.subid);\r
             ps.setInt(2, this.nodeid);\r
             ps.execute();\r
@@ -155,8 +141,7 @@ public class EgressRoute extends NodeClass implements Comparable<EgressRoute> {
     @Override\r
     public boolean doUpdate(Connection conn) {\r
         boolean rv = true;\r
-        String sql = "update EGRESS_ROUTES set NODEID = ? where SUBID = ?";\r
-        try (PreparedStatement ps = conn.prepareStatement(sql)) {\r
+        try (PreparedStatement ps = conn.prepareStatement("update EGRESS_ROUTES set NODEID = ? where SUBID = ?")) {\r
             ps.setInt(1, nodeid);\r
             ps.setInt(2, subid);\r
             ps.executeUpdate();\r