import com.att.eelf.configuration.EELFLogger;\r
import com.att.eelf.configuration.EELFManager;\r
import java.io.IOException;\r
-import java.util.ArrayList;\r
-import java.util.Collection;\r
-import java.util.List;\r
+import java.util.*;\r
import javax.servlet.ServletConfig;\r
import javax.servlet.ServletException;\r
import javax.servlet.http.HttpServletRequest;\r
import javax.servlet.http.HttpServletResponse;\r
+\r
+import org.apache.commons.lang3.StringUtils;\r
import org.json.JSONArray;\r
import org.json.JSONException;\r
import org.json.JSONObject;\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 List<IngressRoute> irt;\r
//Adding EELF Logger Rally:US664892\r
private static EELFLogger eelflogger = EELFManager.getInstance()\r
- .getLogger("org.onap.dmaap.datarouter.provisioning.PublishServlet");\r
+ .getLogger(PublishServlet.class);\r
private static final Object lock = new Object();\r
\r
\r
}\r
\r
@Override\r
- public void doDelete(HttpServletRequest req, HttpServletResponse resp) {\r
- setIpAndFqdnForEelf("doDelete");\r
- eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
- redirect(req, resp);\r
+ public void doDelete(HttpServletRequest req, HttpServletResponse resp) throws ServletException {\r
+ setUpEelfForPublishServlet(req, "doDelete");\r
+ eelflogger.info(EelfMsgs.ENTRY);\r
+ try {\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
+ }\r
}\r
\r
@Override\r
- public void doGet(HttpServletRequest req, HttpServletResponse resp) {\r
- setIpAndFqdnForEelf("doGet");\r
+ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException {\r
+ setUpEelfForPublishServlet(req, "doGet");\r
+ eelflogger.info(EelfMsgs.ENTRY);\r
+ try {\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
+ }\r
}\r
\r
@Override\r
- public void doPut(HttpServletRequest req, HttpServletResponse resp) {\r
- setIpAndFqdnForEelf("doPut");\r
+ public void doPut(HttpServletRequest req, HttpServletResponse resp) throws ServletException {\r
+ setUpEelfForPublishServlet(req, "doPut");\r
+ eelflogger.info(EelfMsgs.ENTRY);\r
+ try {\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
+ }\r
}\r
\r
@Override\r
- public void doPost(HttpServletRequest req, HttpServletResponse resp) {\r
- setIpAndFqdnForEelf("doPost");\r
+ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException {\r
+ setUpEelfForPublishServlet(req, "doPost");\r
+ eelflogger.info(EelfMsgs.ENTRY);\r
+ try {\r
eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF, req.getHeader(BEHALF_HEADER));\r
redirect(req, resp);\r
+ } finally {\r
+ eelflogger.info(EelfMsgs.EXIT);\r
+ }\r
\r
}\r
\r
- private void redirect(HttpServletRequest req, HttpServletResponse resp) {\r
+ private void setUpEelfForPublishServlet(HttpServletRequest req, String method) {\r
+ if (StringUtils.isBlank(req.getHeader("X-ONAP-RequestID")) || StringUtils.isBlank(req.getHeader("X-InvocationID"))) {\r
+ setIpFqdnForEelf(method);\r
+ } else {\r
+ setIpFqdnRequestIDandInvocationIDForEelf(method, req);\r
+ }\r
+ }\r
+\r
+ private void redirect(HttpServletRequest req, HttpServletResponse resp) throws ServletException {\r
try {\r
String[] nodes = getNodes();\r
if (nodes == null || nodes.length == 0) {\r