Simplify ConnectionPoolConfig

kdvolder · kdvolder · commit f73302d15953 · 2020-10-26T11:48:48.000-07:00
Instead of maxTotal and defaultMaxPerRoute only
support a single 'maxConnections' which is used
for both.
diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
@@ -86,11 +86,10 @@ protected ApacheDockerHttpClientImpl(
             )
         );
         if (connectionPoolConf != null) {
-            if (connectionPoolConf.getMaxTotal() != null) {
-                connectionManager.setMaxTotal(connectionPoolConf.getMaxTotal());
-            }
-            if (connectionPoolConf.getDefaultMaxPerRoute() != null) {
-                connectionManager.setDefaultMaxPerRoute(connectionPoolConf.getDefaultMaxPerRoute());
+            Integer maxConnections = connectionPoolConf.getMaxConnections();
+            if (maxConnections != null) {
+                connectionManager.setMaxTotal(maxConnections);
+                connectionManager.setDefaultMaxPerRoute(maxConnections);
             }
         }
         httpClient = HttpClients.custom()
diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ConnectionPoolConfig.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ConnectionPoolConfig.java
@@ -2,25 +2,19 @@
 
 public class ConnectionPoolConfig {
 
-    private Integer maxTotal;
-    private Integer defaultMaxPerRoute;
+    private Integer maxConnections;
 
-    public Integer getMaxTotal() {
-        return maxTotal;
+    public Integer getMaxConnections() {
+        return maxConnections;
     }
-    public ConnectionPoolConfig setMaxTotal(Integer totalMax) {
-        this.maxTotal = totalMax;
-        return this;
-    }
-    public Integer getDefaultMaxPerRoute() {
-        return defaultMaxPerRoute;
-    }
-    public ConnectionPoolConfig setDefaultMaxPerRoute(Integer defaultMaxPerRoute) {
-        this.defaultMaxPerRoute = defaultMaxPerRoute;
+
+    public ConnectionPoolConfig setMaxConnections(Integer maxConnections) {
+        this.maxConnections = maxConnections;
         return this;
     }
+
     @Override
     public String toString() {
-        return "ConnectionPoolConfig [totalMax=" + getMaxTotal() + ", defaultMaxPerRoute=" + defaultMaxPerRoute + "]";
+        return "ConnectionPoolConfig [maxConnections=" + maxConnections + "]";
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -86,11 +86,10 @@ protected ApacheDockerHttpClientImpl(`
`86`	`86`	`)`
`87`	`87`	`);`
`88`	`88`	`if (connectionPoolConf != null) {`
`89`		`- if (connectionPoolConf.getMaxTotal() != null) {`
`90`		`- connectionManager.setMaxTotal(connectionPoolConf.getMaxTotal());`
`91`		`- }`
`92`		`- if (connectionPoolConf.getDefaultMaxPerRoute() != null) {`
`93`		`- connectionManager.setDefaultMaxPerRoute(connectionPoolConf.getDefaultMaxPerRoute());`
	`89`	`+ Integer maxConnections = connectionPoolConf.getMaxConnections();`
	`90`	`+ if (maxConnections != null) {`
	`91`	`+ connectionManager.setMaxTotal(maxConnections);`
	`92`	`+ connectionManager.setDefaultMaxPerRoute(maxConnections);`
`94`	`93`	`}`
`95`	`94`	`}`
`96`	`95`	`httpClient = HttpClients.custom()`