Fixed 22 Blocker sisue in Feed.java

Fixed 22 sonar issues

https://sonar.onap.org/project/issues?id=org.onap.dmaap.datarouter%3Aparent&open=AWHFaQqGEU5FCDfKtndk&resolved=false&severities=BLOCKER&types=BUG

Issue-ID: DMAAP-714
Change-Id: Iaa5b9d612314871af34d0f2fd3440829a1c705b7
Signed-off-by: Amaresh Kumar <kamaresh@in.ibm.com>

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Feed.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Feed.java
index 852321a..c08bce5 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Feed.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Feed.java
@@ -24,20 +24,6 @@
 \r
 package org.onap.dmaap.datarouter.provisioning.beans;\r
 \r
-import java.io.InvalidObjectException;\r
-import java.sql.Connection;\r
-import java.sql.PreparedStatement;\r
-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.Date;\r
-import java.util.HashMap;\r
-import java.util.List;\r
-import java.util.Map;\r
-import java.util.Set;\r
-\r
 import org.apache.log4j.Logger;\r
 import org.json.JSONArray;\r
 import org.json.JSONObject;\r
@@ -45,6 +31,11 @@ import org.onap.dmaap.datarouter.provisioning.utils.DB;
 import org.onap.dmaap.datarouter.provisioning.utils.JSONUtilities;\r
 import org.onap.dmaap.datarouter.provisioning.utils.URLUtilities;\r
 \r
