Expose the default HttpClientBuilder so users can customize further (#…

…713)
googleapis · Jun 13, 2019 · 173a814 · 173a814
1 parent 3ef5405
commit 173a814
Showing 1 changed file with 39 additions and 15 deletions.
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
@@ -123,29 +123,53 @@ public ApacheHttpTransport(HttpClient httpClient) {
    * @since 1.30
    */
   public static HttpClient newDefaultHttpClient() {
+    return newDefaultHttpClientBuilder().build();
+  }
+
+  /**
+   * Creates a new Apache HTTP client builder that is used by the
+   * {@link #ApacheHttpTransport()} constructor.
+   *
+   * <p>
+   * Settings:
+   * </p>
+   * <ul>
+   * <li>The client connection manager is set to {@link PoolingHttpClientConnectionManager}.</li>
+   * <li>The socket buffer size is set to 8192 using {@link SocketConfig}.</li>
+   * <li><The retry mechanism is turned off using
+   * {@link HttpClientBuilder#disableRedirectHandling}.</li>
+   * <li>The route planner uses {@link SystemDefaultRoutePlanner} with
+   * {@link ProxySelector#getDefault()}, which uses the proxy settings from <a
+   * href="http://docs.oracle.com/javase/7/docs/api/java/net/doc-files/net-properties.html">system
+   * properties</a>.</li>
+   * </ul>
+   *
+   * @return new instance of the Apache HTTP client
+   * @since 1.31
+   */
+  public static HttpClientBuilder newDefaultHttpClientBuilder() {
     // Set socket buffer sizes to 8192
     SocketConfig socketConfig =
-        SocketConfig.custom()
-            .setRcvBufSize(8192)
-            .setSndBufSize(8192)
-            .build();
+            SocketConfig.custom()
+                    .setRcvBufSize(8192)
+                    .setSndBufSize(8192)
+                    .build();
 
     PoolingHttpClientConnectionManager connectionManager =
-        new PoolingHttpClientConnectionManager(-1, TimeUnit.MILLISECONDS);
+            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)
+            .setRoutePlanner(new SystemDefaultRoutePlanner(ProxySelector.getDefault()))
+            .setConnectionManager(connectionManager)
+            .disableRedirectHandling()
+            .disableAutomaticRetries();
   }
 
   @Override