[DMAAP-DR] Remove AAF/TLS phase 1

[dmaap/datarouter.git] / datarouter-prov / src / main / java / org / onap / dmaap / datarouter / provisioning / utils / URLUtilities.java

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/URLUtilities.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/URLUtilities.java
index 988b576..8940348 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/URLUtilities.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/URLUtilities.java
@@ -153,20 +153,17 @@ public class URLUtilities {
     }\r
 \r
     public static String getUrlSecurityOption() {\r
-        if (Boolean.parseBoolean(ProvRunner.getProvProperties()\r
-            .getProperty("org.onap.dmaap.datarouter.provserver.tlsenabled", "true"))) {\r
+        if (Boolean.TRUE.equals(ProvRunner.getTlsEnabled())) {\r
             return "https://";\r
         }\r
         return "http://";\r
     }\r
 \r
     private static String getAppropriateUrlPort() {\r
-        if (Boolean.parseBoolean(ProvRunner.getProvProperties()\r
-            .getProperty("org.onap.dmaap.datarouter.provserver.tlsenabled", "true")))\r
-                return "";\r
-\r
+        if (Boolean.TRUE.equals(ProvRunner.getTlsEnabled())) {\r
+            return "";\r
+        }\r
         return ":" + ProvRunner.getProvProperties()\r
             .getProperty("org.onap.dmaap.datarouter.provserver.http.port", "8080");\r
-\r
     }\r
 }\r