feat(apache): Add maxConnTotal configuration

Closes #355
algolia · Aug 22, 2017 · cfbfec2 · cfbfec2
1 parent 6098fef
commit cfbfec2
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 2 deletions.
diff --git a/algoliasearch-common/src/main/java/com/algolia/search/APIClientBuilder.java b/algoliasearch-common/src/main/java/com/algolia/search/APIClientBuilder.java
@@ -107,6 +107,12 @@ public APIClientBuilder setBuildHosts(List<String> buildHosts) {
     return this;
   }
 
+  @Override
+  public APIClientBuilder setMaxConnTotal(int maxConnTotal) {
+    super.setMaxConnTotal(maxConnTotal);
+    return this;
+  }
+
   protected abstract APIClient build(@Nonnull APIClientConfiguration configuration);
 
   /**
@@ -126,6 +132,7 @@ public APIClient build() {
         .setConnectTimeout(connectTimeout)
         .setReadTimeout(readTimeout)
         .setHostDownTimeout(hostDownTimeout)
+        .setMaxConnTotal(maxConnTotal)
     );
   }
 

diff --git a/algoliasearch-common/src/main/java/com/algolia/search/APIClientConfiguration.java b/algoliasearch-common/src/main/java/com/algolia/search/APIClientConfiguration.java
@@ -16,6 +16,7 @@ public class APIClientConfiguration {
   protected int connectTimeout;
   protected int readTimeout;
   protected int hostDownTimeout;
+  protected int maxConnTotal;
 
   public String getApplicationId() {
     return applicationId;
@@ -97,4 +98,14 @@ public APIClientConfiguration setHostDownTimeout(int hostDownTimeout) {
     this.hostDownTimeout = hostDownTimeout;
     return this;
   }
+
+  public int getMaxConnTotal() {
+    return maxConnTotal;
+  }
+
+  public APIClientConfiguration setMaxConnTotal(int maxConnTotal) {
+    this.maxConnTotal = maxConnTotal;
+    return this;
+  }
+
 }
diff --git a/algoliasearch-common/src/main/java/com/algolia/search/GenericAPIClientBuilder.java b/algoliasearch-common/src/main/java/com/algolia/search/GenericAPIClientBuilder.java
@@ -32,6 +32,7 @@ public abstract class GenericAPIClientBuilder {
   protected int readTimeout = READ_TIMEOUT_MS;
   protected int hostDownTimeout = HOST_DOWN_TIMEOUT_MS;
   protected ObjectMapper objectMapper = DEFAULT_OBJECT_MAPPER;
+  protected int maxConnTotal = 10;
 
   /**
    * Initialize this builder with the applicationId and apiKey
@@ -143,6 +144,17 @@ public GenericAPIClientBuilder setBuildHosts(List<String> buildHosts) {
     return this;
   }
 
+  /**
+   * Set the maximum of connection, only available for {@link ApacheAPIClientBuilder} and {@link AsyncAPIClientBuilder}
+   *
+   * @param maxConnTotal the max number of connections
+   * @return this
+   */
+  public GenericAPIClientBuilder setMaxConnTotal(int maxConnTotal) {
+    this.maxConnTotal = maxConnTotal;
+    return this;
+  }
+
   private String getApiClientVersion() {
     try (InputStream versionStream = getClass().getResourceAsStream("version.properties")) {
       BufferedReader versionReader = new BufferedReader(new InputStreamReader(versionStream));

diff --git a/algoliasearch/src/main/java/com/algolia/search/ApacheAPIClientBuilder.java b/algoliasearch/src/main/java/com/algolia/search/ApacheAPIClientBuilder.java
@@ -59,9 +59,14 @@ public ApacheAPIClientBuilder setBuildHosts(List<String> buildHosts) {
     return this;
   }
 
+  @Override
+  public ApacheAPIClientBuilder setMaxConnTotal(int maxConnTotal) {
+    super.setMaxConnTotal(maxConnTotal);
+    return this;
+  }
+
   @Override
   protected APIClient build(@Nonnull APIClientConfiguration configuration) {
     return new APIClient(new ApacheHttpClient(configuration), configuration);
   }
-
 }
diff --git a/algoliasearch/src/main/java/com/algolia/search/ApacheHttpClient.java b/algoliasearch/src/main/java/com/algolia/search/ApacheHttpClient.java
@@ -45,7 +45,9 @@ public ApacheHttpClient(APIClientConfiguration configuration) {
       .disableAutomaticRetries()
       .setDefaultHeaders(httpHeaders)
       .setDnsResolver(new TimeoutableHostNameResolver(configuration.getConnectTimeout()))
-      .setDefaultRequestConfig(requestConfig).build();
+      .setDefaultRequestConfig(requestConfig)
+      .setMaxConnTotal(configuration.getMaxConnTotal())
+      .build();
 
     this.objectMapper = configuration.getObjectMapper();
     this.queryHosts = configuration.getQueryHosts();

diff --git a/algoliasearch/src/test/java/com/algolia/search/ApacheAPIClientBuilderTest.java b/algoliasearch/src/test/java/com/algolia/search/ApacheAPIClientBuilderTest.java
@@ -21,6 +21,7 @@ public void buildAPIClient() throws IOException {
     assertThat(apiClient.configuration).isEqualToIgnoringGivenFields(new APIClientConfiguration()
         .setApplicationId("appId")
         .setApiKey("apiKey")
+        .setMaxConnTotal(10)
         .setConnectTimeout(100)
         .setReadTimeout(200)
         .setHostDownTimeout(300000)