\r
import com.att.eelf.configuration.EELFLogger;\r
import com.att.eelf.configuration.EELFManager;\r
+\r
import java.io.IOException;\r
import java.util.*;\r
import javax.servlet.ServletConfig;\r
import org.onap.dmaap.datarouter.provisioning.beans.IngressRoute;\r
import org.onap.dmaap.datarouter.provisioning.eelf.EelfMsgs;\r
import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
-import org.slf4j.MDC;\r
\r
/**\r
* This servlet handles redirects for the <publishURL> on the provisioning server, which is generated by the\r
private String provstring;\r
private List<IngressRoute> irt;\r
//Adding EELF Logger Rally:US664892\r
- private static EELFLogger eelflogger = EELFManager.getInstance()\r
+ private static EELFLogger eelfLogger = EELFManager.getInstance()\r
.getLogger(PublishServlet.class);\r
private static final Object lock = new Object();\r
\r
}\r
\r
@Override\r
- public void doDelete(HttpServletRequest req, HttpServletResponse resp) throws ServletException {\r
+ public void doDelete(HttpServletRequest req, HttpServletResponse resp) {\r
setUpEelfForPublishServlet(req, "doDelete");\r
- eelflogger.info(EelfMsgs.ENTRY);\r
+ eelfLogger.info(EelfMsgs.ENTRY);\r
try {\r
- eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
+ eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
redirect(req, resp);\r
} finally {\r
- eelflogger.info(EelfMsgs.EXIT);\r
+ eelfLogger.info(EelfMsgs.EXIT);\r
}\r
}\r
\r
@Override\r
- public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException {\r
+ public void doGet(HttpServletRequest req, HttpServletResponse resp) {\r
setUpEelfForPublishServlet(req, "doGet");\r
- eelflogger.info(EelfMsgs.ENTRY);\r
+ eelfLogger.info(EelfMsgs.ENTRY);\r
try {\r
- eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
+ eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
redirect(req, resp);\r
} finally {\r
- eelflogger.info(EelfMsgs.EXIT);\r
+ eelfLogger.info(EelfMsgs.EXIT);\r
}\r
}\r
\r
@Override\r
- public void doPut(HttpServletRequest req, HttpServletResponse resp) throws ServletException {\r
+ public void doPut(HttpServletRequest req, HttpServletResponse resp) {\r
setUpEelfForPublishServlet(req, "doPut");\r
- eelflogger.info(EelfMsgs.ENTRY);\r
+ eelfLogger.info(EelfMsgs.ENTRY);\r
try {\r
- eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
+ eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
redirect(req, resp);\r
} finally {\r
- eelflogger.info(EelfMsgs.EXIT);\r
+ eelfLogger.info(EelfMsgs.EXIT);\r
}\r
}\r
\r
@Override\r
- public void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException {\r
+ public void doPost(HttpServletRequest req, HttpServletResponse resp) {\r
setUpEelfForPublishServlet(req, "doPost");\r
- eelflogger.info(EelfMsgs.ENTRY);\r
+ eelfLogger.info(EelfMsgs.ENTRY);\r
try {\r
- eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF, req.getHeader(BEHALF_HEADER));\r
+ eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF, req.getHeader(BEHALF_HEADER));\r
redirect(req, resp);\r
} finally {\r
- eelflogger.info(EelfMsgs.EXIT);\r
+ eelfLogger.info(EelfMsgs.EXIT);\r
}\r
\r
}\r
}\r
}\r
\r
- private void redirect(HttpServletRequest req, HttpServletResponse resp) throws ServletException {\r
+ private void redirect(HttpServletRequest req, HttpServletResponse resp) {\r
try {\r
String[] nodes = getNodes();\r
if (nodes == null || nodes.length == 0) {\r
: "Invalid request - Missing file ID.";\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_NOT_FOUND);\r
- eventlogger.info(elr);\r
+ eventlogger.error(elr.toString());\r
\r
resp.sendError(HttpServletResponse.SC_NOT_FOUND, message);\r
} else {\r
String message = "Redirected to: " + newurl;\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_MOVED_PERMANENTLY);\r
- eventlogger.info(elr);\r
+ eventlogger.info(elr.toString());\r
\r
resp.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY);\r
resp.setHeader("Location", newurl);\r
}\r
} catch (IOException ioe) {\r
intlogger.error("IOException" + ioe.getMessage());\r
-\r
}\r
}\r
\r