Update ApacheHttpTransport implementation (#558)

* Move apache httpclient dependency to apache adapter artifacts

* Rewrite Apache adapter to use new APIs

* Cleanup apache implementations

* Fix tests

* Fix checkstyle

* Fix dependencies - google-http-client does depend on commons-codec

* Publish both apache adapters as google-http-client-apache with version 1.x and 2.0

* Fix dependency versions

* Remove ApacheHttpTransport.Builder for 2.0

We are providing a subset of builder options and we cannot change
setting after the HttpClient has been built.  We should allow users to
just provide their implementation via the constructor.

* Allow `shutdown` to throw the IOException from closing the httpClient

Author: chingor13

google-http-client-apache-legacy/pom.xml

@@ -7,9 +7,9 @@
     <version>1.27.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
-  <artifactId>google-http-client-apache-legacy</artifactId>
+  <artifactId>google-http-client-apache</artifactId>
   <version>1.27.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-apache-legacy:current} -->
-  <name>Apache HTTP transport for the Google HTTP Client Library for Java.</name>
+  <name>Legacy Apache HTTP transport for the Google HTTP Client Library for Java.</name>
 
   <build>
     <plugins>
@@ -102,6 +102,11 @@
       <artifactId>guava</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>4.2.6</version>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>

google-http-client-apache/pom.xml

@@ -8,7 +8,7 @@
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-http-client-apache</artifactId>
-  <version>1.27.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-apache:current} -->
+  <version>2.0.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-apache:current} -->
   <name>Apache HTTP transport for the Google HTTP Client Library for Java.</name>
 
   <build>
@@ -102,6 +102,10 @@
       <artifactId>guava</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>

google-http-client-apache/src/main/java/com/google/api/client/http/apache/ApacheHttpRequest.java

@@ -20,10 +20,8 @@
 import java.io.IOException;
 import org.apache.http.HttpEntityEnclosingRequest;
 import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.http.conn.params.ConnManagerParams;
-import org.apache.http.params.HttpConnectionParams;
-import org.apache.http.params.HttpParams;
 
 /**
  * @author Yaniv Inbar
@@ -33,9 +31,12 @@ final class ApacheHttpRequest extends LowLevelHttpRequest {
 
   private final HttpRequestBase request;
 
+  private RequestConfig.Builder requestConfig;
+
   ApacheHttpRequest(HttpClient httpClient, HttpRequestBase request) {
     this.httpClient = httpClient;
     this.request = request;
+    this.requestConfig = RequestConfig.custom().setRedirectsEnabled(false);
   }
 
   @Override
@@ -45,10 +46,8 @@ public void addHeader(String name, String value) {
 
   @Override
   public void setTimeout(int connectTimeout, int readTimeout) throws IOException {
-    HttpParams params = request.getParams();
-    ConnManagerParams.setTimeout(params, connectTimeout);
-    HttpConnectionParams.setConnectionTimeout(params, connectTimeout);
-    HttpConnectionParams.setSoTimeout(params, readTimeout);
+    requestConfig.setConnectionRequestTimeout(connectTimeout)
+        .setSocketTimeout(readTimeout);
   }
 
   @Override
@@ -62,6 +61,7 @@ public LowLevelHttpResponse execute() throws IOException {
       entity.setContentType(getContentType());
       ((HttpEntityEnclosingRequest) request).setEntity(entity);
     }
+    request.setConfig(requestConfig.build());
     return new ApacheHttpResponse(request, httpClient.execute(request));
   }
 }