Merge changes from topics 'amareshKumar_DMAAP715_Sonar_5Sep', 'amareshKumar_DMAAP714_...

* changes:
  fixed 12 blocker issues in group.java
  Fixed 22 Blocker sisue in Feed.java

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/IngressRoute.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/IngressRoute.java
index 0de57df..a4ed60a 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/IngressRoute.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/IngressRoute.java
@@ -85,18 +85,18 @@ public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
             DB db = new DB();\r
             @SuppressWarnings("resource")\r
             Connection conn = db.getConnection();\r
-            Statement stmt = conn.createStatement();\r
-            ResultSet rs = stmt.executeQuery(sql);\r
-            while (rs.next()) {\r
-                int seq = rs.getInt("SEQUENCE");\r
-                int feedid = rs.getInt("FEEDID");\r
-                String user = rs.getString("USERID");\r
-                String subnet = rs.getString("SUBNET");\r
-                int nodeset = rs.getInt("NODESET");\r
-                set.add(new IngressRoute(seq, feedid, user, subnet, nodeset));\r
+            try(Statement stmt = conn.createStatement()) {\r
+                try(ResultSet rs = stmt.executeQuery(sql)) {\r
+                    while (rs.next()) {\r
+                        int seq = rs.getInt("SEQUENCE");\r
+                        int feedid = rs.getInt("FEEDID");\r
+                        String user = rs.getString("USERID");\r
+                        String subnet = rs.getString("SUBNET");\r
+                        int nodeset = rs.getInt("NODESET");\r
+                        set.add(new IngressRoute(seq, feedid, user, subnet, nodeset));\r
+                    }\r
+                }\r
             }\r
-            rs.close();\r
-            stmt.close();\r
             db.release(conn);\r
         } catch (SQLException e) {\r
             e.printStackTrace();\r
@@ -128,13 +128,13 @@ public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
             DB db = new DB();\r
             @SuppressWarnings("resource")\r
             Connection conn = db.getConnection();\r
-            Statement stmt = conn.createStatement();\r
-            ResultSet rs = stmt.executeQuery(sql);\r
-            if (rs.next()) {\r
-                rv = rs.getInt("MAX");\r
+            try(Statement stmt = conn.createStatement()) {\r
+               try(ResultSet rs = stmt.executeQuery(sql)) {\r
+                   if (rs.next()) {\r
+                       rv = rs.getInt("MAX");\r
+                   }\r
+               }\r
             }\r
-            rs.close();\r
-            stmt.close();\r
             db.release(conn);\r
         } catch (SQLException e) {\r
             e.printStackTrace();\r
@@ -162,20 +162,22 @@ public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
             ps.setInt(1, feedid);\r
             ps.setString(2, user);\r
             ps.setString(3, subnet);\r
-            ResultSet rs = ps.executeQuery();\r
-            if (rs.next()) {\r
-                int seq = rs.getInt("SEQUENCE");\r
-                int nodeset = rs.getInt("NODESET");\r
-                v = new IngressRoute(seq, feedid, user, subnet, nodeset);\r
+            try(ResultSet rs = ps.executeQuery()) {\r
+                if (rs.next()) {\r
+                    int seq = rs.getInt("SEQUENCE");\r
+                    int nodeset = rs.getInt("NODESET");\r
+                    v = new IngressRoute(seq, feedid, user, subnet, nodeset);\r
+                }\r
             }\r
-            rs.close();\r
             ps.close();\r
             db.release(conn);\r
         } catch (SQLException e) {\r
             e.printStackTrace();\r
         } finally {\r
             try {\r
-                ps.close();\r
+                if(ps!=null) {\r
+                    ps.close();\r
+                }\r
             } catch (SQLException e) {\r
                 e.printStackTrace();\r
             }\r
@@ -191,33 +193,26 @@ public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
      */\r
     public static Collection<IngressRoute> getIngressRoute(int seq) {\r
         Collection<IngressRoute> rv = new ArrayList<IngressRoute>();\r
-        PreparedStatement ps = null;\r
         try {\r
             DB db = new DB();\r
             @SuppressWarnings("resource")\r
             Connection conn = db.getConnection();\r
             String sql = "select FEEDID, USERID, SUBNET, NODESET from INGRESS_ROUTES where SEQUENCE = ?";\r
-            ps = conn.prepareStatement(sql);\r
-            ps.setInt(1, seq);\r
-            ResultSet rs = ps.executeQuery();\r
-            while (rs.next()) {\r
-                int feedid = rs.getInt("FEEDID");\r
-                String user = rs.getString("USERID");\r
-                String subnet = rs.getString("SUBNET");\r
-                int nodeset = rs.getInt("NODESET");\r
-                rv.add(new IngressRoute(seq, feedid, user, subnet, nodeset));\r
+            try(PreparedStatement ps = conn.prepareStatement(sql)) {\r
+                ps.setInt(1, seq);\r
+                try(ResultSet rs = ps.executeQuery()) {\r
+                    while (rs.next()) {\r
+                        int feedid = rs.getInt("FEEDID");\r
+                        String user = rs.getString("USERID");\r
+                        String subnet = rs.getString("SUBNET");\r
+                        int nodeset = rs.getInt("NODESET");\r
+                        rv.add(new IngressRoute(seq, feedid, user, subnet, nodeset));\r
+                    }\r
+                }\r
             }\r
-            rs.close();\r
-            ps.close();\r
             db.release(conn);\r
         } catch (SQLException e) {\r
             e.printStackTrace();\r
-        } finally {\r
-            try {\r
-                ps.close();\r
-            } catch (SQLException e) {\r
-                e.printStackTrace();\r
-            }\r
         }\r
         return rv;\r
     }\r
@@ -386,31 +381,23 @@ public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
 \r
     private Collection<String> readNodes() {\r
         Collection<String> set = new TreeSet<String>();\r
-        PreparedStatement ps = null;\r
         try {\r
             DB db = new DB();\r
             @SuppressWarnings("resource")\r
             Connection conn = db.getConnection();\r
-            Statement stmt = conn.createStatement();\r
             String sql = "select NODEID from NODESETS where SETID = ?";\r
-            ps = conn.prepareStatement(sql);\r
-            ps.setInt(1, nodelist);\r
-            ResultSet rs = ps.executeQuery();\r
-            while (rs.next()) {\r
-                int id = rs.getInt("NODEID");\r
-                set.add(lookupNodeID(id));\r
+            try(PreparedStatement ps = conn.prepareStatement(sql)) {\r
+                ps.setInt(1, nodelist);\r
+                try(ResultSet rs = ps.executeQuery()) {\r
+                    while (rs.next()) {\r
+                        int id = rs.getInt("NODEID");\r
+                        set.add(lookupNodeID(id));\r
+                    }\r
+                }\r
             }\r
-            rs.close();\r
-            stmt.close();\r
             db.release(conn);\r
         } catch (SQLException e) {\r
             e.printStackTrace();\r
-        } finally {\r
-            try {\r
-                ps.close();\r
-            } catch (SQLException e) {\r
-                e.printStackTrace();\r
-            }\r
         }\r
         return set;\r
     }\r
@@ -441,7 +428,9 @@ public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
             e.printStackTrace();\r
         } finally {\r
             try {\r
-                ps.close();\r
+                if(ps!=null) {\r
+                    ps.close();\r
+                }\r
             } catch (SQLException e) {\r
                 e.printStackTrace();\r
             }\r
@@ -482,7 +471,9 @@ public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
             e.printStackTrace();\r
         } finally {\r
             try {\r
-                ps.close();\r
+                if(ps!=null) {\r
+                    ps.close();\r
+                }\r
             } catch (SQLException e) {\r
                 e.printStackTrace();\r
             }\r

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 f50043a..00eb6a2 100644 (file)
--- 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;\r
 import java.sql.SQLException;\r
 import java.sql.Statement;\r
+import java.util.Objects;\r
 import java.util.SortedSet;\r
 import java.util.TreeSet;\r
 \r
@@ -60,16 +61,16 @@ public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute>
             DB db = new DB();\r
             @SuppressWarnings("resource")\r
             Connection conn = db.getConnection();\r
-            Statement stmt = conn.createStatement();\r
-            ResultSet rs = stmt.executeQuery("select FROMNODE, TONODE, VIANODE from NETWORK_ROUTES");\r
-            while (rs.next()) {\r
-                int fromnode = rs.getInt("FROMNODE");\r
-                int tonode = rs.getInt("TONODE");\r
-                int vianode = rs.getInt("VIANODE");\r
-                set.add(new NetworkRoute(fromnode, tonode, vianode));\r
+            try(Statement stmt = conn.createStatement()) {\r
+                try(ResultSet rs = stmt.executeQuery("select FROMNODE, TONODE, VIANODE from NETWORK_ROUTES")) {\r
+                    while (rs.next()) {\r
+                        int fromnode = rs.getInt("FROMNODE");\r
+                        int tonode = rs.getInt("TONODE");\r
+                        int vianode = rs.getInt("VIANODE");\r
+                        set.add(new NetworkRoute(fromnode, tonode, vianode));\r
+                    }\r
+                }\r
             }\r
-            rs.close();\r
-            stmt.close();\r
             db.release(conn);\r
         } catch (SQLException e) {\r
             e.printStackTrace();\r
@@ -129,7 +130,9 @@ public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute>
             e.printStackTrace();\r
         } finally {\r
             try {\r
-                ps.close();\r
+                if(ps!=null) {\r
+                    ps.close();\r
+                }\r
             } catch (SQLException e) {\r
                 e.printStackTrace();\r
             }\r
@@ -157,7 +160,9 @@ public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute>
                 e.printStackTrace();\r
             } finally {\r
                 try {\r
-                    ps.close();\r
+                    if(ps!=null) {\r
+                        ps.close();\r
+                    }\r
                 } catch (SQLException e) {\r
                     e.printStackTrace();\r
                 }\r
@@ -183,7 +188,9 @@ public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute>
             e.printStackTrace();\r
         } finally {\r
             try {\r
-                ps.close();\r
+                if(ps!=null) {\r
+                    ps.close();\r
+                }\r
             } catch (SQLException e) {\r
                 e.printStackTrace();\r
             }\r
@@ -213,6 +220,11 @@ public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute>
         return (fromnode == on.fromnode) && (tonode == on.tonode) && (vianode == on.vianode);\r
     }\r
 \r
+    @Override\r
+    public int hashCode() {\r
+        return Objects.hash(fromnode, tonode, vianode);\r
+    }\r
+\r
     @Override\r
     public int compareTo(NetworkRoute o) {\r
         if (this.fromnode == o.fromnode) {\r

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Parameters.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Parameters.java
index 8e9d5bf..3e8c90b 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Parameters.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Parameters.java
@@ -28,10 +28,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;\r
 import java.sql.SQLException;\r
 import java.sql.Statement;\r
-import java.util.ArrayList;\r
-import java.util.Collection;\r
-import java.util.HashMap;\r
-import java.util.Map;\r
+import java.util.*;\r
 \r
 import org.apache.log4j.Logger;\r
 import org.json.JSONObject;\r
@@ -93,15 +90,15 @@ public class Parameters extends Syncable {
             DB db = new DB();\r
             @SuppressWarnings("resource")\r
             Connection conn = db.getConnection();\r
-            Statement stmt = conn.createStatement();\r
-            String sql = "select * from PARAMETERS";\r
-            ResultSet rs = stmt.executeQuery(sql);\r
-            while (rs.next()) {\r
-                Parameters p = new Parameters(rs);\r
-                coll.add(p);\r
+            try(Statement stmt = conn.createStatement()) {\r
+                String sql = "select * from PARAMETERS";\r
+                try(ResultSet rs = stmt.executeQuery(sql)) {\r
+                    while (rs.next()) {\r
+                        Parameters p = new Parameters(rs);\r
+                        coll.add(p);\r
+                    }\r
+                }\r
             }\r
-            rs.close();\r
-            stmt.close();\r
             db.release(conn);\r
         } catch (SQLException e) {\r
             e.printStackTrace();\r
@@ -121,14 +118,14 @@ public class Parameters extends Syncable {
             DB db = new DB();\r
             @SuppressWarnings("resource")\r
             Connection conn = db.getConnection();\r
-            Statement stmt = conn.createStatement();\r
-            String sql = "select KEYNAME, VALUE from PARAMETERS where KEYNAME = '" + k + "'";\r
-            ResultSet rs = stmt.executeQuery(sql);\r
-            if (rs.next()) {\r
-                v = new Parameters(rs);\r
+            try(Statement stmt = conn.createStatement()) {\r
+                String sql = "select KEYNAME, VALUE from PARAMETERS where KEYNAME = '" + k + "'";\r
+                try(ResultSet rs = stmt.executeQuery(sql)) {\r
+                    if (rs.next()) {\r
+                        v = new Parameters(rs);\r
+                    }\r
+                }\r
             }\r
-            rs.close();\r
-            stmt.close();\r
             db.release(conn);\r
         } catch (SQLException e) {\r
             e.printStackTrace();\r
@@ -191,7 +188,9 @@ public class Parameters extends Syncable {
             e.printStackTrace();\r
         } finally {\r
             try {\r
-                ps.close();\r
+                if(ps!=null) {\r
+                    ps.close();\r
+                }\r
             } catch (SQLException e) {\r
                 e.printStackTrace();\r
             }\r
@@ -216,7 +215,9 @@ public class Parameters extends Syncable {
             e.printStackTrace();\r
         } finally {\r
             try {\r
-                ps.close();\r
+                if(ps!=null) {\r
+                    ps.close();\r
+                }\r
             } catch (SQLException e) {\r
                 e.printStackTrace();\r
             }\r
@@ -240,7 +241,9 @@ public class Parameters extends Syncable {
             e.printStackTrace();\r
         } finally {\r
             try {\r
-                ps.close();\r
+                if(ps!=null) {\r
+                    ps.close();\r
+                }\r
             } catch (SQLException e) {\r
                 e.printStackTrace();\r
             }\r
@@ -265,6 +268,11 @@ public class Parameters extends Syncable {
         return true;\r
     }\r
 \r
+    @Override\r
+    public int hashCode() {\r
+        return Objects.hash(keyname, value);\r
+    }\r
+\r
     @Override\r
     public String toString() {\r
         return "PARAM: keyname=" + keyname + ", value=" + value;\r