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;h=8264de28087099161c9b042bd6838c69f0a563e9;hb=f499514699009bca5f7649725024a50a85204a04;hp=f50043a8ccc76d71e6ec488131b88aec7f92ff3c;hpb=8cbe8a88bc6dfe8673a33a017fe6a5a3e7ce86c3;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 f50043a8..8264de28 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
@@ -29,6 +29,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.Objects;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
@@ -43,14 +44,15 @@ import org.onap.dmaap.datarouter.provisioning.utils.DB;
  * @version $Id: NetworkRoute.java,v 1.2 2013/12/16 20:30:23 eby Exp $
  */
 public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute> {
+
     private static Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");
     private final int fromnode;
     private final int tonode;
     private final int 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).
+     * 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).
      *
      * @return the sorted set
      */
@@ -60,19 +62,19 @@ public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute>
             DB db = new DB();
             @SuppressWarnings("resource")
             Connection conn = db.getConnection();
-            Statement stmt = conn.createStatement();
-            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));
+            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));
+                    }
+                }
             }
-            rs.close();
-            stmt.close();
             db.release(conn);
         } catch (SQLException e) {
-            e.printStackTrace();
+            intlogger.error("SQLException " + e.getMessage());
         }
         return set;
     }
@@ -126,12 +128,13 @@ public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute>
         } catch (SQLException e) {
             rv = false;
             intlogger.warn("PROV0007 doDelete: " + e.getMessage());
-            e.printStackTrace();
         } finally {
             try {
-                ps.close();
+                if (ps != null) {
+                    ps.close();
+                }
             } catch (SQLException e) {
-                e.printStackTrace();
+                intlogger.error("SQLException " + e.getMessage());
             }
         }
         return rv;
@@ -154,12 +157,13 @@ public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute>
                 rv = true;
             } catch (SQLException e) {
                 intlogger.warn("PROV0005 doInsert: " + e.getMessage());
-                e.printStackTrace();
             } finally {
                 try {
-                    ps.close();
+                    if (ps != null) {
+                        ps.close();
+                    }
                 } catch (SQLException e) {
-                    e.printStackTrace();
+                    intlogger.error("SQLException " + e.getMessage());
                 }
             }
         }
@@ -180,12 +184,13 @@ public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute>
         } catch (SQLException e) {
             rv = false;
             intlogger.warn("PROV0006 doUpdate: " + e.getMessage());
-            e.printStackTrace();
         } finally {
             try {
-                ps.close();
+                if (ps != null) {
+                    ps.close();
+                }
             } catch (SQLException e) {
-                e.printStackTrace();
+                intlogger.error("SQLException " + e.getMessage());
             }
         }
         return rv;
@@ -207,17 +212,24 @@ public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute>
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof NetworkRoute))
+        if (!(obj instanceof NetworkRoute)) {
             return false;
+        }
         NetworkRoute on = (NetworkRoute) obj;
         return (fromnode == on.fromnode) && (tonode == on.tonode) && (vianode == on.vianode);
     }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(fromnode, tonode, vianode);
+    }
+
     @Override
     public int compareTo(NetworkRoute o) {
         if (this.fromnode == o.fromnode) {
-            if (this.tonode == o.tonode)
+            if (this.tonode == o.tonode) {
                 return this.vianode - o.vianode;
+            }
             return this.tonode - o.tonode;
         }
         return this.fromnode - o.fromnode;