Merge "Add syntax check before pushing code"

[dmaap/datarouter.git] / datarouter-prov / src / main / java / org / onap / dmaap / datarouter / provisioning / StatisticsServlet.java

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