X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fdatarouter.git;a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2FPublishServlet.java;h=96e523df4ff552d5a014ff78c6c0683c736f5fd6;hp=3ae63bb282d0d06a95a0c9c458bd22605fe7ff3c;hb=14b8d9552808063686e0c22760cec6e35b960b59;hpb=72cd9f3033731242779e708a05f9519f36cf8d43

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/PublishServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/PublishServlet.java
index 3ae63bb2..96e523df 100644
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/PublishServlet.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/PublishServlet.java
@@ -27,13 +27,13 @@ package org.onap.dmaap.datarouter.provisioning;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+import java.util.*;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -42,6 +42,7 @@ import org.onap.dmaap.datarouter.provisioning.beans.EventLogRecord;
 import org.onap.dmaap.datarouter.provisioning.beans.IngressRoute;
 import org.onap.dmaap.datarouter.provisioning.eelf.EelfMsgs;
 import org.onap.dmaap.datarouter.provisioning.utils.DB;
+import org.slf4j.MDC;
 
 /**
  * This servlet handles redirects for the <publishURL> on the provisioning server, which is generated by the
@@ -59,7 +60,7 @@ public class PublishServlet extends BaseServlet {
     private List<IngressRoute> irt;
     //Adding EELF Logger Rally:US664892
     private static EELFLogger eelflogger = EELFManager.getInstance()
-            .getLogger("org.onap.dmaap.datarouter.provisioning.PublishServlet");
+            .getLogger(PublishServlet.class);
     private static final Object lock = new Object();
 
 
@@ -73,35 +74,63 @@ public class PublishServlet extends BaseServlet {
     }
 
     @Override
-    public void doDelete(HttpServletRequest req, HttpServletResponse resp) {
-        setIpAndFqdnForEelf("doDelete");
-        eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");
-        redirect(req, resp);
+    public void doDelete(HttpServletRequest req, HttpServletResponse resp) throws ServletException {
+        setUpEelfForPublishServlet(req, "doDelete");
+        eelflogger.info(EelfMsgs.ENTRY);
+        try {
+            eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");
+            redirect(req, resp);
+        } finally {
+            eelflogger.info(EelfMsgs.EXIT);
+        }
     }
 
     @Override
-    public void doGet(HttpServletRequest req, HttpServletResponse resp) {
-        setIpAndFqdnForEelf("doGet");
+    public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException {
+        setUpEelfForPublishServlet(req, "doGet");
+        eelflogger.info(EelfMsgs.ENTRY);
+        try {
         eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");
         redirect(req, resp);
+        } finally {
+            eelflogger.info(EelfMsgs.EXIT);
+        }
     }
 
     @Override
-    public void doPut(HttpServletRequest req, HttpServletResponse resp) {
-        setIpAndFqdnForEelf("doPut");
+    public void doPut(HttpServletRequest req, HttpServletResponse resp) throws ServletException {
+        setUpEelfForPublishServlet(req, "doPut");
+        eelflogger.info(EelfMsgs.ENTRY);
+        try {
         eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");
         redirect(req, resp);
+        } finally {
+            eelflogger.info(EelfMsgs.EXIT);
+        }
     }
 
     @Override
-    public void doPost(HttpServletRequest req, HttpServletResponse resp) {
-        setIpAndFqdnForEelf("doPost");
+    public void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException {
+        setUpEelfForPublishServlet(req, "doPost");
+        eelflogger.info(EelfMsgs.ENTRY);
+        try {
         eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF, req.getHeader(BEHALF_HEADER));
         redirect(req, resp);
+        } finally {
+            eelflogger.info(EelfMsgs.EXIT);
+        }
 
     }
 
-    private void redirect(HttpServletRequest req, HttpServletResponse resp) {
+    private void setUpEelfForPublishServlet(HttpServletRequest req, String method) {
+        if (StringUtils.isBlank(req.getHeader("X-ONAP-RequestID")) || StringUtils.isBlank(req.getHeader("X-InvocationID"))) {
+            setIpFqdnForEelf(method);
+        } else {
+            setIpFqdnRequestIDandInvocationIDForEelf(method, req);
+        }
+    }
+
+    private void redirect(HttpServletRequest req, HttpServletResponse resp) throws ServletException {
         try {
             String[] nodes = getNodes();
             if (nodes == null || nodes.length == 0) {