Test case fixes 57/62357/3
authorKyle Stewart <kyle.stewart@ericsson.com>
Fri, 24 Aug 2018 14:51:03 +0000 (15:51 +0100)
committerKyle Stewart <kyle.stewart@ericsson.com>
Mon, 27 Aug 2018 11:21:03 +0000 (12:21 +0100)
Change-Id: I697684f7cda881c749fddb02821ade7084d0e0a3
Issue-ID: DMAAP-101
Signed-off-by: Kyle Stewart <kyle.stewart@ericsson.com>
datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java [changed mode: 0644->0755]
datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/InternalServletTest.java [changed mode: 0644->0755]
datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/StatisticsServletTest.java [changed mode: 0644->0755]
datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/SubscribeServletTest.java [changed mode: 0644->0755]

old mode 100644 (file)
new mode 100755 (executable)
index 886a136..134a595
@@ -45,7 +45,9 @@ import org.onap.dmaap.datarouter.provisioning.utils.DB;
 import org.onap.dmaap.datarouter.provisioning.utils.LOGJSONObject;\r
 \r
 /**\r
- * This Servlet handles requests to the &lt;Statistics API&gt; and  &lt;Statistics consilidated resultset&gt;,\r
+ * This Servlet handles requests to the &lt;Statistics API&gt; and  &lt;Statistics consilidated\r
+ * resultset&gt;,\r
+ *\r
  * @author Manish Singh\r
  * @version $Id: StatisticsServlet.java,v 1.11 2016/08/10 17:27:02 Manish Exp $\r
  */\r
@@ -53,536 +55,549 @@ import org.onap.dmaap.datarouter.provisioning.utils.LOGJSONObject;
 \r
 public class StatisticsServlet extends BaseServlet {\r
 \r
-    private static final long TWENTYFOUR_HOURS = (24 * 60 * 60 * 1000L);\r
-    private static final String fmt1 = "yyyy-MM-dd'T'HH:mm:ss'Z'";\r
-    private static final String fmt2 = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";\r
-\r
-\r
-    /**\r
-     * DELETE a logging URL -- not supported.\r
-     */\r
-    @Override\r
-    public void doDelete(HttpServletRequest req, HttpServletResponse resp) throws IOException {\r
-        String message = "DELETE not allowed for the logURL.";\r
-        EventLogRecord elr = new EventLogRecord(req);\r
-        elr.setMessage(message);\r
-        elr.setResult(HttpServletResponse.SC_METHOD_NOT_ALLOWED);\r
-        eventlogger.info(elr);\r
-        resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, message);\r
-    }\r
-    /**\r
-     * GET a Statistics URL -- retrieve Statistics data for a feed or subscription.\r
-     * See the <b>Statistics API</b> document for details on how this     method should be invoked.\r
-     */\r
-    @Override\r
-    public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {\r
-\r
-        Map<String, String> map = buildMapFromRequest(req);\r
-        if (map.get("err") != null) {\r
-            resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "Invalid arguments: "+map.get("err"));\r
-            return;\r
-        }\r
-        // check Accept: header??\r
-\r
-        resp.setStatus(HttpServletResponse.SC_OK);\r
-        resp.setContentType(LOGLIST_CONTENT_TYPE);\r
-        ServletOutputStream out = resp.getOutputStream();\r
-\r
-\r
-        String outputType = "json";\r
-        String feedids = null;\r
-\r
-        if(req.getParameter("feedid") ==null && req.getParameter("groupid") ==null)\r
-        {\r
-            out.print("Invalid request, Feedid or Group ID is required.");\r
-        }\r
-\r
-        if(req.getParameter("feedid")!=null && req.getParameter("groupid") == null) {\r
-            map.put("feedids", req.getParameter("feedid").replace("|", ",").toString());\r
-        }\r
-\r
-        if(req.getParameter("groupid") != null && req.getParameter("feedid") ==null) {\r
-              // String groupid1 = null;\r
-            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 e) {\r
-                     e.printStackTrace();\r
-                  } catch (SQLException e) {\r
-                    e.printStackTrace();\r
-                 }\r
-            }\r
-        if(req.getParameter("groupid") != null && req.getParameter("feedid") !=null) {\r
-               StringBuffer groupid1 = new  StringBuffer();\r
-\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
-\r
-                        System.out.println("groupid1" +groupid1.toString());\r
-\r
-\r
-                  } catch (NumberFormatException e) {\r
-                     e.printStackTrace();\r
-                  } catch (SQLException e) {\r
-                    e.printStackTrace();\r
-                 }\r
-            }\r
-\r
-\r
-\r
-        if(req.getParameter("subid")!=null && req.getParameter("feedid") !=null) {\r
-             StringBuffer subidstr = new  StringBuffer();\r
-//             subidstr.append(" and e.DELIVERY_SUBID in(subid)");\r
-//              subidstr.append(req.getParameter("subid").replace("|", ",").toString());\r
-             subidstr.append("and e.DELIVERY_SUBID in(");\r
-\r
-             subidstr.append(req.getParameter("subid").replace("|", ",").toString());\r
-             subidstr.append(")");\r
-             map.put("subid", subidstr.toString());\r
-        }\r
-        if(req.getParameter("subid")!=null && req.getParameter("groupid") !=null) {\r
-             StringBuffer subidstr = new  StringBuffer();\r
-//             subidstr.append(" and e.DELIVERY_SUBID in(subid)");\r
-//              subidstr.append(req.getParameter("subid").replace("|", ",").toString());\r
-             subidstr.append("and e.DELIVERY_SUBID in(");\r
-\r
-             subidstr.append(req.getParameter("subid").replace("|", ",").toString());\r
-             subidstr.append(")");\r
-             map.put("subid", subidstr.toString());\r
-        }\r
-        if(req.getParameter("type")!=null) {\r
-            map.put("eventType", req.getParameter("type").replace("|", ",").toString());\r
-        }\r
-            if(req.getParameter("output_type")!=null) {\r
-            map.put("output_type", req.getParameter("output_type").toString());\r
-        }\r
-        if(req.getParameter("start_time")!=null) {\r
-            map.put("start_time", req.getParameter("start_time").toString());\r
-        }\r
-        if(req.getParameter("end_time")!=null) {\r
-            map.put("end_time", req.getParameter("end_time").toString());\r
-        }\r
-\r
-        if(req.getParameter("time")!=null) {\r
-            map.put("start_time", req.getParameter("time").toString());\r
-            map.put("end_time", null);\r
-            }\r
-\r
-\r
-\r
-        if(req.getParameter("output_type") !=null)\r
-        {\r
-            outputType = req.getParameter("output_type");\r
-        }\r
-\r
-\r
-        try {\r
-\r
-            String filterQuery = this.queryGeneretor(map);\r
-            eventlogger.debug("SQL Query for Statistics resultset. "+filterQuery);\r
+  private static final long TWENTYFOUR_HOURS = (24 * 60 * 60 * 1000L);\r
+  private static final String fmt1 = "yyyy-MM-dd'T'HH:mm:ss'Z'";\r
+  private static final String fmt2 = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";\r
+\r
+\r
+  /**\r
+   * DELETE a logging URL -- not supported.\r
+   */\r
+  @Override\r
+  public void doDelete(HttpServletRequest req, HttpServletResponse resp) throws IOException {\r
+    String message = "DELETE not allowed for the logURL.";\r
+    EventLogRecord elr = new EventLogRecord(req);\r
+    elr.setMessage(message);\r
+    elr.setResult(HttpServletResponse.SC_METHOD_NOT_ALLOWED);\r
+    eventlogger.info(elr);\r
+    resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, message);\r
+  }\r
+\r
+  /**\r
+   * GET a Statistics URL -- retrieve Statistics data for a feed or subscription. See the\r
+   * <b>Statistics API</b> document for details on how this     method should be invoked.\r
+   */\r
+  @Override\r
+  public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {\r
+\r
+    Map<String, String> map = buildMapFromRequest(req);\r
+    if (map.get("err") != null) {\r
+      resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "Invalid arguments: " + map.get("err"));\r
+      return;\r
+    }\r
+    // check Accept: header??\r
 \r
-            ResultSet rs=this.getRecordsForSQL(filterQuery);\r
+    resp.setStatus(HttpServletResponse.SC_OK);\r
+    resp.setContentType(LOGLIST_CONTENT_TYPE);\r
+    ServletOutputStream out = resp.getOutputStream();\r
 \r
-            if(outputType.equals("csv")) {\r
-                resp.setContentType("application/octet-stream");\r
-                Date date = new Date() ;\r
-                SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-YYYY HH:mm:ss") ;\r
-                resp.setHeader("Content-Disposition", "attachment; filename=\"result:"+dateFormat.format(date)+".csv\"");\r
-                eventlogger.info("Generating CSV file from Statistics resultset");\r
+    String outputType = "json";\r
+    String feedids = null;\r
 \r
-                rsToCSV(rs, out);\r
-            }\r
-            else {\r
-                eventlogger.info("Generating JSON for Statistics resultset");\r
-                this.rsToJson(rs, out);\r
-            }\r
-        }\r
-        catch (IOException e) {\r
-            eventlogger.error("IOException - Generating JSON/CSV:"+e);\r
-            e.printStackTrace();\r
-         }\r
-        catch (JSONException e) {\r
-            eventlogger.error("JSONException - executing SQL query:"+e);\r
-            e.printStackTrace();\r
-        } catch (SQLException e) {\r
-            eventlogger.error("SQLException - executing SQL query:"+e);\r
-            e.printStackTrace();\r
-        } catch (ParseException e) {\r
-            eventlogger.error("ParseException - executing SQL query:"+e);\r
-            e.printStackTrace();\r
-        }\r
+    if (req.getParameter("feedid") == null && req.getParameter("groupid") == null) {\r
+      out.print("Invalid request, Feedid or Group ID is required.");\r
     }\r
 \r
