Fix ApacheHttpTransport configuration (#717)

* Switch back to deprecated setStaleConnectionCheck * checkstyle fix for TODO
googleapis · Jun 18, 2019 · 88a6548 · 88a6548
1 parent 4e77793
commit 88a6548
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 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
@@ -155,19 +155,14 @@ public static HttpClientBuilder newDefaultHttpClientBuilder() {
                     .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)
+            .setConnectionTimeToLive(-1, TimeUnit.MILLISECONDS)
             .setRoutePlanner(new SystemDefaultRoutePlanner(ProxySelector.getDefault()))
-            .setConnectionManager(connectionManager)
             .disableRedirectHandling()
             .disableAutomaticRetries();
   }