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