Merge pull request #1032 from amanoese/fix-credencials-patch

Fix credentials patch

Author: lpatino10

core/src/main/java/com/ibm/watson/developer_cloud/service/WatsonService.java

@@ -430,6 +430,7 @@ public void setUsernameAndPassword(final String username, final String password)
       this.username = username;
       this.password = password;
       apiKey = Credentials.basic(username, password);
+      clearIamCredentials();
     }
   }
 
@@ -459,6 +460,9 @@ public void setIamCredentials(IamOptions iamOptions) {
     this.tokenManager = new IamTokenManager(iamOptions);
   }
 
+  private void clearIamCredentials() {
+    this.tokenManager = null;
+  }
   /*
    * (non-Javadoc)
    *

core/src/test/java/com/ibm/watson/developer_cloud/service/AuthenticationTest.java

@@ -1,5 +1,6 @@
 package com.ibm.watson.developer_cloud.service;
 
+import com.ibm.watson.developer_cloud.util.CredentialUtils;
 import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;
@@ -9,6 +10,7 @@ public class AuthenticationTest {
   private static final String APIKEY_USERNAME = "apikey";
   private static final String APIKEY = "12345";
   private static final String ICP_APIKEY = "icp-12345";
+  private static final String BASIC_USERNAME = "basicUser";
 
   public class TestService extends WatsonService {
     private static final String SERVICE_NAME = "test";
@@ -31,4 +33,29 @@ public void authenticateWithIcp() {
     service.setUsernameAndPassword(APIKEY_USERNAME, ICP_APIKEY);
     assertFalse(service.isTokenManagerSet());
   }
+
+  @Test
+  public void multiAuthenticationWithMultiBindSameServiceOnVcapService() {
+
+    CredentialUtils.setServices("{\n"
+        + "  \"test\": [\n"
+        + "    {\n"
+        + "      \"credentials\": {\n"
+        + "        \"apikey\": \"" + APIKEY + "\",\n"
+        + "        \"url\": \"https://gateway.watsonplatform.net/discovery/api\"\n"
+        + "      },\n"
+        + "      \"plan\": \"lite\"\n"
+        + "    }\n"
+        + "  ]\n"
+        + "}\n");
+
+    TestService serviceA = new TestService();
+    serviceA.setUsernameAndPassword(APIKEY_USERNAME, APIKEY);
+
+    TestService serviceB = new TestService();
+    serviceB.setUsernameAndPassword(BASIC_USERNAME, APIKEY);
+
+    assertTrue(serviceA.isTokenManagerSet());
+    assertFalse(serviceB.isTokenManagerSet());
+  }
 }