X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Freports%2FFeedReport.java;h=652978864845c0a9ce02f6189b240e057192e323;hb=refs%2Fchanges%2F51%2F78851%2F11;hp=4346a0ece36ae64019d1d951b4481a1dbfcbfe6f;hpb=08762278a48f0190b15d83a1ef51b28b1f305982;p=dmaap%2Fdatarouter.git

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 4346a0ec..65297886 100644
--- 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,55 +72,26 @@ public class FeedReport extends ReportBase {
            try( PreparedStatement ps = conn.prepareStatement(SELECT_SQL)) {
                try (ResultSet rs = ps.executeQuery()) {
                    while (rs.next()) {
-                       if (alg1) {
-                           String date = rs.getString("date");
-                           String type = rs.getString("type");
-                           int feedid = rs.getInt("feedid");
-                           int subid = type.equals("del") ? rs.getInt("delivery_subid") : 0;
-                           int count = rs.getInt("count");
-                           sb.append(date + "," + type + "," + feedid + "," + subid + "," + count + "\n");
-                       } else {
-                           String date = rs.getString("date");
-                           JSONObject datemap = jo.optJSONObject(date);
-                           if (datemap == null) {
-                               datemap = new JSONObject();
-                               jo.put(date, datemap);
-                           }
-                           int feed = rs.getInt("FEEDID");
-                           JSONObject feedmap = datemap.optJSONObject("" + feed);
-                           if (feedmap == null) {
-                               feedmap = new JSONObject();
-                               feedmap.put("pubcount", 0);
-                               datemap.put("" + feed, feedmap);
-                           }
-                           String type = rs.getString("TYPE");
-                           int count = rs.getInt("count");
-                           if (type.equals("pub")) {
-                               feedmap.put("pubcount", count);
-                           } else if (type.equals("del")) {
-                               String subid = "" + rs.getInt("DELIVERY_SUBID");
-                               feedmap.put(subid, count);
-                           }
-                       }
+                       String date = rs.getString("date");
+                       String type = rs.getString("type");
+                       int feedid = rs.getInt("feedid");
+                       int subid = type.equals("del") ? rs.getInt("delivery_subid") : 0;
+                       int count = rs.getInt("count");
+                       sb.append(date + "," + type + "," + feedid + "," + subid + "," + count + "\n");
                    }
                }
            }
         db.release(conn);
         } catch (SQLException e) {
-            e.printStackTrace();
+            logger.error(e.toString());
         }
         logger.debug("Query time: " + (System.currentTimeMillis() - start) + " ms");
-        try {
-            PrintWriter os = new PrintWriter(outfile);
-            if (alg1) {
-                os.print("date,type,feedid,subid,count\n");
-                os.print(sb.toString());
-            } else {
-                os.println(toHTML(jo));
-            }
-            os.close();
+        try (PrintWriter os = new PrintWriter(outfile)) {
+            os.print("date,type,feedid,subid,count\n");
+            os.print(sb.toString());
         } catch (FileNotFoundException e) {
             System.err.println("File cannot be written: " + outfile);
+            logger.error(e.toString());
         }
     }
 
@@ -159,6 +130,7 @@ public class FeedReport extends ReportBase {
                                 feedmap.put("pubcount", n + 1);
                             } catch (JSONException e) {
                                 feedmap.put("pubcount", 1);
+                                logger.error(e.toString());
                             }
                         } else if (type.equals("del")) {
                             String subid = "" + rs.getInt("DELIVERY_SUBID");
@@ -167,6 +139,7 @@ public class FeedReport extends ReportBase {
                                 feedmap.put(subid, n + 1);
                             } catch (JSONException e) {
                                 feedmap.put(subid, 1);
+                                logger.error(e.toString());
                             }
                         }
                     }
@@ -174,7 +147,7 @@ public class FeedReport extends ReportBase {
             }
              db.release(conn);
         } catch (SQLException e) {
-            e.printStackTrace();
+            logger.error(e.toString());
         }
         logger.debug("Query time: " + (System.currentTimeMillis() - start) + " ms");
         try {
@@ -183,6 +156,7 @@ public class FeedReport extends ReportBase {
             os.close();
         } catch (FileNotFoundException e) {
             System.err.println("File cannot be written: " + outfile);
+            logger.error(e.toString());
         }
     }
 
@@ -309,7 +283,7 @@ public class FeedReport extends ReportBase {
      *
      * @param args
      */
-    public static void main(String[] args) {
+    public void main(String[] args) {
         int rtype = 0;    // 0 -> day, 1 -> week, 2 -> month, 3 -> year
         String infile = null;
         String outfile = null;
@@ -380,6 +354,7 @@ public class FeedReport extends ReportBase {
                                 feedmap.put("pubcount", n + count);
                             } catch (JSONException e) {
                                 feedmap.put("pubcount", count);
+                                logger.error(e.toString());
                             }
                         } else if (type.equals("del")) {
                             String subid = tt[3];
@@ -388,6 +363,7 @@ public class FeedReport extends ReportBase {
                                 feedmap.put(subid, n + count);
                             } catch (JSONException e) {
                                 feedmap.put(subid, count);
+                                logger.error(e.toString());
                             }
                         }
                     }
@@ -409,7 +385,7 @@ public class FeedReport extends ReportBase {
             System.out.println(t);
         } catch (Exception e) {
             System.err.println(e);
-            e.printStackTrace();
+            logger.error(e.toString());
         }
     }
 }