X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2Futils%2FURLUtilities.java;h=15cc689c77be426a8685e3d2aad75c4dc8f26fb5;hb=96a4ed9df2c1e79e5edffff8ea58e02c98844d55;hp=b58ab5a02f8030fc5846e4962190e75dddd11154;hpb=e06737d701ff5b3dcab311f4337ce40be52c966e;p=dmaap%2Fdatarouter.git 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 b58ab5a0..15cc689c 100644 --- 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 @@ -45,7 +45,7 @@ public class URLUtilities { * @return the URL */ public static String generateFeedURL(int feedid) { - return "https://" + BaseServlet.provName + "/feed/" + feedid; + return "https://" + BaseServlet.getProvName() + "/feed/" + feedid; } /** @@ -55,7 +55,7 @@ public class URLUtilities { * @return the URL */ public static String generatePublishURL(int feedid) { - return "https://" + BaseServlet.provName + "/publish/" + feedid; + return "https://" + BaseServlet.getProvName() + "/publish/" + feedid; } /** @@ -65,7 +65,7 @@ public class URLUtilities { * @return the URL */ public static String generateSubscribeURL(int feedid) { - return "https://" + BaseServlet.provName + "/subscribe/" + feedid; + return "https://" + BaseServlet.getProvName() + "/subscribe/" + feedid; } /** @@ -75,7 +75,7 @@ public class URLUtilities { * @return the URL */ public static String generateFeedLogURL(int feedid) { - return "https://" + BaseServlet.provName + "/feedlog/" + feedid; + return "https://" + BaseServlet.getProvName() + "/feedlog/" + feedid; } /** @@ -85,7 +85,7 @@ public class URLUtilities { * @return the URL */ public static String generateSubscriptionURL(int subid) { - return "https://" + BaseServlet.provName + "/subs/" + subid; + return "https://" + BaseServlet.getProvName() + "/subs/" + subid; } /** @@ -95,7 +95,7 @@ public class URLUtilities { * @return the URL */ public static String generateSubLogURL(int subid) { - return "https://" + BaseServlet.provName + "/sublog/" + subid; + return "https://" + BaseServlet.getProvName() + "/sublog/" + subid; } /** @@ -115,7 +115,7 @@ public class URLUtilities { public static String generatePeerLogsURL() { //Fixes for Itrack ticket - DATARTR-4#Fixing if only one Prov is configured, not to give exception to fill logs. String peerPodUrl = getPeerPodName(); - if (peerPodUrl.equals("") || peerPodUrl.equals(null)) { + if (peerPodUrl.equals("") || peerPodUrl==null) { return ""; }