test: Use interface when creating authenticators

Author: lpatino10

assistant/src/test/java/com/ibm/watson/assistant/v1/AssistantServiceTest.java

@@ -12,6 +12,7 @@
  */
 package com.ibm.watson.assistant.v1;
 
+import com.ibm.cloud.sdk.core.security.Authenticator;
 import com.ibm.cloud.sdk.core.security.IamAuthenticator;
 import com.ibm.watson.common.WatsonServiceTest;
 import org.junit.Assume;
@@ -45,7 +46,7 @@ public void setUp() throws Exception {
 
     Assume.assumeFalse("config.properties doesn't have valid credentials.", apiKey == null);
 
-    IamAuthenticator authenticator = new IamAuthenticator(apiKey);
+    Authenticator authenticator = new IamAuthenticator(apiKey);
     service = new Assistant("2018-07-10", authenticator);
     service.setEndPoint(getProperty("assistant.url"));
     service.setDefaultHeaders(getDefaultHeaders());

assistant/src/test/java/com/ibm/watson/assistant/v2/AssistantServiceTest.java

@@ -12,6 +12,7 @@
  */
 package com.ibm.watson.assistant.v2;
 
+import com.ibm.cloud.sdk.core.security.Authenticator;
 import com.ibm.cloud.sdk.core.security.IamAuthenticator;
 import com.ibm.watson.common.WatsonServiceTest;
 import org.junit.Assume;
@@ -45,7 +46,7 @@ public void setUp() throws Exception {
 
     Assume.assumeFalse("config.properties doesn't have valid credentials.", apiKey == null);
 
-    IamAuthenticator authenticator = new IamAuthenticator(apiKey);
+    Authenticator authenticator = new IamAuthenticator(apiKey);
     service = new Assistant("2019-02-28", authenticator);
     service.setEndPoint(getProperty("assistant.url"));
     service.setDefaultHeaders(getDefaultHeaders());

compare-comply/src/test/java/com/ibm/watson/compare_comply/v1/CompareComplyServiceTest.java

@@ -1,5 +1,6 @@
 package com.ibm.watson.compare_comply.v1;
 
+import com.ibm.cloud.sdk.core.security.Authenticator;
 import com.ibm.cloud.sdk.core.security.IamAuthenticator;
 import com.ibm.watson.common.WatsonServiceTest;
 import org.junit.Assume;
@@ -25,7 +26,7 @@ public void setUp() throws Exception {
     String apiKey = getProperty("compare_comply.apikey");
     Assume.assumeFalse("config.properties doesn't have valid credentials.", apiKey == null);
 
-    IamAuthenticator authenticator = new IamAuthenticator(apiKey);
+    Authenticator authenticator = new IamAuthenticator(apiKey);
     service = new CompareComply(VERSION, authenticator);
     service.setEndPoint(getProperty("compare_comply.url"));
     service.setDefaultHeaders(getDefaultHeaders());

discovery/src/test/java/com/ibm/watson/discovery/v1/DiscoveryServiceIT.java

@@ -17,6 +17,7 @@
 import com.google.gson.JsonPrimitive;
 import com.google.gson.internal.LazilyParsedNumber;
 import com.ibm.cloud.sdk.core.http.HttpMediaType;
+import com.ibm.cloud.sdk.core.security.Authenticator;
 import com.ibm.cloud.sdk.core.security.BasicAuthenticator;
 import com.ibm.cloud.sdk.core.security.IamAuthenticator;
 import com.ibm.cloud.sdk.core.service.exception.BadRequestException;
@@ -228,7 +229,7 @@ public void setup() throws Exception {
     super.setUp();
     String apiKey = getProperty("discovery.apikey");
     String url = getProperty("discovery.url");
-    IamAuthenticator authenticator = new IamAuthenticator(apiKey);
+    Authenticator authenticator = new IamAuthenticator(apiKey);
     discovery = new Discovery("2018-05-23", authenticator);
     discovery.setEndPoint(url);
     discovery.setDefaultHeaders(getDefaultHeaders());

language-translator/src/test/java/com/ibm/watson/language_translator/v3/LanguageTranslatorIT.java

@@ -16,6 +16,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.ibm.cloud.sdk.core.http.HttpMediaType;
 import com.ibm.cloud.sdk.core.http.Response;
+import com.ibm.cloud.sdk.core.security.Authenticator;
 import com.ibm.cloud.sdk.core.security.IamAuthenticator;
 import com.ibm.watson.common.WatsonHttpHeaders;
 import com.ibm.watson.common.WatsonServiceTest;
@@ -81,7 +82,7 @@ public void setUp() throws Exception {
 
     Assume.assumeFalse("config.properties doesn't have valid credentials.", (iamApiKey == null));
 
-    IamAuthenticator authenticator = new IamAuthenticator(iamApiKey);
+    Authenticator authenticator = new IamAuthenticator(iamApiKey);
     service = new LanguageTranslator("2018-05-01", authenticator);
     service.setEndPoint(getProperty("language_translator.url"));
 

natural-language-classifier/src/test/java/com/ibm/watson/natural_language_classifier/v1/NaturalLanguageClassifierIT.java

@@ -12,6 +12,7 @@
  */
 package com.ibm.watson.natural_language_classifier.v1;
 
+import com.ibm.cloud.sdk.core.security.Authenticator;
 import com.ibm.cloud.sdk.core.security.IamAuthenticator;
 import com.ibm.cloud.sdk.core.service.exception.NotFoundException;
 import com.ibm.watson.common.WatsonServiceTest;
@@ -64,7 +65,7 @@ public void setUp() throws Exception {
 
     Assume.assumeFalse("config.properties doesn't have valid credentials.", apiKey == null);
 
-    IamAuthenticator authenticator = new IamAuthenticator(apiKey);
+    Authenticator authenticator = new IamAuthenticator(apiKey);
     service = new NaturalLanguageClassifier(authenticator);
     service.setDefaultHeaders(getDefaultHeaders());
     service.setEndPoint(getProperty("natural_language_classifier.url"));

natural-language-understanding/src/test/java/com/ibm/watson/natural_language_understanding/v1/NaturalLanguageUnderstandingIT.java

@@ -13,6 +13,7 @@
 package com.ibm.watson.natural_language_understanding.v1;
 
 
+import com.ibm.cloud.sdk.core.security.Authenticator;
 import com.ibm.cloud.sdk.core.security.IamAuthenticator;
 import com.ibm.watson.common.RetryRunner;
 import com.ibm.watson.common.WatsonServiceTest;
@@ -77,7 +78,7 @@ public void setUp() throws Exception {
 
     Assume.assumeFalse("config.properties doesn't have valid credentials.", apiKey == null);
 
-    IamAuthenticator authenticator = new IamAuthenticator(apiKey);
+    Authenticator authenticator = new IamAuthenticator(apiKey);
     service = new NaturalLanguageUnderstanding("2018-11-16", authenticator);
     service.setDefaultHeaders(getDefaultHeaders());
     service.setEndPoint(getProperty("natural_language_understanding.url"));

personality-insights/src/test/java/com/ibm/watson/personality_insights/v3/PersonalityInsightsIT.java

@@ -13,6 +13,7 @@
 package com.ibm.watson.personality_insights.v3;
 
 import com.google.common.io.CharStreams;
+import com.ibm.cloud.sdk.core.security.Authenticator;
 import com.ibm.cloud.sdk.core.security.IamAuthenticator;
 import com.ibm.watson.common.WatsonServiceTest;
 import com.ibm.watson.personality_insights.v3.model.ConsumptionPreferences;
@@ -56,7 +57,7 @@ public void setUp() throws Exception {
 
     Assume.assumeFalse("config.properties doesn't have valid credentials.", apiKey == null);
 
-    IamAuthenticator authenticator = new IamAuthenticator(apiKey);
+    Authenticator authenticator = new IamAuthenticator(apiKey);
     service = new PersonalityInsights(VERSION_DATE_2016_10_19, authenticator);
     service.setEndPoint(getProperty("personality_insights.url"));
     service.setDefaultHeaders(getDefaultHeaders());

speech-to-text/src/test/java/com/ibm/watson/speech_to_text/v1/SpeechToTextIT.java

@@ -13,6 +13,7 @@
 package com.ibm.watson.speech_to_text.v1;
 
 import com.ibm.cloud.sdk.core.http.HttpMediaType;
+import com.ibm.cloud.sdk.core.security.Authenticator;
 import com.ibm.cloud.sdk.core.security.BasicAuthenticator;
 import com.ibm.cloud.sdk.core.service.exception.NotFoundException;
 import com.ibm.watson.common.RetryRunner;
@@ -131,7 +132,7 @@ public void setUp() throws Exception {
 
     Assume.assumeFalse("config.properties doesn't have valid credentials.", username == null);
 
-    BasicAuthenticator authenticator = new BasicAuthenticator(username, password);
+    Authenticator authenticator = new BasicAuthenticator(username, password);
     service = new SpeechToText(authenticator);
     service.setEndPoint(getProperty("speech_to_text.url"));
     service.setDefaultHeaders(getDefaultHeaders());