Merge branch 'master' into pa/core-updates

Author: lpatino10

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

@@ -71,6 +71,7 @@ public abstract class WatsonService {
   private static final String BASIC = "Basic ";
   private static final String BEARER = "Bearer ";
   private static final String APIKEY_AS_USERNAME = "apikey";
+  private static final String ICP_PREFIX = "icp-";
   private static final Logger LOG = Logger.getLogger(WatsonService.class.getName());
   private static final String AUTH_HEADER_DEPRECATION_MESSAGE = "Authenticating with the X-Watson-Authorization-Token"
       + "header is deprecated. The token continues to work with Cloud Foundry services, but is not supported for "
@@ -378,7 +379,8 @@ public void setEndPoint(final String endPoint) {
    * @param password the password
    */
   public void setUsernameAndPassword(final String username, final String password) {
-    if (username.equals(APIKEY_AS_USERNAME)) {
+    // we'll perform the token exchange for users UNLESS they're on ICP
+    if (username.equals(APIKEY_AS_USERNAME) && !password.startsWith(ICP_PREFIX)) {
       IamOptions iamOptions = new IamOptions.Builder()
           .apiKey(password)
           .build();

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

@@ -3,9 +3,12 @@
 import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
 
 public class AuthenticationTest {
+  private static final String APIKEY_USERNAME = "apikey";
   private static final String APIKEY = "12345";
+  private static final String ICP_APIKEY = "icp-12345";
 
   public class TestService extends WatsonService {
     private static final String SERVICE_NAME = "test";
@@ -18,7 +21,14 @@ public TestService() {
   @Test
   public void authenticateWithApiKeyAsUsername() {
     TestService service = new TestService();
-    service.setUsernameAndPassword("apikey", APIKEY);
+    service.setUsernameAndPassword(APIKEY_USERNAME, APIKEY);
     assertTrue(service.isTokenManagerSet());
   }
+
+  @Test
+  public void authenticateWithIcp() {
+    TestService service = new TestService();
+    service.setUsernameAndPassword(APIKEY_USERNAME, ICP_APIKEY);
+    assertFalse(service.isTokenManagerSet());
+  }
 }