X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2Fbeans%2FEgressRoute.java;h=bd18280e745f65ee74ab2029015b0c089104f030;hb=adb2ad2d16e851fbf8dcc71af68949a74463204d;hp=a78a9c18bb70828d044b6594e818451589fadf4c;hpb=06271b9df78dadfdab95dc2f6f853cdaa3148d9d;p=dmaap%2Fdatarouter.git

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 a78a9c18..bd18280e 100644
--- 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;
 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 Egress Route Table.
@@ -49,13 +49,14 @@ public class EgressRoute extends NodeClass implements Comparable<EgressRoute> {
     private final int subid;
     private final int nodeid;
 
+    /**
+     * EgressRoute constructor.
+     * @param subid subscription id
+     * @param nodeid node id
+     */
     public EgressRoute(int subid, int nodeid) {
         this.subid = subid;
         this.nodeid = nodeid;
-        // Note: unlike for Feeds, it subscriptions can be removed from the tables, so it is
-        // possible that an orphan ERT entry can exist if a sub is removed.
-        //        if (Subscription.getSubscriptionById(subid) == null)
-        //            throw new IllegalArgumentException("No such subscription: "+subid);
     }
 
     public EgressRoute(int subid, String node) {
@@ -70,16 +71,10 @@ public class EgressRoute extends NodeClass implements Comparable<EgressRoute> {
      */
     public static SortedSet<EgressRoute> getAllEgressRoutes() {
         SortedSet<EgressRoute> set = new TreeSet<>();
-        DB db = new DB();
-        String sql = "select SUBID, NODEID from EGRESS_ROUTES";
-        try (Connection conn = db.getConnection()) {
-            try (Statement stmt = conn.createStatement()) {
-                try (ResultSet rs = stmt.executeQuery(sql)) {
-                    addEgressRouteToSet(set, rs);
-                }
-            } finally {
-                db.release(conn);
-            }
+        try (Connection conn = ProvDbUtils.getInstance().getConnection();
+            Statement stmt = conn.createStatement();
+            ResultSet rs = stmt.executeQuery("select SUBID, NODEID from EGRESS_ROUTES")) {
+            addEgressRouteToSet(set, rs);
         } catch (SQLException e) {
             intlogger.error("PROV0008 EgressRoute.getAllEgressRoutes: " + e.getMessage(), e);
         }
@@ -101,31 +96,26 @@ public class EgressRoute extends NodeClass implements Comparable<EgressRoute> {
      * @return an EgressRoute, or null if there is no route for this subscription
      */
     public static EgressRoute getEgressRoute(int sub) {
-        EgressRoute v = null;
-        DB db = new DB();
-        String sql = "select NODEID from EGRESS_ROUTES where SUBID = ?";
-        try (Connection conn = db.getConnection();
-                PreparedStatement ps = conn.prepareStatement(sql)) {
+        EgressRoute er = null;
+        try (Connection conn = ProvDbUtils.getInstance().getConnection();
+            PreparedStatement ps = conn.prepareStatement("select NODEID from EGRESS_ROUTES where SUBID = ?")) {
             ps.setInt(1, sub);
             try (ResultSet rs = ps.executeQuery()) {
                 if (rs.next()) {
                     int node = rs.getInt("NODEID");
-                    v = new EgressRoute(sub, node);
+                    er = new EgressRoute(sub, node);
                 }
-            } finally {
-                db.release(conn);
             }
         } catch (SQLException e) {
             intlogger.error("PROV0009 EgressRoute.getEgressRoute: " + e.getMessage(), e);
         }
-        return v;
+        return er;
     }
 
     @Override
-    public boolean doDelete(Connection c) {
+    public boolean doDelete(Connection conn) {
         boolean rv = true;
-        String sql = "delete from EGRESS_ROUTES where SUBID = ?";
-        try (PreparedStatement ps = c.prepareStatement(sql)) {
+        try (PreparedStatement ps = conn.prepareStatement("delete from EGRESS_ROUTES where SUBID = ?")) {
             ps.setInt(1, subid);
             ps.execute();
         } catch (SQLException e) {
@@ -136,15 +126,12 @@ public class EgressRoute extends NodeClass implements Comparable<EgressRoute> {
     }
 
     @Override
-    public boolean doInsert(Connection c) {
+    public boolean doInsert(Connection conn) {
         boolean rv = false;
-        String sql = "insert into EGRESS_ROUTES (SUBID, NODEID) values (?, ?)";
-        try (PreparedStatement ps = c.prepareStatement(sql)) {
-            // Create the NETWORK_ROUTES row
+        try (PreparedStatement ps = conn.prepareStatement("insert into EGRESS_ROUTES (SUBID, NODEID) values (?, ?)")) {
             ps.setInt(1, this.subid);
             ps.setInt(2, this.nodeid);
             ps.execute();
-            ps.close();
             rv = true;
         } catch (SQLException e) {
             intlogger.warn("PROV0005 doInsert: " + e.getMessage(), e);
@@ -153,10 +140,9 @@ public class EgressRoute extends NodeClass implements Comparable<EgressRoute> {
     }
 
     @Override
-    public boolean doUpdate(Connection c) {
+    public boolean doUpdate(Connection conn) {
         boolean rv = true;
-        String sql = "update EGRESS_ROUTES set NODEID = ? where SUBID = ?";
-        try (PreparedStatement ps = c.prepareStatement(sql)) {
+        try (PreparedStatement ps = conn.prepareStatement("update EGRESS_ROUTES set NODEID = ? where SUBID = ?")) {
             ps.setInt(1, nodeid);
             ps.setInt(2, subid);
             ps.executeUpdate();
@@ -189,8 +175,8 @@ public class EgressRoute extends NodeClass implements Comparable<EgressRoute> {
     }
 
     @Override
-    public int compareTo(EgressRoute o) {
-        return this.subid - o.subid;
+    public int compareTo(EgressRoute er) {
+        return this.subid - er.subid;
     }
 
     @Override