From ca83de0a6c67d9af8fc0244cec4392823fae601c Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Tue, 18 Jun 2019 11:31:26 -0700
Subject: [PATCH] Fix ApacheHttpTransport configuration (#717)

* Switch back to deprecated setStaleConnectionCheck

* checkstyle fix for TODO
---
 .../http/apache/v2/ApacheHttpRequest.java     |  6 ++++-
 .../http/apache/v2/ApacheHttpTransport.java   | 25 ++++++++-----------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/google-http-client-apache-v2/src/main/java/com/google/api/client/http/apache/v2/ApacheHttpRequest.java b/google-http-client-apache-v2/src/main/java/com/google/api/client/http/apache/v2/ApacheHttpRequest.java
index 5d9323dd6..447edae66 100644
--- a/google-http-client-apache-v2/src/main/java/com/google/api/client/http/apache/v2/ApacheHttpRequest.java
+++ b/google-http-client-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/google-http-client-apache-v2/src/main/java/com/google/api/client/http/apache/v2/ApacheHttpTransport.java b/google-http-client-apache-v2/src/main/java/com/google/api/client/http/apache/v2/ApacheHttpTransport.java
index 42f53d490..0b37d0e24 100644
--- a/google-http-client-apache-v2/src/main/java/com/google/api/client/http/apache/v2/ApacheHttpTransport.java
+++ b/google-http-client-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