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=db5470cc24267c81a818cfa4ce9230ce78e1837f;hb=bda6aeaa60607ab4fe5af508156019d7bd5c0ce4;hp=2ca24539b1cfda47ea02648d9b17ed914a304b77;hpb=f94a3f35ccf9f95455b2840e4465a71b0bb5c71d;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 2ca24539..db5470cc 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,24 +27,25 @@ package org.onap.dmaap.datarouter.provisioning;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 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;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
 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;
+import org.onap.dmaap.datarouter.provisioning.utils.URLUtilities;
 
 /**
  * This servlet handles redirects for the <publishURL> on the provisioning server, which is generated by the
@@ -158,8 +159,14 @@ public class PublishServlet extends BaseServlet {
                 } else {
                     // Generate new URL
                     String nextnode = getRedirectNode(feedid, req);
-                    nextnode = nextnode + ":" + DB.getHttpsPort();
-                    String newurl = "https://" + nextnode + "/publish" + req.getPathInfo();
+                    if (Boolean.TRUE.equals(ProvRunner.getTlsEnabled())) {
+                        nextnode = nextnode + ":" + ProvRunner.getProvProperties().getProperty(
+                            "org.onap.dmaap.datarouter.nodeserver.https.port", "8443");
+                    } else {
+                        nextnode = nextnode + ":" + ProvRunner.getProvProperties().getProperty(
+                            "org.onap.dmaap.datarouter.nodeserver.http.port", "8080");
+                    }
+                    String newurl = URLUtilities.getUrlSecurityOption() + nextnode + "/publish" + req.getPathInfo();
                     String qs = req.getQueryString();
                     if (qs != null) {
                         newurl += "?" + qs;