Merge "Fix LogServlet Vulnerabilities"

[dmaap/datarouter.git] / datarouter-prov / src / main / java / org / onap / dmaap / datarouter / provisioning / beans / IngressRoute.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..6b390c4 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,21 +85,21 @@ 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
+            intlogger.error("SQLException " + e.getMessage());\r
         }\r
         return set;\r
     }\r
@@ -128,16 +128,16 @@ 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
+            intlogger.error("SQLException " + e.getMessage());\r
         }\r
         return rv;\r
     }\r
@@ -162,22 +162,24 @@ 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
+            intlogger.error("SQLException " + e.getMessage());\r
         } finally {\r
             try {\r
-                ps.close();\r
+                if(ps!=null) {\r
+                    ps.close();\r
+                }\r
             } catch (SQLException e) {\r
-                e.printStackTrace();\r
+                intlogger.error("SQLException " + e.getMessage());\r
             }\r
         }\r
         return v;\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
+            intlogger.error("SQLException " + e.getMessage());\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
+            intlogger.error("SQLException " + e.getMessage());\r
         }\r
         return set;\r
     }\r
@@ -438,12 +425,14 @@ public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
         } catch (SQLException e) {\r
             rv = false;\r
             intlogger.warn("PROV0007 doDelete: " + e.getMessage());\r
-            e.printStackTrace();\r
+            intlogger.error("SQLException " + e.getMessage());\r
         } finally {\r
             try {\r
-                ps.close();\r
+                if(ps!=null) {\r
+                    ps.close();\r
+                }\r
             } catch (SQLException e) {\r
-                e.printStackTrace();\r
+                intlogger.error("SQLException " + e.getMessage());\r
             }\r
         }\r
         return rv;\r
@@ -479,12 +468,14 @@ public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
             rv = true;\r
         } catch (SQLException e) {\r
             intlogger.warn("PROV0005 doInsert: " + e.getMessage());\r
-            e.printStackTrace();\r
+            intlogger.error("SQLException " + e.getMessage());\r
         } finally {\r
             try {\r
-                ps.close();\r
+                if(ps!=null) {\r
+                    ps.close();\r
+                }\r
             } catch (SQLException e) {\r
-                e.printStackTrace();\r
+                intlogger.error("SQLException " + e.getMessage());\r
             }\r
         }\r
         return rv;\r