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 2ef5087..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
@@ -28,7 +28,9 @@ import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;\r
 \r
 import java.io.IOException;\r
-import java.util.*;\r
+import java.util.ArrayList;\r
+import java.util.Collection;\r
+import java.util.List;\r
 import javax.servlet.ServletConfig;\r
 import javax.servlet.ServletException;\r
 import javax.servlet.http.HttpServletRequest;\r
@@ -53,6 +55,7 @@ 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 nextNode;\r
@@ -78,7 +81,8 @@ public class PublishServlet extends BaseServlet {
         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
+            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
@@ -90,8 +94,9 @@ public class PublishServlet extends BaseServlet {
         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
+            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
@@ -102,8 +107,9 @@ public class PublishServlet extends BaseServlet {
         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
+            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
@@ -114,8 +120,8 @@ public class PublishServlet extends BaseServlet {
         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
+            eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF, req.getHeader(BEHALF_HEADER));\r
+            redirect(req, resp);\r
         } finally {\r
             eelfLogger.info(EelfMsgs.EXIT);\r
         }\r
@@ -123,7 +129,8 @@ public class PublishServlet extends BaseServlet {
     }\r
 \r
     private void setUpEelfForPublishServlet(HttpServletRequest req, String method) {\r
-        if (StringUtils.isBlank(req.getHeader("X-ONAP-RequestID")) || StringUtils.isBlank(req.getHeader("X-InvocationID"))) {\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
@@ -175,12 +182,12 @@ public class PublishServlet extends BaseServlet {
 \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<>();\r
@@ -207,8 +214,7 @@ public class PublishServlet extends BaseServlet {
 \r
         // No IRT rule matches, do round robin of all active nodes\r
         String[] nodes = getNodes();\r
-        if (nextNode >= nodes.length)    // The list of nodes may have grown/shrunk\r
-        {\r
+        if (nextNode >= nodes.length) {   // The list of nodes may have grown/shrunk\r
             nextNode = 0;\r
         }\r
         return nodes[nextNode++];\r