\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
*/\r
public class URLUtilities {\r
\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
* @return the URL\r
*/\r
public static String generateFeedURL(int feedid) {\r
- return "https://" + BaseServlet.provName + "/feed/" + feedid;\r
+ return HTTPS + BaseServlet.getProvName() + "/feed/" + feedid;\r
}\r
\r
/**\r
* @return the URL\r
*/\r
public static String generatePublishURL(int feedid) {\r
- return "https://" + BaseServlet.provName + "/publish/" + feedid;\r
+ return HTTPS + BaseServlet.getProvName() + "/publish/" + feedid;\r
}\r
\r
/**\r
* @return the URL\r
*/\r
public static String generateSubscribeURL(int feedid) {\r
- return "https://" + BaseServlet.provName + "/subscribe/" + feedid;\r
+ return HTTPS + BaseServlet.getProvName() + "/subscribe/" + feedid;\r
}\r
\r
/**\r
* @return the URL\r
*/\r
public static String generateFeedLogURL(int feedid) {\r
- return "https://" + BaseServlet.provName + "/feedlog/" + feedid;\r
+ return HTTPS + BaseServlet.getProvName() + "/feedlog/" + feedid;\r
}\r
\r
/**\r
* @return the URL\r
*/\r
public static String generateSubscriptionURL(int subid) {\r
- return "https://" + BaseServlet.provName + "/subs/" + subid;\r
+ return HTTPS + BaseServlet.getProvName() + "/subs/" + subid;\r
}\r
\r
/**\r
* @return the URL\r
*/\r
public static String generateSubLogURL(int subid) {\r
- return "https://" + BaseServlet.provName + "/sublog/" + subid;\r
+ return HTTPS + BaseServlet.getProvName() + "/sublog/" + subid;\r
}\r
\r
/**\r
* @return the URL\r
*/\r
public static String generatePeerProvURL() {\r
- return "https://" + getPeerPodName() + "/internal/prov";\r
+ return HTTPS + getPeerPodName() + "/internal/prov";\r
}\r
\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
+ if (peerPodUrl == null || "".equals(peerPodUrl)) {\r
return "";\r
}\r
\r
- return "https://" + peerPodUrl + "/internal/drlogs/";\r
+ return HTTPS + peerPodUrl + "/internal/drlogs/";\r
}\r
\r
/**\r
* @return the name\r
*/\r
public static String getPeerPodName() {\r
- if (other_pod == null) {\r
- String this_pod = "";\r
+ if (otherPod == null) {\r
+ String thisPod;\r
try {\r
- this_pod = InetAddress.getLocalHost().getHostName();\r
- System.out.println("this_pod: " + this_pod);\r
+ thisPod = InetAddress.getLocalHost().getHostName();\r
} catch (UnknownHostException e) {\r
- this_pod = "";\r
+ utilsLogger.trace("UnkownHostException: " + e.getMessage(), e);\r
+ thisPod = "";\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
+ if (!pod.equals(thisPod)) {\r
+ otherPod = pod;\r
}\r
}\r
}\r
- return other_pod;\r
+ return otherPod;\r
}\r
\r
- private static String other_pod;\r
}\r