Cloning does infact share the connection pools

billoneil · billoneil · commit d879e4ed0e30 · 2019-01-03T00:06:26.000-05:00
diff --git a/stubbornjava-common/src/main/java/com/stubbornjava/common/HttpClient.java b/stubbornjava-common/src/main/java/com/stubbornjava/common/HttpClient.java
@@ -63,21 +63,9 @@ public static OkHttpClient wrapWithMetircs(String name, OkHttpClient client) {
     }
 
     // {{start:client}}
-    private static final OkHttpClient client;
     private static final OkHttpClient globalClient;
     static {
-        Dispatcher dispatcher = new Dispatcher();
-        dispatcher.setMaxRequestsPerHost(15);
-
-        client = new OkHttpClient.Builder()
-            .connectTimeout(2, TimeUnit.SECONDS)
-            .writeTimeout(1, TimeUnit.MINUTES)
-            .readTimeout(1, TimeUnit.MINUTES)
-            .dispatcher(dispatcher)
-            .addNetworkInterceptor(loggingInterceptor)
-            .build();
-
-        globalClient = wrapWithMetircs("GlobalClient", baseClientBuilder().build());
+        globalClient = wrapWithMetircs("GlobalClient", defaultClientBuilder().build());
     }
 
     /*
@@ -91,8 +79,16 @@ public static OkHttpClient globalClient() {
      * Global client base for extending defaults.
      * This is the same as the global client but without metrics enabled yet.
      */
-    public static OkHttpClient.Builder baseClientBuilder() {
-        return client.newBuilder();
+    public static OkHttpClient.Builder defaultClientBuilder() {
+        Dispatcher dispatcher = new Dispatcher();
+        dispatcher.setMaxRequestsPerHost(15);
+
+        return new OkHttpClient.Builder()
+            .connectTimeout(2, TimeUnit.SECONDS)
+            .writeTimeout(1, TimeUnit.MINUTES)
+            .readTimeout(1, TimeUnit.MINUTES)
+            .dispatcher(dispatcher)
+            .addNetworkInterceptor(loggingInterceptor);
     }
     // {{end:client}}
 
@@ -102,7 +98,7 @@ public static OkHttpClient.Builder baseClientBuilder() {
      * a stateful cookie jar. This is useful when you need
      * to access password protected sites.
      */
-    public static OkHttpClient newClientWithCookieJar() {
+    public static OkHttpClient newClientWithCookieJar(OkHttpClient client) {
         CookieManager cookieManager = new CookieManager();
         cookieManager.setCookiePolicy(CookiePolicy.ACCEPT_ALL);
         JavaNetCookieJar cookieJar = new JavaNetCookieJar(cookieManager);
diff --git a/stubbornjava-webapp/src/main/java/com/stubbornjava/webapp/github/GitHubApi.java b/stubbornjava-webapp/src/main/java/com/stubbornjava/webapp/github/GitHubApi.java
@@ -88,7 +88,7 @@ public Builder clientSecret(String clientSecret) {
         }
 
         public GitHubApi build() {
-            OkHttpClient client = HttpClient.baseClientBuilder()
+            OkHttpClient client = HttpClient.defaultClientBuilder()
                 .addInterceptor(HttpClient.getHeaderInterceptor("Accept", VERSION_HEADER))
                 .addInterceptor(GitHubApi.gitHubAuth(clientId, clientSecret))
                 .build();

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public Builder clientSecret(String clientSecret) {`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`public GitHubApi build() {`
`91`		`- OkHttpClient client = HttpClient.baseClientBuilder()`
	`91`	`+ OkHttpClient client = HttpClient.defaultClientBuilder()`
`92`	`92`	`.addInterceptor(HttpClient.getHeaderInterceptor("Accept", VERSION_HEADER))`
`93`	`93`	`.addInterceptor(GitHubApi.gitHubAuth(clientId, clientSecret))`
`94`	`94`	`.build();`