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=35205aa97683ff5d231e9aed8c25b81445883639;hp=2ef5087fd6cf5b270c2c3711baa16862e7c3e527;hb=68a9ca240970fceaf12bbe91b7bad8e1d98ecd93;hpb=d6302cb0b3db8043598e8b6bc3dc5ed436f848cb

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 2ef5087f..35205aa9 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
@@ -28,7 +28,9 @@ import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -39,10 +41,10 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONTokener;
+import org.onap.dmaap.datarouter.provisioning.utils.Poker;
 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;
 
 /**
  * This servlet handles redirects for the <publishURL> on the provisioning server, which is generated by the
@@ -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 $
  */
 @SuppressWarnings("serial")
+
 public class PublishServlet extends BaseServlet {
 
     private int nextNode;
@@ -78,7 +81,8 @@ public class PublishServlet extends BaseServlet {
         setUpEelfForPublishServlet(req, "doDelete");
         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);
@@ -90,8 +94,9 @@ public class PublishServlet extends BaseServlet {
         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);
+            eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID,
+                    req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");
+            redirect(req, resp);
         } finally {
             eelfLogger.info(EelfMsgs.EXIT);
         }
@@ -102,8 +107,9 @@ public class PublishServlet extends BaseServlet {
         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);
+            eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID,
+                    req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");
+            redirect(req, resp);
         } finally {
             eelfLogger.info(EelfMsgs.EXIT);
         }
@@ -114,8 +120,8 @@ public class PublishServlet extends BaseServlet {
         setUpEelfForPublishServlet(req, "doPost");
         eelfLogger.info(EelfMsgs.ENTRY);
         try {
-        eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF, req.getHeader(BEHALF_HEADER));
-        redirect(req, resp);
+            eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF, req.getHeader(BEHALF_HEADER));
+            redirect(req, resp);
         } finally {
             eelfLogger.info(EelfMsgs.EXIT);
         }
@@ -123,7 +129,8 @@ public class PublishServlet extends BaseServlet {
     }
 
     private void setUpEelfForPublishServlet(HttpServletRequest req, String method) {
-        if (StringUtils.isBlank(req.getHeader("X-ONAP-RequestID")) || StringUtils.isBlank(req.getHeader("X-InvocationID"))) {
+        if (StringUtils.isBlank(req.getHeader("X-ONAP-RequestID"))
+                    || StringUtils.isBlank(req.getHeader("X-InvocationID"))) {
             setIpFqdnForEelf(method);
         } else {
             setIpFqdnRequestIDandInvocationIDForEelf(method, req);
@@ -151,7 +158,8 @@ public class PublishServlet extends BaseServlet {
                 } else {
                     // Generate new URL
                     String nextnode = getRedirectNode(feedid, req);
-                    nextnode = nextnode + ":" + DB.getHttpsPort();
+                    nextnode = nextnode + ":" + ProvRunner.getProvProperties().getProperty(
+                        "org.onap.dmaap.datarouter.provserver.https.port", "8443");
                     String newurl = "https://" + nextnode + "/publish" + req.getPathInfo();
                     String qs = req.getQueryString();
                     if (qs != null) {
@@ -175,12 +183,12 @@ public class PublishServlet extends BaseServlet {
 
     private String getRedirectNode(int feedid, HttpServletRequest req) {
         // Check to see if the IRT needs to be updated
-        Poker p = Poker.getPoker();
-        String s = p.getProvisioningString();
+        Poker pkr = Poker.getPoker();
+        String str = pkr.getProvisioningString();
         synchronized (lock) {
-            if (irt == null || (s.length() != provstring.length()) || !s.equals(provstring)) {
+            if (irt == null || (str.length() != provstring.length()) || !str.equals(provstring)) {
                 // Provisioning string has changed -- update the IRT
-                provstring = s;
+                provstring = str;
                 JSONObject jo = new JSONObject(new JSONTokener(provstring));
                 JSONArray ja = jo.getJSONArray("ingress");
                 List<IngressRoute> newlist = new ArrayList<>();
@@ -207,8 +215,7 @@ public class PublishServlet extends BaseServlet {
 
         // No IRT rule matches, do round robin of all active nodes
         String[] nodes = getNodes();
-        if (nextNode >= nodes.length)    // The list of nodes may have grown/shrunk
-        {
+        if (nextNode >= nodes.length) {   // The list of nodes may have grown/shrunk
             nextNode = 0;
         }
         return nodes[nextNode++];