Code Review / dmaap / datarouter.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
More unit test coverage and code cleanup
[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 c324942..5813024 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
@@ -7,9 +7,9 @@
  * * Licensed under the Apache License, Version 2.0 (the "License");\r
  * * you may not use this file except in compliance with the License.\r
  * * You may obtain a copy of the License at\r
- * * \r
+ * *\r
  *  *      http://www.apache.org/licenses/LICENSE-2.0\r
- * * \r
+ * *\r
  *  * Unless required by applicable law or agreed to in writing, software\r
  * * distributed under the License is distributed on an "AS IS" BASIS,\r
  * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
@@ -24,9 +24,10 @@
 \r
 package org.onap.dmaap.datarouter.provisioning.utils;\r
 \r
+import com.att.eelf.configuration.EELFLogger;\r
+import com.att.eelf.configuration.EELFManager;\r
 import java.net.InetAddress;\r
 import java.net.UnknownHostException;\r
-import java.util.Arrays;\r
 \r
 import org.onap.dmaap.datarouter.provisioning.BaseServlet;\r
 \r
@@ -37,94 +38,119 @@ 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
-        * Generate the URL used to access a feed.\r
-        * @param feedid the feed id\r
-        * @return the URL\r
-        */\r
-       public static String generateFeedURL(int feedid) {\r
-               return "https://" + BaseServlet.prov_name + "/feed/" + feedid;\r
-       }\r
-       /**\r
-        * Generate the URL used to publish to a feed.\r
-        * @param feedid the feed id\r
-        * @return the URL\r
-        */\r
-       public static String generatePublishURL(int feedid) {\r
-               return "https://" + BaseServlet.prov_name + "/publish/" + feedid;\r
-       }\r
-       /**\r
-        * Generate the URL used to subscribe to a feed.\r
-        * @param feedid the feed id\r
-        * @return the URL\r
-        */\r
-       public static String generateSubscribeURL(int feedid) {\r
-               return "https://" + BaseServlet.prov_name + "/subscribe/" + feedid;\r
-       }\r
-       /**\r
-        * Generate the URL used to access a feed's logs.\r
-        * @param feedid the feed id\r
-        * @return the URL\r
-        */\r
-       public static String generateFeedLogURL(int feedid) {\r
-               return "https://" + BaseServlet.prov_name + "/feedlog/" + feedid;\r
-       }\r
-       /**\r
-        * Generate the URL used to access a subscription.\r
-        * @param subid the subscription id\r
-        * @return the URL\r
-        */\r
-       public static String generateSubscriptionURL(int subid) {\r
-               return "https://" + BaseServlet.prov_name + "/subs/" + subid;\r
-       }\r
-       /**\r
-        * Generate the URL used to access a subscription's logs.\r
-        * @param subid the subscription id\r
-        * @return the URL\r
-        */\r
-       public static String generateSubLogURL(int subid) {\r
-               return "https://" + BaseServlet.prov_name + "/sublog/" + subid;\r
-       }\r
-       /**\r
-        * Generate the URL used to access the provisioning data on the peer POD.\r
-        * @return the URL\r
-        */\r
-       public static String generatePeerProvURL() {\r
-               return "https://" + getPeerPodName() + "/internal/prov";\r
-       }\r
-       /**\r
-        * Generate the URL used to access the logfile data on the peer POD.\r
-        * @return the URL\r
-        */\r
-       public static String generatePeerLogsURL() {\r
-               //Fixes for Itrack ticket - DATARTR-4#Fixing if only one Prov is configured, not to give exception to fill logs.\r
-               String peerPodUrl = getPeerPodName();\r
-               if(peerPodUrl.equals("") || peerPodUrl.equals(null)){\r
-                       return "";\r
-               }\r
-                               \r
-               return "https://" + peerPodUrl + "/internal/drlogs/";\r
-       }\r
-       /**\r
-        * Return the real (non CNAME) version of the peer POD's DNS name.\r
-        * @return the name\r
-        */\r
-       public static String getPeerPodName() {\r
-               if (other_pod == null) {\r
-                       String this_pod = "";\r
-                       try {\r
-                               this_pod = InetAddress.getLocalHost().getHostName();\r
-                               System.out.println("this_pod: "+this_pod);\r
-                       } catch (UnknownHostException e) {\r
-                               this_pod = "";\r
-                       }\r
-                       System.out.println("ALL PODS: "+Arrays.asList(BaseServlet.getPods()));\r
-                       for (String pod : BaseServlet.getPods()) {\r
-                               if (!pod.equals(this_pod))\r
-                                       other_pod = pod;\r
-                       }\r
-               }\r
-               return other_pod;\r
-       }\r
-       private static String other_pod;\r
+\r
+    private static final EELFLogger utilsLogger = EELFManager.getInstance().getLogger("UtilsLog");\r
+    private static final String HTTPS = "https://";\r
+    private static String otherPod;\r
+\r
+    private URLUtilities() {\r
+    }\r
+\r
+    /**\r
+     * Generate the URL used to access a feed.\r
+     *\r
+     * @param feedid the feed id\r
+     * @return the URL\r
+     */\r
+    public static String generateFeedURL(int feedid) {\r
+        return HTTPS + BaseServlet.getProvName() + "/feed/" + feedid;\r
+    }\r
+\r
+    /**\r
+     * Generate the URL used to publish to a feed.\r
+     *\r
+     * @param feedid the feed id\r
+     * @return the URL\r
+     */\r
+    public static String generatePublishURL(int feedid) {\r
+        return HTTPS + BaseServlet.getProvName() + "/publish/" + feedid;\r
+    }\r
+\r
+    /**\r
+     * Generate the URL used to subscribe to a feed.\r
+     *\r
+     * @param feedid the feed id\r
+     * @return the URL\r
+     */\r
+    public static String generateSubscribeURL(int feedid) {\r
+        return HTTPS + BaseServlet.getProvName() + "/subscribe/" + feedid;\r
+    }\r
+\r
+    /**\r
+     * Generate the URL used to access a feed's logs.\r
+     *\r
+     * @param feedid the feed id\r
+     * @return the URL\r
+     */\r
+    public static String generateFeedLogURL(int feedid) {\r
+        return HTTPS + BaseServlet.getProvName() + "/feedlog/" + feedid;\r
+    }\r
+\r
+    /**\r
+     * Generate the URL used to access a subscription.\r
+     *\r
+     * @param subid the subscription id\r
+     * @return the URL\r
+     */\r
+    public static String generateSubscriptionURL(int subid) {\r
+        return HTTPS + BaseServlet.getProvName() + "/subs/" + subid;\r
+    }\r
+\r
+    /**\r
+     * Generate the URL used to access a subscription's logs.\r
+     *\r
+     * @param subid the subscription id\r
+     * @return the URL\r
+     */\r
+    public static String generateSubLogURL(int subid) {\r
+        return HTTPS + BaseServlet.getProvName() + "/sublog/" + subid;\r
+    }\r
+\r
+    /**\r
+     * Generate the URL used to access the provisioning data on the peer POD.\r
+     *\r
+     * @return the URL\r
+     */\r
+    public static String generatePeerProvURL() {\r
+        return HTTPS + getPeerPodName() + "/internal/prov";\r
+    }\r
+\r
+    /**\r
+     * Generate the URL used to access the logfile data on the peer POD.\r
+     *\r
+     * @return the URL\r
+     */\r
+    public static String generatePeerLogsURL() {\r
+        //Fixes for Itrack ticket - DATARTR-4#Fixing if only one Prov is configured, not to give exception to fill logs.\r
+        String peerPodUrl = getPeerPodName();\r
+        if (peerPodUrl == null || "".equals(peerPodUrl)) {\r
+            return "";\r
+        }\r
+\r
+        return HTTPS + peerPodUrl + "/internal/drlogs/";\r
+    }\r
+\r
+    /**\r
+     * Return the real (non CNAME) version of the peer POD's DNS name.\r
+     *\r
+     * @return the name\r
+     */\r
+    public static String getPeerPodName() {\r
+        if (otherPod == null) {\r
+            String thisPod;\r
+            try {\r
+                thisPod = InetAddress.getLocalHost().getHostName();\r
+            } catch (UnknownHostException e) {\r
+                utilsLogger.trace("UnkownHostException: " + e.getMessage(), e);\r
+                thisPod = "";\r
+            }\r
+            for (String pod : BaseServlet.getPods()) {\r
+                if (!pod.equals(thisPod)) {\r
+                    otherPod = pod;\r
+                }\r
+            }\r
+        }\r
+        return otherPod;\r
+    }\r
+\r
 }\r
The Data Routing System project is intended to provide a common framework by which data producers can make data available to data consumers and a way for potential consumers to find feeds with the data they require. The interface to DR is exposed as a RESTful web service known as the DR Publishing and Delivery API