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
// 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
if (req.getParameter("type") != null) {\r
map.put(EVENT_TYPE, req.getParameter("type").replace("|", ","));\r
}\r
- if (req.getParameter(OUTPUT_TYPE) != null) {\r
- map.put(OUTPUT_TYPE, req.getParameter(OUTPUT_TYPE));\r
+ if (req.getParameter(OUTPUT_TYPE) != null && req.getParameter(OUTPUT_TYPE).equals(CSV_OUTPUT_TYPE)) {\r
+ map.put(OUTPUT_TYPE, req.getParameter(CSV_OUTPUT_TYPE));\r
+ outputType = CSV_OUTPUT_TYPE;\r
+ }\r
+ if (req.getParameter(OUTPUT_TYPE) != null && req.getParameter(OUTPUT_TYPE).equals(JSON_OUTPUT_TYPE)) {\r
+ map.put(OUTPUT_TYPE, req.getParameter(JSON_OUTPUT_TYPE));\r
}\r
if (req.getParameter(START_TIME) != null) {\r
map.put(START_TIME, req.getParameter(START_TIME));\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
- }\r
try {\r
this.getRecordsForSQL(map, outputType, resp.getOutputStream(), resp);\r
} catch (IOException ioe) {\r
try (Connection conn = ProvDbUtils.getInstance().getConnection();\r
PreparedStatement ps = conn.prepareStatement(filterQuery);\r
ResultSet rs = ps.executeQuery()) {\r
- if ("csv".equals(outputType)) {\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