10 files changed, 1025 insertions, 941 deletions
diff --git a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeMain.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeMain.java
index e0f6b7f6..b8c06f14 100644
--- a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeMain.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeMain.java
@@ -102,7 +102,6 @@ public class NodeMain {
         Server server = new Server();
         // HTTP configuration
         HttpConfiguration httpConfiguration = new HttpConfiguration();
-        httpConfiguration.setIdleTimeout(2000);
         httpConfiguration.setRequestHeaderSize(2048);
 
         // HTTP connector
@@ -110,6 +109,7 @@ public class NodeMain {
         try (ServerConnector httpServerConnector = new ServerConnector(server,
             new HttpConnectionFactory(httpConfiguration))) {
             httpServerConnector.setPort(nodeConfigManager.getHttpPort());
+            httpServerConnector.setIdleTimeout(2000);
 
             // HTTPS configuration
             SslContextFactory sslContextFactory = new SslContextFactory();
diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/Main.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/Main.java
index 3afce990..87979be6 100644
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/Main.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/Main.java
@@ -127,7 +127,6 @@ public class Main {
         httpConfiguration.setSecurePort(httpsPort);
         httpConfiguration.setOutputBufferSize(32768);
         httpConfiguration.setRequestHeaderSize(2048);
-        httpConfiguration.setIdleTimeout(300000);
         httpConfiguration.setSendServerVersion(true);
         httpConfiguration.setSendDateHeader(false);
 
@@ -146,6 +145,7 @@ public class Main {
             new HttpConnectionFactory(httpConfiguration))) {
             httpServerConnector.setPort(httpPort);
             httpServerConnector.setAcceptQueueSize(2);
+            httpServerConnector.setIdleTimeout(300000);
 
             // HTTPS configuration
             HttpConfiguration httpsConfiguration = new HttpConfiguration(httpConfiguration);
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 886a136f..134a595b 100644..100755
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java
@@ -45,7 +45,9 @@ import org.onap.dmaap.datarouter.provisioning.utils.DB;
 import org.onap.dmaap.datarouter.provisioning.utils.LOGJSONObject;
 
 /**
- * This Servlet handles requests to the &lt;Statistics API&gt; and  &lt;Statistics consilidated resultset&gt;,
+ * This Servlet handles requests to the &lt;Statistics API&gt; and  &lt;Statistics consilidated
+ * resultset&gt;,
+ *
  * @author Manish Singh
  * @version $Id: StatisticsServlet.java,v 1.11 2016/08/10 17:27:02 Manish Exp $
  */
@@ -53,536 +55,549 @@ import org.onap.dmaap.datarouter.provisioning.utils.LOGJSONObject;
 
 public class StatisticsServlet extends BaseServlet {
 
-    private static final long TWENTYFOUR_HOURS = (24 * 60 * 60 * 1000L);
-    private static final String fmt1 = "yyyy-MM-dd'T'HH:mm:ss'Z'";
-    private static final String fmt2 = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
-
-
-    /**
-     * DELETE a logging URL -- not supported.
-     */
-    @Override
-    public void doDelete(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-        String message = "DELETE not allowed for the logURL.";
-        EventLogRecord elr = new EventLogRecord(req);
-        elr.setMessage(message);
-        elr.setResult(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
-        eventlogger.info(elr);
-        resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, message);
-    }
-    /**
-     * GET a Statistics URL -- retrieve Statistics data for a feed or subscription.
-     * See the <b>Statistics API</b> document for details on how this     method should be invoked.
-     */
-    @Override
-    public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-
-        Map<String, String> map = buildMapFromRequest(req);
-        if (map.get("err") != null) {
-            resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "Invalid arguments: "+map.get("err"));
-            return;
-        }
-        // check Accept: header??
-
-        resp.setStatus(HttpServletResponse.SC_OK);
-        resp.setContentType(LOGLIST_CONTENT_TYPE);
-        ServletOutputStream out = resp.getOutputStream();
-
-
-        String outputType = "json";
-        String feedids = null;
-
-        if(req.getParameter("feedid") ==null && req.getParameter("groupid") ==null)
-        {
-            out.print("Invalid request, Feedid or Group ID is required.");
-        }
-
-        if(req.getParameter("feedid")!=null && req.getParameter("groupid") == null) {
-            map.put("feedids", req.getParameter("feedid").replace("|", ",").toString());
-        }
-
-        if(req.getParameter("groupid") != null && req.getParameter("feedid") ==null) {
-              // String groupid1 = null;
-            StringBuffer groupid1 = new  StringBuffer();
-
-                 try {
-                     System.out.println("feeedidsssssssss");
-                     groupid1 = this.getFeedIdsByGroupId(Integer.parseInt(req.getParameter("groupid")));
-                      System.out.println("feeedids"+req.getParameter("groupid"));
-
-                        map.put("feedids", groupid1.toString());
-                        System.out.println("groupid1" +groupid1.toString());
-
-
-                  } catch (NumberFormatException e) {
-                     e.printStackTrace();
-                  } catch (SQLException e) {
-                    e.printStackTrace();
-                 }
-            }
-        if(req.getParameter("groupid") != null && req.getParameter("feedid") !=null) {
-               StringBuffer groupid1 = new  StringBuffer();
-
-
-                 try {
-                     System.out.println("both r not null");
-                     groupid1 = this.getFeedIdsByGroupId(Integer.parseInt(req.getParameter("groupid")));
-                      System.out.println("feeedids"+req.getParameter("groupid"));
-                      groupid1.append(",");
-                       groupid1.append(req.getParameter("feedid").replace("|", ",").toString());
-
-                        map.put("feedids", groupid1.toString());
-
-
-                        System.out.println("groupid1" +groupid1.toString());
-
-
-                  } catch (NumberFormatException e) {
-                     e.printStackTrace();
-                  } catch (SQLException e) {
-                    e.printStackTrace();
-                 }
-            }
-
-
-
-        if(req.getParameter("subid")!=null && req.getParameter("feedid") !=null) {
-             StringBuffer subidstr = new  StringBuffer();
-//             subidstr.append(" and e.DELIVERY_SUBID in(subid)");
-//              subidstr.append(req.getParameter("subid").replace("|", ",").toString());
-             subidstr.append("and e.DELIVERY_SUBID in(");
-
-             subidstr.append(req.getParameter("subid").replace("|", ",").toString());
-             subidstr.append(")");
-             map.put("subid", subidstr.toString());
-        }
-        if(req.getParameter("subid")!=null && req.getParameter("groupid") !=null) {
-             StringBuffer subidstr = new  StringBuffer();
-//             subidstr.append(" and e.DELIVERY_SUBID in(subid)");
-//              subidstr.append(req.getParameter("subid").replace("|", ",").toString());
-             subidstr.append("and e.DELIVERY_SUBID in(");
-
-             subidstr.append(req.getParameter("subid").replace("|", ",").toString());
-             subidstr.append(")");
-             map.put("subid", subidstr.toString());
-        }
-        if(req.getParameter("type")!=null) {
-            map.put("eventType", req.getParameter("type").replace("|", ",").toString());
-        }
-            if(req.getParameter("output_type")!=null) {
-            map.put("output_type", req.getParameter("output_type").toString());
-        }
-        if(req.getParameter("start_time")!=null) {
-            map.put("start_time", req.getParameter("start_time").toString());
-        }
-        if(req.getParameter("end_time")!=null) {
-            map.put("end_time", req.getParameter("end_time").toString());
-        }
-
-        if(req.getParameter("time")!=null) {
-            map.put("start_time", req.getParameter("time").toString());
-            map.put("end_time", null);
-            }
-
-
-
-        if(req.getParameter("output_type") !=null)
-        {
-            outputType = req.getParameter("output_type");
-        }
-
-
-        try {
-
-            String filterQuery = this.queryGeneretor(map);
-            eventlogger.debug("SQL Query for Statistics resultset. "+filterQuery);
+  private static final long TWENTYFOUR_HOURS = (24 * 60 * 60 * 1000L);
+  private static final String fmt1 = "yyyy-MM-dd'T'HH:mm:ss'Z'";
+  private static final String fmt2 = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
+
+
+  /**
+   * DELETE a logging URL -- not supported.
+   */
+  @Override
+  public void doDelete(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+    String message = "DELETE not allowed for the logURL.";
+    EventLogRecord elr = new EventLogRecord(req);
+    elr.setMessage(message);
+    elr.setResult(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
+    eventlogger.info(elr);
+    resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, message);
+  }
+
+  /**
+   * GET a Statistics URL -- retrieve Statistics data for a feed or subscription. See the
+   * <b>Statistics API</b> document for details on how this     method should be invoked.
+   */
+  @Override
+  public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+
+    Map<String, String> map = buildMapFromRequest(req);
+    if (map.get("err") != null) {
+      resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "Invalid arguments: " + map.get("err"));
+      return;
+    }
+    // check Accept: header??
 
-            ResultSet rs=this.getRecordsForSQL(filterQuery);
+    resp.setStatus(HttpServletResponse.SC_OK);
+    resp.setContentType(LOGLIST_CONTENT_TYPE);
+    ServletOutputStream out = resp.getOutputStream();
 
-            if(outputType.equals("csv")) {
-                resp.setContentType("application/octet-stream");
-                Date date = new Date() ;
-                SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-YYYY HH:mm:ss") ;
-                resp.setHeader("Content-Disposition", "attachment; filename=\"result:"+dateFormat.format(date)+".csv\"");
-                eventlogger.info("Generating CSV file from Statistics resultset");
+    String outputType = "json";
+    String feedids = null;
 
-                rsToCSV(rs, out);
-            }
-            else {
-                eventlogger.info("Generating JSON for Statistics resultset");
-                this.rsToJson(rs, out);
-            }
-        }
-        catch (IOException e) {
-            eventlogger.error("IOException - Generating JSON/CSV:"+e);
-            e.printStackTrace();
-         }
-        catch (JSONException e) {
-            eventlogger.error("JSONException - executing SQL query:"+e);
-            e.printStackTrace();
-        } catch (SQLException e) {
-            eventlogger.error("SQLException - executing SQL query:"+e);
-            e.printStackTrace();
-        } catch (ParseException e) {
-            eventlogger.error("ParseException - executing SQL query:"+e);
-            e.printStackTrace();
-        }
+    if (req.getParameter("feedid") == null && req.getParameter("groupid") == null) {
+      out.print("Invalid request, Feedid or Group ID is required.");
     }
 
-
-    /**
-     * rsToJson - Converting RS to JSON object
-     * @exception IOException, SQLException
-     * @param out ServletOutputStream, rs as ResultSet
-     */
-    public void rsToCSV(ResultSet rs, ServletOutputStream out) throws IOException, SQLException {
-        String header = "FEEDNAME,FEEDID,FILES_PUBLISHED,PUBLISH_LENGTH, FILES_DELIVERED, DELIVERED_LENGTH, SUBSCRIBER_URL, SUBID, PUBLISH_TIME,DELIVERY_TIME, AverageDelay\n";
-
-        // String header = "FEEDNAME,FEEDID,TYPE,REMOTE_ADDR,DELIVERY_SUBID,REQURI,TOTAL CONTENT LENGTH,NO OF FILE,AVERAGE DELAY\n";
-
-         out.write(header.getBytes());
-
-         while(rs.next()) {
-            StringBuffer line = new StringBuffer();
-                line.append(rs.getString("FEEDNAME"));
-                line.append(",");
-                line.append(rs.getString("FEEDID"));
-                line.append(",");
-                line.append(rs.getString("FILES_PUBLISHED"));
-                line.append(",");
-                line.append(rs.getString("PUBLISH_LENGTH"));
-                line.append(",");
-                line.append(rs.getString("FILES_DELIVERED"));
-                line.append(",");
-                line.append(rs.getString("DELIVERED_LENGTH"));
-                line.append(",");
-                line.append(rs.getString("SUBSCRIBER_URL"));
-                line.append(",");
-                line.append(rs.getString("SUBID"));
-                line.append(",");
-                line.append(rs.getString("PUBLISH_TIME"));
-                line.append(",");
-                line.append(rs.getString("DELIVERY_TIME"));
-                line.append(",");
-                line.append(rs.getString("AverageDelay"));
-                line.append(",");
-
-                line.append("\n");
-                out.write(line.toString().getBytes());
-                out.flush();
-         }
-    }
-
-    /**
-     * rsToJson - Converting RS to JSON object
-     * @exception IOException, SQLException
-     * @param out ServletOutputStream, rs as ResultSet
-     */
-    public void rsToJson(ResultSet rs, ServletOutputStream out) throws IOException, SQLException {
-
-        String fields[] = {"FEEDNAME","FEEDID","FILES_PUBLISHED","PUBLISH_LENGTH", "FILES_DELIVERED", "DELIVERED_LENGTH", "SUBSCRIBER_URL", "SUBID", "PUBLISH_TIME","DELIVERY_TIME", "AverageDelay"};
-        StringBuffer line = new StringBuffer();
-
-         line.append("[\n");
-
-         while(rs.next()) {
-             LOGJSONObject j2 = new LOGJSONObject();
-             for (String key : fields) {
-                Object v = rs.getString(key);
-                if (v != null)
-                    j2.put(key.toLowerCase(), v);
-                else
-                    j2.put(key.toLowerCase(), "");
-            }
-            line =  line.append(j2.toString());;
-            line.append(",\n");
-         }
-         line.append("]");
-        out.print(line.toString());
-    }
-
-    /**
-     * getFeedIdsByGroupId - Getting FEEDID's by GROUP ID.
-     * @exception SQL Query SQLException.
-     * @param groupIds
-     */
-    public StringBuffer getFeedIdsByGroupId(int groupIds) throws SQLException{
-
-        DB db = null;
-        Connection conn = null;
-        PreparedStatement prepareStatement = null;
-        ResultSet resultSet=null;
-        String sqlGoupid = null;
-        StringBuffer feedIds = new StringBuffer();
-
-        try {
-            db = new DB();
-            conn = db.getConnection();
-            sqlGoupid= " SELECT FEEDID from FEEDS  WHERE GROUPID = ?";
-            prepareStatement =conn.prepareStatement(sqlGoupid);
-            prepareStatement.setInt(1, groupIds);
-            resultSet=prepareStatement.executeQuery();
-            while(resultSet.next()){
-                feedIds.append(resultSet.getInt("FEEDID"));
-                feedIds.append(",");
-            }
-            feedIds.deleteCharAt(feedIds.length()-1);
-        System.out.println("feedIds"+feedIds.toString());
-
-        } catch (SQLException e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                    if(resultSet != null) {
-                        resultSet.close();
-                        resultSet = null;
-                    }
-
-                    if(prepareStatement != null) {
-                        prepareStatement.close();
-                        prepareStatement = null;
-                    }
-
-                    if(conn != null){
-                        db.release(conn);
-                    }
-                } catch(Exception e) {
-                    e.printStackTrace();
-                }
-        }
-        return feedIds;
+    if (req.getParameter("feedid") != null && req.getParameter("groupid") == null) {
+      map.put("feedids", req.getParameter("feedid").replace("|", ",").toString());
     }
 
+    if (req.getParameter("groupid") != null && req.getParameter("feedid") == null) {
+      StringBuffer groupid1 = new StringBuffer();
 
-    /**
-     * queryGeneretor - Generating sql query
-     * @exception ParseException
-     * @param map as key value pare of all user input fields
-     */
-    public String queryGeneretor(Map<String, String> map) throws ParseException{
+      try {
+        System.out.println("feeedidsssssssss");
+        groupid1 = this.getFeedIdsByGroupId(Integer.parseInt(req.getParameter("groupid")));
+        System.out.println("feeedids" + req.getParameter("groupid"));
 
-        String sql = null;
-        String eventType = null;
-        String feedids = null;
-        String start_time = null;
-        String end_time = null;
-        String subid=" ";
-        if(map.get("eventType") != null){
-            eventType=(String) map.get("eventType");
-        }
-        if(map.get("feedids") != null){
-            feedids=(String) map.get("feedids");
-        }
-        if(map.get("start_time") != null){
-            start_time=(String) map.get("start_time");
-        }
-        if(map.get("end_time") != null){
-            end_time=(String) map.get("end_time");
-        }
-        if("all".equalsIgnoreCase(eventType)){
-            eventType="PUB','DEL, EXP, PBF";
-        }
-        if(map.get("subid") != null){
-            subid=(String) map.get("subid");
-        }
+        map.put("feedids", groupid1.toString());
+        System.out.println("groupid1" + groupid1.toString());
 
-        eventlogger.info("Generating sql query to get Statistics resultset. ");
 
-        if(end_time==null && start_time==null ){
+      } catch (NumberFormatException e) {
+        e.printStackTrace();
+      } catch (SQLException e) {
+        e.printStackTrace();
+      }
+    }
+    if (req.getParameter("groupid") != null && req.getParameter("feedid") != null) {
+      StringBuffer groupid1 = new StringBuffer();
 
+      try {
+        System.out.println("both r not null");
+        groupid1 = this.getFeedIdsByGroupId(Integer.parseInt(req.getParameter("groupid")));
+        System.out.println("feeedids" + req.getParameter("groupid"));
+        groupid1.append(",");
+        groupid1.append(req.getParameter("feedid").replace("|", ",").toString());
 
-                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";
+        map.put("feedids", groupid1.toString());
 
-            return sql;
-        }else if(start_time!=null && end_time==null ){
+        System.out.println("groupid1" + groupid1.toString());
 
-            long inputTimeInMilli=60000*Long.parseLong(start_time);
-            Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
-            long currentTimeInMilli=cal.getTimeInMillis();
-            long compareTime=currentTimeInMilli-inputTimeInMilli;
 
-              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";
+      } catch (NumberFormatException e) {
+        e.printStackTrace();
+      } catch (SQLException e) {
+        e.printStackTrace();
+      }
+    }
 
-             return sql;
+    if (req.getParameter("subid") != null && req.getParameter("feedid") != null) {
+      StringBuffer subidstr = new StringBuffer();
+      subidstr.append("and e.DELIVERY_SUBID in(");
 
-        }else{
-            SimpleDateFormat inFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
-            Date startDate=inFormat.parse(start_time);
-            Date endDate=inFormat.parse(end_time);
+      subidstr.append(req.getParameter("subid").replace("|", ",").toString());
+      subidstr.append(")");
+      map.put("subid", subidstr.toString());
+    }
+    if (req.getParameter("subid") != null && req.getParameter("groupid") != null) {
+      StringBuffer subidstr = new StringBuffer();
+      subidstr.append("and e.DELIVERY_SUBID in(");
 
-            long startInMillis=startDate.getTime();
-            long endInMillis=endDate.getTime();
+      subidstr.append(req.getParameter("subid").replace("|", ",").toString());
+      subidstr.append(")");
+      map.put("subid", subidstr.toString());
+    }
+    if (req.getParameter("type") != null) {
+      map.put("eventType", req.getParameter("type").replace("|", ",").toString());
+    }
+    if (req.getParameter("output_type") != null) {
+      map.put("output_type", req.getParameter("output_type").toString());
+    }
+    if (req.getParameter("start_time") != null) {
+      map.put("start_time", req.getParameter("start_time").toString());
+    }
+    if (req.getParameter("end_time") != null) {
+      map.put("end_time", req.getParameter("end_time").toString());
+    }
 
-             {
+    if (req.getParameter("time") != null) {
+      map.put("start_time", req.getParameter("time").toString());
+      map.put("end_time", null);
+    }
 
-                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";
+    if (req.getParameter("output_type") != null) {
+      outputType = req.getParameter("output_type");
+    }
 
-            }
-            return sql;
+    try {
+
+      String filterQuery = this.queryGeneretor(map);
+      eventlogger.debug("SQL Query for Statistics resultset. " + filterQuery);
+
+      ResultSet rs = this.getRecordsForSQL(filterQuery);
+
+      if (outputType.equals("csv")) {
+        resp.setContentType("application/octet-stream");
+        Date date = new Date();
+        SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-YYYY HH:mm:ss");
+        resp.setHeader("Content-Disposition",
+            "attachment; filename=\"result:" + dateFormat.format(date) + ".csv\"");
+        eventlogger.info("Generating CSV file from Statistics resultset");
+
+        rsToCSV(rs, out);
+      } else {
+        eventlogger.info("Generating JSON for Statistics resultset");
+        this.rsToJson(rs, out);
+      }
+    } catch (IOException e) {
+      eventlogger.error("IOException - Generating JSON/CSV:" + e);
+      e.printStackTrace();
+    } catch (JSONException e) {
+      eventlogger.error("JSONException - executing SQL query:" + e);
+      e.printStackTrace();
+    } catch (SQLException e) {
+      eventlogger.error("SQLException - executing SQL query:" + e);
+      e.printStackTrace();
+    } catch (ParseException e) {
+      eventlogger.error("ParseException - executing SQL query:" + e);
+      e.printStackTrace();
+    }
+  }
+
+
+  /**
+   * rsToJson - Converting RS to JSON object
+   *
+   * @param out ServletOutputStream, rs as ResultSet
+   * @throws IOException, SQLException
+   */
+  public void rsToCSV(ResultSet rs, ServletOutputStream out) throws IOException, SQLException {
+    String header = "FEEDNAME,FEEDID,FILES_PUBLISHED,PUBLISH_LENGTH, FILES_DELIVERED, DELIVERED_LENGTH, SUBSCRIBER_URL, SUBID, PUBLISH_TIME,DELIVERY_TIME, AverageDelay\n";
+
+    out.write(header.getBytes());
+
+    while (rs.next()) {
+      StringBuffer line = new StringBuffer();
+      line.append(rs.getString("FEEDNAME"));
+      line.append(",");
+      line.append(rs.getString("FEEDID"));
+      line.append(",");
+      line.append(rs.getString("FILES_PUBLISHED"));
+      line.append(",");
+      line.append(rs.getString("PUBLISH_LENGTH"));
+      line.append(",");
+      line.append(rs.getString("FILES_DELIVERED"));
+      line.append(",");
+      line.append(rs.getString("DELIVERED_LENGTH"));
+      line.append(",");
+      line.append(rs.getString("SUBSCRIBER_URL"));
+      line.append(",");
+      line.append(rs.getString("SUBID"));
+      line.append(",");
+      line.append(rs.getString("PUBLISH_TIME"));
+      line.append(",");
+      line.append(rs.getString("DELIVERY_TIME"));
+      line.append(",");
+      line.append(rs.getString("AverageDelay"));
+      line.append(",");
+
+      line.append("\n");
+      out.write(line.toString().getBytes());
+      out.flush();
+    }
+  }
+
+  /**
+   * rsToJson - Converting RS to JSON object
+   *
+   * @param out ServletOutputStream, rs as ResultSet
+   * @throws IOException, SQLException
+   */
+  public void rsToJson(ResultSet rs, ServletOutputStream out) throws IOException, SQLException {
+
+    String fields[] = {"FEEDNAME", "FEEDID", "FILES_PUBLISHED", "PUBLISH_LENGTH", "FILES_DELIVERED",
+        "DELIVERED_LENGTH", "SUBSCRIBER_URL", "SUBID", "PUBLISH_TIME", "DELIVERY_TIME",
+        "AverageDelay"};
+    StringBuffer line = new StringBuffer();
+
+    line.append("[\n");
+
+    while (rs.next()) {
+      LOGJSONObject j2 = new LOGJSONObject();
+      for (String key : fields) {
+        Object v = rs.getString(key);
+        if (v != null) {
+          j2.put(key.toLowerCase(), v);
+        } else {
+          j2.put(key.toLowerCase(), "");
         }
+      }
+      line = line.append(j2.toString());
+      line.append(",\n");
     }
-
-
-    /**
-     * PUT a Statistics URL -- not supported.
-     */
-    @Override
-    public void doPut(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-        String message = "PUT not allowed for the StatisticsURL.";
-        EventLogRecord elr = new EventLogRecord(req);
-        elr.setMessage(message);
-        elr.setResult(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
-        eventlogger.info(elr);
-        resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, message);
-    }
-    /**
-     * POST a Statistics URL -- not supported.
-     */
-    @Override
-    public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-        String message = "POST not allowed for the StatisticsURL.";
-        EventLogRecord elr = new EventLogRecord(req);
-        elr.setMessage(message);
-        elr.setResult(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
-        eventlogger.info(elr);
-        resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, message);
-    }
-
-    private Map<String, String> buildMapFromRequest(HttpServletRequest req) {
-        Map<String, String> map = new HashMap<String, String>();
-        String s = req.getParameter("type");
-        if (s != null) {
-            if (s.equals("pub") || s.equals("del") || s.equals("exp")) {
-                map.put("type", s);
-            } else {
-                map.put("err", "bad type");
-                return map;
-            }
-        } else
-        map.put("type", "all");
-        map.put("publishSQL", "");
-        map.put("statusSQL", "");
-        map.put("resultSQL", "");
-        map.put("reasonSQL", "");
-
-        s = req.getParameter("publishId");
-        if (s != null) {
-            if (s.indexOf("'") >= 0) {
-                map.put("err", "bad publishId");
-                return map;
-            }
-            map.put("publishSQL", " AND PUBLISH_ID = '"+s+"'");
+    line.append("]");
+    out.print(line.toString());
+  }
+
+  /**
+   * getFeedIdsByGroupId - Getting FEEDID's by GROUP ID.
+   *
+   * @throws SQL Query SQLException.
+   */
+  public StringBuffer getFeedIdsByGroupId(int groupIds) throws SQLException {
+
+    DB db = null;
+    Connection conn = null;
+    PreparedStatement prepareStatement = null;
+    ResultSet resultSet = null;
+    String sqlGoupid = null;
+    StringBuffer feedIds = new StringBuffer();
+
+    try {
+      db = new DB();
+      conn = db.getConnection();
+      sqlGoupid = " SELECT FEEDID from FEEDS  WHERE GROUPID = ?";
+      prepareStatement = conn.prepareStatement(sqlGoupid);
+      prepareStatement.setInt(1, groupIds);
+      resultSet = prepareStatement.executeQuery();
+      while (resultSet.next()) {
+        feedIds.append(resultSet.getInt("FEEDID"));
+        feedIds.append(",");
+      }
+      feedIds.deleteCharAt(feedIds.length() - 1);
+      System.out.println("feedIds" + feedIds.toString());
+
+    } catch (SQLException e) {
+      e.printStackTrace();
+    } finally {
+      try {
+        if (resultSet != null) {
+          resultSet.close();
+          resultSet = null;
         }
 
-        s = req.getParameter("statusCode");
-        if (s != null) {
-            String sql = null;
-            if (s.equals("success")) {
-                sql = " AND STATUS >= 200 AND STATUS < 300";
-            } else if (s.equals("redirect")) {
-                sql = " AND STATUS >= 300 AND STATUS < 400";
-            } else if (s.equals("failure")) {
-                sql = " AND STATUS >= 400";
-            } else {
-                try {
-                    Integer n = Integer.parseInt(s);
-                    if ((n >= 100 && n < 600) || (n == -1))
-                        sql = " AND STATUS = " + n;
-                } catch (NumberFormatException e) {
-                }
-            }
-            if (sql == null) {
-                map.put("err", "bad statusCode");
-                return map;
-            }
-            map.put("statusSQL", sql);
-            map.put("resultSQL", sql.replaceAll("STATUS", "RESULT"));
+        if (prepareStatement != null) {
+          prepareStatement.close();
+          prepareStatement = null;
         }
 
-        s = req.getParameter("expiryReason");
-        if (s != null) {
-            map.put("type", "exp");
-            if (s.equals("notRetryable")) {
-                map.put("reasonSQL", " AND REASON = 'notRetryable'");
-            } else if (s.equals("retriesExhausted")) {
-                map.put("reasonSQL", " AND REASON = 'retriesExhausted'");
-            } else if (s.equals("diskFull")) {
-                map.put("reasonSQL", " AND REASON = 'diskFull'");
-            } else if (s.equals("other")) {
-                map.put("reasonSQL", " AND REASON = 'other'");
-            } else {
-                map.put("err", "bad expiryReason");
-                return map;
-            }
+        if (conn != null) {
+          db.release(conn);
         }
+      } catch (Exception e) {
+        e.printStackTrace();
+      }
+    }
+    return feedIds;
+  }
+
+
+  /**
+   * queryGeneretor - Generating sql query
+   *
+   * @param map as key value pare of all user input fields
+   */
+  public String queryGeneretor(Map<String, String> map) throws ParseException {
+
+    String sql = null;
+    String eventType = null;
+    String feedids = null;
+    String start_time = null;
+    String end_time = null;
+    String subid = " ";
+    if (map.get("eventType") != null) {
+      eventType = (String) map.get("eventType");
+    }
+    if (map.get("feedids") != null) {
+      feedids = (String) map.get("feedids");
+    }
+    if (map.get("start_time") != null) {
+      start_time = (String) map.get("start_time");
+    }
+    if (map.get("end_time") != null) {
+      end_time = (String) map.get("end_time");
+    }
+    if ("all".equalsIgnoreCase(eventType)) {
+      eventType = "PUB','DEL, EXP, PBF";
+    }
+    if (map.get("subid") != null) {
+      subid = (String) map.get("subid");
+    }
 
-        long stime = getTimeFromParam(req.getParameter("start"));
-        if (stime < 0) {
-            map.put("err", "bad start");
-            return map;
-        }
-        long etime = getTimeFromParam(req.getParameter("end"));
-        if (etime < 0) {
-            map.put("err", "bad end");
-            return map;
-        }
-        if (stime == 0 && etime == 0) {
-            etime = System.currentTimeMillis();
-            stime = etime - TWENTYFOUR_HOURS;
-        } else if (stime == 0) {
-            stime = etime - TWENTYFOUR_HOURS;
-        } else if (etime == 0) {
-            etime = stime + TWENTYFOUR_HOURS;
-        }
-        map.put("timeSQL", String.format(" AND EVENT_TIME >= %d AND EVENT_TIME <= %d", stime, etime));
+    eventlogger.info("Generating sql query to get Statistics resultset. ");
+
+    if (end_time == null && start_time == null) {
+
+      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";
+
+      return sql;
+    } else if (start_time != null && end_time == null) {
+
+      long inputTimeInMilli = 60000 * Long.parseLong(start_time);
+      Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
+      long currentTimeInMilli = cal.getTimeInMillis();
+      long compareTime = currentTimeInMilli - inputTimeInMilli;
+
+      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";
+
+      return sql;
+
+    } else {
+      SimpleDateFormat inFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+      Date startDate = inFormat.parse(start_time);
+      Date endDate = inFormat.parse(end_time);
+
+      long startInMillis = startDate.getTime();
+      long endInMillis = endDate.getTime();
+
+      {
+
+        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";
+
+      }
+      return sql;
+    }
+  }
+
+
+  /**
+   * PUT a Statistics URL -- not supported.
+   */
+  @Override
+  public void doPut(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+    String message = "PUT not allowed for the StatisticsURL.";
+    EventLogRecord elr = new EventLogRecord(req);
+    elr.setMessage(message);
+    elr.setResult(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
+    eventlogger.info(elr);
+    resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, message);
+  }
+
+  /**
+   * POST a Statistics URL -- not supported.
+   */
+  @Override
+  public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+    String message = "POST not allowed for the StatisticsURL.";
+    EventLogRecord elr = new EventLogRecord(req);
+    elr.setMessage(message);
+    elr.setResult(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
+    eventlogger.info(elr);
+    resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, message);
+  }
+
+  private Map<String, String> buildMapFromRequest(HttpServletRequest req) {
+    Map<String, String> map = new HashMap<String, String>();
+    String s = req.getParameter("type");
+    if (s != null) {
+      if (s.equals("pub") || s.equals("del") || s.equals("exp")) {
+        map.put("type", s);
+      } else {
+        map.put("err", "bad type");
         return map;
+      }
+    } else {
+      map.put("type", "all");
     }
-    private long getTimeFromParam(final String s) {
-        if (s == null)
-            return 0;
-        try {
-            // First, look for an RFC 3339 date
-            String fmt = (s.indexOf('.') > 0) ? fmt2 : fmt1;
-            SimpleDateFormat sdf = new SimpleDateFormat(fmt);
-            Date d = sdf.parse(s);
-            return d.getTime();
-        } catch (ParseException e) {
-        }
+    map.put("publishSQL", "");
+    map.put("statusSQL", "");
+    map.put("resultSQL", "");
+    map.put("reasonSQL", "");
+
+    s = req.getParameter("publishId");
+    if (s != null) {
+      if (s.indexOf("'") >= 0) {
+        map.put("err", "bad publishId");
+        return map;
+      }
+      map.put("publishSQL", " AND PUBLISH_ID = '" + s + "'");
+    }
+
+    s = req.getParameter("statusCode");
+    if (s != null) {
+      String sql = null;
+      if (s.equals("success")) {
+        sql = " AND STATUS >= 200 AND STATUS < 300";
+      } else if (s.equals("redirect")) {
+        sql = " AND STATUS >= 300 AND STATUS < 400";
+      } else if (s.equals("failure")) {
+        sql = " AND STATUS >= 400";
+      } else {
         try {
-            // Also allow a long (in ms); useful for testing
-            long n = Long.parseLong(s);
-            return n;
+          Integer n = Integer.parseInt(s);
+          if ((n >= 100 && n < 600) || (n == -1)) {
+            sql = " AND STATUS = " + n;
+          }
         } catch (NumberFormatException e) {
         }
-        intlogger.info("Error parsing time="+s);
-        return -1;
+      }
+      if (sql == null) {
+        map.put("err", "bad statusCode");
+        return map;
+      }
+      map.put("statusSQL", sql);
+      map.put("resultSQL", sql.replaceAll("STATUS", "RESULT"));
     }
 
+    s = req.getParameter("expiryReason");
+    if (s != null) {
+      map.put("type", "exp");
+      if (s.equals("notRetryable")) {
+        map.put("reasonSQL", " AND REASON = 'notRetryable'");
+      } else if (s.equals("retriesExhausted")) {
+        map.put("reasonSQL", " AND REASON = 'retriesExhausted'");
+      } else if (s.equals("diskFull")) {
+        map.put("reasonSQL", " AND REASON = 'diskFull'");
+      } else if (s.equals("other")) {
+        map.put("reasonSQL", " AND REASON = 'other'");
+      } else {
+        map.put("err", "bad expiryReason");
+        return map;
+      }
+    }
 
-    private ResultSet getRecordsForSQL(String sql) {
-        intlogger.debug(sql);
-        long start = System.currentTimeMillis();
-        DB db = new DB();
-        Connection conn = null;
-        ResultSet rs=null;
+    long stime = getTimeFromParam(req.getParameter("start"));
+    if (stime < 0) {
+      map.put("err", "bad start");
+      return map;
+    }
+    long etime = getTimeFromParam(req.getParameter("end"));
+    if (etime < 0) {
+      map.put("err", "bad end");
+      return map;
+    }
+    if (stime == 0 && etime == 0) {
+      etime = System.currentTimeMillis();
+      stime = etime - TWENTYFOUR_HOURS;
+    } else if (stime == 0) {
+      stime = etime - TWENTYFOUR_HOURS;
+    } else if (etime == 0) {
+      etime = stime + TWENTYFOUR_HOURS;
+    }
+    map.put("timeSQL", String.format(" AND EVENT_TIME >= %d AND EVENT_TIME <= %d", stime, etime));
+    return map;
+  }
 
-        try {
-            conn = db.getConnection();
-            Statement  stmt = conn.createStatement();
-            PreparedStatement pst=conn.prepareStatement(sql);
-            rs=pst.executeQuery();
-            //this.rsToJson(rs)
-            //rs.close();
-            stmt.close();
-        } catch (SQLException e) {
-            e.printStackTrace();
-        } finally {
-            if (conn != null)
-                db.release(conn);
-        }
+  private long getTimeFromParam(final String s) {
+    if (s == null) {
+      return 0;
+    }
+    try {
+      // First, look for an RFC 3339 date
+      String fmt = (s.indexOf('.') > 0) ? fmt2 : fmt1;
+      SimpleDateFormat sdf = new SimpleDateFormat(fmt);
+      Date d = sdf.parse(s);
+      return d.getTime();
+    } catch (ParseException e) {
+    }
+    try {
+      // Also allow a long (in ms); useful for testing
+      long n = Long.parseLong(s);
+      return n;
+    } catch (NumberFormatException e) {
+    }
+    intlogger.info("Error parsing time=" + s);
+    return -1;
+  }
+
+
+  private ResultSet getRecordsForSQL(String sql) {
+    intlogger.debug(sql);
+    long start = System.currentTimeMillis();
+    DB db = new DB();
+    Connection conn = null;
+    ResultSet rs = null;
+
+    try {
+      conn = db.getConnection();
+      Statement stmt = conn.createStatement();
+      PreparedStatement pst = conn.prepareStatement(sql);
+      rs = pst.executeQuery();
+      //this.rsToJson(rs)
+      //rs.close();
+      stmt.close();
+    } catch (SQLException e) {
+      e.printStackTrace();
+    } finally {
+      if (conn != null) {
+        db.release(conn);
+      }
+    }
 
-        intlogger.debug("Time: " + (System.currentTimeMillis()-start) + " ms");
+    intlogger.debug("Time: " + (System.currentTimeMillis() - start) + " ms");
 
-        return rs;
-    }
+    return rs;
+  }
 }
diff --git a/datarouter-prov/src/main/resources/docker-compose/prov_data/provserver.properties b/datarouter-prov/src/main/resources/docker-compose/prov_data/provserver.properties
index 383bce31..7758a64d 100644
--- a/datarouter-prov/src/main/resources/docker-compose/prov_data/provserver.properties
+++ b/datarouter-prov/src/main/resources/docker-compose/prov_data/provserver.properties
@@ -40,7 +40,7 @@ org.onap.dmaap.datarouter.provserver.logretention        = 30
 
 #DMAAP-597 (Tech Dept) REST request source IP auth
 # relaxation to accommodate OOM kubernetes deploy
-org.onap.dmaap.datarouter.provserver.isaddressauthenabled = true
+org.onap.dmaap.datarouter.provserver.isaddressauthenabled = false
 
 # Database access
 org.onap.dmaap.datarouter.db.driver   = org.mariadb.jdbc.Driver
diff --git a/datarouter-prov/src/main/resources/provserver.properties b/datarouter-prov/src/main/resources/provserver.properties
index 383bce31..7758a64d 100644
--- a/datarouter-prov/src/main/resources/provserver.properties
+++ b/datarouter-prov/src/main/resources/provserver.properties
@@ -40,7 +40,7 @@ org.onap.dmaap.datarouter.provserver.logretention        = 30
 
 #DMAAP-597 (Tech Dept) REST request source IP auth
 # relaxation to accommodate OOM kubernetes deploy
-org.onap.dmaap.datarouter.provserver.isaddressauthenabled = true
+org.onap.dmaap.datarouter.provserver.isaddressauthenabled = false
 
 # Database access
 org.onap.dmaap.datarouter.db.driver   = org.mariadb.jdbc.Driver
diff --git a/datarouter-prov/src/test/java/datarouter/provisioning/IntegrationTestInternalMisc.java b/datarouter-prov/src/test/java/datarouter/provisioning/IntegrationTestInternalMisc.java
index fd00ea51..bc724079 100644
--- a/datarouter-prov/src/test/java/datarouter/provisioning/IntegrationTestInternalMisc.java
+++ b/datarouter-prov/src/test/java/datarouter/provisioning/IntegrationTestInternalMisc.java
@@ -69,7 +69,7 @@ public class IntegrationTestInternalMisc extends IntegrationTestBase {
 
     @Test
     public void testInternalHalt() {
-        String url   = props.getProperty("test.host") + "/internal/halt";
+        String url   = props.getProperty("test.host") + "/halt";
         HttpGet httpPost = new HttpGet(url);
         try {
             httpPost.addHeader(FeedServlet.BEHALF_HEADER, "JUnit");
diff --git a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/InternalServletTest.java b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/InternalServletTest.java
index 104d137a..f8342449 100644..100755
--- a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/InternalServletTest.java
+++ b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/InternalServletTest.java
@@ -22,6 +22,22 @@
  ******************************************************************************/
 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);
+  }
 }
diff --git a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/StatisticsServletTest.java b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/StatisticsServletTest.java
index e42a8a8c..0a9632eb 100644..100755
--- a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/StatisticsServletTest.java
+++ b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/StatisticsServletTest.java
@@ -22,100 +22,124 @@
  ******************************************************************************/
 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");
+  }
 }
diff --git a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/SubscribeServletTest.java b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/SubscribeServletTest.java
index eea213f4..cdf96ba6 100644..100755
--- a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/SubscribeServletTest.java
+++ b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/SubscribeServletTest.java
@@ -270,7 +270,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) {
diff --git a/pom.xml b/pom.xml
index 66ac7b73..d3327ba9 100755
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
         <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>
         <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
         <sonar.projectVersion>${project.version}</sonar.projectVersion>
-        <jetty.version>9.4.12.RC2</jetty.version>
+        <jetty.version>9.3.8.RC0</jetty.version>
         <jetty.websocket.version>8.2.0.v20160908</jetty.websocket.version>
         <thoughtworks.version>1.4.10</thoughtworks.version>
         <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>