Code Review / dmaap / datarouter.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Checkstyle fixes for datarouter prov
[dmaap/datarouter.git] / datarouter-prov / src / main / java / org / onap / dmaap / datarouter / provisioning / PublishServlet.java
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 8229ee5..2ca2453 100644 (file)
--- 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;
 \r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r
+\r
 import java.io.IOException;\r
 import java.util.ArrayList;\r
 import java.util.Collection;\r
@@ -34,11 +35,13 @@ import javax.servlet.ServletConfig;
 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.json.JSONTokener;\r
 import org.onap.dmaap.datarouter.provisioning.beans.EventLogRecord;\r
-import org.onap.dmaap.datarouter.provisioning.beans.Feed;\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
@@ -52,53 +55,86 @@ import org.onap.dmaap.datarouter.provisioning.utils.DB;
  * @version $Id: PublishServlet.java,v 1.8 2014/03/12 19:45:41 eby Exp $\r
  */\r
 @SuppressWarnings("serial")\r
+\r
 public class PublishServlet extends BaseServlet {\r
 \r
-    private int next_node;\r
+    private int nextNode;\r
     private String provstring;\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
+    private static EELFLogger eelfLogger = EELFManager.getInstance()\r
+            .getLogger(PublishServlet.class);\r
     private static final Object lock = new Object();\r
 \r
 \r
     @Override\r
     public void init(ServletConfig config) throws ServletException {\r
         super.init(config);\r
-        next_node = 0;\r
+        nextNode = 0;\r
         provstring = "";\r
-        irt = new ArrayList<IngressRoute>();\r
+        irt = new ArrayList<>();\r
 \r
     }\r
 \r
     @Override\r
-    public void doDelete(HttpServletRequest req, HttpServletResponse resp) throws IOException {\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) {\r
+        setUpEelfForPublishServlet(req, "doDelete");\r
+        eelfLogger.info(EelfMsgs.ENTRY);\r
+        try {\r
+            eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID,\r
+                    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) throws IOException {\r
-        setIpAndFqdnForEelf("doGet");\r
-        eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
-        redirect(req, resp);\r
+    public void doGet(HttpServletRequest req, HttpServletResponse resp) {\r
+        setUpEelfForPublishServlet(req, "doGet");\r
+        eelfLogger.info(EelfMsgs.ENTRY);\r
+        try {\r
+            eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID,\r
+                    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) throws IOException {\r
-        setIpAndFqdnForEelf("doPut");\r
-        eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
-        redirect(req, resp);\r
+    public void doPut(HttpServletRequest req, HttpServletResponse resp) {\r
+        setUpEelfForPublishServlet(req, "doPut");\r
+        eelfLogger.info(EelfMsgs.ENTRY);\r
+        try {\r
+            eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID,\r
+                    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) throws IOException {\r
-        setIpAndFqdnForEelf("doPost");\r
-        eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF, req.getHeader(BEHALF_HEADER));\r
-        redirect(req, resp);\r
+    public void doPost(HttpServletRequest req, HttpServletResponse resp) {\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 setUpEelfForPublishServlet(HttpServletRequest req, String method) {\r
+        if (StringUtils.isBlank(req.getHeader("X-ONAP-RequestID"))\r
+                    || 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) {\r
@@ -116,7 +152,7 @@ public class PublishServlet extends BaseServlet {
                             : "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
@@ -133,29 +169,28 @@ public class PublishServlet extends BaseServlet {
                     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
             }\r
         } catch (IOException ioe) {\r
-            intlogger.error("IOException" + ioe.getMessage());\r
-\r
+            intlogger.error("PROV0151 PublishServlet.redirect: " + ioe.getMessage(), ioe);\r
         }\r
     }\r
 \r
     private String getRedirectNode(int feedid, HttpServletRequest req) {\r
         // Check to see if the IRT needs to be updated\r
-        Poker p = Poker.getPoker();\r
-        String s = p.getProvisioningString();\r
+        Poker pkr = Poker.getPoker();\r
+        String str = pkr.getProvisioningString();\r
         synchronized (lock) {\r
-            if (irt == null || (s.length() != provstring.length()) || !s.equals(provstring)) {\r
+            if (irt == null || (str.length() != provstring.length()) || !str.equals(provstring)) {\r
                 // Provisioning string has changed -- update the IRT\r
-                provstring = s;\r
+                provstring = str;\r
                 JSONObject jo = new JSONObject(new JSONTokener(provstring));\r
                 JSONArray ja = jo.getJSONArray("ingress");\r
-                List<IngressRoute> newlist = new ArrayList<IngressRoute>();\r
+                List<IngressRoute> newlist = new ArrayList<>();\r
                 for (int i = 0; i < ja.length(); i++) {\r
                     IngressRoute iroute = new IngressRoute(ja.getJSONObject(i));\r
                     newlist.add(iroute);\r
@@ -179,11 +214,10 @@ public class PublishServlet extends BaseServlet {
 \r
         // No IRT rule matches, do round robin of all active nodes\r
         String[] nodes = getNodes();\r
-        if (next_node >= nodes.length)    // The list of nodes may have grown/shrunk\r
-        {\r
-            next_node = 0;\r
+        if (nextNode >= nodes.length) {   // The list of nodes may have grown/shrunk\r
+            nextNode = 0;\r
         }\r
-        return nodes[next_node++];\r
+        return nodes[nextNode++];\r
     }\r
 \r
     private int checkPath(HttpServletRequest req) {\r
@@ -198,11 +232,16 @@ public class PublishServlet extends BaseServlet {
         }\r
         try {\r
             int feedid = Integer.parseInt(path.substring(0, ix));\r
-            if (!Feed.isFeedValid(feedid)) {\r
-                return -1;\r
+            String provData = Poker.getPoker().getProvisioningString();\r
+            JSONArray feeds = new JSONObject(provData).getJSONArray("feeds");\r
+            for (int n = 0; n < feeds.length(); ++n) {\r
+                if (feeds.getJSONObject(n).getInt("feedid") == feedid) {\r
+                    return feedid;\r
+                }\r
             }\r
-            return feedid;\r
-        } catch (NumberFormatException e) {\r
+            return -1;\r
+        } catch (NumberFormatException | JSONException e) {\r
+            intlogger.debug("PROV0152 PublishServlet.checkPath: " + e.getMessage(), e);\r
             return -1;\r
         }\r
     }\r
The Data Routing System project is intended to provide a common framework by which data producers can make data available to data consumers and a way for potential consumers to find feeds with the data they require. The interface to DR is exposed as a RESTful web service known as the DR Publishing and Delivery API