refactor: Rename base service class and change references

Author: lpatino10

src/main/java/com/ibm/cloud/sdk/core/http/HttpClientSingleton.java

@@ -12,10 +12,9 @@
  */
 package com.ibm.cloud.sdk.core.http;
 
-import com.ibm.cloud.sdk.core.service.WatsonService;
+import com.ibm.cloud.sdk.core.service.BaseService;
 import com.ibm.cloud.sdk.core.service.security.DelegatingSSLSocketFactory;
 import com.ibm.cloud.sdk.core.util.HttpLogging;
-
 import okhttp3.ConnectionSpec;
 import okhttp3.OkHttpClient;
 import okhttp3.OkHttpClient.Builder;
@@ -52,7 +51,7 @@
 public class HttpClientSingleton {
   private static HttpClientSingleton instance = null;
 
-  private static final Logger LOG = Logger.getLogger(WatsonService.class.getName());
+  private static final Logger LOG = Logger.getLogger(BaseService.class.getName());
 
   /**
    * TrustManager for disabling SSL verification, which essentially lets everything through.
@@ -130,7 +129,7 @@ private void addCookieJar(final OkHttpClient.Builder builder) {
     final CookieManager cookieManager = new CookieManager();
     cookieManager.setCookiePolicy(CookiePolicy.ACCEPT_ALL);
 
-    builder.cookieJar(new WatsonCookieJar(cookieManager));
+    builder.cookieJar(new ServiceCookieJar(cookieManager));
   }
 
   /**
@@ -213,7 +212,7 @@ protected SSLSocket configureSocket(SSLSocket socket) throws IOException {
   }
 
   /**
-   * Creates an {@link OkHttpClient} instance with a new {@link WatsonCookieJar}.
+   * Creates an {@link OkHttpClient} instance with a new {@link ServiceCookieJar}.
    *
    * @return the client
    */

src/main/java/com/ibm/cloud/sdk/core/service/WatsonService.java renamed to src/main/java/com/ibm/cloud/sdk/core/service/BaseService.java

@@ -59,7 +59,7 @@
  *
  * @see <a href="http://www.ibm.com/watson/developercloud/"> IBM Watson Developer Cloud</a>
  */
-public abstract class WatsonService {
+public abstract class BaseService {
 
   private static final String URL = "url";
   private static final String PATH_AUTHORIZATION_V1_TOKEN = "/v1/token";
@@ -68,11 +68,7 @@ public abstract class WatsonService {
   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 "
-      + "services that use Identity and Access Management (IAM) authentication. For details see the IAM "
-      + "authentication section in the README.";
+  private static final Logger LOG = Logger.getLogger(BaseService.class.getName());
   private String apiKey;
   private String username;
   private String password;
@@ -104,11 +100,11 @@ public abstract class WatsonService {
     Pattern.compile("(?i)application\\/json\\-patch\\+json(;.*)?");
 
   /**
-   * Instantiates a new Watson service.
+   * Instantiates a new IBM Cloud service.
    *
    * @param name the service name
    */
-  public WatsonService(final String name) {
+  public BaseService(final String name) {
     this.name = name;
 
     // file credentials take precedence
@@ -343,10 +339,6 @@ protected void setAuthentication(final Builder builder) {
       builder.addHeader(HttpHeaders.AUTHORIZATION, BEARER + accessToken);
     } else if (getApiKey() == null) {
       if (skipAuthentication) {
-        Headers currentHeaders = builder.build().headers();
-        if (currentHeaders.get(HttpHeaders.X_WATSON_AUTHORIZATION_TOKEN) != null) {
-          LOG.warning(AUTH_HEADER_DEPRECATION_MESSAGE);
-        }
         return;
       }
       throw new IllegalArgumentException("apiKey or username and password were not specified");

src/test/java/com/ibm/cloud/sdk/core/test/service/WatsonServiceTest.java

@@ -17,35 +17,35 @@
 
 import org.junit.Test;
 
-import com.ibm.cloud.sdk.core.service.WatsonService;
+import com.ibm.cloud.sdk.core.service.BaseService;
 
 /**
- * Unit tests associated with the WatsonService core class.
+ * Unit tests associated with the BaseService core class.
  *
  */
-public class WatsonServiceTest {
+public class BaseServiceTest {
 
   @Test
   public void testMimeTypes() {
-    assertTrue(WatsonService.isJsonMimeType("application/json"));
-    assertTrue(WatsonService.isJsonMimeType("application/json; charset=utf-8"));
-    assertTrue(WatsonService.isJsonMimeType("application/json;charset=utf-8"));
-    assertTrue(WatsonService.isJsonMimeType("APPLICATION/JSON;charset=utf-16"));
-    assertFalse(WatsonService.isJsonMimeType("application/notjson"));
-    assertFalse(WatsonService.isJsonMimeType("application/json-patch+json"));
-    assertFalse(WatsonService.isJsonMimeType("APPlication/JSON-patCH+jSoN;charset=utf-8"));
-    assertTrue(WatsonService.isJsonPatchMimeType("APPlication/JSON-patCH+jSoN;charset=utf-8"));
-    assertTrue(WatsonService.isJsonMimeType("application/merge-patch+json"));
-    assertTrue(WatsonService.isJsonMimeType("application/merge-patch+json;charset=utf-8"));
-    assertFalse(WatsonService.isJsonMimeType("application/json2-patch+json"));
-    assertFalse(WatsonService.isJsonMimeType("application/merge-patch+json-blah"));
-    assertFalse(WatsonService.isJsonMimeType("application/merge patch json"));
+    assertTrue(BaseService.isJsonMimeType("application/json"));
+    assertTrue(BaseService.isJsonMimeType("application/json; charset=utf-8"));
+    assertTrue(BaseService.isJsonMimeType("application/json;charset=utf-8"));
+    assertTrue(BaseService.isJsonMimeType("APPLICATION/JSON;charset=utf-16"));
+    assertFalse(BaseService.isJsonMimeType("application/notjson"));
+    assertFalse(BaseService.isJsonMimeType("application/json-patch+json"));
+    assertFalse(BaseService.isJsonMimeType("APPlication/JSON-patCH+jSoN;charset=utf-8"));
+    assertTrue(BaseService.isJsonPatchMimeType("APPlication/JSON-patCH+jSoN;charset=utf-8"));
+    assertTrue(BaseService.isJsonMimeType("application/merge-patch+json"));
+    assertTrue(BaseService.isJsonMimeType("application/merge-patch+json;charset=utf-8"));
+    assertFalse(BaseService.isJsonMimeType("application/json2-patch+json"));
+    assertFalse(BaseService.isJsonMimeType("application/merge-patch+json-blah"));
+    assertFalse(BaseService.isJsonMimeType("application/merge patch json"));
 
-    assertTrue(WatsonService.isJsonPatchMimeType("application/json-patch+json"));
-    assertTrue(WatsonService.isJsonPatchMimeType("application/json-patch+json;charset=utf-8"));
-    assertFalse(WatsonService.isJsonPatchMimeType("application/json"));
-    assertFalse(WatsonService.isJsonPatchMimeType("APPLICATION/JsOn; charset=utf-8"));
-    assertFalse(WatsonService.isJsonPatchMimeType("application/merge-patch+json"));
-    assertFalse(WatsonService.isJsonPatchMimeType("application/merge-patch+json;charset=utf-8"));
+    assertTrue(BaseService.isJsonPatchMimeType("application/json-patch+json"));
+    assertTrue(BaseService.isJsonPatchMimeType("application/json-patch+json;charset=utf-8"));
+    assertFalse(BaseService.isJsonPatchMimeType("application/json"));
+    assertFalse(BaseService.isJsonPatchMimeType("APPLICATION/JsOn; charset=utf-8"));
+    assertFalse(BaseService.isJsonPatchMimeType("application/merge-patch+json"));
+    assertFalse(BaseService.isJsonPatchMimeType("application/merge-patch+json;charset=utf-8"));
   }
 }