Bump version of Apache httpclient.

Author: Matt Whisenhnunt

.travis.yml

@@ -8,4 +8,3 @@ notifications:
 jdk:
   - oraclejdk8
   - openjdk7
-  - openjdk6

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

@@ -123,9 +123,6 @@ public ApacheHttpTransport() {
    */
   public ApacheHttpTransport(HttpClient httpClient) {
     this.httpClient = httpClient;
-    HttpParams params = httpClient.getParams();
-    HttpProtocolParams.setVersion(params, HttpVersion.HTTP_1_1);
-    params.setBooleanParameter(ClientPNames.HANDLE_REDIRECTS, false);
   }
 
   /**
@@ -164,6 +161,8 @@ static HttpParams newDefaultHttpParams() {
     HttpConnectionParams.setSocketBufferSize(params, 8192);
     ConnManagerParams.setMaxTotalConnections(params, 200);
     ConnManagerParams.setMaxConnectionsPerRoute(params, new ConnPerRouteBean(20));
+    HttpProtocolParams.setVersion(params, HttpVersion.HTTP_1_1);
+    params.setBooleanParameter(ClientPNames.HANDLE_REDIRECTS, false);
     return params;
   }
 
@@ -278,7 +277,7 @@ public static final class Builder {
      * </p>
      *
      * <pre>
-       setProxy(new HttpHost("127.0.0.1", 8080))
+     setProxy(new HttpHost("127.0.0.1", 8080))
      * </pre>
      */
     public Builder setProxy(HttpHost proxy) {
@@ -314,7 +313,7 @@ public Builder setProxySelector(ProxySelector proxySelector) {
      * </p>
      *
      * <pre>
-    trustCertificatesFromJavaKeyStore(new FileInputStream("certs.jks"), "password");
+     trustCertificatesFromJavaKeyStore(new FileInputStream("certs.jks"), "password");
      * </pre>
      *
      * @param keyStoreStream input stream to the key store (closed at the end of this method in a
@@ -338,7 +337,7 @@ public Builder trustCertificatesFromJavaKeyStore(InputStream keyStoreStream, Str
      * </p>
      *
      * <pre>
-    trustCertificatesFromStream(new FileInputStream("certs.pem"));
+     trustCertificatesFromStream(new FileInputStream("certs.pem"));
      * </pre>
      *
      * @param certificateStream certificate stream

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

@@ -50,13 +50,14 @@
  * @since 1.14
  * @author Yaniv Inbar
  */
-@Beta
+@Deprecated
 public class MockHttpClient extends DefaultHttpClient {
 
   /** HTTP response code to use. */
   int responseCode;
 
   @Override
+  @Deprecated
   protected RequestDirector createClientRequestDirector(HttpRequestExecutor requestExec,
       ClientConnectionManager conman, ConnectionReuseStrategy reustrat,
       ConnectionKeepAliveStrategy kastrat, HttpRoutePlanner rouplan, HttpProcessor httpProcessor,
@@ -73,11 +74,13 @@ public HttpResponse execute(HttpHost target, HttpRequest request, HttpContext co
   }
 
   /** Returns the HTTP response code to use. */
+  @Deprecated
   public final int getResponseCode() {
     return responseCode;
   }
 
   /** Sets the HTTP response code to use. */
+  @Deprecated
   public MockHttpClient setResponseCode(int responseCode) {
     Preconditions.checkArgument(responseCode >= 0);
     this.responseCode = responseCode;

google-http-client/src/test/java/com/google/api/client/http/apache/ApacheHttpTransportTest.java

@@ -14,13 +14,13 @@
 
 package com.google.api.client.http.apache;
 
-import com.google.api.client.testing.http.apache.MockHttpClient;
 import com.google.api.client.util.ByteArrayStreamingContent;
 import com.google.api.client.util.StringUtils;
 
 import junit.framework.TestCase;
 import org.apache.http.HttpVersion;
 import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.client.params.ClientPNames;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.impl.client.DefaultHttpRequestRetryHandler;
@@ -29,6 +29,10 @@
 import org.apache.http.params.HttpParams;
 import org.apache.http.params.HttpProtocolParams;
 
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 /**
  * Tests {@link ApacheHttpTransport}.
  *
@@ -43,17 +47,16 @@ public void testApacheHttpTransport() {
     checkHttpClient(httpClient);
   }
 
-  public void testApacheHttpTransportWithParam() {
-    ApacheHttpTransport transport = new ApacheHttpTransport(new DefaultHttpClient());
-    checkHttpClient(transport.getHttpClient());
-  }
-
   public void testNewDefaultHttpClient() {
     checkDefaultHttpClient(ApacheHttpTransport.newDefaultHttpClient());
   }
 
   public void testRequestsWithContent() throws Exception {
-    ApacheHttpTransport transport = new ApacheHttpTransport(new MockHttpClient());
+    HttpClient mockClient = mock(HttpClient.class);
+    org.apache.http.HttpResponse mockResponse = mock(org.apache.http.HttpResponse.class);
+    when(mockClient.execute(any(HttpUriRequest.class))).thenReturn(mockResponse);
+
+    ApacheHttpTransport transport = new ApacheHttpTransport(mockClient);
 
     // Test GET.
     subtestUnsupportedRequestsWithContent(

pom.xml

@@ -617,8 +617,7 @@
     <project.guava.version>17.0</project.guava.version>
     <project.xpp3.version>1.1.4c</project.xpp3.version>
     <project.commons-logging.version>1.1.1</project.commons-logging.version>
-    <project.httpclient.version>4.0.1</project.httpclient.version>
-    <project.httpcore.version>4.0.1</project.httpcore.version>
+    <project.httpclient.version>4.5.3</project.httpclient.version>
     <project.jdo2-api.version>2.3-eb</project.jdo2-api.version>
   </properties>
 </project>