X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2FStatisticsServlet.java;h=5fa7e1697fadeaabe771631d0a5f0a3481c2a041;hb=3ebd2534167e73426d2b19efb05eaf9892f6f9d6;hp=3902dc63cf350d7e8fefe3eb0a4c50345ab1433b;hpb=e7045aa2c572410e4ab4143fc4c570a8826157e3;p=dmaap%2Fdatarouter.git

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java
index 3902dc63..5fa7e169 100755
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java
@@ -70,7 +70,7 @@ public class StatisticsServlet extends BaseServlet {
     EventLogRecord elr = new EventLogRecord(req);
     elr.setMessage(message);
     elr.setResult(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
-    eventlogger.info(elr);
+    eventlogger.error(elr.toString());
     sendResponseError(resp, HttpServletResponse.SC_METHOD_NOT_ALLOWED, message, eventlogger);
   }
 
@@ -98,7 +98,7 @@ public class StatisticsServlet extends BaseServlet {
       try {
         resp.getOutputStream().print("Invalid request, Feedid or Group ID is required.");
       } catch (IOException ioe) {
-        eventlogger.error("IOException: " + ioe.getMessage());
+        eventlogger.error("PROV0171 StatisticsServlet.doGet: " + ioe.getMessage(), ioe);
       }
     }
 
@@ -110,35 +110,22 @@ public class StatisticsServlet extends BaseServlet {
       StringBuffer groupid1 = new StringBuffer();
 
       try {
-        System.out.println("feeedidsssssssss");
         groupid1 = this.getFeedIdsByGroupId(Integer.parseInt(req.getParameter("groupid")));
-        System.out.println("feeedids" + req.getParameter("groupid"));
-
         map.put("feedids", groupid1.toString());
-        System.out.println("groupid1" + groupid1.toString());
-
-
       } catch (NumberFormatException | SQLException e) {
-        eventlogger.error(e.getMessage());
+        eventlogger.error("PROV0172 StatisticsServlet.doGet: " + e.getMessage(), e);
       }
     }
     if (req.getParameter("groupid") != null && req.getParameter("feedid") != null) {
       StringBuffer groupid1 = new StringBuffer();
 
       try {
-        System.out.println("both r not null");
         groupid1 = this.getFeedIdsByGroupId(Integer.parseInt(req.getParameter("groupid")));
-        System.out.println("feeedids" + req.getParameter("groupid"));
         groupid1.append(",");
         groupid1.append(req.getParameter("feedid").replace("|", ",").toString());
-
         map.put("feedids", groupid1.toString());
-
-        System.out.println("groupid1" + groupid1.toString());
-
-
       } catch (NumberFormatException | SQLException e) {
-        eventlogger.error(e.getMessage());
+        eventlogger.error("PROV0173 StatisticsServlet.doGet: " + e.getMessage(), e);
       }
     }
 
@@ -182,7 +169,7 @@ public class StatisticsServlet extends BaseServlet {
     try {
       this.getRecordsForSQL(map, outputType, resp.getOutputStream(), resp);
     } catch (IOException ioe) {
-      eventlogger.error("IOException: " + ioe.getMessage());
+      eventlogger.error("PROV0174 StatisticsServlet.doGet: " +  ioe.getMessage(), ioe);
     }
 
   }
@@ -291,7 +278,7 @@ public class StatisticsServlet extends BaseServlet {
           System.out.println("feedIds" + feedIds.toString());
       }
     } catch (SQLException e) {
-      eventlogger.error(e.getMessage());
+      eventlogger.error("PROV0175 StatisticsServlet.getFeedIdsByGroupId: " + e.getMessage(), e);
     } finally {
       try {
         if (resultSet != null) {
@@ -302,7 +289,7 @@ public class StatisticsServlet extends BaseServlet {
           db.release(conn);
         }
       } catch (Exception e) {
-        eventlogger.error(e.getMessage());
+        eventlogger.error("PROV0176 StatisticsServlet.getFeedIdsByGroupId: " + e.getMessage(), e);
       }
     }
     return feedIds;
@@ -407,7 +394,7 @@ public class StatisticsServlet extends BaseServlet {
     EventLogRecord elr = new EventLogRecord(req);
     elr.setMessage(message);
     elr.setResult(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
-    eventlogger.info(elr);
+    eventlogger.error(elr.toString());
     sendResponseError(resp, HttpServletResponse.SC_METHOD_NOT_ALLOWED, message, eventlogger);
   }
 
@@ -420,7 +407,7 @@ public class StatisticsServlet extends BaseServlet {
     EventLogRecord elr = new EventLogRecord(req);
     elr.setMessage(message);
     elr.setResult(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
-    eventlogger.info(elr);
+    eventlogger.error(elr.toString());
     sendResponseError(resp, HttpServletResponse.SC_METHOD_NOT_ALLOWED, message, eventlogger);
   }
 
@@ -546,10 +533,8 @@ public class StatisticsServlet extends BaseServlet {
       intlogger.debug(filterQuery);
       long start = System.currentTimeMillis();
       DB db = new DB();
-      ResultSet rs = null;
       try (Connection conn = db.getConnection()) {
-        try (PreparedStatement pst = conn.prepareStatement(filterQuery)) {
-          rs = pst.executeQuery();
+        try (ResultSet rs = conn.prepareStatement(filterQuery).executeQuery()) {
           if (outputType.equals("csv")) {
             resp.setContentType("application/octet-stream");
             Date date = new Date();