refactor: Remove logic to build and use User-Agent

Author: lpatino10

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

@@ -36,7 +36,6 @@
 import com.ibm.cloud.sdk.core.service.security.IamOptions;
 import com.ibm.cloud.sdk.core.service.security.IamTokenManager;
 import com.ibm.cloud.sdk.core.util.CredentialUtils;
-import com.ibm.cloud.sdk.core.util.RequestUtils;
 import com.ibm.cloud.sdk.core.util.ResponseConverterUtils;
 import jersey.repackaged.jsr166e.CompletableFuture;
 import okhttp3.Call;
@@ -208,17 +207,11 @@ private Call createCall(final Request request) {
    * @param builder the new default headers
    */
   protected void setDefaultHeaders(final Request.Builder builder) {
-    String userAgent = RequestUtils.getUserAgent();
-
     if (defaultHeaders != null) {
       for (String key : defaultHeaders.names()) {
         builder.header(key, defaultHeaders.get(key));
       }
-      if (defaultHeaders.get(HttpHeaders.USER_AGENT) != null) {
-        userAgent += " " + defaultHeaders.get(HttpHeaders.USER_AGENT);
-      }
     }
-    builder.header(HttpHeaders.USER_AGENT, userAgent);
   }
 
   /**

src/main/java/com/ibm/cloud/sdk/core/util/RequestUtils.java

@@ -19,18 +19,13 @@
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.ibm.cloud.sdk.core.http.HttpMediaType;
-import com.ibm.cloud.sdk.core.http.InputStreamRequestBody;
-
 /**
  * Utility functions to use when creating a {@link com.ibm.cloud.sdk.core.http.RequestBuilder }.
  *
@@ -39,10 +34,6 @@ public final class RequestUtils {
 
   private static final Logger LOG = Logger.getLogger(RequestUtils.class.getName());
 
-  private static final String[] properties =
-      new String[] { "java.vendor", "java.version", "os.arch", "os.name", "os.version" };
-  private static String userAgent;
-
   private RequestUtils() {
     // This is a utility class - no instantiation allowed.
   }
@@ -142,18 +133,6 @@ public static String join(Iterable<?> iterable, String separator) {
     return sb.toString();
   }
 
-  /**
-   * Gets the user agent.
-   *
-   * @return the user agent
-   */
-  public static synchronized String getUserAgent() {
-    if (userAgent == null) {
-      userAgent = buildUserAgent();
-    }
-    return userAgent;
-  }
-
   private static String loadSdkVersion() {
     ClassLoader classLoader = RequestUtils.class.getClassLoader();
     InputStream inputStream = classLoader.getResourceAsStream("version.properties");
@@ -168,20 +147,6 @@ private static String loadSdkVersion() {
     return properties.getProperty("version", "unknown-version");
   }
 
-  /**
-   * Builds the user agent using System properties.
-   *
-   * @return the string that represents the user agent
-   */
-  private static String buildUserAgent() {
-    final List<String> details = new ArrayList<String>();
-    for (String propertyName : properties) {
-      details.add(propertyName + "=" + System.getProperty(propertyName));
-    }
-
-    return "watson-apis-java-sdk/" + loadSdkVersion() + " (" + RequestUtils.join(details, "; ") + ")";
-  }
-
   /**
    * Returns a request body that encapsulates the specified file qualified with the specified content type.
    *

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

@@ -15,8 +15,6 @@
 import com.google.gson.JsonObject;
 import com.ibm.cloud.sdk.core.http.HttpMediaType;
 import com.ibm.cloud.sdk.core.http.RequestBuilder;
-import com.ibm.cloud.sdk.core.util.RequestUtils;
-
 import okhttp3.HttpUrl;
 import okhttp3.MediaType;
 import okhttp3.Request;
@@ -30,7 +28,6 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
 /**
  * The Class RequestBuilderTest.
@@ -246,14 +243,4 @@ public void testSpecialCharacterQuery() {
     final Request request = RequestBuilder.get(HttpUrl.parse(url)).query("ä&ö", "ö=ü").build();
     assertEquals(url + "?%C3%A4%26%C3%B6=%C3%B6%3D%C3%BC", request.url().toString());
   }
-
-  /**
-   * Test user agent.
-   */
-  @Test
-  public void testUserAgent() {
-    assertNotNull(RequestUtils.getUserAgent());
-    assertTrue(RequestUtils.getUserAgent().startsWith("watson-apis-java-sdk/"));
-  }
-
 }