Make ChannelPool Netty specific, close AsyncHttpClient#376

Author: Stephane Landelle

api/src/main/java/org/asynchttpclient/AsyncHttpClient.java

@@ -417,7 +417,6 @@ protected void finalize() throws Throwable {
  *
  * @return true if closed
  */
- @SuppressWarnings("UnusedDeclaration")
  public boolean isClosed() {
  return isClosed.get();
  }
@@ -427,15 +426,13 @@ public boolean isClosed() {
  *
  * @return {@link AsyncHttpClientConfig}
  */
- @SuppressWarnings("UnusedDeclaration")
  public AsyncHttpClientConfig getConfig() {
  return config;
  }
 
  /**
  * Set default signature calculator to use for requests build by this client instance
  */
- @SuppressWarnings("UnusedDeclaration")
  public AsyncHttpClient setSignatureCalculator(SignatureCalculator signatureCalculator) {
  this.signatureCalculator = signatureCalculator;
  return this;
@@ -457,7 +454,6 @@ public BoundRequestBuilder prepareGet(String url) {
  * @param url A well formed URL.
  * @return {@link RequestBuilder}
  */
- @SuppressWarnings("UnusedDeclaration")
  public BoundRequestBuilder prepareConnect(String url) {
  return requestBuilder("CONNECT", url);
  }
@@ -508,7 +504,6 @@ public BoundRequestBuilder preparePut(String url) {
  * @param url A well formed URL.
  * @return {@link RequestBuilder}
  */
- @SuppressWarnings("UnusedDeclaration")
  public BoundRequestBuilder prepareDelete(String url) {
  return requestBuilder("DELETE", url);
  }
@@ -519,7 +514,6 @@ public BoundRequestBuilder prepareDelete(String url) {
  * @param url A well formed URL.
  * @return {@link RequestBuilder}
  */
- @SuppressWarnings("UnusedDeclaration")
  public BoundRequestBuilder preparePatch(String url) {
  return requestBuilder("PATCH", url);
  }
@@ -530,7 +524,6 @@ public BoundRequestBuilder preparePatch(String url) {
  * @param url A well formed URL.
  * @return {@link RequestBuilder}
  */
- @SuppressWarnings("UnusedDeclaration")
  public BoundRequestBuilder prepareTrace(String url) {
  return requestBuilder("TRACE", url);
  }
@@ -541,7 +534,6 @@ public BoundRequestBuilder prepareTrace(String url) {
  * @param request a {@link Request}
  * @return {@link RequestBuilder}
  */
- @SuppressWarnings("UnusedDeclaration")
  public BoundRequestBuilder prepareRequest(Request request) {
  return requestBuilder(request);
  }

api/src/main/java/org/asynchttpclient/AsyncHttpClientConfig.java

@@ -93,7 +93,6 @@ public class AsyncHttpClientConfig {
  protected SSLContext sslContext;
  protected SSLEngineFactory sslEngineFactory;
  protected AsyncHttpProviderConfig<?, ?> providerConfig;
- protected ConnectionsPool<?, ?> connectionsPool;
  protected Realm realm;
  protected List<RequestFilter> requestFilters;
  protected List<ResponseFilter> responseFilters;
@@ -136,7 +135,7 @@ private AsyncHttpClientConfig(int maxTotalConnections,
  SSLContext sslContext,
  SSLEngineFactory sslEngineFactory,
  AsyncHttpProviderConfig<?, ?> providerConfig,
- ConnectionsPool<?, ?> connectionsPool, Realm realm,
+ Realm realm,
  List<RequestFilter> requestFilters,
  List<ResponseFilter> responseFilters,
  List<IOExceptionFilter> ioExceptionFilters,
@@ -171,7 +170,6 @@ private AsyncHttpClientConfig(int maxTotalConnections,
  this.sslContext = sslContext;
  this.sslEngineFactory = sslEngineFactory;
  this.providerConfig = providerConfig;
- this.connectionsPool = connectionsPool;
  this.realm = realm;
  this.requestFilters = requestFilters;
  this.responseFilters = responseFilters;
@@ -333,15 +331,6 @@ public SSLContext getSSLContext() {
  return sslContext;
  }
 
- /**
- * Return an instance of {@link ConnectionsPool}
- *
- * @return an instance of {@link ConnectionsPool}
- */
- public ConnectionsPool<?, ?> getConnectionsPool() {
- return connectionsPool;
- }
-
  /**
  * Return an instance of {@link SSLEngineFactory} used for SSL connection.
  *
@@ -605,7 +594,6 @@ public static class Builder {
  private SSLContext sslContext;
  private SSLEngineFactory sslEngineFactory;
  private AsyncHttpProviderConfig<?, ?> providerConfig;
- private ConnectionsPool<?, ?> connectionsPool;
  private Realm realm;
  private int requestCompressionLevel = -1;
  private int maxRequestRetry = 5;
@@ -845,17 +833,6 @@ public Builder setAsyncHttpClientProviderConfig(AsyncHttpProviderConfig<?, ?> pr
  return this;
  }
 
- /**
- * Set the {@link ConnectionsPool}
- *
- * @param connectionsPool the {@link ConnectionsPool}
- * @return a {@link Builder}
- */
- public Builder setConnectionsPool(ConnectionsPool<?, ?> connectionsPool) {
- this.connectionsPool = connectionsPool;
- return this;
- }
-
  /**
  * Set the {@link Realm} that will be used for all requests.
  *
@@ -1167,7 +1144,6 @@ public Builder setAsyncConnectMode(boolean asyncConnectMode) {
  public Builder(AsyncHttpClientConfig prototype) {
  allowPoolingConnection = prototype.getAllowPoolingConnection();
  providerConfig = prototype.getAsyncHttpProviderConfig();
- connectionsPool = prototype.getConnectionsPool();
  defaultConnectionTimeOutInMs = prototype.getConnectionTimeoutInMs();
  defaultIdleConnectionInPoolTimeoutInMs = prototype.getIdleConnectionInPoolTimeoutInMs();
  defaultIdleConnectionTimeoutInMs = prototype.getIdleConnectionTimeoutInMs();
@@ -1254,7 +1230,6 @@ public Thread newThread(Runnable r) {
  sslContext,
  sslEngineFactory,
  providerConfig,
- connectionsPool,
  realm,
  requestFilters,
  responseFilters,

api/src/main/java/org/asynchttpclient/AsyncHttpClientConfigBean.java

@@ -175,11 +175,6 @@ public AsyncHttpClientConfigBean setProviderConfig(AsyncHttpProviderConfig<?, ?>
  return this;
  }
 
- public AsyncHttpClientConfigBean setConnectionsPool(ConnectionsPool<?, ?> connectionsPool) {
- this.connectionsPool = connectionsPool;
- return this;
- }
-
  public AsyncHttpClientConfigBean setRealm(Realm realm) {
  this.realm = realm;
  return this;

api/src/test/java/org/asynchttpclient/async/ConnectionPoolTest.java

@@ -127,12 +127,6 @@ public Response onCompleted(Response response) throws Exception {
  }
  }
 
- @Test(groups = { "standalone", "default_provider" })
- public abstract void testInvalidConnectionsPool();
-
- @Test(groups = { "standalone", "default_provider" })
- public abstract void testValidConnectionsPool();
-
  @Test(groups = { "standalone", "default_provider" })
  public void multipleMaxConnectionOpenTest() throws Exception {
  AsyncHttpClientConfig cg = new AsyncHttpClientConfig.Builder().setAllowPoolingConnection(true).setConnectionTimeoutInMs(5000).setMaximumConnectionsTotal(1).build();

providers/grizzly/src/test/java/org/asynchttpclient/providers/grizzly/GrizzlyConnectionPoolTest.java

@@ -15,10 +15,8 @@
 
 import org.asynchttpclient.AsyncHttpClient;
 import org.asynchttpclient.AsyncHttpClientConfig;
-import org.asynchttpclient.ConnectionsPool;
 import org.asynchttpclient.Response;
 import org.asynchttpclient.async.ConnectionPoolTest;
-import org.glassfish.grizzly.Connection;
 import org.testng.annotations.Test;
 
 import java.util.concurrent.TimeUnit;
@@ -35,111 +33,6 @@ public AsyncHttpClient getAsyncHttpClient(AsyncHttpClientConfig config) {
  @Override
  @Test(enabled=false)
  public void testMaxTotalConnectionsException() {
- AsyncHttpClient client = getAsyncHttpClient(new AsyncHttpClientConfig.Builder().setAllowPoolingConnection(true).setMaximumConnectionsTotal(1).build());
- try {
- String url = getTargetUrl();
- int i;
- Exception exception = null;
- for (i = 0; i < 20; i++) {
- try {
- log.info("{} requesting url [{}]...", i, url);
-
- if (i < 5) {
- client.prepareGet(url).execute().get();
- } else {
- client.prepareGet(url).execute();
- }
- } catch (Exception ex) {
- exception = ex;
- break;
- }
- }
- assertNotNull(exception);
- assertNotNull(exception.getMessage());
- } finally {
- client.close();
- }
- }
-
- @Override
- public void testValidConnectionsPool() {
- ConnectionsPool<String, Connection> cp = new ConnectionsPool<String, Connection>() {
-
- public boolean offer(String key, Connection connection) {
- return true;
- }
-
- public Connection poll(String connection) {
- return null;
- }
-
- public boolean removeAll(Connection connection) {
- return false;
- }
-
- public boolean canCacheConnection() {
- return true;
- }
-
- public void destroy() {
-
- }
- };
-
- AsyncHttpClient client = getAsyncHttpClient(new AsyncHttpClientConfig.Builder().setConnectionsPool(cp).build());
- try {
- Exception exception = null;
- try {
- client.prepareGet(getTargetUrl()).execute().get(TIMEOUT, TimeUnit.SECONDS);
- } catch (Exception ex) {
- ex.printStackTrace();
- exception = ex;
- }
- assertNull(exception);
- } finally {
- client.close();
- }
- }
-
- @Test(groups = { "standalone", "default_provider" }, enabled=false)
- public void testInvalidConnectionsPool() {
-
- ConnectionsPool<String, Connection> cp = new ConnectionsPool<String, Connection>() {
-
- public boolean offer(String key, Connection connection) {
- return false;
- }
-
- public Connection poll(String connection) {
- return null;
- }
-
- public boolean removeAll(Connection connection) {
- return false;
- }
-
- public boolean canCacheConnection() {
- return false;
- }
-
- public void destroy() {
-
- }
- };
-
- AsyncHttpClient client = getAsyncHttpClient(new AsyncHttpClientConfig.Builder().setConnectionsPool(cp).build());
- try {
- Exception exception = null;
- try {
- client.prepareGet(getTargetUrl()).execute().get(TIMEOUT, TimeUnit.SECONDS);
- } catch (Exception ex) {
- ex.printStackTrace();
- exception = ex;
- }
- assertNotNull(exception);
- } finally {
- client.close();
- }
  }
 
  @Override

providers/netty/src/main/java/org/asynchttpclient/providers/netty/NettyAsyncHttpProvider.java

@@ -57,7 +57,7 @@ public NettyAsyncHttpProvider(AsyncHttpClientConfig config) {
  public String toString() {
  int availablePermits = channels.freeConnections != null ? channels.freeConnections.availablePermits() : 0;
  return String.format("NettyAsyncHttpProvider4:\n\t- maxConnections: %d\n\t- openChannels: %s\n\t- connectionPools: %s", config.getMaxTotalConnections()
- - availablePermits, channels.openChannels.toString(), channels.connectionsPool.toString());
+ - availablePermits, channels.openChannels.toString(), channels.channelPool.toString());
  }
 
  @Override

providers/netty/src/main/java/org/asynchttpclient/providers/netty/NettyAsyncHttpProviderConfig.java

@@ -26,6 +26,7 @@
 import java.util.Set;
 
 import org.asynchttpclient.AsyncHttpProviderConfig;
+import org.asynchttpclient.providers.netty.channel.ChannelPool;
 import org.asynchttpclient.providers.netty.response.EagerResponseBodyPart;
 import org.asynchttpclient.providers.netty.response.LazyResponseBodyPart;
 import org.asynchttpclient.providers.netty.response.ResponseBodyPart;
@@ -83,6 +84,8 @@ public class NettyAsyncHttpProviderConfig implements AsyncHttpProviderConfig<Str
 
  private ResponseBodyPartFactory bodyPartFactory = new EagerResponseBodyPartFactory();
 
+ private ChannelPool channelPool;
+
  public NettyAsyncHttpProviderConfig() {
  properties.put(REUSE_ADDRESS, Boolean.FALSE);
  }
@@ -208,6 +211,14 @@ public void setBodyPartFactory(ResponseBodyPartFactory bodyPartFactory) {
  this.bodyPartFactory = bodyPartFactory;
  }
 
+ public ChannelPool getChannelPool() {
+ return channelPool;
+ }
+
+ public void setChannelPool(ChannelPool channelPool) {
+ this.channelPool = channelPool;
+ }
+
  public static interface AdditionalChannelInitializer {
 
  void initChannel(Channel ch) throws Exception;