Added 8 Sonar blocker fixes in Parameters.java

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

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

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