[DMAAP-DR] Remove AAF/TLS phase 1

[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 949019d..db5470c 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
@@ -27,14 +27,14 @@ package org.onap.dmaap.datarouter.provisioning;
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r
 \r
+import jakarta.servlet.ServletConfig;\r
+import jakarta.servlet.ServletException;\r
 import java.io.IOException;\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
-import javax.servlet.http.HttpServletResponse;\r
+import jakarta.servlet.http.HttpServletRequest;\r
+import jakarta.servlet.http.HttpServletResponse;\r
 \r
 import org.apache.commons.lang3.StringUtils;\r
 import org.json.JSONArray;\r
@@ -159,8 +159,7 @@ public class PublishServlet extends BaseServlet {
                 } else {\r
                     // Generate new URL\r
                     String nextnode = getRedirectNode(feedid, req);\r
-                    if (Boolean.parseBoolean(ProvRunner.getProvProperties()\r
-                        .getProperty("org.onap.dmaap.datarouter.provserver.tlsenabled", "true"))) {\r
+                    if (Boolean.TRUE.equals(ProvRunner.getTlsEnabled())) {\r
                         nextnode = nextnode + ":" + ProvRunner.getProvProperties().getProperty(\r
                             "org.onap.dmaap.datarouter.nodeserver.https.port", "8443");\r
                     } else {\r