Fix ApacheHttpTransport configuration (#717)

* Switch back to deprecated setStaleConnectionCheck * checkstyle fix for TODO
googleapis · Jun 21, 2019 · ca83de0 · ca83de0
1 parent 509ab96
commit ca83de0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/...lient-apache-v2/src/main/java/com/google/api/client/http/apache/v2/ApacheHttpRequest.java b/...lient-apache-v2/src/main/java/com/google/api/client/http/apache/v2/ApacheHttpRequest.java
@@ -33,11 +33,15 @@ final class ApacheHttpRequest extends LowLevelHttpRequest {
 
   private RequestConfig.Builder requestConfig;
 
+  @SuppressWarnings("deprecation")
   ApacheHttpRequest(HttpClient httpClient, HttpRequestBase request) {
     this.httpClient = httpClient;
     this.request = request;
     // disable redirects as google-http-client handles redirects
-    this.requestConfig = RequestConfig.custom().setRedirectsEnabled(false);
+    this.requestConfig = RequestConfig.custom()
+        .setRedirectsEnabled(false)
+        // TODO(chingor): configure in HttpClientBuilder when available
+        .setStaleConnectionCheckEnabled(false);
   }
 
   @Override

diff --git a/...ent-apache-v2/src/main/java/com/google/api/client/http/apache/v2/ApacheHttpTransport.java b/...ent-apache-v2/src/main/java/com/google/api/client/http/apache/v2/ApacheHttpTransport.java
@@ -130,22 +130,17 @@ public static HttpClient newDefaultHttpClient() {
             .setSndBufSize(8192)
             .build();
 
-    PoolingHttpClientConnectionManager connectionManager =
-        new PoolingHttpClientConnectionManager(-1, TimeUnit.MILLISECONDS);
-    // Disable the stale connection check (previously configured in the HttpConnectionParams
-    connectionManager.setValidateAfterInactivity(-1);
-
     return HttpClientBuilder.create()
-        .useSystemProperties()
-        .setSSLSocketFactory(SSLConnectionSocketFactory.getSocketFactory())
-        .setDefaultSocketConfig(socketConfig)
-        .setMaxConnTotal(200)
-        .setMaxConnPerRoute(20)
-        .setRoutePlanner(new SystemDefaultRoutePlanner(ProxySelector.getDefault()))
-        .setConnectionManager(connectionManager)
-        .disableRedirectHandling()
-        .disableAutomaticRetries()
-        .build();
+            .useSystemProperties()
+            .setSSLSocketFactory(SSLConnectionSocketFactory.getSocketFactory())
+            .setDefaultSocketConfig(socketConfig)
+            .setMaxConnTotal(200)
+            .setMaxConnPerRoute(20)
+            .setConnectionTimeToLive(-1, TimeUnit.MILLISECONDS)
+            .setRoutePlanner(new SystemDefaultRoutePlanner(ProxySelector.getDefault()))
+            .disableRedirectHandling()
+            .disableAutomaticRetries()
+            .build();
   }
 
   @Override