-\r
-    /**\r
-     * rsToJson - Converting RS to JSON object\r
-     * @exception IOException, SQLException\r
-     * @param out ServletOutputStream, rs as ResultSet\r
-     */\r
-    public void rsToCSV(ResultSet rs, ServletOutputStream out) throws IOException, SQLException {\r
-        String header = "FEEDNAME,FEEDID,FILES_PUBLISHED,PUBLISH_LENGTH, FILES_DELIVERED, DELIVERED_LENGTH, SUBSCRIBER_URL, SUBID, PUBLISH_TIME,DELIVERY_TIME, AverageDelay\n";\r
-\r
-        // String header = "FEEDNAME,FEEDID,TYPE,REMOTE_ADDR,DELIVERY_SUBID,REQURI,TOTAL CONTENT LENGTH,NO OF FILE,AVERAGE DELAY\n";\r
-\r
-         out.write(header.getBytes());\r
-\r
-         while(rs.next()) {\r
-            StringBuffer line = new StringBuffer();\r
-                line.append(rs.getString("FEEDNAME"));\r
-                line.append(",");\r
-                line.append(rs.getString("FEEDID"));\r
-                line.append(",");\r
-                line.append(rs.getString("FILES_PUBLISHED"));\r
-                line.append(",");\r
-                line.append(rs.getString("PUBLISH_LENGTH"));\r
-                line.append(",");\r
-                line.append(rs.getString("FILES_DELIVERED"));\r
-                line.append(",");\r
-                line.append(rs.getString("DELIVERED_LENGTH"));\r
-                line.append(",");\r
-                line.append(rs.getString("SUBSCRIBER_URL"));\r
-                line.append(",");\r
-                line.append(rs.getString("SUBID"));\r
-                line.append(",");\r
-                line.append(rs.getString("PUBLISH_TIME"));\r
-                line.append(",");\r
-                line.append(rs.getString("DELIVERY_TIME"));\r
-                line.append(",");\r
-                line.append(rs.getString("AverageDelay"));\r
-                line.append(",");\r
-\r
-                line.append("\n");\r
-                out.write(line.toString().getBytes());\r
-                out.flush();\r
-         }\r
-    }\r
-\r
-    /**\r
-     * rsToJson - Converting RS to JSON object\r
-     * @exception IOException, SQLException\r
-     * @param out ServletOutputStream, rs as ResultSet\r
-     */\r
-    public void rsToJson(ResultSet rs, ServletOutputStream out) throws IOException, SQLException {\r
-\r
-        String fields[] = {"FEEDNAME","FEEDID","FILES_PUBLISHED","PUBLISH_LENGTH", "FILES_DELIVERED", "DELIVERED_LENGTH", "SUBSCRIBER_URL", "SUBID", "PUBLISH_TIME","DELIVERY_TIME", "AverageDelay"};\r
-        StringBuffer line = new StringBuffer();\r
-\r
-         line.append("[\n");\r
-\r
-         while(rs.next()) {\r
-             LOGJSONObject j2 = new LOGJSONObject();\r
-             for (String key : fields) {\r
-                Object v = rs.getString(key);\r
-                if (v != null)\r
-                    j2.put(key.toLowerCase(), v);\r
-                else\r
-                    j2.put(key.toLowerCase(), "");\r
-            }\r
-            line =  line.append(j2.toString());;\r
-            line.append(",\n");\r
-         }\r
-         line.append("]");\r
-        out.print(line.toString());\r
-    }\r
-\r
-    /**\r
-     * getFeedIdsByGroupId - Getting FEEDID's by GROUP ID.\r
-     * @exception SQL Query SQLException.\r
-     * @param groupIds\r
-     */\r
-    public StringBuffer getFeedIdsByGroupId(int groupIds) throws SQLException{\r
-\r
-        DB db = null;\r
-        Connection conn = null;\r
-        PreparedStatement prepareStatement = null;\r
-        ResultSet resultSet=null;\r
-        String sqlGoupid = null;\r
-        StringBuffer feedIds = new StringBuffer();\r
-\r
-        try {\r
-            db = new DB();\r
-            conn = db.getConnection();\r
-            sqlGoupid= " SELECT FEEDID from FEEDS  WHERE GROUPID = ?";\r
-            prepareStatement =conn.prepareStatement(sqlGoupid);\r
-            prepareStatement.setInt(1, groupIds);\r
-            resultSet=prepareStatement.executeQuery();\r
-            while(resultSet.next()){\r
-                feedIds.append(resultSet.getInt("FEEDID"));\r
-                feedIds.append(",");\r
-            }\r
-            feedIds.deleteCharAt(feedIds.length()-1);\r
-        System.out.println("feedIds"+feedIds.toString());\r
-\r
-        } catch (SQLException e) {\r
-            e.printStackTrace();\r
-        } finally {\r
-            try {\r
-                    if(resultSet != null) {\r
-                        resultSet.close();\r
-                        resultSet = null;\r
-                    }\r
-\r
-                    if(prepareStatement != null) {\r
-                        prepareStatement.close();\r
-                        prepareStatement = null;\r
-                    }\r
-\r
-                    if(conn != null){\r
-                        db.release(conn);\r
-                    }\r
-                } catch(Exception e) {\r
-                    e.printStackTrace();\r
-                }\r
-        }\r
-        return feedIds;\r
+    if (req.getParameter("feedid") != null && req.getParameter("groupid") == null) {\r
+      map.put("feedids", req.getParameter("feedid").replace("|", ",").toString());\r
     }\r
 \r
+    if (req.getParameter("groupid") != null && req.getParameter("feedid") == null) {\r
+      StringBuffer groupid1 = new StringBuffer();\r
 \r
-    /**\r
-     * queryGeneretor - Generating sql query\r
-     * @exception ParseException\r
-     * @param map as key value pare of all user input fields\r
-     */\r
-    public String queryGeneretor(Map<String, String> map) throws ParseException{\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
-        String sql = null;\r
-        String eventType = null;\r
-        String feedids = null;\r
-        String start_time = null;\r
-        String end_time = null;\r
-        String subid=" ";\r
-        if(map.get("eventType") != null){\r
-            eventType=(String) map.get("eventType");\r
-        }\r
-        if(map.get("feedids") != null){\r
-            feedids=(String) map.get("feedids");\r
-        }\r
-        if(map.get("start_time") != null){\r
-            start_time=(String) map.get("start_time");\r
-        }\r
-        if(map.get("end_time") != null){\r
-            end_time=(String) map.get("end_time");\r
-        }\r
-        if("all".equalsIgnoreCase(eventType)){\r
-            eventType="PUB','DEL, EXP, PBF";\r
-        }\r
-        if(map.get("subid") != null){\r
-            subid=(String) map.get("subid");\r
-        }\r
+        map.put("feedids", groupid1.toString());\r
+        System.out.println("groupid1" + groupid1.toString());\r
 \r
-        eventlogger.info("Generating sql query to get Statistics resultset. ");\r
 \r
-        if(end_time==null && start_time==null ){\r
+      } catch (NumberFormatException e) {\r
+        e.printStackTrace();\r
+      } catch (SQLException e) {\r
+        e.printStackTrace();\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
-                sql="SELECT (SELECT NAME FROM FEEDS AS f WHERE f.FEEDID in("+feedids+") and f.FEEDID=e.FEEDID) AS FEEDNAME, e.FEEDID as FEEDID, (SELECT COUNT(*) FROM LOG_RECORDS AS c WHERE c.FEEDID in("+feedids+") and c.FEEDID=e.FEEDID AND c.TYPE='PUB') AS FILES_PUBLISHED,(SELECT SUM(content_length) FROM LOG_RECORDS AS c WHERE c.FEEDID in("+feedids+")  and c.FEEDID=e.FEEDID AND c.TYPE='PUB') AS PUBLISH_LENGTH, COUNT(e.EVENT_TIME) as FILES_DELIVERED,  sum(m.content_length) as DELIVERED_LENGTH,SUBSTRING_INDEX(e.REQURI,'/',+3) as SUBSCRIBER_URL, e.DELIVERY_SUBID as SUBID, e.EVENT_TIME AS PUBLISH_TIME, m.EVENT_TIME AS DELIVERY_TIME,  AVG(e.EVENT_TIME - m.EVENT_TIME)/1000 as AverageDelay FROM LOG_RECORDS e JOIN LOG_RECORDS m ON m.PUBLISH_ID = e.PUBLISH_ID AND e.FEEDID IN ("+feedids+") "+subid+" AND m.STATUS=204 AND e.RESULT=204  group by SUBID";\r
+        map.put("feedids", groupid1.toString());\r
 \r
-            return sql;\r
-        }else if(start_time!=null && end_time==null ){\r
+        System.out.println("groupid1" + groupid1.toString());\r
 \r
-            long inputTimeInMilli=60000*Long.parseLong(start_time);\r
-            Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("GMT"));\r
-            long currentTimeInMilli=cal.getTimeInMillis();\r
-            long compareTime=currentTimeInMilli-inputTimeInMilli;\r
 \r
-              sql="SELECT (SELECT NAME FROM FEEDS AS f WHERE f.FEEDID in("+feedids+") and f.FEEDID=e.FEEDID) AS FEEDNAME, e.FEEDID as FEEDID, (SELECT COUNT(*) FROM LOG_RECORDS AS c WHERE c.FEEDID in("+feedids+") and c.FEEDID=e.FEEDID AND c.TYPE='PUB') AS FILES_PUBLISHED,(SELECT SUM(content_length) FROM LOG_RECORDS AS c WHERE c.FEEDID in("+feedids+")  and c.FEEDID=e.FEEDID AND c.TYPE='PUB') AS PUBLISH_LENGTH, COUNT(e.EVENT_TIME) as FILES_DELIVERED,  sum(m.content_length) as DELIVERED_LENGTH,SUBSTRING_INDEX(e.REQURI,'/',+3) as SUBSCRIBER_URL, e.DELIVERY_SUBID as SUBID, e.EVENT_TIME AS PUBLISH_TIME, m.EVENT_TIME AS DELIVERY_TIME,  AVG(e.EVENT_TIME - m.EVENT_TIME)/1000 as AverageDelay FROM LOG_RECORDS e JOIN LOG_RECORDS m ON m.PUBLISH_ID = e.PUBLISH_ID AND e.FEEDID IN ("+feedids+") "+subid+" AND m.STATUS=204 AND e.RESULT=204 and e.event_time>="+compareTime+" group by SUBID";\r
+      } catch (NumberFormatException e) {\r
+        e.printStackTrace();\r
+      } catch (SQLException e) {\r
+        e.printStackTrace();\r
+      }\r
+    }\r
 \r
-             return sql;\r
+    if (req.getParameter("subid") != null && req.getParameter("feedid") != null) {\r
+      StringBuffer subidstr = new StringBuffer();\r
+      subidstr.append("and e.DELIVERY_SUBID in(");\r
 \r
-        }else{\r
-            SimpleDateFormat inFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");\r
-            Date startDate=inFormat.parse(start_time);\r
-            Date endDate=inFormat.parse(end_time);\r
+      subidstr.append(req.getParameter("subid").replace("|", ",").toString());\r
+      subidstr.append(")");\r
+      map.put("subid", subidstr.toString());\r
+    }\r
+    if (req.getParameter("subid") != null && req.getParameter("groupid") != null) {\r
+      StringBuffer subidstr = new StringBuffer();\r
+      subidstr.append("and e.DELIVERY_SUBID in(");\r
 \r
-            long startInMillis=startDate.getTime();\r
-            long endInMillis=endDate.getTime();\r
+      subidstr.append(req.getParameter("subid").replace("|", ",").toString());\r
+      subidstr.append(")");\r
+      map.put("subid", subidstr.toString());\r
+    }\r
+    if (req.getParameter("type") != null) {\r
+      map.put("eventType", req.getParameter("type").replace("|", ",").toString());\r
+    }\r
+    if (req.getParameter("output_type") != null) {\r
+      map.put("output_type", req.getParameter("output_type").toString());\r
+    }\r
+    if (req.getParameter("start_time") != null) {\r
+      map.put("start_time", req.getParameter("start_time").toString());\r
+    }\r
+    if (req.getParameter("end_time") != null) {\r
+      map.put("end_time", req.getParameter("end_time").toString());\r
+    }\r
 \r
-             {\r
+    if (req.getParameter("time") != null) {\r
+      map.put("start_time", req.getParameter("time").toString());\r
+      map.put("end_time", null);\r
+    }\r
 \r
-                sql="SELECT (SELECT NAME FROM FEEDS AS f WHERE f.FEEDID in("+feedids+") and f.FEEDID=e.FEEDID) AS FEEDNAME, e.FEEDID as FEEDID, (SELECT COUNT(*) FROM LOG_RECORDS AS c WHERE c.FEEDID in("+feedids+") and c.FEEDID=e.FEEDID AND c.TYPE='PUB') AS FILES_PUBLISHED,(SELECT SUM(content_length) FROM LOG_RECORDS AS c WHERE c.FEEDID in("+feedids+")  and c.FEEDID=e.FEEDID AND c.TYPE='PUB') AS PUBLISH_LENGTH, COUNT(e.EVENT_TIME) as FILES_DELIVERED,  sum(m.content_length) as DELIVERED_LENGTH,SUBSTRING_INDEX(e.REQURI,'/',+3) as SUBSCRIBER_URL, e.DELIVERY_SUBID as SUBID, e.EVENT_TIME AS PUBLISH_TIME, m.EVENT_TIME AS DELIVERY_TIME,  AVG(e.EVENT_TIME - m.EVENT_TIME)/1000 as AverageDelay FROM LOG_RECORDS e JOIN LOG_RECORDS m ON m.PUBLISH_ID = e.PUBLISH_ID AND e.FEEDID IN ("+feedids+") "+subid+" AND m.STATUS=204 AND e.RESULT=204 and e.event_time between "+startInMillis+" and "+endInMillis+" group by SUBID";\r
+    if (req.getParameter("output_type") != null) {\r
+      outputType = req.getParameter("output_type");\r
+    }\r
 \r
-            }\r
-            return sql;\r
+    try {\r
+\r
+      String filterQuery = this.queryGeneretor(map);\r
+      eventlogger.debug("SQL Query for Statistics resultset. " + filterQuery);\r
+\r
+      ResultSet rs = this.getRecordsForSQL(filterQuery);\r
+\r
+      if (outputType.equals("csv")) {\r
+        resp.setContentType("application/octet-stream");\r
+        Date date = new Date();\r
+        SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-YYYY HH:mm:ss");\r
+        resp.setHeader("Content-Disposition",\r
+            "attachment; filename=\"result:" + dateFormat.format(date) + ".csv\"");\r
+        eventlogger.info("Generating CSV file from Statistics resultset");\r
+\r
+        rsToCSV(rs, out);\r
+      } else {\r
+        eventlogger.info("Generating JSON for Statistics resultset");\r
+        this.rsToJson(rs, out);\r
+      }\r
+    } catch (IOException e) {\r
+      eventlogger.error("IOException - Generating JSON/CSV:" + e);\r
+      e.printStackTrace();\r
+    } catch (JSONException e) {\r
+      eventlogger.error("JSONException - executing SQL query:" + e);\r
+      e.printStackTrace();\r
+    } catch (SQLException e) {\r
+      eventlogger.error("SQLException - executing SQL query:" + e);\r
+      e.printStackTrace();\r
+    } catch (ParseException e) {\r
+      eventlogger.error("ParseException - executing SQL query:" + e);\r
+      e.printStackTrace();\r
+    }\r
+  }\r
+\r
+\r
+  /**\r
+   * rsToJson - Converting RS to JSON object\r
+   *\r
+   * @param out ServletOutputStream, rs as ResultSet\r
+   * @throws IOException, SQLException\r
+   */\r
+  public void rsToCSV(ResultSet rs, ServletOutputStream out) throws IOException, SQLException {\r
+    String header = "FEEDNAME,FEEDID,FILES_PUBLISHED,PUBLISH_LENGTH, FILES_DELIVERED, DELIVERED_LENGTH, SUBSCRIBER_URL, SUBID, PUBLISH_TIME,DELIVERY_TIME, AverageDelay\n";\r
+\r
+    out.write(header.getBytes());\r
+\r
+    while (rs.next()) {\r
+      StringBuffer line = new StringBuffer();\r
+      line.append(rs.getString("FEEDNAME"));\r
+      line.append(",");\r
+      line.append(rs.getString("FEEDID"));\r
+      line.append(",");\r
+      line.append(rs.getString("FILES_PUBLISHED"));\r
+      line.append(",");\r
+      line.append(rs.getString("PUBLISH_LENGTH"));\r
+      line.append(",");\r
+      line.append(rs.getString("FILES_DELIVERED"));\r
+      line.append(",");\r
+      line.append(rs.getString("DELIVERED_LENGTH"));\r
+      line.append(",");\r
+      line.append(rs.getString("SUBSCRIBER_URL"));\r
+      line.append(",");\r
+      line.append(rs.getString("SUBID"));\r
+      line.append(",");\r
+      line.append(rs.getString("PUBLISH_TIME"));\r
+      line.append(",");\r
+      line.append(rs.getString("DELIVERY_TIME"));\r
+      line.append(",");\r
+      line.append(rs.getString("AverageDelay"));\r
+      line.append(",");\r
+\r
+      line.append("\n");\r
+      out.write(line.toString().getBytes());\r
+      out.flush();\r
+    }\r
+  }\r
+\r
+  /**\r
+   * rsToJson - Converting RS to JSON object\r
+   *\r
+   * @param out ServletOutputStream, rs as ResultSet\r
+   * @throws IOException, SQLException\r
+   */\r
+  public void rsToJson(ResultSet rs, ServletOutputStream out) throws IOException, SQLException {\r
+\r
+    String fields[] = {"FEEDNAME", "FEEDID", "FILES_PUBLISHED", "PUBLISH_LENGTH", "FILES_DELIVERED",\r
+        "DELIVERED_LENGTH", "SUBSCRIBER_URL", "SUBID", "PUBLISH_TIME", "DELIVERY_TIME",\r
+        "AverageDelay"};\r
+    StringBuffer line = new StringBuffer();\r
+\r
+    line.append("[\n");\r
+\r
+    while (rs.next()) {\r
+      LOGJSONObject j2 = new LOGJSONObject();\r
+      for (String key : fields) {\r
+        Object v = rs.getString(key);\r
+        if (v != null) {\r
+          j2.put(key.toLowerCase(), v);\r
+        } else {\r
+          j2.put(key.toLowerCase(), "");\r
         }\r
+      }\r
+      line = line.append(j2.toString());\r
+      line.append(",\n");\r
     }\r
-\r
-\r
-    /**\r
-     * PUT a Statistics URL -- not supported.\r
-     */\r
-    @Override\r
-    public void doPut(HttpServletRequest req, HttpServletResponse resp) throws IOException {\r
-        String message = "PUT not allowed for the StatisticsURL.";\r
-        EventLogRecord elr = new EventLogRecord(req);\r
-        elr.setMessage(message);\r
-        elr.setResult(HttpServletResponse.SC_METHOD_NOT_ALLOWED);\r
-        eventlogger.info(elr);\r
-        resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, message);\r
-    }\r
-    /**\r
-     * POST a Statistics URL -- not supported.\r
-     */\r
-    @Override\r
-    public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {\r
-        String message = "POST not allowed for the StatisticsURL.";\r
-        EventLogRecord elr = new EventLogRecord(req);\r
-        elr.setMessage(message);\r
-        elr.setResult(HttpServletResponse.SC_METHOD_NOT_ALLOWED);\r
-        eventlogger.info(elr);\r
-        resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, message);\r
-    }\r
-\r
-    private Map<String, String> buildMapFromRequest(HttpServletRequest req) {\r
-        Map<String, String> map = new HashMap<String, String>();\r
-        String s = req.getParameter("type");\r
-        if (s != null) {\r
-            if (s.equals("pub") || s.equals("del") || s.equals("exp")) {\r
-                map.put("type", s);\r
-            } else {\r
-                map.put("err", "bad type");\r
-                return map;\r
-            }\r
-        } else\r
-        map.put("type", "all");\r
-        map.put("publishSQL", "");\r
-        map.put("statusSQL", "");\r
-        map.put("resultSQL", "");\r
-        map.put("reasonSQL", "");\r
-\r
-        s = req.getParameter("publishId");\r
-        if (s != null) {\r
-            if (s.indexOf("'") >= 0) {\r
-                map.put("err", "bad publishId");\r
-                return map;\r
-            }\r
-            map.put("publishSQL", " AND PUBLISH_ID = '"+s+"'");\r
+    line.append("]");\r
+    out.print(line.toString());\r
+  }\r
+\r
+  /**\r
+   * getFeedIdsByGroupId - Getting FEEDID's by GROUP ID.\r
+   *\r
+   * @throws SQL Query SQLException.\r
+   */\r
+  public StringBuffer getFeedIdsByGroupId(int groupIds) throws SQLException {\r
+\r
+    DB db = null;\r
+    Connection conn = null;\r
+    PreparedStatement prepareStatement = null;\r
+    ResultSet resultSet = null;\r
+    String sqlGoupid = null;\r
+    StringBuffer feedIds = new StringBuffer();\r
+\r
+    try {\r
+      db = new DB();\r
+      conn = db.getConnection();\r
+      sqlGoupid = " SELECT FEEDID from FEEDS  WHERE GROUPID = ?";\r
+      prepareStatement = conn.prepareStatement(sqlGoupid);\r
+      prepareStatement.setInt(1, groupIds);\r
+      resultSet = prepareStatement.executeQuery();\r
+      while (resultSet.next()) {\r
+        feedIds.append(resultSet.getInt("FEEDID"));\r
+        feedIds.append(",");\r
+      }\r
+      feedIds.deleteCharAt(feedIds.length() - 1);\r
+      System.out.println("feedIds" + feedIds.toString());\r
+\r
+    } catch (SQLException e) {\r
+      e.printStackTrace();\r
+    } finally {\r
+      try {\r
+        if (resultSet != null) {\r
+          resultSet.close();\r
+          resultSet = null;\r
         }\r
 \r
-        s = req.getParameter("statusCode");\r
-        if (s != null) {\r
-            String sql = null;\r
-            if (s.equals("success")) {\r
-                sql = " AND STATUS >= 200 AND STATUS < 300";\r
-            } else if (s.equals("redirect")) {\r
-                sql = " AND STATUS >= 300 AND STATUS < 400";\r
-            } else if (s.equals("failure")) {\r
-                sql = " AND STATUS >= 400";\r
-            } else {\r
-                try {\r
-                    Integer n = Integer.parseInt(s);\r
-                    if ((n >= 100 && n < 600) || (n == -1))\r
-                        sql = " AND STATUS = " + n;\r
-                } catch (NumberFormatException e) {\r
-                }\r
-            }\r
-            if (sql == null) {\r
-                map.put("err", "bad statusCode");\r
-                return map;\r
-            }\r
-            map.put("statusSQL", sql);\r
-            map.put("resultSQL", sql.replaceAll("STATUS", "RESULT"));\r
+        if (prepareStatement != null) {\r
+          prepareStatement.close();\r
+          prepareStatement = null;\r
         }\r
 \r
-        s = req.getParameter("expiryReason");\r
-        if (s != null) {\r
-            map.put("type", "exp");\r
-            if (s.equals("notRetryable")) {\r
-                map.put("reasonSQL", " AND REASON = 'notRetryable'");\r
-            } else if (s.equals("retriesExhausted")) {\r
-                map.put("reasonSQL", " AND REASON = 'retriesExhausted'");\r
-            } else if (s.equals("diskFull")) {\r
-                map.put("reasonSQL", " AND REASON = 'diskFull'");\r
-            } else if (s.equals("other")) {\r
-                map.put("reasonSQL", " AND REASON = 'other'");\r
-            } else {\r
-                map.put("err", "bad expiryReason");\r
-                return map;\r
-            }\r
+        if (conn != null) {\r
+          db.release(conn);\r
         }\r
+      } catch (Exception e) {\r
+        e.printStackTrace();\r
+      }\r
+    }\r
+    return feedIds;\r
+  }\r
+\r
+\r
+  /**\r
+   * queryGeneretor - Generating sql query\r
+   *\r
+   * @param map as key value pare of all user input fields\r
+   */\r
+  public String queryGeneretor(Map<String, String> map) throws ParseException {\r
+\r
+    String sql = null;\r
+    String eventType = null;\r
+    String feedids = null;\r
+    String start_time = null;\r
+    String end_time = null;\r
+    String subid = " ";\r
+    if (map.get("eventType") != null) {\r
+      eventType = (String) map.get("eventType");\r
+    }\r
+    if (map.get("feedids") != null) {\r
+      feedids = (String) map.get("feedids");\r
+    }\r
+    if (map.get("start_time") != null) {\r
+      start_time = (String) map.get("start_time");\r
+    }\r
+    if (map.get("end_time") != null) {\r
+      end_time = (String) map.get("end_time");\r
+    }\r
+    if ("all".equalsIgnoreCase(eventType)) {\r
+      eventType = "PUB','DEL, EXP, PBF";\r
+    }\r
+    if (map.get("subid") != null) {\r
+      subid = (String) map.get("subid");\r
+    }\r
 \r
-        long stime = getTimeFromParam(req.getParameter("start"));\r
-        if (stime < 0) {\r
-            map.put("err", "bad start");\r
-            return map;\r
-        }\r
-        long etime = getTimeFromParam(req.getParameter("end"));\r
-        if (etime < 0) {\r
-            map.put("err", "bad end");\r
-            return map;\r
-        }\r
-        if (stime == 0 && etime == 0) {\r
-            etime = System.currentTimeMillis();\r
-            stime = etime - TWENTYFOUR_HOURS;\r
-        } else if (stime == 0) {\r
-            stime = etime - TWENTYFOUR_HOURS;\r
-        } else if (etime == 0) {\r
-            etime = stime + TWENTYFOUR_HOURS;\r
-        }\r
-        map.put("timeSQL", String.format(" AND EVENT_TIME >= %d AND EVENT_TIME <= %d", stime, etime));\r
+    eventlogger.info("Generating sql query to get Statistics resultset. ");\r
+\r
+    if (end_time == null && start_time == null) {\r
+\r
+      sql = "SELECT (SELECT NAME FROM FEEDS AS f WHERE f.FEEDID in(" + feedids\r
+          + ") and f.FEEDID=e.FEEDID) AS FEEDNAME, e.FEEDID as FEEDID, (SELECT COUNT(*) FROM LOG_RECORDS AS c WHERE c.FEEDID in("\r
+          + feedids\r
+          + ") and c.FEEDID=e.FEEDID AND c.TYPE='PUB') AS FILES_PUBLISHED,(SELECT SUM(content_length) FROM LOG_RECORDS AS c WHERE c.FEEDID in("\r
+          + feedids\r
+          + ")  and c.FEEDID=e.FEEDID AND c.TYPE='PUB') AS PUBLISH_LENGTH, COUNT(e.EVENT_TIME) as FILES_DELIVERED,  sum(m.content_length) as DELIVERED_LENGTH,SUBSTRING_INDEX(e.REQURI,'/',+3) as SUBSCRIBER_URL, e.DELIVERY_SUBID as SUBID, e.EVENT_TIME AS PUBLISH_TIME, m.EVENT_TIME AS DELIVERY_TIME,  AVG(e.EVENT_TIME - m.EVENT_TIME)/1000 as AverageDelay FROM LOG_RECORDS e JOIN LOG_RECORDS m ON m.PUBLISH_ID = e.PUBLISH_ID AND e.FEEDID IN ("\r
+          + feedids + ") " + subid + " AND m.STATUS=204 AND e.RESULT=204  group by SUBID";\r
+\r
+      return sql;\r
+    } else if (start_time != null && end_time == null) {\r
+\r
+      long inputTimeInMilli = 60000 * Long.parseLong(start_time);\r
+      Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("GMT"));\r
+      long currentTimeInMilli = cal.getTimeInMillis();\r
+      long compareTime = currentTimeInMilli - inputTimeInMilli;\r
+\r
+      sql = "SELECT (SELECT NAME FROM FEEDS AS f WHERE f.FEEDID in(" + feedids\r
+          + ") and f.FEEDID=e.FEEDID) AS FEEDNAME, e.FEEDID as FEEDID, (SELECT COUNT(*) FROM LOG_RECORDS AS c WHERE c.FEEDID in("\r
+          + feedids\r
+          + ") and c.FEEDID=e.FEEDID AND c.TYPE='PUB') AS FILES_PUBLISHED,(SELECT SUM(content_length) FROM LOG_RECORDS AS c WHERE c.FEEDID in("\r
+          + feedids\r
+          + ")  and c.FEEDID=e.FEEDID AND c.TYPE='PUB') AS PUBLISH_LENGTH, COUNT(e.EVENT_TIME) as FILES_DELIVERED,  sum(m.content_length) as DELIVERED_LENGTH,SUBSTRING_INDEX(e.REQURI,'/',+3) as SUBSCRIBER_URL, e.DELIVERY_SUBID as SUBID, e.EVENT_TIME AS PUBLISH_TIME, m.EVENT_TIME AS DELIVERY_TIME,  AVG(e.EVENT_TIME - m.EVENT_TIME)/1000 as AverageDelay FROM LOG_RECORDS e JOIN LOG_RECORDS m ON m.PUBLISH_ID = e.PUBLISH_ID AND e.FEEDID IN ("\r
+          + feedids + ") " + subid + " AND m.STATUS=204 AND e.RESULT=204 and e.event_time>="\r
+          + compareTime + " group by SUBID";\r
+\r
+      return sql;\r
+\r
+    } else {\r
+      SimpleDateFormat inFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");\r
+      Date startDate = inFormat.parse(start_time);\r
+      Date endDate = inFormat.parse(end_time);\r
+\r
+      long startInMillis = startDate.getTime();\r
+      long endInMillis = endDate.getTime();\r
+\r
+      {\r
+\r
+        sql = "SELECT (SELECT NAME FROM FEEDS AS f WHERE f.FEEDID in(" + feedids\r
+            + ") and f.FEEDID=e.FEEDID) AS FEEDNAME, e.FEEDID as FEEDID, (SELECT COUNT(*) FROM LOG_RECORDS AS c WHERE c.FEEDID in("\r
+            + feedids\r
+            + ") and c.FEEDID=e.FEEDID AND c.TYPE='PUB') AS FILES_PUBLISHED,(SELECT SUM(content_length) FROM LOG_RECORDS AS c WHERE c.FEEDID in("\r
+            + feedids\r
+            + ")  and c.FEEDID=e.FEEDID AND c.TYPE='PUB') AS PUBLISH_LENGTH, COUNT(e.EVENT_TIME) as FILES_DELIVERED,  sum(m.content_length) as DELIVERED_LENGTH,SUBSTRING_INDEX(e.REQURI,'/',+3) as SUBSCRIBER_URL, e.DELIVERY_SUBID as SUBID, e.EVENT_TIME AS PUBLISH_TIME, m.EVENT_TIME AS DELIVERY_TIME,  AVG(e.EVENT_TIME - m.EVENT_TIME)/1000 as AverageDelay FROM LOG_RECORDS e JOIN LOG_RECORDS m ON m.PUBLISH_ID = e.PUBLISH_ID AND e.FEEDID IN ("\r
+            + feedids + ") " + subid\r
+            + " AND m.STATUS=204 AND e.RESULT=204 and e.event_time between " + startInMillis\r
+            + " and " + endInMillis + " group by SUBID";\r
+\r
+      }\r
+      return sql;\r
+    }\r
+  }\r
+\r
+\r
+  /**\r
+   * PUT a Statistics URL -- not supported.\r
+   */\r
+  @Override\r
+  public void doPut(HttpServletRequest req, HttpServletResponse resp) throws IOException {\r
+    String message = "PUT not allowed for the StatisticsURL.";\r
+    EventLogRecord elr = new EventLogRecord(req);\r
+    elr.setMessage(message);\r
+    elr.setResult(HttpServletResponse.SC_METHOD_NOT_ALLOWED);\r
+    eventlogger.info(elr);\r
+    resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, message);\r
+  }\r
+\r
+  /**\r
+   * POST a Statistics URL -- not supported.\r
+   */\r
+  @Override\r
+  public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {\r
+    String message = "POST not allowed for the StatisticsURL.";\r
+    EventLogRecord elr = new EventLogRecord(req);\r
+    elr.setMessage(message);\r
+    elr.setResult(HttpServletResponse.SC_METHOD_NOT_ALLOWED);\r
+    eventlogger.info(elr);\r
+    resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, message);\r
+  }\r
+\r
+  private Map<String, String> buildMapFromRequest(HttpServletRequest req) {\r
+    Map<String, String> map = new HashMap<String, String>();\r
+    String s = req.getParameter("type");\r
+    if (s != null) {\r
+      if (s.equals("pub") || s.equals("del") || s.equals("exp")) {\r
+        map.put("type", s);\r
+      } else {\r
+        map.put("err", "bad type");\r
         return map;\r
+      }\r
+    } else {\r
+      map.put("type", "all");\r
     }\r
-    private long getTimeFromParam(final String s) {\r
-        if (s == null)\r
-            return 0;\r
-        try {\r
-            // First, look for an RFC 3339 date\r
-            String fmt = (s.indexOf('.') > 0) ? fmt2 : fmt1;\r
-            SimpleDateFormat sdf = new SimpleDateFormat(fmt);\r
-            Date d = sdf.parse(s);\r
-            return d.getTime();\r
-        } catch (ParseException e) {\r
-        }\r
+    map.put("publishSQL", "");\r
+    map.put("statusSQL", "");\r
+    map.put("resultSQL", "");\r
+    map.put("reasonSQL", "");\r
+\r
+    s = req.getParameter("publishId");\r
+    if (s != null) {\r
+      if (s.indexOf("'") >= 0) {\r
+        map.put("err", "bad publishId");\r
+        return map;\r
+      }\r
+      map.put("publishSQL", " AND PUBLISH_ID = '" + s + "'");\r
+    }\r
+\r
+    s = req.getParameter("statusCode");\r
+    if (s != null) {\r
+      String sql = null;\r
+      if (s.equals("success")) {\r
+        sql = " AND STATUS >= 200 AND STATUS < 300";\r
+      } else if (s.equals("redirect")) {\r
+        sql = " AND STATUS >= 300 AND STATUS < 400";\r
+      } else if (s.equals("failure")) {\r
+        sql = " AND STATUS >= 400";\r
+      } else {\r
         try {\r
-            // Also allow a long (in ms); useful for testing\r
-            long n = Long.parseLong(s);\r
-            return n;\r
+          Integer n = Integer.parseInt(s);\r
+          if ((n >= 100 && n < 600) || (n == -1)) {\r
+            sql = " AND STATUS = " + n;\r
+          }\r
         } catch (NumberFormatException e) {\r
         }\r
-        intlogger.info("Error parsing time="+s);\r
-        return -1;\r
+      }\r
+      if (sql == null) {\r
+        map.put("err", "bad statusCode");\r
+        return map;\r
+      }\r
+      map.put("statusSQL", sql);\r
+      map.put("resultSQL", sql.replaceAll("STATUS", "RESULT"));\r
     }\r
 \r
+    s = req.getParameter("expiryReason");\r
+    if (s != null) {\r
+      map.put("type", "exp");\r
+      if (s.equals("notRetryable")) {\r
+        map.put("reasonSQL", " AND REASON = 'notRetryable'");\r
+      } else if (s.equals("retriesExhausted")) {\r
+        map.put("reasonSQL", " AND REASON = 'retriesExhausted'");\r
+      } else if (s.equals("diskFull")) {\r
+        map.put("reasonSQL", " AND REASON = 'diskFull'");\r
+      } else if (s.equals("other")) {\r
+        map.put("reasonSQL", " AND REASON = 'other'");\r
+      } else {\r
+        map.put("err", "bad expiryReason");\r
+        return map;\r
+      }\r
+    }\r
 \r
-    private ResultSet getRecordsForSQL(String sql) {\r
-        intlogger.debug(sql);\r
-        long start = System.currentTimeMillis();\r
-        DB db = new DB();\r
-        Connection conn = null;\r
-        ResultSet rs=null;\r
+    long stime = getTimeFromParam(req.getParameter("start"));\r
+    if (stime < 0) {\r
+      map.put("err", "bad start");\r
+      return map;\r
+    }\r
+    long etime = getTimeFromParam(req.getParameter("end"));\r
+    if (etime < 0) {\r
+      map.put("err", "bad end");\r
+      return map;\r
+    }\r
+    if (stime == 0 && etime == 0) {\r
+      etime = System.currentTimeMillis();\r
+      stime = etime - TWENTYFOUR_HOURS;\r
+    } else if (stime == 0) {\r
+      stime = etime - TWENTYFOUR_HOURS;\r
+    } else if (etime == 0) {\r
+      etime = stime + TWENTYFOUR_HOURS;\r
+    }\r
+    map.put("timeSQL", String.format(" AND EVENT_TIME >= %d AND EVENT_TIME <= %d", stime, etime));\r
+    return map;\r
+  }\r
 \r
-        try {\r
-            conn = db.getConnection();\r
-            Statement  stmt = conn.createStatement();\r
-            PreparedStatement pst=conn.prepareStatement(sql);\r
-            rs=pst.executeQuery();\r
-            //this.rsToJson(rs)\r
-            //rs.close();\r
-            stmt.close();\r
-        } catch (SQLException e) {\r
-            e.printStackTrace();\r
-        } finally {\r
-            if (conn != null)\r
-                db.release(conn);\r
-        }\r
+  private long getTimeFromParam(final String s) {\r
+    if (s == null) {\r
+      return 0;\r
+    }\r
+    try {\r
+      // First, look for an RFC 3339 date\r
+      String fmt = (s.indexOf('.') > 0) ? fmt2 : fmt1;\r
+      SimpleDateFormat sdf = new SimpleDateFormat(fmt);\r
+      Date d = sdf.parse(s);\r
+      return d.getTime();\r
+    } catch (ParseException e) {\r
+    }\r
+    try {\r
+      // Also allow a long (in ms); useful for testing\r
+      long n = Long.parseLong(s);\r
+      return n;\r
+    } catch (NumberFormatException e) {\r
+    }\r
+    intlogger.info("Error parsing time=" + s);\r
+    return -1;\r
+  }\r
+\r
+\r
+  private ResultSet getRecordsForSQL(String sql) {\r
+    intlogger.debug(sql);\r
+    long start = System.currentTimeMillis();\r
+    DB db = new DB();\r
+    Connection conn = null;\r
+    ResultSet rs = null;\r
+\r
+    try {\r
+      conn = db.getConnection();\r
+      Statement stmt = conn.createStatement();\r
+      PreparedStatement pst = conn.prepareStatement(sql);\r
+      rs = pst.executeQuery();\r
+      //this.rsToJson(rs)\r
+      //rs.close();\r
+      stmt.close();\r
+    } catch (SQLException e) {\r
+      e.printStackTrace();\r
+    } finally {\r
+      if (conn != null) {\r
+        db.release(conn);\r
+      }\r
+    }\r
 \r
-        intlogger.debug("Time: " + (System.currentTimeMillis()-start) + " ms");\r
+    intlogger.debug("Time: " + (System.currentTimeMillis() - start) + " ms");\r
 \r
-        return rs;\r
-    }\r
+    return rs;\r
+  }\r
 }\r
