X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2Fbeans%2FNetworkRoute.java;fp=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2Fbeans%2FNetworkRoute.java;h=fa3d4e0e5bade9b74eee03c32cfc8d49a89684d4;hb=f20778ffa99aa9c6f30a0f84112a5392b259ea63;hp=6ac05445e0468899d116aff5ff1c73b46c3f116c;hpb=d6302cb0b3db8043598e8b6bc3dc5ed436f848cb;p=dmaap%2Fdatarouter.git 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 6ac05445..fa3d4e0e 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 @@ -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,9 +34,6 @@ import java.sql.Statement; import java.util.Objects; import java.util.SortedSet; import java.util.TreeSet; - -import com.att.eelf.configuration.EELFLogger; -import com.att.eelf.configuration.EELFManager; import org.json.JSONObject; import org.onap.dmaap.datarouter.provisioning.utils.DB; @@ -52,6 +51,30 @@ public class NetworkRoute extends NodeClass implements Comparable private final int tonode; private final int vianode; + public NetworkRoute(String fromnode, String tonode) { + this.fromnode = lookupNodeName(fromnode); + this.tonode = lookupNodeName(tonode); + this.vianode = -1; + } + + public NetworkRoute(String fromnode, String tonode, String vianode) { + this.fromnode = lookupNodeName(fromnode); + this.tonode = lookupNodeName(tonode); + this.vianode = lookupNodeName(vianode); + } + + public NetworkRoute(JSONObject jo) { + this.fromnode = lookupNodeName(jo.getString("from")); + this.tonode = lookupNodeName(jo.getString("to")); + this.vianode = lookupNodeName(jo.getString("via")); + } + + private NetworkRoute(int fromnode, int tonode, int vianode) { + this.fromnode = fromnode; + this.tonode = tonode; + this.vianode = vianode; + } + /** * Get a set of all Network Routes in the DB. The set is sorted according to the natural sorting order of the * routes (based on the from and to node names in each route). @@ -66,43 +89,24 @@ public class NetworkRoute extends NodeClass implements Comparable Connection conn = db.getConnection(); try (Statement stmt = conn.createStatement()) { try (ResultSet rs = stmt.executeQuery("select FROMNODE, TONODE, VIANODE from NETWORK_ROUTES")) { - while (rs.next()) { - int fromnode = rs.getInt("FROMNODE"); - int tonode = rs.getInt("TONODE"); - int vianode = rs.getInt("VIANODE"); - set.add(new NetworkRoute(fromnode, tonode, vianode)); - } + addNetworkRouteToSet(set, rs); } + } finally { + db.release(conn); } - db.release(conn); } catch (SQLException e) { intlogger.error(SQLEXCEPTION + e.getMessage(), e); } return set; } - public NetworkRoute(String fromnode, String tonode) { - this.fromnode = lookupNodeName(fromnode); - this.tonode = lookupNodeName(tonode); - this.vianode = -1; - } - - public NetworkRoute(String fromnode, String tonode, String vianode) { - this.fromnode = lookupNodeName(fromnode); - this.tonode = lookupNodeName(tonode); - this.vianode = lookupNodeName(vianode); - } - - public NetworkRoute(JSONObject jo) { - this.fromnode = lookupNodeName(jo.getString("from")); - this.tonode = lookupNodeName(jo.getString("to")); - this.vianode = lookupNodeName(jo.getString("via")); - } - - public NetworkRoute(int fromnode, int tonode, int vianode) { - this.fromnode = fromnode; - this.tonode = tonode; - this.vianode = vianode; + private static void addNetworkRouteToSet(SortedSet set, ResultSet rs) throws SQLException { + while (rs.next()) { + int fromnode = rs.getInt("FROMNODE"); + int tonode = rs.getInt("TONODE"); + int vianode = rs.getInt("VIANODE"); + set.add(new NetworkRoute(fromnode, tonode, vianode)); + } } public int getFromnode() { @@ -113,27 +117,21 @@ public class NetworkRoute extends NodeClass implements Comparable return tonode; } + public int getVianode() { + return vianode; + } + @Override public boolean doDelete(Connection c) { boolean rv = true; - PreparedStatement ps = null; - try { - String sql = "delete from NETWORK_ROUTES where FROMNODE = ? AND TONODE = ?"; - ps = c.prepareStatement(sql); + String sql = "delete from NETWORK_ROUTES where FROMNODE = ? AND TONODE = ?"; + try (PreparedStatement ps = c.prepareStatement(sql)) { ps.setInt(1, fromnode); ps.setInt(2, tonode); ps.execute(); } catch (SQLException e) { rv = false; intlogger.warn("PROV0007 doDelete: " + e.getMessage(), e); - } finally { - try { - if (ps != null) { - ps.close(); - } - } catch (SQLException e) { - intlogger.error(SQLEXCEPTION + e.getMessage(), e); - } } return rv; } @@ -141,28 +139,17 @@ public class NetworkRoute extends NodeClass implements Comparable @Override public boolean doInsert(Connection c) { boolean rv = false; + String sql = "insert into NETWORK_ROUTES (FROMNODE, TONODE, VIANODE) values (?, ?, ?)"; if (this.vianode >= 0) { - PreparedStatement ps = null; - try { + try (PreparedStatement ps = c.prepareStatement(sql)) { // Create the NETWORK_ROUTES row - String sql = "insert into NETWORK_ROUTES (FROMNODE, TONODE, VIANODE) values (?, ?, ?)"; - ps = c.prepareStatement(sql); ps.setInt(1, this.fromnode); ps.setInt(2, this.tonode); ps.setInt(3, this.vianode); ps.execute(); - ps.close(); rv = true; } catch (SQLException e) { intlogger.warn("PROV0005 doInsert: " + e.getMessage(), e); - } finally { - try { - if (ps != null) { - ps.close(); - } - } catch (SQLException e) { - intlogger.error(SQLEXCEPTION + e.getMessage(), e); - } } } return rv; @@ -171,10 +158,8 @@ public class NetworkRoute extends NodeClass implements Comparable @Override public boolean doUpdate(Connection c) { boolean rv = true; - PreparedStatement ps = null; - try { - String sql = "update NETWORK_ROUTES set VIANODE = ? where FROMNODE = ? and TONODE = ?"; - ps = c.prepareStatement(sql); + String sql = "update NETWORK_ROUTES set VIANODE = ? where FROMNODE = ? and TONODE = ?"; + try (PreparedStatement ps = c.prepareStatement(sql)) { ps.setInt(1, vianode); ps.setInt(2, fromnode); ps.setInt(3, tonode); @@ -182,14 +167,6 @@ public class NetworkRoute extends NodeClass implements Comparable } catch (SQLException e) { rv = false; intlogger.warn("PROV0006 doUpdate: " + e.getMessage(), e); - } finally { - try { - if (ps != null) { - ps.close(); - } - } catch (SQLException e) { - intlogger.error(SQLEXCEPTION + e.getMessage(), e); - } } return rv; }