feat(http-manager): keep current setter-only builder pattern

dargmuesli · dargmuesli · commit c514b65a279f · 2024-12-03T23:53:09.000+01:00
diff --git a/src/main/java/se/michaelthelin/spotify/SpotifyHttpManager.java b/src/main/java/se/michaelthelin/spotify/SpotifyHttpManager.java
@@ -39,6 +39,7 @@ public class SpotifyHttpManager implements IHttpManager {
   private static final Gson GSON = new Gson();
   private final CloseableHttpClient httpClient;
   private final CloseableHttpClient httpClientCaching;
+  private final HttpClientConnectionManager connectionManager;
   private final HttpHost proxy;
   private final UsernamePasswordCredentials proxyCredentials;
   private final Integer cacheMaxEntries;
@@ -76,6 +77,19 @@ public SpotifyHttpManager(Builder builder) {
       );
     }
 
+    if (builder.connectionManager != null) {
+      this.connectionManager = builder.connectionManager;
+    } else {
+      BasicHttpClientConnectionManager basicHttpClientConnectionManager = new BasicHttpClientConnectionManager();
+      basicHttpClientConnectionManager.setConnectionConfig(ConnectionConfig
+        .custom()
+        .setConnectTimeout(connectTimeout != null ?
+          Timeout.ofMilliseconds(connectTimeout) :
+          ConnectionConfig.DEFAULT.getConnectTimeout())
+        .build());
+      this.connectionManager = basicHttpClientConnectionManager;
+    }
+
     RequestConfig requestConfig = RequestConfig
       .custom()
       .setCookieSpec(StandardCookieSpec.STRICT)
@@ -91,7 +105,7 @@ public SpotifyHttpManager(Builder builder) {
     this.httpClient = HttpClients
       .custom()
       .disableContentCompression()
-      .setConnectionManager(builder.getConnectionManager())
+      .setConnectionManager(connectionManager)
       .setDefaultCredentialsProvider(credentialsProvider)
       .setDefaultRequestConfig(requestConfig)
       .setProxy(proxy)
@@ -102,7 +116,7 @@ public SpotifyHttpManager(Builder builder) {
       .custom()
       .setCacheConfig(cacheConfig)
       .disableContentCompression()
-      .setConnectionManager(builder.getConnectionManager())
+      .setConnectionManager(connectionManager)
       .setDefaultCredentialsProvider(credentialsProvider)
       .setDefaultRequestConfig(requestConfig)
       .setProxy(proxy)
@@ -121,6 +135,10 @@ public static URI makeUri(String uriString) {
     }
   }
 
+  public HttpClientConnectionManager getConnectionManager() {
+    return connectionManager;
+  }
+
   public HttpHost getProxy() {
     return proxy;
   }
@@ -352,14 +370,19 @@ private String getResponseBody(CloseableHttpResponse httpResponse) throws
   }
 
   public static class Builder {
+    private HttpClientConnectionManager connectionManager;
     private HttpHost proxy;
     private UsernamePasswordCredentials proxyCredentials;
     private Integer cacheMaxEntries;
     private Integer cacheMaxObjectSize;
     private Integer connectionRequestTimeout;
     private Integer connectTimeout;
     private Integer socketTimeout;
-    private HttpClientConnectionManager connectionManager;
+
+    public Builder setConnectionManager(HttpClientConnectionManager connectionManager) {
+      this.connectionManager = connectionManager;
+      return this;
+    }
 
     public Builder setProxy(HttpHost proxy) {
       this.proxy = proxy;
@@ -396,26 +419,6 @@ public Builder setSocketTimeout(Integer socketTimeout) {
       return this;
     }
 
-    public Builder setConnectionManager(HttpClientConnectionManager connectionManager) {
-      this.connectionManager = connectionManager;
-      return this;
-    }
-
-    HttpClientConnectionManager getConnectionManager() {
-      if (connectionManager == null) {
-        BasicHttpClientConnectionManager basicHttpClientConnectionManager = new BasicHttpClientConnectionManager();
-        basicHttpClientConnectionManager.setConnectionConfig(ConnectionConfig
-          .custom()
-          .setConnectTimeout(connectTimeout != null ?
-            Timeout.ofMilliseconds(connectTimeout) :
-            ConnectionConfig.DEFAULT.getConnectTimeout())
-          .build());
-        connectionManager = basicHttpClientConnectionManager;
-      }
-
-      return connectionManager;
-    }
-
     public SpotifyHttpManager build() {
       return new SpotifyHttpManager(this);
     }