old mode 100644 (file)
new mode 100755 (executable)
index 104d137..f834244
  ******************************************************************************/
 package org.onap.dmaap.datarouter.provisioning;
 
+import static org.hamcrest.Matchers.notNullValue;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.argThat;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.onap.dmaap.datarouter.provisioning.BaseServlet.BEHALF_HEADER;
+
+import java.net.InetAddress;
+import java.util.HashMap;
+import java.util.Map;
+import javax.servlet.ServletInputStream;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.reflect.FieldUtils;
 import org.junit.Before;
 import org.junit.Test;
@@ -29,377 +45,406 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.onap.dmaap.datarouter.authz.AuthorizationResponse;
 import org.onap.dmaap.datarouter.authz.Authorizer;
-import org.onap.dmaap.datarouter.provisioning.beans.*;
+import org.onap.dmaap.datarouter.provisioning.beans.Deleteable;
+import org.onap.dmaap.datarouter.provisioning.beans.Feed;
+import org.onap.dmaap.datarouter.provisioning.beans.Insertable;
+import org.onap.dmaap.datarouter.provisioning.beans.LogRecord;
+import org.onap.dmaap.datarouter.provisioning.beans.NodeClass;
+import org.onap.dmaap.datarouter.provisioning.beans.Parameters;
+import org.onap.dmaap.datarouter.provisioning.beans.Subscription;
+import org.onap.dmaap.datarouter.provisioning.beans.Updateable;
 import org.onap.dmaap.datarouter.provisioning.utils.LogfileLoader;
 import org.onap.dmaap.datarouter.provisioning.utils.RLEBitSet;
 import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import java.net.InetAddress;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.hamcrest.Matchers.notNullValue;
