Update for OOM integration

[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 c3661ba..b58ab5a 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
@@ -37,6 +37,7 @@ import org.onap.dmaap.datarouter.provisioning.BaseServlet;
  * @version $Id: URLUtilities.java,v 1.2 2014/03/12 19:45:41 eby Exp $\r
  */\r
 public class URLUtilities {\r
+\r
     /**\r
      * Generate the URL used to access a feed.\r
      *\r
@@ -44,7 +45,7 @@ public class URLUtilities {
      * @return the URL\r
      */\r
     public static String generateFeedURL(int feedid) {\r
-        return "https://" + BaseServlet.prov_name + "/feed/" + feedid;\r
+        return "https://" + BaseServlet.provName + "/feed/" + feedid;\r
     }\r
 \r
     /**\r
@@ -54,7 +55,7 @@ public class URLUtilities {
      * @return the URL\r
      */\r
     public static String generatePublishURL(int feedid) {\r
-        return "https://" + BaseServlet.prov_name + "/publish/" + feedid;\r
+        return "https://" + BaseServlet.provName + "/publish/" + feedid;\r
     }\r
 \r
     /**\r
@@ -64,7 +65,7 @@ public class URLUtilities {
      * @return the URL\r
      */\r
     public static String generateSubscribeURL(int feedid) {\r
-        return "https://" + BaseServlet.prov_name + "/subscribe/" + feedid;\r
+        return "https://" + BaseServlet.provName + "/subscribe/" + feedid;\r
     }\r
 \r
     /**\r
@@ -74,7 +75,7 @@ public class URLUtilities {
      * @return the URL\r
      */\r
     public static String generateFeedLogURL(int feedid) {\r
-        return "https://" + BaseServlet.prov_name + "/feedlog/" + feedid;\r
+        return "https://" + BaseServlet.provName + "/feedlog/" + feedid;\r
     }\r
 \r
     /**\r
@@ -84,7 +85,7 @@ public class URLUtilities {
      * @return the URL\r
      */\r
     public static String generateSubscriptionURL(int subid) {\r
-        return "https://" + BaseServlet.prov_name + "/subs/" + subid;\r
+        return "https://" + BaseServlet.provName + "/subs/" + subid;\r
     }\r
 \r
     /**\r
@@ -94,7 +95,7 @@ public class URLUtilities {
      * @return the URL\r
      */\r
     public static String generateSubLogURL(int subid) {\r
-        return "https://" + BaseServlet.prov_name + "/sublog/" + subid;\r
+        return "https://" + BaseServlet.provName + "/sublog/" + subid;\r
     }\r
 \r
     /**\r
@@ -137,8 +138,9 @@ public class URLUtilities {
             }\r
             System.out.println("ALL PODS: " + Arrays.asList(BaseServlet.getPods()));\r
             for (String pod : BaseServlet.getPods()) {\r
-                if (!pod.equals(this_pod))\r
+                if (!pod.equals(this_pod)) {\r
                     other_pod = pod;\r
+                }\r
             }\r
         }\r
         return other_pod;\r