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

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 96e523df..76a983f8 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
@@ -26,6 +26,7 @@ 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.*;
 import javax.servlet.ServletConfig;
@@ -42,7 +43,6 @@ 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 +59,7 @@ public class PublishServlet extends BaseServlet {
     private String provstring;
     private List<IngressRoute> irt;
     //Adding EELF Logger Rally:US664892
-    private static EELFLogger eelflogger = EELFManager.getInstance()
+    private static EELFLogger eelfLogger = EELFManager.getInstance()
             .getLogger(PublishServlet.class);
     private static final Object lock = new Object();
 
@@ -74,50 +74,50 @@ public class PublishServlet extends BaseServlet {
     }
 
     @Override
-    public void doDelete(HttpServletRequest req, HttpServletResponse resp) throws ServletException {
+    public void doDelete(HttpServletRequest req, HttpServletResponse resp) {
         setUpEelfForPublishServlet(req, "doDelete");
-        eelflogger.info(EelfMsgs.ENTRY);
+        eelfLogger.info(EelfMsgs.ENTRY);
         try {
-            eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");
+            eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");
             redirect(req, resp);
         } finally {
-            eelflogger.info(EelfMsgs.EXIT);
+            eelfLogger.info(EelfMsgs.EXIT);
         }
     }
 
     @Override
-    public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException {
+    public void doGet(HttpServletRequest req, HttpServletResponse resp) {
         setUpEelfForPublishServlet(req, "doGet");
-        eelflogger.info(EelfMsgs.ENTRY);
+        eelfLogger.info(EelfMsgs.ENTRY);
         try {
-        eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");
+        eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");
         redirect(req, resp);
         } finally {
-            eelflogger.info(EelfMsgs.EXIT);
+            eelfLogger.info(EelfMsgs.EXIT);
         }
     }
 
     @Override
-    public void doPut(HttpServletRequest req, HttpServletResponse resp) throws ServletException {
+    public void doPut(HttpServletRequest req, HttpServletResponse resp) {
         setUpEelfForPublishServlet(req, "doPut");
-        eelflogger.info(EelfMsgs.ENTRY);
+        eelfLogger.info(EelfMsgs.ENTRY);
         try {
-        eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");
+        eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");
         redirect(req, resp);
         } finally {
-            eelflogger.info(EelfMsgs.EXIT);
+            eelfLogger.info(EelfMsgs.EXIT);
         }
     }
 
     @Override
-    public void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException {
+    public void doPost(HttpServletRequest req, HttpServletResponse resp) {
         setUpEelfForPublishServlet(req, "doPost");
-        eelflogger.info(EelfMsgs.ENTRY);
+        eelfLogger.info(EelfMsgs.ENTRY);
         try {
-        eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF, req.getHeader(BEHALF_HEADER));
+        eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF, req.getHeader(BEHALF_HEADER));
         redirect(req, resp);
         } finally {
-            eelflogger.info(EelfMsgs.EXIT);
+            eelfLogger.info(EelfMsgs.EXIT);
         }
 
     }
@@ -130,7 +130,7 @@ public class PublishServlet extends BaseServlet {
         }
     }
 
-    private void redirect(HttpServletRequest req, HttpServletResponse resp) throws ServletException {
+    private void redirect(HttpServletRequest req, HttpServletResponse resp) {
         try {
             String[] nodes = getNodes();
             if (nodes == null || nodes.length == 0) {
@@ -145,7 +145,7 @@ public class PublishServlet extends BaseServlet {
                             : "Invalid request - Missing file ID.";
                     elr.setMessage(message);
                     elr.setResult(HttpServletResponse.SC_NOT_FOUND);
-                    eventlogger.info(elr);
+                    eventlogger.error(elr.toString());
 
                     resp.sendError(HttpServletResponse.SC_NOT_FOUND, message);
                 } else {
@@ -162,7 +162,7 @@ public class PublishServlet extends BaseServlet {
                     String message = "Redirected to: " + newurl;
                     elr.setMessage(message);
                     elr.setResult(HttpServletResponse.SC_MOVED_PERMANENTLY);
-                    eventlogger.info(elr);
+                    eventlogger.info(elr.toString());
 
                     resp.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY);
                     resp.setHeader("Location", newurl);
@@ -170,7 +170,6 @@ public class PublishServlet extends BaseServlet {
             }
         } catch (IOException ioe) {
             intlogger.error("IOException" + ioe.getMessage());
-
         }
     }