-import static org.mockito.Matchers.*;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.onap.dmaap.datarouter.provisioning.BaseServlet.BEHALF_HEADER;
-
 @RunWith(PowerMockRunner.class)
-@SuppressStaticInitializationFor({"org.onap.dmaap.datarouter.provisioning.beans.Feed", "org.onap.dmaap.datarouter.provisioning.beans.Parameters", "org.onap.dmaap.datarouter.provisioning.beans.NodeClass",
-                                  "org.onap.dmaap.datarouter.provisioning.beans.Subscription", "org.onap.dmaap.datarouter.provisioning.utils.LogfileLoader"})
+@PrepareForTest(LogRecord.class)
+@SuppressStaticInitializationFor({"org.onap.dmaap.datarouter.provisioning.beans.Feed",
+    "org.onap.dmaap.datarouter.provisioning.beans.Parameters",
+    "org.onap.dmaap.datarouter.provisioning.beans.NodeClass",
+    "org.onap.dmaap.datarouter.provisioning.beans.Subscription",
+    "org.onap.dmaap.datarouter.provisioning.utils.LogfileLoader"})
 public class InternalServletTest extends DrServletTestBase {
-    private InternalServlet internalServlet;
 
-    @Mock
-    private HttpServletRequest request;
-
-    @Mock
-    private HttpServletResponse response;
-
-    @Before
-    public void setUp() throws Exception {
-        super.setUp();
-        internalServlet = new InternalServlet();
-        setAuthoriserToReturnRequestIsAuthorized();
-        setUpValidAuthorisedRequest();
-    }
-
-    @Test
-    public void Given_Request_Is_HTTP_GET_And_Address_Not_Authorized_When_HTTPS_Is_Required_Then_Forbidden_Response_Is_Generated() throws Exception {
-        when(request.getRemoteAddr()).thenReturn("127.100.0.3");
-        internalServlet.doGet(request, response);
-        verify(response).sendError(eq(HttpServletResponse.SC_FORBIDDEN), argThat(notNullValue(String.class)));
-    }
-
-    @Test
-    public void Given_Request_Is_HTTP_GET_With_Halt_In_Endpoint_But_Not_Sent_From_Localhost_Then_Forbidden_Response_Is_Generated() throws Exception {
-        when(request.getPathInfo()).thenReturn("/halt");
-        when(request.isSecure()).thenReturn(false);
-        when(request.getRemoteAddr()).thenReturn("127.100.0.3");
-        internalServlet.doGet(request, response);
-        verify(response).setStatus(eq(HttpServletResponse.SC_FORBIDDEN));
-    }
-
-    @Test
-    public void Given_Request_Is_HTTP_GET_With_Halt_In_Endpoint_Request_Succeeds() throws Exception {
-        when(request.getPathInfo()).thenReturn("/halt");
-        when(request.isSecure()).thenReturn(false);
-        when(request.getRemoteAddr()).thenReturn("127.0.0.1");
-        internalServlet.doGet(request, response);
-        verify(response).setStatus(eq(HttpServletResponse.SC_OK));
-    }
-
-    @Test
-    public void Given_Request_Is_HTTP_GET_With_FetchProv_In_Endpoint_Request_Succeeds() throws Exception {
-        when(request.getPathInfo()).thenReturn("/fetchProv");
-        when(request.isSecure()).thenReturn(false);
-        internalServlet.doGet(request, response);
-        verify(response).setStatus(eq(HttpServletResponse.SC_OK));
-    }
-
-    @Test
-    public void Given_Request_Is_HTTP_GET_With_Prov_In_Endpoint_Request_Succeeds() throws Exception {
-        when(request.getPathInfo()).thenReturn("/prov");
-        when(request.getQueryString()).thenReturn(null);
-        setPokerToNotCreateTimers();
-        ServletOutputStream outStream = mock(ServletOutputStream.class);
-        when(response.getOutputStream()).thenReturn(outStream);
-        internalServlet.doGet(request, response);
-        verify(response).setStatus(eq(HttpServletResponse.SC_OK));
-    }
-
-    @Test
-    public void Given_Request_Is_HTTP_GET_With_Logs_In_Endpoint_Request_Succeeds() throws Exception {
-        when(request.getPathInfo()).thenReturn("/logs/");
-        ServletOutputStream outStream = mock(ServletOutputStream.class);
-        when(response.getOutputStream()).thenReturn(outStream);
-        internalServlet.doGet(request, response);
-        verify(response).setStatus(eq(HttpServletResponse.SC_OK));
-    }
-
-    @Test
-    public void Given_Request_Is_HTTP_GET_Starts_With_Logs_In_Endpoint_Request_Succeeds() throws Exception {
-        when(request.getPathInfo()).thenReturn("/logs/TestFile");
-        internalServlet.doGet(request, response);
-        verify(response).sendError(eq(HttpServletResponse.SC_NO_CONTENT), argThat(notNullValue(String.class)));
-    }
-
-    @Test
-    public void Given_Request_Is_HTTP_GET_With_Api_In_Endpoint_Request_Succeeds() throws Exception {
-        when(request.getPathInfo()).thenReturn("/api/Key");
-        setParametersToNotContactDb(false);
-        ServletOutputStream outStream = mock(ServletOutputStream.class);
-        when(response.getOutputStream()).thenReturn(outStream);
-        internalServlet.doGet(request, response);
-        verify(response).setStatus(eq(HttpServletResponse.SC_OK));
-    }
-
-    @Test
-    public void Given_Request_Is_HTTP_GET_With_Drlogs_In_Endpoint_Request_Succeeds() throws Exception {
-        when(request.getPathInfo()).thenReturn("/drlogs/");
-        PowerMockito.mockStatic(LogfileLoader.class);
-        LogfileLoader logfileLoader = mock(LogfileLoader.class);
-        when(logfileLoader.getBitSet()).thenReturn(new RLEBitSet());
-        PowerMockito.when(LogfileLoader.getLoader()).thenReturn(logfileLoader);
-        ServletOutputStream outStream = mock(ServletOutputStream.class);
-        when(response.getOutputStream()).thenReturn(outStream);
-        internalServlet.doGet(request, response);
-        verify(response).setStatus(eq(HttpServletResponse.SC_OK));
-    }
-
-    @Test
-    public void Given_Request_Is_HTTP_GET_Incorrect_Endpoint_Then_No_Content_Response_Is_Generated() throws Exception {
-        when(request.getPathInfo()).thenReturn("/incorrect/");
-        internalServlet.doGet(request, response);
-        verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class)));
-    }
-
-    @Test
-    public void Given_Request_Is_HTTP_PUT_And_Address_Not_Authorized_When_HTTPS_Is_Required_Then_Forbidden_Response_Is_Generated() throws Exception {
-        when(request.getRemoteAddr()).thenReturn("127.100.0.3");
-        internalServlet.doPut(request, response);
-        verify(response).sendError(eq(HttpServletResponse.SC_FORBIDDEN), argThat(notNullValue(String.class)));
-    }
-
-    @Test
-    public void Given_Request_Is_HTTP_PUT_With_Api_In_Endpoint_Request_Succeeds() throws Exception {
-        when(request.getPathInfo()).thenReturn("/api/Key");
-        setParametersToNotContactDb(false);
-        String[] values = {"V", "a", "l", "u", "e", "s"};
-        when(request.getParameterValues(anyString())).thenReturn(values);
-        internalServlet = internalServerSuccess();
-        setPokerToNotCreateTimers();
-        mockProvisioningParametersChanged();
-        internalServlet.doPut(request, response);
-        verify(response).setStatus(eq(HttpServletResponse.SC_OK));
-    }
-
-    @Test
-    public void Given_Request_Is_HTTP_PUT_With_Api_In_Endpoint_And_Update_Fails_Then_Internal_Server_Error_Is_Generated() throws Exception {
-        when(request.getPathInfo()).thenReturn("/api/Key");
-        setParametersToNotContactDb(false);
-        String[] values = {"V", "a", "l", "u", "e", "s"};
-        when(request.getParameterValues(anyString())).thenReturn(values);
-        internalServlet = internalServerFailure();
-        internalServlet.doPut(request, response);
-        verify(response).sendError(eq(HttpServletResponse.SC_INTERNAL_SERVER_ERROR), argThat(notNullValue(String.class)));
-    }
-
-    @Test
-    public void Given_Request_Is_HTTP_PUT_With_Incorrect_Endpoint_Then_Not_Found_Error_Is_Generated() throws Exception {
-        when(request.getPathInfo()).thenReturn("/incorrect");
-        internalServlet.doPut(request, response);
-        verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class)));
-    }
-
-    @Test
-    public void Given_Request_Is_HTTP_DELETE_And_Address_Not_Authorized_When_HTTPS_Is_Required_Then_Forbidden_Response_Is_Generated() throws Exception {
-        when(request.getRemoteAddr()).thenReturn("127.100.0.3");
-        internalServlet.doDelete(request, response);
-        verify(response).sendError(eq(HttpServletResponse.SC_FORBIDDEN), argThat(notNullValue(String.class)));
-    }
-
-    @Test
-    public void Given_Request_Is_HTTP_DELETE_With_Api_In_Endpoint_Request_Succeeds() throws Exception {
-        when(request.getPathInfo()).thenReturn("/api/Key");
-        setParametersToNotContactDb(false);
-        String[] values = {"V", "a", "l", "u", "e", "s"};
-        when(request.getParameterValues(anyString())).thenReturn(values);
-        internalServlet = internalServerSuccess();
-        setPokerToNotCreateTimers();
-        mockProvisioningParametersChanged();
-        internalServlet.doDelete(request, response);
-        verify(response).setStatus(eq(HttpServletResponse.SC_OK));
-    }
-
-    @Test
-    public void Given_Request_Is_HTTP_DELETE_With_Api_In_Endpoint_And_Delete_Fails_Then_Internal_Server_Error_Is_Generated() throws Exception {
-        when(request.getPathInfo()).thenReturn("/api/Key");
-        setParametersToNotContactDb(false);
-        String[] values = {"V", "a", "l", "u", "e", "s"};
-        when(request.getParameterValues(anyString())).thenReturn(values);
-        internalServlet = internalServerFailure();
-        internalServlet.doDelete(request, response);
-        verify(response).sendError(eq(HttpServletResponse.SC_INTERNAL_SERVER_ERROR), argThat(notNullValue(String.class)));
-    }
-
-    @Test
-    public void Given_Request_Is_HTTP_DELETE_With_Incorrect_Endpoint_Then_Not_Found_Error_Is_Generated() throws Exception {
-        when(request.getPathInfo()).thenReturn("/incorrect");
-        internalServlet.doDelete(request, response);
-        verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class)));
-    }
-
-    @Test
-    public void Given_Request_Is_HTTP_POST_And_Address_Not_Authorized_When_HTTPS_Is_Required_Then_Forbidden_Response_Is_Generated() throws Exception {
-        when(request.getRemoteAddr()).thenReturn("127.100.0.3");
-        internalServlet.doPost(request, response);
-        verify(response).sendError(eq(HttpServletResponse.SC_FORBIDDEN), argThat(notNullValue(String.class)));
-    }
-
-    @Test
-    public void Given_Request_Is_HTTP_POST_With_Api_In_Endpoint_Request_Succeeds() throws Exception {
-        when(request.getPathInfo()).thenReturn("/api/Key");
-        setParametersToNotContactDb(true);
-        String[] values = {"V", "a", "l", "u", "e", "s"};
-        when(request.getParameterValues(anyString())).thenReturn(values);
-        internalServlet = internalServerSuccess();
-        setPokerToNotCreateTimers();
-        mockProvisioningParametersChanged();
-        internalServlet.doPost(request, response);
-        verify(response).setStatus(eq(HttpServletResponse.SC_OK));
-    }
-
-    @Test
-    public void Given_Request_Is_HTTP_POST_With_Api_In_Endpoint_And_Insert_Fails_Then_Internal_Server_Error_Is_Generated() throws Exception {
-        when(request.getPathInfo()).thenReturn("/api/Key");
-        setParametersToNotContactDb(true);
-        String[] values = {"V", "a", "l", "u", "e", "s"};
-        when(request.getParameterValues(anyString())).thenReturn(values);
-        internalServlet = internalServerFailure();
-        internalServlet.doPost(request, response);
-        verify(response).sendError(eq(HttpServletResponse.SC_INTERNAL_SERVER_ERROR), argThat(notNullValue(String.class)));
-    }
-
-    @Test
-    public void Given_Request_Is_HTTP_POST_To_Logs_And_Content_Header_Is_Not_Supported_Type_Then_Unsupported_Media_Type_Response_Is_Generated() throws Exception {
-        when(request.getHeader("Content-Type")).thenReturn("stub_contentType");
-        when(request.getPathInfo()).thenReturn("/logs/");
-        internalServlet.doPost(request, response);
-        verify(response).setStatus(eq(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE));
-    }
-
-    @Test
-    public void Given_Request_Is_HTTP_POST_To_Logs_And_Content_Encoding_Is_Not_Supported_Type_Then_Unsupported_Media_Type_Response_Is_Generated() throws Exception {
-        when(request.getHeader("Content-Encoding")).thenReturn("not-supported");
-        when(request.getPathInfo()).thenReturn("/logs/");
-        internalServlet.doPost(request, response);
-        verify(response).setStatus(eq(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE));
-    }
-
-    @Test
-    public void Given_Request_Is_HTTP_POST_To_Drlogs_And_Then_Unsupported_Media_Type_Response_Is_Generated() throws Exception {
-        when(request.getHeader("Content-Type")).thenReturn("stub_contentType");
-        when(request.getPathInfo()).thenReturn("/drlogs/");
-        internalServlet.doPost(request, response);
-        verify(response).setStatus(eq(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE));
-    }
-
-    @Test
-    public void Given_Request_Is_HTTP_POST_To_Drlogs_And_Request_Succeeds() throws Exception {
-        when(request.getPathInfo()).thenReturn("/drlogs/");
-        ServletInputStream inStream = mock(ServletInputStream.class);
-        when(inStream.read()).thenReturn(1, -1);
-        when(request.getInputStream()).thenReturn(inStream);
-        internalServlet.doPost(request, response);
-        verify(response).setStatus(eq(HttpServletResponse.SC_OK));
-    }
-
-    @Test
-    public void Given_Request_Is_HTTP_POST_With_Incorrect_Endpoint_Then_Not_Found_Error_Is_Generated() throws Exception {
-        when(request.getPathInfo()).thenReturn("/incorrect/");
-        internalServlet.doPost(request, response);
-        verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class)));
-    }
-
-    private void setAuthoriserToReturnRequestIsAuthorized() throws IllegalAccessException {
-        AuthorizationResponse authResponse = mock(AuthorizationResponse.class);
-        Authorizer authorizer = mock(Authorizer.class);
-        FieldUtils.writeDeclaredStaticField(BaseServlet.class, "authz", authorizer, true);
-        when(authorizer.decide(request)).thenReturn(authResponse);
-        when(authResponse.isAuthorized()).thenReturn(true);
-    }
-
-    private void setUpValidAuthorisedRequest() throws Exception {
-        setUpValidSecurityOnHttpRequest();
-        setBehalfHeader("Stub_Value");
-        setValidPathInfoInHttpHeader();
-        when(request.getHeader("Content-Type")).thenReturn("text/plain");
-        when(request.getHeader("Content-Encoding")).thenReturn("gzip");
-    }
-
-    private void setUpValidSecurityOnHttpRequest() throws Exception {
-        when(request.isSecure()).thenReturn(true);
-        when(request.getRemoteAddr()).thenReturn(InetAddress.getLocalHost().getHostAddress());
-        InetAddress[] nodeAddresses = new InetAddress[1];
-        nodeAddresses[0] = InetAddress.getLocalHost();
-        FieldUtils.writeDeclaredStaticField(BaseServlet.class, "nodeAddresses", nodeAddresses, true);
-        FieldUtils.writeDeclaredStaticField(BaseServlet.class, "requireCert", false, true);
-    }
-
-    private void setBehalfHeader(String headerValue) {
-        when(request.getHeader(BEHALF_HEADER)).thenReturn(headerValue);
-    }
-
-    private void setValidPathInfoInHttpHeader() {
-        when(request.getPathInfo()).thenReturn("/123");
-    }
-
-    private void setPokerToNotCreateTimers() throws Exception {
-        Poker poker = mock(Poker.class);
-        FieldUtils.writeDeclaredStaticField(Poker.class, "poker", poker, true);
-    }
-
-    private void setParametersToNotContactDb(boolean isPost) {
-        PowerMockito.mockStatic(Parameters.class);
-        Parameters parameters = mock(Parameters.class);
-        if (isPost) {
-            PowerMockito.when(Parameters.getParameter(anyString())).thenReturn(null);
-        } else {
-            PowerMockito.when(Parameters.getParameter(anyString())).thenReturn(parameters);
-        }
-    }
-
-    private InternalServlet internalServerSuccess() {
-        InternalServlet internalServlet = new InternalServlet() {
-
-            protected boolean doUpdate(Updateable bean) {
-                return true;
-            }
-
-            protected boolean doDelete(Deleteable bean) {
-                return true;
-            }
-
-            protected boolean doInsert(Insertable bean) {
-                return true;
-            }
-        };
-        return internalServlet;
-    }
-
-    private InternalServlet internalServerFailure() {
-        InternalServlet internalServlet = new InternalServlet() {
-
-            protected boolean doUpdate(Updateable bean) {
-                return false;
-            }
-
-            protected boolean doDelete(Deleteable bean) {
-                return false;
-            }
-
-            protected boolean doInsert(Insertable bean) {
-                return false;
-            }
-        };
-        return internalServlet;
-    }
-
-    private void mockProvisioningParametersChanged() throws IllegalAccessException{
-        PowerMockito.mockStatic(Feed.class);
-        PowerMockito.mockStatic(Subscription.class);
-        PowerMockito.when(Feed.countActiveFeeds()).thenReturn(0);
-        PowerMockito.when(Subscription.countActiveSubscriptions()).thenReturn(0);
-        Map<String, Integer> map = new HashMap<>();
-        FieldUtils.writeDeclaredStaticField(NodeClass.class, "map", map, true);
-    }
+  private InternalServlet internalServlet;
+
+  @Mock
+  private HttpServletRequest request;
+
+  @Mock
+  private HttpServletResponse response;
+
+  @Before
+  public void setUp() throws Exception {
+    super.setUp();
+    internalServlet = new InternalServlet();
+    setAuthoriserToReturnRequestIsAuthorized();
+    setUpValidAuthorisedRequest();
+  }
+
+  @Test
+  public void Given_Request_Is_HTTP_GET_And_Address_Not_Authorized_When_HTTPS_Is_Required_Then_Forbidden_Response_Is_Generated()
+      throws Exception {
+    when(request.getRemoteAddr()).thenReturn("127.100.0.3");
+    internalServlet.doGet(request, response);
+    verify(response)
+        .sendError(eq(HttpServletResponse.SC_FORBIDDEN), argThat(notNullValue(String.class)));
+  }
+
+  @Test
+  public void Given_Request_Is_HTTP_GET_With_Halt_In_Endpoint_But_Not_Sent_From_Localhost_Then_Forbidden_Response_Is_Generated()
+      throws Exception {
+    when(request.getPathInfo()).thenReturn("/halt");
+    when(request.isSecure()).thenReturn(false);
+    when(request.getRemoteAddr()).thenReturn("127.100.0.3");
+    internalServlet.doGet(request, response);
+    verify(response).setStatus(eq(HttpServletResponse.SC_FORBIDDEN));
+  }
+
+  @Test
+  public void Given_Request_Is_HTTP_GET_With_Halt_In_Endpoint_Request_Succeeds() throws Exception {
+    when(request.getPathInfo()).thenReturn("/halt");
+    when(request.isSecure()).thenReturn(false);
+    when(request.getRemoteAddr()).thenReturn("127.0.0.1");
+    internalServlet.doGet(request, response);
+    verify(response).setStatus(eq(HttpServletResponse.SC_OK));
+  }
+
+  @Test
+  public void Given_Request_Is_HTTP_GET_With_FetchProv_In_Endpoint_Request_Succeeds()
+      throws Exception {
+    when(request.getPathInfo()).thenReturn("/fetchProv");
+    when(request.isSecure()).thenReturn(false);
+    internalServlet.doGet(request, response);
+    verify(response).setStatus(eq(HttpServletResponse.SC_OK));
+  }
+
+  @Test
+  public void Given_Request_Is_HTTP_GET_With_Prov_In_Endpoint_Request_Succeeds() throws Exception {
+    when(request.getPathInfo()).thenReturn("/prov");
+    when(request.getQueryString()).thenReturn(null);
+    setPokerToNotCreateTimers();
+    ServletOutputStream outStream = mock(ServletOutputStream.class);
+    when(response.getOutputStream()).thenReturn(outStream);
+    internalServlet.doGet(request, response);
+    verify(response).setStatus(eq(HttpServletResponse.SC_OK));
+  }
+
+  @Test
+  public void Given_Request_Is_HTTP_GET_With_Logs_In_Endpoint_Request_Succeeds() throws Exception {
+    when(request.getPathInfo()).thenReturn("/logs/");
+    ServletOutputStream outStream = mock(ServletOutputStream.class);
+    when(response.getOutputStream()).thenReturn(outStream);
+    internalServlet.doGet(request, response);
+    verify(response).setStatus(eq(HttpServletResponse.SC_OK));
+  }
+
+  @Test
+  public void Given_Request_Is_HTTP_GET_Starts_With_Logs_In_Endpoint_Request_Succeeds()
+      throws Exception {
+    when(request.getPathInfo()).thenReturn("/logs/TestFile");
+    internalServlet.doGet(request, response);
+    verify(response)
+        .sendError(eq(HttpServletResponse.SC_NO_CONTENT), argThat(notNullValue(String.class)));
+  }
+
+  @Test
+  public void Given_Request_Is_HTTP_GET_With_Api_In_Endpoint_Request_Succeeds() throws Exception {
+    when(request.getPathInfo()).thenReturn("/api/Key");
+    setParametersToNotContactDb(false);
+    ServletOutputStream outStream = mock(ServletOutputStream.class);
+    when(response.getOutputStream()).thenReturn(outStream);
+    internalServlet.doGet(request, response);
+    verify(response).setStatus(eq(HttpServletResponse.SC_OK));
+  }
+
+  @Test
+  public void Given_Request_Is_HTTP_GET_With_Drlogs_In_Endpoint_Request_Succeeds()
+      throws Exception {
+    when(request.getPathInfo()).thenReturn("/drlogs/");
+    PowerMockito.mockStatic(LogfileLoader.class);
+    LogfileLoader logfileLoader = mock(LogfileLoader.class);
+    when(logfileLoader.getBitSet()).thenReturn(new RLEBitSet());
+    PowerMockito.when(LogfileLoader.getLoader()).thenReturn(logfileLoader);
+    ServletOutputStream outStream = mock(ServletOutputStream.class);
+    when(response.getOutputStream()).thenReturn(outStream);
+    internalServlet.doGet(request, response);
+    verify(response).setStatus(eq(HttpServletResponse.SC_OK));
+  }
+
+  @Test
+  public void Given_Request_Is_HTTP_GET_Incorrect_Endpoint_Then_No_Content_Response_Is_Generated()
+      throws Exception {
+    when(request.getPathInfo()).thenReturn("/incorrect/");
+    internalServlet.doGet(request, response);
+    verify(response)
+        .sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class)));
+  }
+
+  @Test
+  public void Given_Request_Is_HTTP_PUT_And_Address_Not_Authorized_When_HTTPS_Is_Required_Then_Forbidden_Response_Is_Generated()
+      throws Exception {
+    when(request.getRemoteAddr()).thenReturn("127.100.0.3");
+    internalServlet.doPut(request, response);
+    verify(response)
+        .sendError(eq(HttpServletResponse.SC_FORBIDDEN), argThat(notNullValue(String.class)));
+  }
+
+  @Test
+  public void Given_Request_Is_HTTP_PUT_With_Api_In_Endpoint_Request_Succeeds() throws Exception {
+    when(request.getPathInfo()).thenReturn("/api/Key");
+    setParametersToNotContactDb(false);
+    String[] values = {"V", "a", "l", "u", "e", "s"};
+    when(request.getParameterValues(anyString())).thenReturn(values);
+    internalServlet = internalServerSuccess();
+    setPokerToNotCreateTimers();
+    mockProvisioningParametersChanged();
+    internalServlet.doPut(request, response);
+    verify(response).setStatus(eq(HttpServletResponse.SC_OK));
+  }
+
+  @Test
+  public void Given_Request_Is_HTTP_PUT_With_Api_In_Endpoint_And_Update_Fails_Then_Internal_Server_Error_Is_Generated()
+      throws Exception {
+    when(request.getPathInfo()).thenReturn("/api/Key");
+    setParametersToNotContactDb(false);
+    String[] values = {"V", "a", "l", "u", "e", "s"};
+    when(request.getParameterValues(anyString())).thenReturn(values);
+    internalServlet = internalServerFailure();
+    internalServlet.doPut(request, response);
+    verify(response).sendError(eq(HttpServletResponse.SC_INTERNAL_SERVER_ERROR),
+        argThat(notNullValue(String.class)));
+  }
+
+  @Test
+  public void Given_Request_Is_HTTP_PUT_With_Incorrect_Endpoint_Then_Not_Found_Error_Is_Generated()
+      throws Exception {
+    when(request.getPathInfo()).thenReturn("/incorrect");
+    internalServlet.doPut(request, response);
+    verify(response)
+        .sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class)));
+  }
+
+  @Test
+  public void Given_Request_Is_HTTP_DELETE_And_Address_Not_Authorized_When_HTTPS_Is_Required_Then_Forbidden_Response_Is_Generated()
+      throws Exception {
+    when(request.getRemoteAddr()).thenReturn("127.100.0.3");
+    internalServlet.doDelete(request, response);
+    verify(response)
+        .sendError(eq(HttpServletResponse.SC_FORBIDDEN), argThat(notNullValue(String.class)));
+  }
+
+  @Test
+  public void Given_Request_Is_HTTP_DELETE_With_Api_In_Endpoint_Request_Succeeds()
+      throws Exception {
+    when(request.getPathInfo()).thenReturn("/api/Key");
+    setParametersToNotContactDb(false);
+    String[] values = {"V", "a", "l", "u", "e", "s"};
+    when(request.getParameterValues(anyString())).thenReturn(values);
+    internalServlet = internalServerSuccess();
+    setPokerToNotCreateTimers();
+    mockProvisioningParametersChanged();
+    internalServlet.doDelete(request, response);
+    verify(response).setStatus(eq(HttpServletResponse.SC_OK));
+  }
+
+  @Test
+  public void Given_Request_Is_HTTP_DELETE_With_Api_In_Endpoint_And_Delete_Fails_Then_Internal_Server_Error_Is_Generated()
+      throws Exception {
+    when(request.getPathInfo()).thenReturn("/api/Key");
+    setParametersToNotContactDb(false);
+    String[] values = {"V", "a", "l", "u", "e", "s"};
+    when(request.getParameterValues(anyString())).thenReturn(values);
+    internalServlet = internalServerFailure();
+    internalServlet.doDelete(request, response);
+    verify(response).sendError(eq(HttpServletResponse.SC_INTERNAL_SERVER_ERROR),
+        argThat(notNullValue(String.class)));
+  }
+
+  @Test
+  public void Given_Request_Is_HTTP_DELETE_With_Incorrect_Endpoint_Then_Not_Found_Error_Is_Generated()
+      throws Exception {
+    when(request.getPathInfo()).thenReturn("/incorrect");
+    internalServlet.doDelete(request, response);
+    verify(response)
+        .sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class)));
+  }
+
+  @Test
+  public void Given_Request_Is_HTTP_POST_And_Address_Not_Authorized_When_HTTPS_Is_Required_Then_Forbidden_Response_Is_Generated()
+      throws Exception {
+    when(request.getRemoteAddr()).thenReturn("127.100.0.3");
+    internalServlet.doPost(request, response);
+    verify(response)
+        .sendError(eq(HttpServletResponse.SC_FORBIDDEN), argThat(notNullValue(String.class)));
+  }
+
+  @Test
+  public void Given_Request_Is_HTTP_POST_With_Api_In_Endpoint_Request_Succeeds() throws Exception {
+    when(request.getPathInfo()).thenReturn("/api/Key");
+    setParametersToNotContactDb(true);
+    String[] values = {"V", "a", "l", "u", "e", "s"};
+    when(request.getParameterValues(anyString())).thenReturn(values);
+    internalServlet = internalServerSuccess();
+    setPokerToNotCreateTimers();
+    mockProvisioningParametersChanged();
+    internalServlet.doPost(request, response);
+    verify(response).setStatus(eq(HttpServletResponse.SC_OK));
+  }
+
+  @Test
+  public void Given_Request_Is_HTTP_POST_With_Api_In_Endpoint_And_Insert_Fails_Then_Internal_Server_Error_Is_Generated()
+      throws Exception {
+    when(request.getPathInfo()).thenReturn("/api/Key");
+    setParametersToNotContactDb(true);
+    String[] values = {"V", "a", "l", "u", "e", "s"};
+    when(request.getParameterValues(anyString())).thenReturn(values);
+    internalServlet = internalServerFailure();
+    internalServlet.doPost(request, response);
+    verify(response).sendError(eq(HttpServletResponse.SC_INTERNAL_SERVER_ERROR),
+        argThat(notNullValue(String.class)));
+  }
+
+  @Test
+  public void Given_Request_Is_HTTP_POST_To_Logs_And_Content_Header_Is_Not_Supported_Type_Then_Unsupported_Media_Type_Response_Is_Generated()
+      throws Exception {
+    when(request.getHeader("Content-Type")).thenReturn("stub_contentType");
+    when(request.getPathInfo()).thenReturn("/logs/");
+    internalServlet.doPost(request, response);
+    verify(response).setStatus(eq(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE));
+  }
+
+  @Test
+  public void Given_Request_Is_HTTP_POST_To_Logs_And_Content_Encoding_Is_Not_Supported_Type_Then_Unsupported_Media_Type_Response_Is_Generated()
+      throws Exception {
+    when(request.getHeader("Content-Encoding")).thenReturn("not-supported");
+    when(request.getPathInfo()).thenReturn("/logs/");
+    internalServlet.doPost(request, response);
+    verify(response).setStatus(eq(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE));
+  }
+
+  @Test
+  public void Given_Request_Is_HTTP_POST_To_Drlogs_And_Then_Unsupported_Media_Type_Response_Is_Generated()
+      throws Exception {
+    when(request.getHeader("Content-Type")).thenReturn("stub_contentType");
+    when(request.getPathInfo()).thenReturn("/drlogs/");
+    internalServlet.doPost(request, response);
+    verify(response).setStatus(eq(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE));
+  }
+
+  @Test
+  public void Given_Request_Is_HTTP_POST_To_Drlogs_And_Request_Succeeds() throws Exception {
+    when(request.getPathInfo()).thenReturn("/drlogs/");
+    ServletInputStream inStream = mock(ServletInputStream.class);
+    when(inStream.read()).thenReturn(1, -1);
+    when(request.getInputStream()).thenReturn(inStream);
+    PowerMockito.mockStatic(LogRecord.class);
+    internalServlet.doPost(request, response);
+    verify(response).setStatus(eq(HttpServletResponse.SC_OK));
+  }
+
+  @Test
+  public void Given_Request_Is_HTTP_POST_With_Incorrect_Endpoint_Then_Not_Found_Error_Is_Generated()
+      throws Exception {
+    when(request.getPathInfo()).thenReturn("/incorrect/");
+    internalServlet.doPost(request, response);
+    verify(response)
+        .sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class)));
+  }
+
+  private void setAuthoriserToReturnRequestIsAuthorized() throws IllegalAccessException {
+    AuthorizationResponse authResponse = mock(AuthorizationResponse.class);
+    Authorizer authorizer = mock(Authorizer.class);
+    FieldUtils.writeDeclaredStaticField(BaseServlet.class, "authz", authorizer, true);
+    when(authorizer.decide(request)).thenReturn(authResponse);
+    when(authResponse.isAuthorized()).thenReturn(true);
+  }
+
+  private void setUpValidAuthorisedRequest() throws Exception {
+    setUpValidSecurityOnHttpRequest();
+    setBehalfHeader("Stub_Value");
+    setValidPathInfoInHttpHeader();
+    when(request.getHeader("Content-Type")).thenReturn("text/plain");
+    when(request.getHeader("Content-Encoding")).thenReturn("gzip");
+  }
+
+  private void setUpValidSecurityOnHttpRequest() throws Exception {
+    when(request.isSecure()).thenReturn(true);
+    when(request.getRemoteAddr()).thenReturn(InetAddress.getLocalHost().getHostAddress());
+    InetAddress[] nodeAddresses = new InetAddress[1];
+    nodeAddresses[0] = InetAddress.getLocalHost();
+    FieldUtils.writeDeclaredStaticField(BaseServlet.class, "nodeAddresses", nodeAddresses, true);
+    FieldUtils.writeDeclaredStaticField(BaseServlet.class, "requireCert", false, true);
+  }
+
+  private void setBehalfHeader(String headerValue) {
+    when(request.getHeader(BEHALF_HEADER)).thenReturn(headerValue);
+  }
+
+  private void setValidPathInfoInHttpHeader() {
+    when(request.getPathInfo()).thenReturn("/123");
+  }
+
+  private void setPokerToNotCreateTimers() throws Exception {
+    Poker poker = mock(Poker.class);
+    FieldUtils.writeDeclaredStaticField(Poker.class, "poker", poker, true);
+  }
+
+  private void setParametersToNotContactDb(boolean isPost) {
+    PowerMockito.mockStatic(Parameters.class);
+    Parameters parameters = mock(Parameters.class);
+    if (isPost) {
+      PowerMockito.when(Parameters.getParameter(anyString())).thenReturn(null);
+    } else {
+      PowerMockito.when(Parameters.getParameter(anyString())).thenReturn(parameters);
+    }
+  }
+
+  private InternalServlet internalServerSuccess() {
+    InternalServlet internalServlet = new InternalServlet() {
+
+      protected boolean doUpdate(Updateable bean) {
+        return true;
+      }
+
+      protected boolean doDelete(Deleteable bean) {
+        return true;
+      }
+
+      protected boolean doInsert(Insertable bean) {
+        return true;
+      }
+    };
+    return internalServlet;
+  }
+
+  private InternalServlet internalServerFailure() {
+    InternalServlet internalServlet = new InternalServlet() {
+
+      protected boolean doUpdate(Updateable bean) {
+        return false;
+      }
+
+      protected boolean doDelete(Deleteable bean) {
+        return false;
+      }
+
+      protected boolean doInsert(Insertable bean) {
+        return false;
+      }
+    };
+    return internalServlet;
+  }
+
+  private void mockProvisioningParametersChanged() throws IllegalAccessException {
+    PowerMockito.mockStatic(Feed.class);
+    PowerMockito.mockStatic(Subscription.class);
+    PowerMockito.when(Feed.countActiveFeeds()).thenReturn(0);
+    PowerMockito.when(Subscription.countActiveSubscriptions()).thenReturn(0);
+    Map<String, Integer> map = new HashMap<>();
+    FieldUtils.writeDeclaredStaticField(NodeClass.class, "map", map, true);
+  }
 }
