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%2FEgressRoute.java;h=54d5b39f5c954c9d7c323e1923f50b7d8a4d5456;hp=c6788e084e0a7e7dfa2a37962841b51686245478;hb=bc1df610cddfb558cf6bde90c269b4af59768648;hpb=84c33621751a4f70ca72da23dd71ddeb7c1f9915 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 c6788e08..54d5b39f 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 @@ -24,6 +24,8 @@ package org.onap.dmaap.datarouter.provisioning.beans; +import com.att.eelf.configuration.EELFLogger; +import com.att.eelf.configuration.EELFManager; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -32,8 +34,6 @@ import java.sql.Statement; import java.util.Objects; import java.util.SortedSet; import java.util.TreeSet; - -import org.apache.log4j.Logger; import org.json.JSONObject; import org.onap.dmaap.datarouter.provisioning.utils.DB; @@ -44,39 +44,61 @@ import org.onap.dmaap.datarouter.provisioning.utils.DB; * @version $Id: EgressRoute.java,v 1.3 2013/12/16 20:30:23 eby Exp $ */ public class EgressRoute extends NodeClass implements Comparable { - private static Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal"); + + private static EELFLogger intlogger = EELFManager.getInstance().getLogger("InternalLog"); private final int subid; private final int nodeid; /** - * Get a set of all Egress Routes in the DB. The set is sorted according to the natural sorting order - * of the routes (based on the subscription ID in each route). + * 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) { + this(subid, lookupNodeName(node)); + } + + /** + * Get a set of all Egress Routes in the DB. The set is sorted according to the natural sorting order of the routes + * (based on the subscription ID in each route). * * @return the sorted set */ public static SortedSet getAllEgressRoutes() { - SortedSet 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 SUBID, NODEID from EGRESS_ROUTES")) { - while (rs.next()) { - int subid = rs.getInt("SUBID"); - int nodeid = rs.getInt("NODEID"); - set.add(new EgressRoute(subid, nodeid)); - } - } - } - - db.release(conn); + SortedSet 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); + } } catch (SQLException e) { - e.printStackTrace(); + intlogger.error("PROV0008 EgressRoute.getAllEgressRoutes: " + e.getMessage(), e); } return set; } + private static void addEgressRouteToSet(SortedSet set, ResultSet rs) throws SQLException { + while (rs.next()) { + int subid = rs.getInt("SUBID"); + int nodeid = rs.getInt("NODEID"); + set.add(new EgressRoute(subid, nodeid)); + } + } + /** * Get a single Egress Route for the subscription sub. * @@ -84,125 +106,68 @@ public class EgressRoute extends NodeClass implements Comparable { * @return an EgressRoute, or null if there is no route for this subscription */ public static EgressRoute getEgressRoute(int sub) { - EgressRoute v = null; - PreparedStatement ps = null; - try { - DB db = new DB(); - @SuppressWarnings("resource") - Connection conn = db.getConnection(); - String sql = "select NODEID from EGRESS_ROUTES where SUBID = ?"; - ps = conn.prepareStatement(sql); + EgressRoute er = null; + DB db = new DB(); + String sql = "select NODEID from EGRESS_ROUTES where SUBID = ?"; + try (Connection conn = db.getConnection(); + PreparedStatement ps = conn.prepareStatement(sql)) { ps.setInt(1, sub); - try(ResultSet rs = ps.executeQuery()) { + 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); } - ps.close(); - db.release(conn); } catch (SQLException e) { - e.printStackTrace(); - } finally { - try { - if(ps!=null) { - ps.close(); - } - } catch (SQLException e) { - e.printStackTrace(); - } + intlogger.error("PROV0009 EgressRoute.getEgressRoute: " + e.getMessage(), e); } - return v; - } - - public EgressRoute(int subid, int nodeid) throws IllegalArgumentException { - 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) throws IllegalArgumentException { - this(subid, lookupNodeName(node)); + return er; } @Override - public boolean doDelete(Connection c) { + public boolean doDelete(Connection conn) { boolean rv = true; - PreparedStatement ps = null; - try { - String sql = "delete from EGRESS_ROUTES where SUBID = ?"; - ps = c.prepareStatement(sql); + String sql = "delete from EGRESS_ROUTES where SUBID = ?"; + try (PreparedStatement ps = conn.prepareStatement(sql)) { ps.setInt(1, subid); ps.execute(); } catch (SQLException e) { rv = false; - intlogger.warn("PROV0007 doDelete: " + e.getMessage()); - e.printStackTrace(); - } finally { - try { - if(ps!=null) { - ps.close(); - } - } catch (SQLException e) { - e.printStackTrace(); - } + intlogger.error("PROV0007 doDelete: " + e.getMessage(), e); } return rv; } @Override - public boolean doInsert(Connection c) { + public boolean doInsert(Connection conn) { boolean rv = false; - PreparedStatement ps = null; - try { + String sql = "insert into EGRESS_ROUTES (SUBID, NODEID) values (?, ?)"; + try (PreparedStatement ps = conn.prepareStatement(sql)) { // Create the NETWORK_ROUTES row - String sql = "insert into EGRESS_ROUTES (SUBID, NODEID) values (?, ?)"; - ps = c.prepareStatement(sql); 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.printStackTrace(); - } finally { - try { - if(ps!=null) { - ps.close(); - } - } catch (SQLException e) { - e.printStackTrace(); - } + intlogger.warn("PROV0005 doInsert: " + e.getMessage(), e); } return rv; } @Override - public boolean doUpdate(Connection c) { + public boolean doUpdate(Connection conn) { boolean rv = true; - PreparedStatement ps = null; - try { - String sql = "update EGRESS_ROUTES set NODEID = ? where SUBID = ?"; - ps = c.prepareStatement(sql); + String sql = "update EGRESS_ROUTES set NODEID = ? where SUBID = ?"; + try (PreparedStatement ps = conn.prepareStatement(sql)) { ps.setInt(1, nodeid); ps.setInt(2, subid); ps.executeUpdate(); } catch (SQLException e) { rv = false; - intlogger.warn("PROV0006 doUpdate: " + e.getMessage()); - e.printStackTrace(); - } finally { - try { - if(ps!=null) { - ps.close(); - } - } catch (SQLException e) { - e.printStackTrace(); - } + intlogger.warn("PROV0006 doUpdate: " + e.getMessage(), e); } return rv; } @@ -221,15 +186,16 @@ public class EgressRoute extends NodeClass implements Comparable { @Override public boolean equals(Object obj) { - if (!(obj instanceof EgressRoute)) + if (!(obj instanceof EgressRoute)) { return false; + } EgressRoute on = (EgressRoute) obj; return (subid == on.subid) && (nodeid == on.nodeid); } @Override - public int compareTo(EgressRoute o) { - return this.subid - o.subid; + public int compareTo(EgressRoute er) { + return this.subid - er.subid; } @Override