Retrieve service URL from JDNI

Author: lpatino10

core/src/main/java/com/ibm/watson/developer_cloud/util/CredentialUtils.java

@@ -109,24 +109,31 @@ public String getUsername() {
   /** The Constant API_KEY. */
   private static final String API_KEY = "api_key";
 
+  /** The Constant LOOKUP_NAME_EXTENSION_API_KEY. */
+  private static final String LOOKUP_NAME_EXTENSION_API_KEY = "/credentials";
+
+  /** The Constant LOOKUP_NAME_EXTENSION_URL. */
+  private static final String LOOKUP_NAME_EXTENSION_URL = "/url";
+
   private CredentialUtils() {
     // This is a utility class - no instantiation allowed.
   }
 
   /**
-   * Attempt to get the Base64-encoded API key through JNDI.
+   * Attempt to get the Base64-encoded value through JNDI.
    *
    * This method should always return null on Android due to the javax functions being unsupported
    *
    * @param serviceName Name of the bluemix service
-   * @return The encoded API Key
+   * @param lookupNameExtension Extension to determine which value should be retrieved through JDNI
+   * @return The encoded desired value
    */
-  private static String getKeyUsingJNDI(String serviceName) {
+  private static String getJDNIValue(String serviceName, String lookupNameExtension) {
     if (!isClassAvailable("javax.naming.Context") || !isClassAvailable("javax.naming.InitialContext")) {
       log.info("JNDI string lookups is not available.");
       return null;
     }
-    String lookupName = "watson-developer-cloud/" + serviceName + "/credentials";
+    String lookupName = "watson-developer-cloud/" + serviceName + lookupNameExtension;
     try {
       Context context = new InitialContext();
       return (String) context.lookup(lookupName);
@@ -192,7 +199,7 @@ public static String getAPIKey(String serviceName, String plan) {
 
     final JsonObject services = getVCAPServices();
     if (services == null) {
-      return getKeyUsingJNDI(serviceName);
+      return getJDNIValue(serviceName, LOOKUP_NAME_EXTENSION_API_KEY);
     }
     if (serviceName.equalsIgnoreCase(ALCHEMY_API)) {
       final JsonObject credentials = getCredentialsObject(services, serviceName, plan);
@@ -299,12 +306,12 @@ public static String getAPIUrl(String serviceName) {
   }
 
   /**
-   * Returns the apiKey from the VCAP_SERVICES or null if doesn't exists. If plan is specified, then only credentials
-   * for the given plan will be returned.
+   * Returns the API URL from the VCAP_SERVICES, JDNI, or null if doesn't exists. If plan is specified, then only
+   * credentials for the given plan will be returned.
    *
    * @param serviceName the service name
    * @param plan the service plan: standard, free or experimental
-   * @return the API key
+   * @return the API URL
    */
   public static String getAPIUrl(String serviceName, String plan) {
     if ((serviceName == null) || serviceName.isEmpty()) {
@@ -313,7 +320,7 @@ public static String getAPIUrl(String serviceName, String plan) {
 
     final JsonObject services = getVCAPServices();
     if (services == null) {
-      return null;
+      return getJDNIValue(serviceName, LOOKUP_NAME_EXTENSION_URL);
     }
 
     final JsonObject credentials = getCredentialsObject(services, serviceName, plan);