old mode 100644 (file)
new mode 100755 (executable)
index e42a8a8..0a9632e
  ******************************************************************************/
 package org.onap.dmaap.datarouter.provisioning;
 
+import static org.hamcrest.Matchers.notNullValue;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.argThat;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doCallRealMethod;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import static org.hamcrest.Matchers.notNullValue;
-import static org.mockito.Matchers.*;
-import static org.mockito.Mockito.*;
 
 @RunWith(PowerMockRunner.class)
-public class StatisticsServletTest extends DrServletTestBase{
-    private StatisticsServlet statisticsServlet;
+@PrepareForTest(StatisticsServlet.class)
+public class StatisticsServletTest extends DrServletTestBase {
+
+  private StatisticsServlet statisticsServlet;
 
-    @Mock
-    private HttpServletRequest request;
+  @Mock
+  private HttpServletRequest request;
 
-    @Mock
-    private HttpServletResponse response;
+  @Mock
+  private HttpServletResponse response;
 
-    @Before
-    public void setUp() throws Exception{
-        super.setUp();
-        statisticsServlet = new StatisticsServlet();
-        buildRequestParameters();
-    }
+  @Before
+  public void setUp() throws Exception {
+    super.setUp();
+    statisticsServlet = new StatisticsServlet();
+    buildRequestParameters();
+  }
 
-    @Test
-    public void Given_Request_Is_HTTP_DELETE_SC_METHOD_NOT_ALLOWED_Response_Is_Generated() throws Exception {
-        statisticsServlet.doDelete(request, response);
-        verify(response).sendError(eq(HttpServletResponse.SC_METHOD_NOT_ALLOWED), argThat(notNullValue(String.class)));
-    }
+  @Test
+  public void Given_Request_Is_HTTP_DELETE_SC_METHOD_NOT_ALLOWED_Response_Is_Generated()
+      throws Exception {
+    statisticsServlet.doDelete(request, response);
+    verify(response).sendError(eq(HttpServletResponse.SC_METHOD_NOT_ALLOWED),
+        argThat(notNullValue(String.class)));
+  }
 
-    @Test
-    public void Given_Request_Is_HTTP_PUT_SC_METHOD_NOT_ALLOWED_Response_Is_Generated() throws Exception {
-        statisticsServlet.doPut(request, response);
-        verify(response).sendError(eq(HttpServletResponse.SC_METHOD_NOT_ALLOWED), argThat(notNullValue(String.class)));
-    }
+  @Test
+  public void Given_Request_Is_HTTP_PUT_SC_METHOD_NOT_ALLOWED_Response_Is_Generated()
+      throws Exception {
+    statisticsServlet.doPut(request, response);
+    verify(response).sendError(eq(HttpServletResponse.SC_METHOD_NOT_ALLOWED),
+        argThat(notNullValue(String.class)));
+  }
 
-    @Test
-    public void Given_Request_Is_HTTP_POST_SC_METHOD_NOT_ALLOWED_Response_Is_Generated() throws Exception {
-        statisticsServlet.doPost(request, response);
-        verify(response).sendError(eq(HttpServletResponse.SC_METHOD_NOT_ALLOWED), argThat(notNullValue(String.class)));
-    }
+  @Test
+  public void Given_Request_Is_HTTP_POST_SC_METHOD_NOT_ALLOWED_Response_Is_Generated()
+      throws Exception {
+    statisticsServlet.doPost(request, response);
+    verify(response).sendError(eq(HttpServletResponse.SC_METHOD_NOT_ALLOWED),
+        argThat(notNullValue(String.class)));
+  }
 
-    @Test
-    public void Given_Request_Is_HTTP_GET_With_Incorrect_Parameters_Then_Bad_Request_Response_Is_Generated() throws Exception {
-        when(request.getParameter("type")).thenReturn("get");
-        statisticsServlet.doGet(request, response);
-        verify(response).sendError(eq(HttpServletResponse.SC_BAD_REQUEST), argThat(notNullValue(String.class)));
-    }
+  @Test
+  public void Given_Request_Is_HTTP_GET_With_Incorrect_Parameters_Then_Bad_Request_Response_Is_Generated()
+      throws Exception {
+    when(request.getParameter("type")).thenReturn("get");
+    statisticsServlet.doGet(request, response);
+    verify(response)
+        .sendError(eq(HttpServletResponse.SC_BAD_REQUEST), argThat(notNullValue(String.class)));
+  }
 
-    @Test
-    public void Given_Request_Is_HTTP_GET_With_GroupId_But_No_FeedId_Parameters_Then_Request_Succeeds() throws Exception {
-        ServletOutputStream outStream = mock(ServletOutputStream.class);
-        when(response.getOutputStream()).thenReturn(outStream);
-        statisticsServlet = mock(StatisticsServlet.class);
-        doCallRealMethod().when(statisticsServlet).doGet(request, response);
-        doNothing().when(statisticsServlet).rsToCSV(anyObject(), anyObject());
-        when(statisticsServlet.getFeedIdsByGroupId(anyInt())).thenReturn(new StringBuffer("1"));
-        statisticsServlet.doGet(request, response);
-        verify(response).setStatus(eq(HttpServletResponse.SC_OK));
-    }
+  @Test
+  public void Given_Request_Is_HTTP_GET_With_GroupId_But_No_FeedId_Parameters_Then_Request_Succeeds()
+      throws Exception {
+    ServletOutputStream outStream = mock(ServletOutputStream.class);
+    when(response.getOutputStream()).thenReturn(outStream);
+    statisticsServlet = PowerMockito.mock(StatisticsServlet.class);
+    PowerMockito.doReturn(null).when(statisticsServlet, "getRecordsForSQL", anyString());
+    doNothing().when(statisticsServlet).rsToCSV(anyObject(), anyObject());
+    doCallRealMethod().when(statisticsServlet).doGet(request, response);
+    when(statisticsServlet.getFeedIdsByGroupId(anyInt())).thenReturn(new StringBuffer("1"));
+    statisticsServlet.doGet(request, response);
+    verify(response).setStatus(eq(HttpServletResponse.SC_OK));
+  }
 
-    @Test
-    public void Given_Request_Is_HTTP_GET_With_GroupId_And_FeedId_Parameters_Then_Request_Succeeds() throws Exception {
-        when(request.getParameter("feedid")).thenReturn("1");
-        ServletOutputStream outStream = mock(ServletOutputStream.class);
-        when(response.getOutputStream()).thenReturn(outStream);
-        statisticsServlet = mock(StatisticsServlet.class);
-        doCallRealMethod().when(statisticsServlet).doGet(request, response);
-        doCallRealMethod().when(statisticsServlet).queryGeneretor(anyObject());
-        doNothing().when(statisticsServlet).rsToCSV(anyObject(), anyObject());
-        when(statisticsServlet.getFeedIdsByGroupId(anyInt())).thenReturn(new StringBuffer("1"));
-        statisticsServlet.doGet(request, response);
-        verify(response).setStatus(eq(HttpServletResponse.SC_OK));
-    }
+  @Test
+  public void Given_Request_Is_HTTP_GET_With_GroupId_And_FeedId_Parameters_Then_Request_Succeeds()
+      throws Exception {
+    when(request.getParameter("feedid")).thenReturn("1");
+    ServletOutputStream outStream = mock(ServletOutputStream.class);
+    when(response.getOutputStream()).thenReturn(outStream);
+    statisticsServlet = PowerMockito.mock(StatisticsServlet.class);
+    PowerMockito.doReturn(null).when(statisticsServlet, "getRecordsForSQL", anyString());
+    doNothing().when(statisticsServlet).rsToCSV(anyObject(), anyObject());
+    doCallRealMethod().when(statisticsServlet).doGet(request, response);
+    doCallRealMethod().when(statisticsServlet).queryGeneretor(anyObject());
+    when(statisticsServlet.getFeedIdsByGroupId(anyInt())).thenReturn(new StringBuffer("1"));
+    statisticsServlet.doGet(request, response);
+    verify(response).setStatus(eq(HttpServletResponse.SC_OK));
+  }
 
-    private void buildRequestParameters() {
-        when(request.getParameter("type")).thenReturn("exp");
-        when(request.getParameter("publishId")).thenReturn("ID");
-        when(request.getParameter("statusCode")).thenReturn("success");
-        when(request.getParameter("expiryReason")).thenReturn("other");
-        when(request.getParameter("start")).thenReturn("0");
-        when(request.getParameter("end")).thenReturn("0");
-        when(request.getParameter("output_type")).thenReturn("csv");
-        when(request.getParameter("start_time")).thenReturn("13");
-        when(request.getParameter("end_time")).thenReturn("15");
-        when(request.getParameter("time")).thenReturn("10");
-        when(request.getParameter("groupid")).thenReturn("1");
-        when(request.getParameter("subid")).thenReturn("1");
-    }
+  private void buildRequestParameters() {
+    when(request.getParameter("type")).thenReturn("exp");
+    when(request.getParameter("publishId")).thenReturn("ID");
+    when(request.getParameter("statusCode")).thenReturn("success");
+    when(request.getParameter("expiryReason")).thenReturn("other");
+    when(request.getParameter("start")).thenReturn("0");
+    when(request.getParameter("end")).thenReturn("0");
+    when(request.getParameter("output_type")).thenReturn("csv");
+    when(request.getParameter("start_time")).thenReturn("13");
+    when(request.getParameter("end_time")).thenReturn("15");
+    when(request.getParameter("time")).thenReturn("10");
+    when(request.getParameter("groupid")).thenReturn("1");
+    when(request.getParameter("subid")).thenReturn("1");
+  }
 }
old mode 100644 (file)
new mode 100755 (executable)
index c663451..9009b97
@@ -269,7 +269,7 @@ public class SubscribeServletTest extends DrServletTestBase {
         authAddressesAndNetworks.add(("127.0.0.1"));
         FieldUtils.writeDeclaredStaticField(BaseServlet.class, "authorizedAddressesAndNetworks", authAddressesAndNetworks, true);
         FieldUtils.writeDeclaredStaticField(BaseServlet.class, "requireCert", false, true);
-        FieldUtils.writeDeclaredStaticField(BaseServlet.class, "maxSubs", 1, true);
+        FieldUtils.writeDeclaredStaticField(BaseServlet.class, "maxSubs", 100, true);
     }
 
     private void setBehalfHeader(String headerValue) {