Fix Sonar bugs

[dmaap/datarouter.git] / datarouter-prov / src / main / java / org / onap / dmaap / datarouter / reports / FeedReport.java

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 4346a0e..fe9c460 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
@@ -72,36 +72,12 @@ public class FeedReport extends ReportBase {
            try( PreparedStatement ps = conn.prepareStatement(SELECT_SQL)) {\r
                try (ResultSet rs = ps.executeQuery()) {\r
                    while (rs.next()) {\r
-                       if (alg1) {\r
-                           String date = rs.getString("date");\r
-                           String type = rs.getString("type");\r
-                           int feedid = rs.getInt("feedid");\r
-                           int subid = type.equals("del") ? rs.getInt("delivery_subid") : 0;\r
-                           int count = rs.getInt("count");\r
-                           sb.append(date + "," + type + "," + feedid + "," + subid + "," + count + "\n");\r
-                       } else {\r
-                           String date = rs.getString("date");\r
-                           JSONObject datemap = jo.optJSONObject(date);\r
-                           if (datemap == null) {\r
-                               datemap = new JSONObject();\r
-                               jo.put(date, datemap);\r
-                           }\r
-                           int feed = rs.getInt("FEEDID");\r
-                           JSONObject feedmap = datemap.optJSONObject("" + feed);\r
-                           if (feedmap == null) {\r
-                               feedmap = new JSONObject();\r
-                               feedmap.put("pubcount", 0);\r
-                               datemap.put("" + feed, feedmap);\r
-                           }\r
-                           String type = rs.getString("TYPE");\r
-                           int count = rs.getInt("count");\r
-                           if (type.equals("pub")) {\r
-                               feedmap.put("pubcount", count);\r
-                           } else if (type.equals("del")) {\r
-                               String subid = "" + rs.getInt("DELIVERY_SUBID");\r
-                               feedmap.put(subid, count);\r
-                           }\r
-                       }\r
+                       String date = rs.getString("date");\r
+                       String type = rs.getString("type");\r
+                       int feedid = rs.getInt("feedid");\r
+                       int subid = type.equals("del") ? rs.getInt("delivery_subid") : 0;\r
+                       int count = rs.getInt("count");\r
+                       sb.append(date + "," + type + "," + feedid + "," + subid + "," + count + "\n");\r
                    }\r
                }\r
            }\r
@@ -110,15 +86,9 @@ public class FeedReport extends ReportBase {
             e.printStackTrace();\r
         }\r
         logger.debug("Query time: " + (System.currentTimeMillis() - start) + " ms");\r
-        try {\r
-            PrintWriter os = new PrintWriter(outfile);\r
-            if (alg1) {\r
-                os.print("date,type,feedid,subid,count\n");\r
-                os.print(sb.toString());\r
-            } else {\r
-                os.println(toHTML(jo));\r
-            }\r
-            os.close();\r
+        try (PrintWriter os = new PrintWriter(outfile)) {\r
+            os.print("date,type,feedid,subid,count\n");\r
+            os.print(sb.toString());\r
         } catch (FileNotFoundException e) {\r
             System.err.println("File cannot be written: " + outfile);\r
         }\r