fix FeedReport vulnerabilities

Change-Id: I46f75ec2f92eec39ba532935aef15446477252a6
Signed-off-by: Ronan Keogh <ronan.keogh@ericsson.com>
Issue-ID: DMAAP-775

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/FeedReport.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/FeedReport.java
index fe9c460..3f67efe 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/FeedReport.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/FeedReport.java
@@ -83,7 +83,7 @@ public class FeedReport extends ReportBase {
            }\r
         db.release(conn);\r
         } catch (SQLException e) {\r
-            e.printStackTrace();\r
+            logger.error(e);\r
         }\r
         logger.debug("Query time: " + (System.currentTimeMillis() - start) + " ms");\r
         try (PrintWriter os = new PrintWriter(outfile)) {\r
@@ -91,6 +91,7 @@ public class FeedReport extends ReportBase {
             os.print(sb.toString());\r
         } catch (FileNotFoundException e) {\r
             System.err.println("File cannot be written: " + outfile);\r
+            logger.error(e);\r
         }\r
     }\r
 \r
@@ -129,6 +130,7 @@ public class FeedReport extends ReportBase {
                                 feedmap.put("pubcount", n + 1);\r
                             } catch (JSONException e) {\r
                                 feedmap.put("pubcount", 1);\r
+                                logger.error(e);\r
                             }\r
                         } else if (type.equals("del")) {\r
                             String subid = "" + rs.getInt("DELIVERY_SUBID");\r
@@ -137,6 +139,7 @@ public class FeedReport extends ReportBase {
                                 feedmap.put(subid, n + 1);\r
                             } catch (JSONException e) {\r
                                 feedmap.put(subid, 1);\r
+                                logger.error(e);\r
                             }\r
                         }\r
                     }\r
@@ -144,7 +147,7 @@ public class FeedReport extends ReportBase {
             }\r
              db.release(conn);\r
         } catch (SQLException e) {\r
-            e.printStackTrace();\r
+            logger.error(e);\r
         }\r
         logger.debug("Query time: " + (System.currentTimeMillis() - start) + " ms");\r
         try {\r
@@ -153,6 +156,7 @@ public class FeedReport extends ReportBase {
             os.close();\r
         } catch (FileNotFoundException e) {\r
             System.err.println("File cannot be written: " + outfile);\r
+            logger.error(e);\r
         }\r
     }\r
 \r
@@ -279,7 +283,7 @@ public class FeedReport extends ReportBase {
      *\r
      * @param args\r
      */\r
-    public static void main(String[] args) {\r
+    public void main(String[] args) {\r
         int rtype = 0;    // 0 -> day, 1 -> week, 2 -> month, 3 -> year\r
         String infile = null;\r
         String outfile = null;\r
@@ -350,6 +354,7 @@ public class FeedReport extends ReportBase {
                                 feedmap.put("pubcount", n + count);\r
                             } catch (JSONException e) {\r
                                 feedmap.put("pubcount", count);\r
+                                logger.error(e);\r
                             }\r
                         } else if (type.equals("del")) {\r
                             String subid = tt[3];\r
@@ -358,6 +363,7 @@ public class FeedReport extends ReportBase {
                                 feedmap.put(subid, n + count);\r
                             } catch (JSONException e) {\r
                                 feedmap.put(subid, count);\r
+                                logger.error(e);\r
                             }\r
                         }\r
                     }\r
@@ -379,7 +385,7 @@ public class FeedReport extends ReportBase {
             System.out.println(t);\r
         } catch (Exception e) {\r
             System.err.println(e);\r
-            e.printStackTrace();\r
+            logger.error(e);\r
         }\r
     }\r
 }\r