chore: remove legacy apache http from core (#2014)

The Android SDK uses HttpURLConnection as its HTTP runtime.
aws-android-sdk-core contains dead code that references the legacy
Apache HTTP Client used by the V1 Java SDK, from which this codebase
originates. The Apache HTTP client has considerable baggage on the
Android platform, and can cause runtime failures. In an effort to fully
remove it from the codebase, it is being removed from core.

As of this commit, Apache Logging is still a compile-time dependency in
core. If it is provided at runtime, it will be used. Otherwise, the SDK
will fallback to logging against the Android Log utility. This behavior
is discussed here: #476

Author: jamesonwilliams

aws-android-sdk-core/build.gradle

@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 28
-    useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
         minSdkVersion 9
@@ -16,6 +15,7 @@ android {
 
 dependencies {
     api 'com.google.code.gson:gson:2.8.6'
+    compileOnly 'commons-logging:commons-logging:1.2'
     implementation 'androidx.annotation:annotation:1.1.0'
 
     testImplementation 'joda-time:joda-time:2.8.1'
@@ -24,6 +24,6 @@ dependencies {
     testImplementation 'org.easymock:easymock:3.1'
     testImplementation 'org.robolectric:robolectric:4.3.1'
     testImplementation 'xerces:xercesImpl:2.12.0'
-    testRuntimeOnly 'org.apache.httpcomponents:httpclient:4.5.12'
+    testRuntimeOnly 'commons-logging:commons-logging:1.2'
 }
 

aws-android-sdk-core/pom.xml

@@ -23,6 +23,12 @@
       <artifactId>annotation</artifactId>
       <version>1.1.0</version>
     </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>

aws-android-sdk-core/src/main/java/com/amazonaws/ClientConfiguration.java

@@ -15,7 +15,6 @@
 
 package com.amazonaws;
 
-import com.amazonaws.http.IdleConnectionReaper;
 import com.amazonaws.retry.PredefinedRetryPolicies;
 import com.amazonaws.retry.RetryPolicy;
 import com.amazonaws.util.VersionInfoUtils;
@@ -57,14 +56,6 @@ public class ClientConfiguration {
      */
     public static final RetryPolicy DEFAULT_RETRY_POLICY = PredefinedRetryPolicies.DEFAULT;
 
-    /**
-     * The default on whether to use the {@link IdleConnectionReaper} to manage
-     * stale connections
-     *
-     * @see IdleConnectionReaper
-     */
-    public static final boolean DEFAULT_USE_REAPER = true;
-
     /** The HTTP user agent header passed with all HTTP requests. */
     private String userAgent = DEFAULT_USER_AGENT;
 
@@ -152,14 +143,6 @@ public class ClientConfiguration {
      */
     private int socketReceiveBufferSizeHint = 0;
 
-    /**
-     * Optional whether to use the {@link IdleConnectionReaper} to manage stale
-     * connections. A reason for not running the {@link IdleConnectionReaper}
-     * can be if running in an environment where the modifyThread and
-     * modifyThreadGroup permissions are not allowed.
-     */
-    private boolean useReaper = DEFAULT_USE_REAPER;
-
     /**
      * Optional override to control which signature algorithm should be used to
      * sign requests to the service. If not explicitly set, the client will
@@ -210,7 +193,6 @@ public ClientConfiguration(ClientConfiguration other) {
         this.preemptiveBasicProxyAuth = other.preemptiveBasicProxyAuth;
         this.socketTimeout = other.socketTimeout;
         this.userAgent = other.userAgent;
-        this.useReaper = other.useReaper;
         this.socketReceiveBufferSizeHint = other.socketReceiveBufferSizeHint;
         this.socketSendBufferSizeHint = other.socketSendBufferSizeHint;
         this.signerOverride = other.signerOverride;
@@ -752,40 +734,6 @@ public ClientConfiguration withConnectionTimeout(int connectionTimeout) {
         return this;
     }
 
-    /**
-     * Checks if the {@link IdleConnectionReaper} is to be started
-     *
-     * @return if the {@link IdleConnectionReaper} is to be started
-     */
-    public boolean useReaper() {
-        return useReaper;
-    }
-
-    /**
-     * Sets whether the {@link IdleConnectionReaper} is to be started as a
-     * daemon thread
-     *
-     * @param use whether the {@link IdleConnectionReaper} is to be started as a
-     *            daemon thread
-     * @see IdleConnectionReaper
-     */
-    public void setUseReaper(boolean use) {
-        this.useReaper = use;
-    }
-
-    /**
-     * Sets whether the {@link IdleConnectionReaper} is to be started as a
-     * daemon thread
-     *
-     * @param use the {@link IdleConnectionReaper} is to be started as a daemon
-     *            thread
-     * @return The updated ClientConfiguration object.
-     */
-    public ClientConfiguration withReaper(boolean use) {
-        setUseReaper(use);
-        return this;
-    }
-
     /**
      * Returns the optional size hints (in bytes) for the low level TCP send and
      * receive buffers. This is an advanced option for advanced users who want

aws-android-sdk-core/src/main/java/com/amazonaws/http/ApacheHttpClient.java

@@ -17,8 +17,6 @@
 
 import com.amazonaws.AmazonWebServiceRequest;
 
-import org.apache.http.conn.ssl.BrowserCompatHostnameVerifier;
-
 import java.io.IOException;
 
 /**
@@ -31,9 +29,6 @@
  * If modified, the request is likely to be rejected by AWS service.</li>
  * <li>Disable retry logic and redirect which are handled by the service client
  * itself.</li>
- * <li>Enable {@link BrowserCompatHostnameVerifier} so that a wildcard (such as
- * "*.amazonaws.com") matches all subdomains, including "a.b.amazonaws.com".
- * This is needed for S3 virtual hosting. See <a
  * href="http://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html"
  * >Virtual Hosting of Buckets</a> for more details.</li>
  * <li>Beware of the Expect 100-continue header. Currently it's only used in <a