import java.sql.PreparedStatement;\r
import java.sql.ResultSet;\r
import java.sql.SQLException;\r
-import java.sql.Statement;\r
import java.text.ParseException;\r
import java.text.SimpleDateFormat;\r
import java.util.Calendar;\r
import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
import org.onap.dmaap.datarouter.provisioning.utils.LOGJSONObject;\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
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
+ private static final String FMT1 = "yyyy-MM-dd'T'HH:mm:ss'Z'";\r
+ private static final String FMT2 = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";\r
+\r
\r
\r
/**\r
* DELETE a logging URL -- not supported.\r
*/\r
@Override\r
- public void doDelete(HttpServletRequest req, HttpServletResponse resp) throws IOException {\r
+ public void doDelete(HttpServletRequest req, HttpServletResponse resp) {\r
String message = "DELETE not allowed for the logURL.";\r
EventLogRecord elr = new EventLogRecord(req);\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_METHOD_NOT_ALLOWED);\r
- eventlogger.info(elr);\r
- resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, message);\r
+ eventlogger.error(elr.toString());\r
+ sendResponseError(resp, HttpServletResponse.SC_METHOD_NOT_ALLOWED, message, eventlogger);\r
}\r
\r
/**\r
* <b>Statistics API</b> document for details on how this method should be invoked.\r
*/\r
@Override\r
- public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {\r
+ public void doGet(HttpServletRequest req, HttpServletResponse resp) {\r
\r
Map<String, String> map = buildMapFromRequest(req);\r
if (map.get("err") != null) {\r
- resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "Invalid arguments: " + map.get("err"));\r
+ sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, "Invalid arguments: " + map.get("err"), eventlogger);\r
return;\r
}\r
// check Accept: header??\r
\r
resp.setStatus(HttpServletResponse.SC_OK);\r
resp.setContentType(LOGLIST_CONTENT_TYPE);\r
- ServletOutputStream out = resp.getOutputStream();\r
\r
String outputType = "json";\r
- String feedids = null;\r
\r
- if (req.getParameter("feedid") == null && req.getParameter("groupid") == null) {\r
- out.print("Invalid request, Feedid or Group ID is required.");\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
+ } catch (IOException ioe) {\r
+ eventlogger.error("PROV0171 StatisticsServlet.doGet: " + ioe.getMessage(), ioe);\r
+ }\r
}\r
\r
- if (req.getParameter("feedid") != null && req.getParameter("groupid") == null) {\r
- map.put("feedids", req.getParameter("feedid").replace("|", ",").toString());\r
+ if (req.getParameter(FEEDID) != null && req.getParameter(GROUPID) == null) {\r
+ map.put(FEEDIDS, req.getParameter(FEEDID).replace("|", ","));\r
}\r
\r
- if (req.getParameter("groupid") != null && req.getParameter("feedid") == null) {\r
+ if (req.getParameter(GROUPID) != null && req.getParameter(FEEDID) == null) {\r
StringBuffer groupid1 = new StringBuffer();\r
\r
try {\r
- System.out.println("feeedidsssssssss");\r
- groupid1 = this.getFeedIdsByGroupId(Integer.parseInt(req.getParameter("groupid")));\r
- System.out.println("feeedids" + req.getParameter("groupid"));\r
-\r
- map.put("feedids", groupid1.toString());\r
- System.out.println("groupid1" + groupid1.toString());\r
-\r
-\r
- } catch (NumberFormatException e) {\r
- e.printStackTrace();\r
- } catch (SQLException e) {\r
- e.printStackTrace();\r
+ groupid1 = this.getFeedIdsByGroupId(Integer.parseInt(req.getParameter(GROUPID)));\r
+ map.put(FEEDIDS, groupid1.toString());\r
+ } catch (NumberFormatException | SQLException e) {\r
+ eventlogger.error("PROV0172 StatisticsServlet.doGet: " + e.getMessage(), e);\r
}\r
}\r
- if (req.getParameter("groupid") != null && req.getParameter("feedid") != null) {\r
+ if (req.getParameter(GROUPID) != null && req.getParameter(FEEDID) != null) {\r
StringBuffer groupid1 = new StringBuffer();\r
\r
try {\r
- System.out.println("both r not null");\r
- groupid1 = this.getFeedIdsByGroupId(Integer.parseInt(req.getParameter("groupid")));\r
- System.out.println("feeedids" + req.getParameter("groupid"));\r
+ groupid1 = this.getFeedIdsByGroupId(Integer.parseInt(req.getParameter(GROUPID)));\r
groupid1.append(",");\r
- groupid1.append(req.getParameter("feedid").replace("|", ",").toString());\r
-\r
- map.put("feedids", groupid1.toString());\r
-\r
- System.out.println("groupid1" + groupid1.toString());\r
-\r
-\r
- } catch (NumberFormatException e) {\r
- e.printStackTrace();\r
- } catch (SQLException e) {\r
- e.printStackTrace();\r
+ groupid1.append(req.getParameter(FEEDID).replace("|", ","));\r
+ map.put(FEEDIDS, groupid1.toString());\r
+ } catch (NumberFormatException | SQLException e) {\r
+ eventlogger.error("PROV0173 StatisticsServlet.doGet: " + e.getMessage(), e);\r
}\r
}\r
\r
- if (req.getParameter("subid") != null && req.getParameter("feedid") != null) {\r
+ if (req.getParameter(SUBID) != null && req.getParameter(FEEDID) != null) {\r
StringBuffer subidstr = new StringBuffer();\r
subidstr.append("and e.DELIVERY_SUBID in(");\r
\r
- subidstr.append(req.getParameter("subid").replace("|", ",").toString());\r
+ subidstr.append(req.getParameter(SUBID).replace("|", ","));\r
subidstr.append(")");\r
- map.put("subid", subidstr.toString());\r
+ map.put(SUBID, subidstr.toString());\r
}\r
- if (req.getParameter("subid") != null && req.getParameter("groupid") != null) {\r
+ if (req.getParameter(SUBID) != null && req.getParameter(GROUPID) != null) {\r
StringBuffer subidstr = new StringBuffer();\r
subidstr.append("and e.DELIVERY_SUBID in(");\r
\r
- subidstr.append(req.getParameter("subid").replace("|", ",").toString());\r
+ subidstr.append(req.getParameter(SUBID).replace("|", ","));\r
subidstr.append(")");\r
- map.put("subid", subidstr.toString());\r
+ map.put(SUBID, subidstr.toString());\r
}\r
if (req.getParameter("type") != null) {\r
- map.put("eventType", req.getParameter("type").replace("|", ",").toString());\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").toString());\r
+ if (req.getParameter(OUTPUT_TYPE) != null) {\r
+ map.put(OUTPUT_TYPE, req.getParameter(OUTPUT_TYPE));\r
}\r
- if (req.getParameter("start_time") != null) {\r
- map.put("start_time", req.getParameter("start_time").toString());\r
+ if (req.getParameter(START_TIME) != null) {\r
+ map.put(START_TIME, req.getParameter(START_TIME));\r
}\r
- if (req.getParameter("end_time") != null) {\r
- map.put("end_time", req.getParameter("end_time").toString());\r
+ if (req.getParameter(END_TIME) != null) {\r
+ map.put(END_TIME, req.getParameter(END_TIME));\r
}\r
\r
if (req.getParameter("time") != null) {\r
- map.put("start_time", req.getParameter("time").toString());\r
- map.put("end_time", null);\r
+ map.put(START_TIME, req.getParameter("time"));\r
+ map.put(END_TIME, null);\r
}\r
\r
- if (req.getParameter("output_type") != null) {\r
- outputType = req.getParameter("output_type");\r
+ if (req.getParameter(OUTPUT_TYPE) != null) {\r
+ outputType = req.getParameter(OUTPUT_TYPE);\r
}\r
-\r
try {\r
-\r
- String filterQuery = this.queryGeneretor(map);\r
- eventlogger.debug("SQL Query for Statistics resultset. " + filterQuery);\r
-\r
- ResultSet rs = this.getRecordsForSQL(filterQuery);\r
-\r
- if (outputType.equals("csv")) {\r
- resp.setContentType("application/octet-stream");\r
- Date date = new Date();\r
- SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-YYYY HH:mm:ss");\r
- resp.setHeader("Content-Disposition",\r
- "attachment; filename=\"result:" + dateFormat.format(date) + ".csv\"");\r
- eventlogger.info("Generating CSV file from Statistics resultset");\r
-\r
- rsToCSV(rs, out);\r
- } else {\r
- eventlogger.info("Generating JSON for Statistics resultset");\r
- this.rsToJson(rs, out);\r
- }\r
- } catch (IOException e) {\r
- eventlogger.error("IOException - Generating JSON/CSV:" + e);\r
- e.printStackTrace();\r
- } catch (JSONException e) {\r
- eventlogger.error("JSONException - executing SQL query:" + e);\r
- e.printStackTrace();\r
- } catch (SQLException e) {\r
- eventlogger.error("SQLException - executing SQL query:" + e);\r
- e.printStackTrace();\r
- } catch (ParseException e) {\r
- eventlogger.error("ParseException - executing SQL query:" + e);\r
- e.printStackTrace();\r
+ this.getRecordsForSQL(map, outputType, resp.getOutputStream(), resp);\r
+ } catch (IOException ioe) {\r
+ eventlogger.error("PROV0174 StatisticsServlet.doGet: " + ioe.getMessage(), ioe);\r
}\r
+\r
}\r
\r
\r
*/\r
public void rsToJson(ResultSet rs, ServletOutputStream out) throws IOException, SQLException {\r
\r
- String fields[] = {"FEEDNAME", "FEEDID", "FILES_PUBLISHED", "PUBLISH_LENGTH", "FILES_DELIVERED",\r
+ String[] fields = {"FEEDNAME", "FEEDID", "FILES_PUBLISHED", "PUBLISH_LENGTH", "FILES_DELIVERED",\r
"DELIVERED_LENGTH", "SUBSCRIBER_URL", "SUBID", "PUBLISH_TIME", "DELIVERY_TIME",\r
"AverageDelay"};\r
StringBuffer line = new StringBuffer();\r
/**\r
* getFeedIdsByGroupId - Getting FEEDID's by GROUP ID.\r
*\r
- * @throws SQL Query SQLException.\r
+ * @throws SQLException Query SQLException.\r
*/\r
public StringBuffer getFeedIdsByGroupId(int groupIds) throws SQLException {\r
\r
DB db = null;\r
Connection conn = null;\r
- PreparedStatement prepareStatement = null;\r
ResultSet resultSet = null;\r
String sqlGoupid = null;\r
StringBuffer feedIds = new StringBuffer();\r
db = new DB();\r
conn = db.getConnection();\r
sqlGoupid = " SELECT FEEDID from FEEDS WHERE GROUPID = ?";\r
- prepareStatement = conn.prepareStatement(sqlGoupid);\r
- prepareStatement.setInt(1, groupIds);\r
- resultSet = prepareStatement.executeQuery();\r
- while (resultSet.next()) {\r
- feedIds.append(resultSet.getInt("FEEDID"));\r
- feedIds.append(",");\r
+ try(PreparedStatement prepareStatement = conn.prepareStatement(sqlGoupid)) {\r
+ prepareStatement.setInt(1, groupIds);\r
+ resultSet = prepareStatement.executeQuery();\r
+ while (resultSet.next()) {\r
+ feedIds.append(resultSet.getInt("FEEDID"));\r
+ feedIds.append(",");\r
+ }\r
+ feedIds.deleteCharAt(feedIds.length() - 1);\r
+ System.out.println("feedIds" + feedIds.toString());\r
}\r
- feedIds.deleteCharAt(feedIds.length() - 1);\r
- System.out.println("feedIds" + feedIds.toString());\r
-\r
} catch (SQLException e) {\r
- e.printStackTrace();\r
+ eventlogger.error("PROV0175 StatisticsServlet.getFeedIdsByGroupId: " + e.getMessage(), e);\r
} finally {\r
try {\r
if (resultSet != null) {\r
resultSet.close();\r
resultSet = null;\r
}\r
-\r
- if (prepareStatement != null) {\r
- prepareStatement.close();\r
- prepareStatement = null;\r
- }\r
-\r
- if (conn != null) {\r
+ if (conn != null) {\r
db.release(conn);\r
}\r
} catch (Exception e) {\r
- e.printStackTrace();\r
+ eventlogger.error("PROV0176 StatisticsServlet.getFeedIdsByGroupId: " + e.getMessage(), e);\r
}\r
}\r
return feedIds;\r
String start_time = null;\r
String end_time = null;\r
String subid = " ";\r
- if (map.get("eventType") != null) {\r
- eventType = (String) map.get("eventType");\r
+ if (map.get(EVENT_TYPE) != null) {\r
+ eventType = map.get(EVENT_TYPE);\r
}\r
- if (map.get("feedids") != null) {\r
- feedids = (String) map.get("feedids");\r
+ if (map.get(FEEDIDS) != null) {\r
+ feedids = map.get(FEEDIDS);\r
}\r
- if (map.get("start_time") != null) {\r
- start_time = (String) map.get("start_time");\r
+ if (map.get(START_TIME) != null) {\r
+ start_time = map.get(START_TIME);\r
}\r
- if (map.get("end_time") != null) {\r
- end_time = (String) map.get("end_time");\r
+ if (map.get(END_TIME) != null) {\r
+ end_time = map.get(END_TIME);\r
}\r
if ("all".equalsIgnoreCase(eventType)) {\r
eventType = "PUB','DEL, EXP, PBF";\r
}\r
- if (map.get("subid") != null) {\r
- subid = (String) map.get("subid");\r
+ if (map.get(SUBID) != null) {\r
+ subid = map.get(SUBID);\r
}\r
\r
eventlogger.info("Generating sql query to get Statistics resultset. ");\r
* PUT a Statistics URL -- not supported.\r
*/\r
@Override\r
- public void doPut(HttpServletRequest req, HttpServletResponse resp) throws IOException {\r
+ public void doPut(HttpServletRequest req, HttpServletResponse resp) {\r
String message = "PUT not allowed for the StatisticsURL.";\r
EventLogRecord elr = new EventLogRecord(req);\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_METHOD_NOT_ALLOWED);\r
- eventlogger.info(elr);\r
- resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, message);\r
+ eventlogger.error(elr.toString());\r
+ sendResponseError(resp, HttpServletResponse.SC_METHOD_NOT_ALLOWED, message, eventlogger);\r
}\r
\r
/**\r
* POST a Statistics URL -- not supported.\r
*/\r
@Override\r
- public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {\r
+ public void doPost(HttpServletRequest req, HttpServletResponse resp) {\r
String message = "POST not allowed for the StatisticsURL.";\r
EventLogRecord elr = new EventLogRecord(req);\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_METHOD_NOT_ALLOWED);\r
- eventlogger.info(elr);\r
- resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, message);\r
+ eventlogger.error(elr.toString());\r
+ sendResponseError(resp, HttpServletResponse.SC_METHOD_NOT_ALLOWED, message, eventlogger);\r
}\r
\r
private Map<String, String> buildMapFromRequest(HttpServletRequest req) {\r
- Map<String, String> map = new HashMap<String, String>();\r
+ Map<String, String> map = new HashMap<>();\r
String s = req.getParameter("type");\r
if (s != null) {\r
- if (s.equals("pub") || s.equals("del") || s.equals("exp")) {\r
+ if ("pub".equals(s) || "del".equals(s) || "exp".equals(s)) {\r
map.put("type", s);\r
} else {\r
map.put("err", "bad type");\r
map.put("publishSQL", "");\r
map.put("statusSQL", "");\r
map.put("resultSQL", "");\r
- map.put("reasonSQL", "");\r
+ map.put(REASON_SQL, "");\r
\r
s = req.getParameter("publishId");\r
if (s != null) {\r
s = req.getParameter("statusCode");\r
if (s != null) {\r
String sql = null;\r
- if (s.equals("success")) {\r
+ if ("success".equals(s)) {\r
sql = " AND STATUS >= 200 AND STATUS < 300";\r
- } else if (s.equals("redirect")) {\r
+ } else if ("redirect".equals(s)) {\r
sql = " AND STATUS >= 300 AND STATUS < 400";\r
- } else if (s.equals("failure")) {\r
+ } else if ("failure".equals(s)) {\r
sql = " AND STATUS >= 400";\r
} else {\r
try {\r
s = req.getParameter("expiryReason");\r
if (s != null) {\r
map.put("type", "exp");\r
- if (s.equals("notRetryable")) {\r
- map.put("reasonSQL", " AND REASON = 'notRetryable'");\r
- } else if (s.equals("retriesExhausted")) {\r
- map.put("reasonSQL", " AND REASON = 'retriesExhausted'");\r
- } else if (s.equals("diskFull")) {\r
- map.put("reasonSQL", " AND REASON = 'diskFull'");\r
- } else if (s.equals("other")) {\r
- map.put("reasonSQL", " AND REASON = 'other'");\r
+ if ("notRetryable".equals(s)) {\r
+ map.put(REASON_SQL, " AND REASON = 'notRetryable'");\r
+ } else if ("retriesExhausted".equals(s)) {\r
+ map.put(REASON_SQL, " AND REASON = 'retriesExhausted'");\r
+ } else if ("diskFull".equals(s)) {\r
+ map.put(REASON_SQL, " AND REASON = 'diskFull'");\r
+ } else if ("other".equals("other")) {\r
+ map.put(REASON_SQL, " AND REASON = 'other'");\r
} else {\r
map.put("err", "bad expiryReason");\r
return map;\r
}\r
try {\r
// First, look for an RFC 3339 date\r
- String fmt = (s.indexOf('.') > 0) ? fmt2 : fmt1;\r
+ String fmt = (s.indexOf('.') > 0) ? FMT2 : FMT1;\r
SimpleDateFormat sdf = new SimpleDateFormat(fmt);\r
Date d = sdf.parse(s);\r
return d.getTime();\r
}\r
try {\r
// Also allow a long (in ms); useful for testing\r
- long n = Long.parseLong(s);\r
- return n;\r
+ return Long.parseLong(s);\r
} catch (NumberFormatException e) {\r
}\r
intlogger.info("Error parsing time=" + s);\r
return -1;\r
}\r
\r
-\r
- private ResultSet getRecordsForSQL(String sql) {\r
- intlogger.debug(sql);\r
- long start = System.currentTimeMillis();\r
- DB db = new DB();\r
- Connection conn = null;\r
- ResultSet rs = null;\r
-\r
+ private void getRecordsForSQL(Map<String, String> map, String outputType, ServletOutputStream out, HttpServletResponse resp) {\r
try {\r
- conn = db.getConnection();\r
- Statement stmt = conn.createStatement();\r
- PreparedStatement pst = conn.prepareStatement(sql);\r
- rs = pst.executeQuery();\r
- //this.rsToJson(rs)\r
- //rs.close();\r
- stmt.close();\r
- } catch (SQLException e) {\r
- e.printStackTrace();\r
- } finally {\r
- if (conn != null) {\r
- db.release(conn);\r
+\r
+ 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
+\r
+ rsToCSV(rs, out);\r
+ } else {\r
+ eventlogger.info("Generating JSON for Statistics resultset");\r
+ this.rsToJson(rs, out);\r
+ }\r
+ }\r
+ } catch (SQLException e) {\r
+ eventlogger.error("SQLException:" + e);\r
}\r
+ intlogger.debug("Time: " + (System.currentTimeMillis() - start) + " ms");\r
+ } catch (IOException e) {\r
+ eventlogger.error("IOException - Generating JSON/CSV:" + e);\r
+ } catch (JSONException e) {\r
+ eventlogger.error("JSONException - executing SQL query:" + e);\r
+ } catch (ParseException e) {\r
+ eventlogger.error("ParseException - executing SQL query:" + e);\r
}\r
-\r
- intlogger.debug("Time: " + (System.currentTimeMillis() - start) + " ms");\r
-\r
- return rs;\r
}\r
}\r
+\r
Code Review / dmaap / datarouter.git / blobdiff