+import java.io.InvalidObjectException;\r
+import java.sql.*;\r
+import java.util.*;\r
+import java.util.Date;\r
+\r
 /**\r
  * The representation of a Feed.  Feeds can be retrieved from the DB, or stored/updated in the DB.\r
  *\r
@@ -81,13 +72,13 @@ public class Feed extends Syncable {
         try {\r
             DB db = new DB();\r
             Connection conn = db.getConnection();\r
-            Statement stmt = conn.createStatement();\r
-            ResultSet rs = stmt.executeQuery("select COUNT(*) from FEEDS where FEEDID = " + id);\r
-            if (rs.next()) {\r
-                count = rs.getInt(1);\r
+            try(Statement stmt = conn.createStatement()) {\r
+                try(ResultSet rs = stmt.executeQuery("select COUNT(*) from FEEDS where FEEDID = " + id)) {\r
+                    if (rs.next()) {\r
+                        count = rs.getInt(1);\r
+                    }\r
+                }\r
             }\r
-            rs.close();\r
-            stmt.close();\r
             db.release(conn);\r
         } catch (SQLException e) {\r
             e.printStackTrace();\r
@@ -131,13 +122,13 @@ public class Feed extends Syncable {
             DB db = new DB();\r
             @SuppressWarnings("resource")\r
             Connection conn = db.getConnection();\r
-            Statement stmt = conn.createStatement();\r
-            ResultSet rs = stmt.executeQuery("select count(*) from FEEDS where DELETED = 0");\r
-            if (rs.next()) {\r
-                count = rs.getInt(1);\r
+            try(Statement stmt = conn.createStatement()) {\r
+                try (ResultSet rs = stmt.executeQuery("select count(*) from FEEDS where DELETED = 0")) {\r
+                    if (rs.next()) {\r
+                        count = rs.getInt(1);\r
+                    }\r
+                }\r
             }\r
-            rs.close();\r
-            stmt.close();\r
             db.release(conn);\r
         } catch (SQLException e) {\r
             intlogger.info("countActiveFeeds: " + e.getMessage());\r
@@ -152,13 +143,13 @@ public class Feed extends Syncable {
             DB db = new DB();\r
             @SuppressWarnings("resource")\r
             Connection conn = db.getConnection();\r
-            Statement stmt = conn.createStatement();\r
-            ResultSet rs = stmt.executeQuery("select MAX(feedid) from FEEDS");\r
-            if (rs.next()) {\r
-                max = rs.getInt(1);\r
+            try(Statement stmt = conn.createStatement()) {\r
+                try (ResultSet rs = stmt.executeQuery("select MAX(feedid) from FEEDS")) {\r
+                    if (rs.next()) {\r
+                        max = rs.getInt(1);\r
+                    }\r
+                }\r
             }\r
-            rs.close();\r
-            stmt.close();\r
             db.release(conn);\r
         } catch (SQLException e) {\r
             intlogger.info("getMaxFeedID: " + e.getMessage());\r
@@ -173,40 +164,39 @@ public class Feed extends Syncable {
             DB db = new DB();\r
             @SuppressWarnings("resource")\r
             Connection conn = db.getConnection();\r
-            Statement stmt = conn.createStatement();\r
-            ResultSet rs = stmt.executeQuery("select * from FEEDS");\r
-            while (rs.next()) {\r
-                Feed feed = new Feed(rs);\r
-                map.put(feed.getFeedid(), feed);\r
-            }\r
-            rs.close();\r
+            try(Statement stmt = conn.createStatement()) {\r
+                try(ResultSet rs = stmt.executeQuery("select * from FEEDS")) {\r
+                    while (rs.next()) {\r
+                        Feed feed = new Feed(rs);\r
+                        map.put(feed.getFeedid(), feed);\r
+                    }\r
+                }\r
 \r
-            String sql = "select * from FEED_ENDPOINT_IDS";\r
-            rs = stmt.executeQuery(sql);\r
-            while (rs.next()) {\r
-                int id = rs.getInt("FEEDID");\r
-                Feed feed = map.get(id);\r
-                if (feed != null) {\r
-                    FeedEndpointID epi = new FeedEndpointID(rs);\r
-                    Collection<FeedEndpointID> ecoll = feed.getAuthorization().getEndpoint_ids();\r
-                    ecoll.add(epi);\r
+                String sql = "select * from FEED_ENDPOINT_IDS";\r
+                try(ResultSet rs = stmt.executeQuery(sql)){\r
+                    while (rs.next()) {\r
+                        int id = rs.getInt("FEEDID");\r
+                        Feed feed = map.get(id);\r
+                        if (feed != null) {\r
+                            FeedEndpointID epi = new FeedEndpointID(rs);\r
+                            Collection<FeedEndpointID> ecoll = feed.getAuthorization().getEndpoint_ids();\r
+                            ecoll.add(epi);\r
+                        }\r
+                    }\r
                 }\r
-            }\r
-            rs.close();\r
 \r
-            sql = "select * from FEED_ENDPOINT_ADDRS";\r
-            rs = stmt.executeQuery(sql);\r
-            while (rs.next()) {\r
-                int id = rs.getInt("FEEDID");\r
-                Feed feed = map.get(id);\r
-                if (feed != null) {\r
-                    Collection<String> acoll = feed.getAuthorization().getEndpoint_addrs();\r
-                    acoll.add(rs.getString("ADDR"));\r
+                sql = "select * from FEED_ENDPOINT_ADDRS";\r
+                try(ResultSet rs = stmt.executeQuery(sql)) {\r
+                    while (rs.next()) {\r
+                        int id = rs.getInt("FEEDID");\r
+                        Feed feed = map.get(id);\r
+                        if (feed != null) {\r
+                            Collection<String> acoll = feed.getAuthorization().getEndpoint_addrs();\r
+                            acoll.add(rs.getString("ADDR"));\r
+                        }\r
+                    }\r
                 }\r
             }\r
-            rs.close();\r
-\r
-            stmt.close();\r
             db.release(conn);\r
         } catch (SQLException e) {\r
             e.printStackTrace();\r
@@ -231,16 +221,16 @@ public class Feed extends Syncable {
             DB db = new DB();\r
             @SuppressWarnings("resource")\r
             Connection conn = db.getConnection();\r
-            PreparedStatement ps = conn.prepareStatement(sql);\r
-            if (sql.indexOf('?') >= 0)\r
-                ps.setString(1, val);\r
-            ResultSet rs = ps.executeQuery();\r
-            while (rs.next()) {\r
-                String t = rs.getString(1);\r
-                list.add(t.trim());\r
+            try(PreparedStatement ps = conn.prepareStatement(sql)) {\r
+                if (sql.indexOf('?') >= 0)\r
+                    ps.setString(1, val);\r
+                try(ResultSet rs = ps.executeQuery()) {\r
+                    while (rs.next()) {\r
+                        String t = rs.getString(1);\r
+                        list.add(t.trim());\r
+                    }\r
+                }\r
             }\r
-            rs.close();\r
-            ps.close();\r
             db.release(conn);\r
         } catch (SQLException e) {\r
             e.printStackTrace();\r
@@ -254,30 +244,30 @@ public class Feed extends Syncable {
         try {\r
             DB db = new DB();\r
             Connection conn = db.getConnection();\r
-            Statement stmt = conn.createStatement();\r
-            ResultSet rs = stmt.executeQuery(sql);\r
-            if (rs.next()) {\r
-                feed = new Feed(rs);\r
-                rs.close();\r
-\r
-                sql = "select * from FEED_ENDPOINT_IDS where FEEDID = " + feed.feedid;\r
-                rs = stmt.executeQuery(sql);\r
-                Collection<FeedEndpointID> ecoll = feed.getAuthorization().getEndpoint_ids();\r
-                while (rs.next()) {\r
-                    FeedEndpointID epi = new FeedEndpointID(rs);\r
-                    ecoll.add(epi);\r
+            try (Statement stmt = conn.createStatement()) {\r
+                try (ResultSet rs = stmt.executeQuery(sql)) {\r
+                    if (rs.next()) {\r
+                        feed = new Feed(rs);\r
+                    }\r
                 }\r
-                rs.close();\r
-\r
-                sql = "select * from FEED_ENDPOINT_ADDRS where FEEDID = " + feed.feedid;\r
-                rs = stmt.executeQuery(sql);\r
-                Collection<String> acoll = feed.getAuthorization().getEndpoint_addrs();\r
-                while (rs.next()) {\r
-                    acoll.add(rs.getString("ADDR"));\r
+                if (feed != null) {\r
+                    sql = "select * from FEED_ENDPOINT_IDS where FEEDID = " + feed.feedid;\r
+                    try (ResultSet rs = stmt.executeQuery(sql)) {\r
+                        Collection<FeedEndpointID> ecoll = feed.getAuthorization().getEndpoint_ids();\r
+                        while (rs.next()) {\r
+                            FeedEndpointID epi = new FeedEndpointID(rs);\r
+                            ecoll.add(epi);\r
+                        }\r
+                    }\r
+                    sql = "select * from FEED_ENDPOINT_ADDRS where FEEDID = " + feed.feedid;\r
+                    try (ResultSet rs = stmt.executeQuery(sql)) {\r
+                        Collection<String> acoll = feed.getAuthorization().getEndpoint_addrs();\r
+                        while (rs.next()) {\r
+                            acoll.add(rs.getString("ADDR"));\r
+                        }\r
+                    }\r
                 }\r
             }\r
-            rs.close();\r
-            stmt.close();\r
             db.release(conn);\r
         } catch (SQLException e) {\r
             e.printStackTrace();\r
@@ -546,7 +536,9 @@ public class Feed 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
@@ -557,17 +549,8 @@ public class Feed extends Syncable {
     @Override\r
     public synchronized boolean doInsert(Connection c) {\r
         boolean rv = true;\r
-//        PreparedStatement ps = null;\r
         try {\r
             if (feedid == -1) {\r
-//                // Get the next feedid\r
-//                String sql = "insert into FEEDS_UNIQUEID (FEEDID) values (0)";\r
-//                ps = c.prepareStatement(sql, new String[] { "FEEDID" });\r
-//                ps.execute();\r
-//                ResultSet rs = ps.getGeneratedKeys();\r
-//                rs.first();\r
-//                setFeedid(rs.getInt(1));\r
-                // No feed ID assigned yet, so assign the next available one\r
                 setFeedid(next_feedid++);\r
             }\r
             // In case we insert a feed from synchronization\r
@@ -577,54 +560,48 @@ public class Feed extends Syncable {
             // Create FEED_ENDPOINT_IDS rows\r
             FeedAuthorization auth = getAuthorization();\r
             String sql = "insert into FEED_ENDPOINT_IDS values (?, ?, ?)";\r
-            PreparedStatement ps2 = c.prepareStatement(sql);\r
-            for (FeedEndpointID fid : auth.getEndpoint_ids()) {\r
-                ps2.setInt(1, feedid);\r
-                ps2.setString(2, fid.getId());\r
-                ps2.setString(3, fid.getPassword());\r
-                ps2.executeUpdate();\r
+            try(PreparedStatement ps2 = c.prepareStatement(sql)) {\r
+                for (FeedEndpointID fid : auth.getEndpoint_ids()) {\r
+                    ps2.setInt(1, feedid);\r
+                    ps2.setString(2, fid.getId());\r
+                    ps2.setString(3, fid.getPassword());\r
+                    ps2.executeUpdate();\r
+                }\r
             }\r
-            ps2.close();\r
 \r
             // Create FEED_ENDPOINT_ADDRS rows\r
             sql = "insert into FEED_ENDPOINT_ADDRS values (?, ?)";\r
-            ps2 = c.prepareStatement(sql);\r
-            for (String t : auth.getEndpoint_addrs()) {\r
-                ps2.setInt(1, feedid);\r
-                ps2.setString(2, t);\r
-                ps2.executeUpdate();\r
+            try(PreparedStatement ps2 = c.prepareStatement(sql)) {\r
+                for (String t : auth.getEndpoint_addrs()) {\r
+                    ps2.setInt(1, feedid);\r
+                    ps2.setString(2, t);\r
+                    ps2.executeUpdate();\r
+                }\r
             }\r
-            ps2.close();\r
 \r
             // Finally, create the FEEDS row\r
             sql = "insert into FEEDS (FEEDID, NAME, VERSION, DESCRIPTION, AUTH_CLASS, PUBLISHER, SELF_LINK, PUBLISH_LINK, SUBSCRIBE_LINK, LOG_LINK, DELETED, SUSPENDED,BUSINESS_DESCRIPTION, GROUPID) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?, ?)";\r
-            ps2 = c.prepareStatement(sql);\r
-            ps2.setInt(1, feedid);\r
-            ps2.setString(2, getName());\r
-            ps2.setString(3, getVersion());\r
-            ps2.setString(4, getDescription());\r
-            ps2.setString(5, getAuthorization().getClassification());\r
-            ps2.setString(6, getPublisher());\r
-            ps2.setString(7, getLinks().getSelf());\r
-            ps2.setString(8, getLinks().getPublish());\r
-            ps2.setString(9, getLinks().getSubscribe());\r
-            ps2.setString(10, getLinks().getLog());\r
-            ps2.setBoolean(11, isDeleted());\r
-            ps2.setBoolean(12, isSuspended());\r
-            ps2.setString(13, getBusiness_description()); // New field is added - Groups feature Rally:US708102 - 1610\r
-            ps2.setInt(14, groupid); //New field is added - Groups feature Rally:US708115 - 1610\r
-            ps2.executeUpdate();\r
-            ps2.close();\r
+            try(PreparedStatement ps2 = c.prepareStatement(sql)) {\r
+                ps2.setInt(1, feedid);\r
+                ps2.setString(2, getName());\r
+                ps2.setString(3, getVersion());\r
+                ps2.setString(4, getDescription());\r
+                ps2.setString(5, getAuthorization().getClassification());\r
+                ps2.setString(6, getPublisher());\r
+                ps2.setString(7, getLinks().getSelf());\r
+                ps2.setString(8, getLinks().getPublish());\r
+                ps2.setString(9, getLinks().getSubscribe());\r
+                ps2.setString(10, getLinks().getLog());\r
+                ps2.setBoolean(11, isDeleted());\r
+                ps2.setBoolean(12, isSuspended());\r
+                ps2.setString(13, getBusiness_description()); // New field is added - Groups feature Rally:US708102 - 1610\r
+                ps2.setInt(14, groupid); //New field is added - Groups feature Rally:US708115 - 1610\r
+                ps2.executeUpdate();\r
+            }\r
         } catch (SQLException e) {\r
             rv = false;\r
             intlogger.warn("PROV0005 doInsert: " + e.getMessage());\r
             e.printStackTrace();\r
-//        } finally {\r
-//            try {\r
-//                ps.close();\r
-//            } catch (SQLException e) {\r
-//                e.printStackTrace();\r
-//            }\r
         }\r
         return rv;\r
     }\r
@@ -741,7 +718,9 @@ public class Feed 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
@@ -789,4 +768,9 @@ public class Feed extends Syncable {
     public String toString() {\r
         return "FEED: feedid=" + feedid + ", name=" + name + ", version=" + version;\r
     }\r
+\r
+    @Override\r
+    public int hashCode() {\r
+        return Objects.hash(feedid, groupid, name, version, description, business_description, authorization, publisher, links, deleted, suspended, last_mod, created_date);\r
+    }\r
 }\r