X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2FStatisticsServlet.java;h=1c324e5a4868e06f9d1fa5f232261e510df8ad7f;hb=bda6aeaa60607ab4fe5af508156019d7bd5c0ce4;hp=b0695449054ebe5aeddddd363dbd19b7e29168d7;hpb=0645ccf674f388cc989ef43d2ce24f359915e453;p=dmaap%2Fdatarouter.git diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java index b0695449..1c324e5a 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 @@ -23,6 +23,9 @@ package org.onap.dmaap.datarouter.provisioning; +import static org.onap.dmaap.datarouter.provisioning.utils.HttpServletUtils.sendResponseError; + +import jakarta.servlet.ServletOutputStream; import java.io.IOException; import java.sql.Connection; import java.sql.PreparedStatement; @@ -30,36 +33,55 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.Map; import java.util.TimeZone; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.json.JSONException; import org.onap.dmaap.datarouter.provisioning.beans.EventLogRecord; -import org.onap.dmaap.datarouter.provisioning.utils.DB; import org.onap.dmaap.datarouter.provisioning.utils.LOGJSONObject; +import org.onap.dmaap.datarouter.provisioning.utils.ProvDbUtils; -import static org.onap.dmaap.datarouter.provisioning.utils.HttpServletUtils.sendResponseError; /** * This Servlet handles requests to the <Statistics API> and <Statistics consilidated - * resultset>, + * resultset>. * * @author Manish Singh * @version $Id: StatisticsServlet.java,v 1.11 2016/08/10 17:27:02 Manish Exp $ */ @SuppressWarnings("serial") + 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'"; public static final String FEEDID = "FEEDID"; + public static final String START = "start"; + + //sql Strings + private static final String SQL_SELECT_NAME = "SELECT (SELECT NAME FROM FEEDS AS f WHERE f.FEEDID in("; + private static final String SQL_FEED_ID = ") and f.FEEDID=e.FEEDID) AS FEEDNAME, e.FEEDID as FEEDID, "; + private static final String SQL_SELECT_COUNT = "(SELECT COUNT(*) FROM LOG_RECORDS AS c WHERE c.FEEDID in("; + private static final String SQL_TYPE_PUB = ") and c.FEEDID=e.FEEDID AND c.TYPE='PUB') AS FILES_PUBLISHED,"; + private static final String SQL_SELECT_SUM = "(SELECT SUM(content_length) FROM LOG_RECORDS AS c WHERE c.FEEDID in("; + private static final String SQL_PUBLISH_LENGTH = ") and c.FEEDID=e.FEEDID AND c.TYPE='PUB') AS PUBLISH_LENGTH, COUNT(e.EVENT_TIME) as FILES_DELIVERED,"; + private static final String SQL_SUBSCRIBER_URL = " sum(m.content_length) as DELIVERED_LENGTH, SUBSTRING_INDEX(e.REQURI,'/',+3) as SUBSCRIBER_URL,"; + private static final String SQL_SUB_ID = " e.DELIVERY_SUBID as SUBID, "; + private static final String SQL_DELIVERY_TIME = " e.EVENT_TIME AS PUBLISH_TIME, m.EVENT_TIME AS DELIVERY_TIME, "; + private static final String SQL_AVERAGE_DELAY = " AVG(e.EVENT_TIME - m.EVENT_TIME)/1000 as AverageDelay FROM LOG_RECORDS"; + private static final String SQL_JOIN_RECORDS = " e JOIN LOG_RECORDS m ON m.PUBLISH_ID = e.PUBLISH_ID AND e.FEEDID IN ("; + private static final String SQL_STATUS_204 = " AND m.STATUS=204 AND e.RESULT=204 "; + private static final String SQL_GROUP_SUB_ID = " group by SUBID"; + private static final String JSON_OUTPUT_TYPE = "json"; + private static final String CSV_OUTPUT_TYPE = "csv"; /** @@ -83,13 +105,14 @@ public class StatisticsServlet extends BaseServlet { public void doGet(HttpServletRequest req, HttpServletResponse resp) { Map map = buildMapFromRequest(req); if (map.get("err") != null) { - sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, "Invalid arguments: " + map.get("err"), eventlogger); + sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, + "Invalid arguments: " + map.get("err"), eventlogger); return; } // check Accept: header?? resp.setStatus(HttpServletResponse.SC_OK); resp.setContentType(LOGLIST_CONTENT_TYPE); - String outputType = "json"; + String outputType = JSON_OUTPUT_TYPE; if (req.getParameter(FEEDID) == null && req.getParameter(GROUPID) == null) { try { resp.getOutputStream().print("Invalid request, Feedid or Group ID is required."); @@ -105,7 +128,7 @@ public class StatisticsServlet extends BaseServlet { try { groupid1 = this.getFeedIdsByGroupId(Integer.parseInt(req.getParameter(GROUPID))); map.put(FEEDIDS, groupid1.toString()); - } catch (NumberFormatException | SQLException e) { + } catch (NumberFormatException e) { eventlogger.error("PROV0172 StatisticsServlet.doGet: " + e.getMessage(), e); } } @@ -116,7 +139,7 @@ public class StatisticsServlet extends BaseServlet { groupid1.append(","); groupid1.append(req.getParameter(FEEDID).replace("|", ",")); map.put(FEEDIDS, groupid1.toString()); - } catch (NumberFormatException | SQLException e) { + } catch (NumberFormatException e) { eventlogger.error("PROV0173 StatisticsServlet.doGet: " + e.getMessage(), e); } } @@ -135,19 +158,41 @@ public class StatisticsServlet extends BaseServlet { } if (req.getParameter(OUTPUT_TYPE) != null) { map.put(OUTPUT_TYPE, req.getParameter(OUTPUT_TYPE)); + outputType = req.getParameter(OUTPUT_TYPE); + } + if (req.getParameter(OUTPUT_TYPE) != null && req.getParameter(OUTPUT_TYPE).equals(JSON_OUTPUT_TYPE)) { + map.put(OUTPUT_TYPE, JSON_OUTPUT_TYPE); } if (req.getParameter(START_TIME) != null) { - map.put(START_TIME, req.getParameter(START_TIME)); + String startTime = req.getParameter(START_TIME); + try { + Long.parseLong(startTime); + map.put(START_TIME, startTime); + } + catch (NumberFormatException e) { + eventlogger.error("Invalid start time StatisticsServlet.doGet: " + e.getMessage(), e); + } } if (req.getParameter(END_TIME) != null) { - map.put(END_TIME, req.getParameter(END_TIME)); + String endTime = req.getParameter(END_TIME); + try { + Long.parseLong(endTime); + map.put(END_TIME, endTime); + } + catch (NumberFormatException e) { + eventlogger.error("Invalid end time StatisticsServlet.doGet: " + e.getMessage(), e); + } } if (req.getParameter("time") != null) { - map.put(START_TIME, req.getParameter("time")); - map.put(END_TIME, null); - } - if (req.getParameter(OUTPUT_TYPE) != null) { - outputType = req.getParameter(OUTPUT_TYPE); + String time = req.getParameter("time"); + try { + Long.parseLong(time); + map.put(START_TIME, time); + map.put(END_TIME, null); + } + catch (NumberFormatException e) { + eventlogger.error("Invalid end time StatisticsServlet.doGet: " + e.getMessage(), e); + } } try { this.getRecordsForSQL(map, outputType, resp.getOutputStream(), resp); @@ -157,14 +202,15 @@ public class StatisticsServlet extends BaseServlet { } - /** - * rsToJson - Converting RS to JSON object + * rsToJson - Converting RS to JSON object. * - * @param out ServletOutputStream, rs as ResultSet - * @throws IOException, SQLException + * @param out ServletOutputStream + * @param rs as ResultSet + * @throws IOException input/output exception + * @throws SQLException SQL exception */ - public void rsToCSV(ResultSet rs, ServletOutputStream out) throws IOException, SQLException { + private 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()); @@ -199,10 +245,12 @@ public class StatisticsServlet extends BaseServlet { } /** - * rsToJson - Converting RS to JSON object + * rsToJson - Converting RS to JSON object. * - * @param out ServletOutputStream, rs as ResultSet - * @throws IOException, SQLException + * @param out ServletOutputStream + * @param rs as ResultSet + * @throws IOException input/output exception + * @throws SQLException SQL exception */ private void rsToJson(ResultSet rs, ServletOutputStream out) throws IOException, SQLException { String[] fields = {"FEEDNAME", FEEDID, "FILES_PUBLISHED", "PUBLISH_LENGTH", "FILES_DELIVERED", @@ -213,9 +261,9 @@ public class StatisticsServlet extends BaseServlet { while (rs.next()) { LOGJSONObject j2 = new LOGJSONObject(); for (String key : fields) { - Object v = rs.getString(key); - if (v != null) { - j2.put(key.toLowerCase(), v); + Object val = rs.getString(key); + if (val != null) { + j2.put(key.toLowerCase(), val); } else { j2.put(key.toLowerCase(), ""); } @@ -230,62 +278,48 @@ public class StatisticsServlet extends BaseServlet { /** * getFeedIdsByGroupId - Getting FEEDID's by GROUP ID. * - * @throws SQLException Query SQLException. + * @param groupIds Integer ref of Group */ - private StringBuilder getFeedIdsByGroupId(int groupIds) throws SQLException { - DB db = null; - Connection conn = null; - ResultSet resultSet = null; - String sqlGoupid = null; + private StringBuilder getFeedIdsByGroupId(int groupIds) { StringBuilder feedIds = new StringBuilder(); - try { - db = new DB(); - conn = db.getConnection(); - sqlGoupid = " SELECT FEEDID from FEEDS WHERE GROUPID = ?"; - try (PreparedStatement prepareStatement = conn.prepareStatement(sqlGoupid)) { - prepareStatement.setInt(1, groupIds); - resultSet = prepareStatement.executeQuery(); + try (Connection conn = ProvDbUtils.getInstance().getConnection(); + PreparedStatement prepareStatement = conn.prepareStatement( + " SELECT FEEDID from FEEDS WHERE GROUPID = ?")) { + prepareStatement.setInt(1, groupIds); + try (ResultSet resultSet = prepareStatement.executeQuery()) { while (resultSet.next()) { feedIds.append(resultSet.getInt(FEEDID)); feedIds.append(","); } - feedIds.deleteCharAt(feedIds.length() - 1); - eventlogger.info("PROV0177 StatisticsServlet.getFeedIdsByGroupId: feedIds = " + feedIds.toString()); } + feedIds.deleteCharAt(feedIds.length() - 1); + eventlogger.info("PROV0177 StatisticsServlet.getFeedIdsByGroupId: feedIds = " + feedIds.toString()); } catch (SQLException e) { eventlogger.error("PROV0175 StatisticsServlet.getFeedIdsByGroupId: " + e.getMessage(), e); - } finally { - try { - if (resultSet != null) { - resultSet.close(); - } - if (conn != null) { - db.release(conn); - } - } catch (Exception e) { - eventlogger.error("PROV0176 StatisticsServlet.getFeedIdsByGroupId: " + e.getMessage(), e); - } } return feedIds; } /** - * queryGeneretor - Generating sql query + * getResultSet - Set the result from the query. * * @param map as key value pare of all user input fields */ - private String queryGeneretor(Map map) throws ParseException { + private void getResultSet(Map map, String outputType, ServletOutputStream out, + HttpServletResponse resp) throws ParseException, SQLException, IOException { String sql; - String eventType = null; String feedids = null; String startTime = null; String endTime = null; + long compareTime = 0; + long startInMillis = 0; + long endInMillis = 0; String subid = " "; - if (map.get(EVENT_TYPE) != null) { - eventType = map.get(EVENT_TYPE); - } + String compareType; + ResultSet rs; + if (map.get(FEEDIDS) != null) { feedids = map.get(FEEDIDS); } @@ -295,63 +329,54 @@ public class StatisticsServlet extends BaseServlet { if (map.get(END_TIME) != null) { endTime = map.get(END_TIME); } - if ("all".equalsIgnoreCase(eventType)) { - eventType = "PUB','DEL, EXP, PBF"; - } if (map.get(SUBID) != null) { subid = map.get(SUBID); } - eventlogger.info("Generating sql query to get Statistics resultset. "); - if (endTime == null && startTime == 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; + sql = SQL_SELECT_NAME + "?" + SQL_FEED_ID + SQL_SELECT_COUNT + "?" + SQL_TYPE_PUB + SQL_SELECT_SUM + + "?" + SQL_PUBLISH_LENGTH + SQL_SUBSCRIBER_URL + SQL_SUB_ID + SQL_DELIVERY_TIME + SQL_AVERAGE_DELAY + + SQL_JOIN_RECORDS + "?" + ") " + SQL_STATUS_204 + SQL_GROUP_SUB_ID; + compareType = "default"; } else if (startTime != null && endTime == null) { - long inputTimeInMilli = 60000 * Long.parseLong(startTime); 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; - + compareTime = currentTimeInMilli - inputTimeInMilli; + sql = SQL_SELECT_NAME + "?" + SQL_FEED_ID + SQL_SELECT_COUNT + "?" + SQL_TYPE_PUB + SQL_SELECT_SUM + + "?" + SQL_PUBLISH_LENGTH + SQL_SUBSCRIBER_URL + SQL_SUB_ID + SQL_DELIVERY_TIME + SQL_AVERAGE_DELAY + + SQL_JOIN_RECORDS + "?" + ") " + SQL_STATUS_204 + + " and e.event_time>=" + "?" + SQL_GROUP_SUB_ID; + compareType = START; } else { SimpleDateFormat inFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); Date startDate = inFormat.parse(startTime); Date endDate = inFormat.parse(endTime); - - 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; + startInMillis = startDate.getTime(); + endInMillis = endDate.getTime(); + sql = SQL_SELECT_NAME + "?" + SQL_FEED_ID + SQL_SELECT_COUNT + "?" + SQL_TYPE_PUB + SQL_SELECT_SUM + + "?" + SQL_PUBLISH_LENGTH + SQL_SUBSCRIBER_URL + SQL_SUB_ID + SQL_DELIVERY_TIME + SQL_AVERAGE_DELAY + + SQL_JOIN_RECORDS + "?" + ") " + SQL_STATUS_204 + + " and e.event_time between " + "?" + " and " + "?" + SQL_GROUP_SUB_ID; + compareType = "startAndEnd"; + } + try (Connection conn = ProvDbUtils.getInstance().getConnection(); + PreparedStatement ps = conn.prepareStatement(sql)) { + eventlogger.debug("SQL Query for Statistics resultset. " + sql); + intlogger.debug(sql); + ps.setString(1, feedids); + ps.setString(2, feedids); + ps.setString(3, feedids); + ps.setString(4, feedids); + if (compareType.equals(START)) { + ps.setLong(5, compareTime); + } + if (compareType.equals("startAndEnd")) { + ps.setLong(5, startInMillis); + ps.setLong(6, endInMillis); + } + rs = ps.executeQuery(); + parseResult(outputType, out, resp, rs); } } @@ -384,10 +409,10 @@ public class StatisticsServlet extends BaseServlet { private Map buildMapFromRequest(HttpServletRequest req) { Map map = new HashMap<>(); - String s = req.getParameter("type"); - if (s != null) { - if ("pub".equals(s) || "del".equals(s) || "exp".equals(s)) { - map.put("type", s); + String str = req.getParameter("type"); + if (str != null) { + if ("pub".equals(str) || "del".equals(str) || "exp".equals(str)) { + map.put("type", str); } else { map.put("err", "bad type"); return map; @@ -400,19 +425,19 @@ public class StatisticsServlet extends BaseServlet { map.put("resultSQL", ""); map.put(REASON_SQL, ""); - s = req.getParameter("publishId"); - if (s != null) { - if (s.indexOf("'") >= 0) { + str = req.getParameter("publishId"); + if (str != null) { + if (str.indexOf("'") >= 0) { map.put("err", "bad publishId"); return map; } - map.put("publishSQL", " AND PUBLISH_ID = '" + s + "'"); + map.put("publishSQL", " AND PUBLISH_ID = '" + str + "'"); } - s = req.getParameter("statusCode"); - if (s != null) { + str = req.getParameter("statusCode"); + if (str != null) { String sql = null; - switch (s) { + switch (str) { case "success": sql = " AND STATUS >= 200 AND STATUS < 300"; break; @@ -424,9 +449,9 @@ public class StatisticsServlet extends BaseServlet { break; default: try { - int n = Integer.parseInt(s); - if ((n >= 100 && n < 600) || (n == -1)) { - sql = " AND STATUS = " + n; + int statusCode = Integer.parseInt(str); + if ((statusCode >= 100 && statusCode < 600) || (statusCode == -1)) { + sql = " AND STATUS = " + statusCode; } } catch (NumberFormatException e) { eventlogger.error("Failed to parse input", e); @@ -438,13 +463,13 @@ public class StatisticsServlet extends BaseServlet { return map; } map.put("statusSQL", sql); - map.put("resultSQL", sql.replaceAll("STATUS", "RESULT")); + map.put("resultSQL", sql.replace("STATUS", "RESULT")); } - s = req.getParameter("expiryReason"); - if (s != null) { + str = req.getParameter("expiryReason"); + if (str != null) { map.put("type", "exp"); - switch (s) { + switch (str) { case "notRetryable": map.put(REASON_SQL, " AND REASON = 'notRetryable'"); break; @@ -463,7 +488,7 @@ public class StatisticsServlet extends BaseServlet { } } - long stime = getTimeFromParam(req.getParameter("start")); + long stime = getTimeFromParam(req.getParameter(START)); if (stime < 0) { map.put("err", "bad start"); return map; @@ -485,56 +510,38 @@ public class StatisticsServlet extends BaseServlet { return map; } - private long getTimeFromParam(final String s) { - if (s == null) { + private long getTimeFromParam(final String str) { + if (str == null) { return 0; } try { // First, look for an RFC 3339 date - String fmt = (s.indexOf('.') > 0) ? FMT2 : FMT1; + String fmt = (str.indexOf('.') > 0) ? FMT2 : FMT1; SimpleDateFormat sdf = new SimpleDateFormat(fmt); - Date d = sdf.parse(s); - return d.getTime(); + Date date = sdf.parse(str); + return date.getTime(); } catch (ParseException e) { intlogger.error("Exception in getting Time :- " + e.getMessage(), e); } try { // Also allow a long (in ms); useful for testing - return Long.parseLong(s); + return Long.parseLong(str); } catch (NumberFormatException e) { intlogger.error("Exception in getting Time :- " + e.getMessage(), e); } - intlogger.info("Error parsing time=" + s); + intlogger.info("Error parsing time=" + str); return -1; } - private void getRecordsForSQL(Map map, String outputType, ServletOutputStream out, HttpServletResponse resp) { + private void getRecordsForSQL(Map map, String outputType, ServletOutputStream out, + HttpServletResponse resp) { + eventlogger.info("Generating sql query to get Statistics resultset. "); try { - String filterQuery = this.queryGeneretor(map); - eventlogger.debug("SQL Query for Statistics resultset. " + filterQuery); - intlogger.debug(filterQuery); long start = System.currentTimeMillis(); - DB db = new DB(); - try (Connection conn = db.getConnection()) { - try (ResultSet rs = conn.prepareStatement(filterQuery).executeQuery()) { - if ("csv".equals(outputType)) { - 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); - } - } - db.release(conn); - } catch (SQLException e) { - eventlogger.error("SQLException:" + e); - } + this.getResultSet(map, outputType, out, resp); intlogger.debug("Time: " + (System.currentTimeMillis() - start) + " ms"); + } catch (SQLException e) { + eventlogger.error("SQLException:" + e.getMessage()); } catch (IOException e) { eventlogger.error("IOException - Generating JSON/CSV:" + e); } catch (JSONException e) { @@ -543,5 +550,20 @@ public class StatisticsServlet extends BaseServlet { eventlogger.error("ParseException - executing SQL query:" + e); } } + + private void parseResult(String outputType, ServletOutputStream out, HttpServletResponse resp, + ResultSet rs) throws IOException, SQLException { + if (CSV_OUTPUT_TYPE.equals(outputType)) { + resp.setContentType("application/octet-stream"); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd-MM-yyyy HH:mm:ss"); + resp.setHeader("Content-Disposition", + "attachment; filename=\"result:" + LocalDateTime.now().format(formatter) + ".csv\""); + eventlogger.info("Generating CSV file from Statistics resultset"); + rsToCSV(rs, out); + } else { + eventlogger.info("Generating JSON for Statistics resultset"); + this.rsToJson(rs, out); + } + } }