From 757ac03cbd0f65095474fbc740144d17f5a39fd7 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 13 Jun 2019 17:01:01 -0700 Subject: [PATCH 1/2] Switch back to deprecated setStaleConnectionCheck --- .../api/client/http/apache/v2/ApacheHttpRequest.java | 6 +++++- .../api/client/http/apache/v2/ApacheHttpTransport.java | 7 +------ 2 files changed, 6 insertions(+), 7 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..b860bce60 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: 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 2506fd028..7f547a38b 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 @@ -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(); } From fd2fc0a8f4335420c860ef4107913f135eb8898b Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 13 Jun 2019 17:16:25 -0700 Subject: [PATCH 2/2] checkstyle fix for TODO --- .../com/google/api/client/http/apache/v2/ApacheHttpRequest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b860bce60..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 @@ -40,7 +40,7 @@ final class ApacheHttpRequest extends LowLevelHttpRequest { // disable redirects as google-http-client handles redirects this.requestConfig = RequestConfig.custom() .setRedirectsEnabled(false) - // TODO: configure in HttpClientBuilder when available + // TODO(chingor): configure in HttpClientBuilder when available .setStaleConnectionCheckEnabled(false); }