Properly configure provider when using a SimpleClient

slandelle · slandelle · commit 10b8ad8558e7 · 2013-09-02T23:28:29.000+02:00
diff --git a/api/src/test/java/org/asynchttpclient/async/BasicAuthTest.java b/api/src/test/java/org/asynchttpclient/async/BasicAuthTest.java
@@ -48,6 +48,7 @@
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -72,6 +73,8 @@ public abstract class BasicAuthTest extends AbstractBasicTest {
     protected final static String admin = "admin";
 
     private Server server2;
+    
+    public abstract String getProviderClass();
 
     @BeforeClass(alwaysRun = true)
     @Override
@@ -475,7 +478,7 @@ public AbstractHandler configureHandler() throws Exception {
     @Test(groups = { "standalone", "default_provider" })
     public void stringBuilderBodyConsumerTest() throws Throwable {
 
-        SimpleAsyncHttpClient client = new SimpleAsyncHttpClient.Builder().setRealmPrincipal(user).setRealmPassword(admin).setUrl(getTargetUrl()).setHeader("Content-Type", "text/html").build();
+        SimpleAsyncHttpClient client = new SimpleAsyncHttpClient.Builder().setProviderClass(getProviderClass()).setRealmPrincipal(user).setRealmPassword(admin).setUrl(getTargetUrl()).setHeader("Content-Type", "text/html").build();
         try {
             StringBuilder s = new StringBuilder();
             Future<Response> future = client.post(new InputStreamBodyGenerator(new ByteArrayInputStream(MY_MESSAGE.getBytes())), new AppendableBodyConsumer(s));
diff --git a/api/src/test/java/org/asynchttpclient/async/ProxyTunnellingTest.java b/api/src/test/java/org/asynchttpclient/async/ProxyTunnellingTest.java
@@ -45,6 +45,8 @@ public abstract class ProxyTunnellingTest extends AbstractBasicTest {
 
     private Server server2;
 
+    public abstract String getProviderClass();
+
     public AbstractHandler configureHandler() throws Exception {
         ProxyHandler proxy = new ProxyHandler();
         return proxy;
@@ -152,7 +154,7 @@ public Response onCompleted(Response response) throws Exception {
     @Test(groups = { "online", "default_provider" })
     public void testSimpleAHCConfigProxy() throws IOException, InterruptedException, ExecutionException, TimeoutException {
 
-        SimpleAsyncHttpClient client = new SimpleAsyncHttpClient.Builder().setProxyProtocol(ProxyServer.Protocol.HTTPS).setProxyHost("127.0.0.1").setProxyPort(port1).setFollowRedirects(true).setUrl(getTargetUrl2()).setHeader("Content-Type", "text/html").build();
+        SimpleAsyncHttpClient client = new SimpleAsyncHttpClient.Builder().setProviderClass(getProviderClass()).setProxyProtocol(ProxyServer.Protocol.HTTPS).setProxyHost("127.0.0.1").setProxyPort(port1).setFollowRedirects(true).setUrl(getTargetUrl2()).setHeader("Content-Type", "text/html").build();
         try {
             Response r = client.get().get();
 
diff --git a/api/src/test/java/org/asynchttpclient/async/SimpleAsyncHttpClientTest.java b/api/src/test/java/org/asynchttpclient/async/SimpleAsyncHttpClientTest.java
@@ -27,7 +27,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
 import static junit.framework.Assert.assertTrue;
diff --git a/providers/grizzly/src/test/java/org/asynchttpclient/providers/grizzly/GrizzlyBasicAuthTest.java b/providers/grizzly/src/test/java/org/asynchttpclient/providers/grizzly/GrizzlyBasicAuthTest.java
@@ -19,10 +19,13 @@
 
 public class GrizzlyBasicAuthTest extends BasicAuthTest {
 
-
     @Override
     public AsyncHttpClient getAsyncHttpClient(AsyncHttpClientConfig config) {
         return GrizzlyProviderUtil.grizzlyProvider(config);
     }
 
+    @Override
+    public String getProviderClass() {
+    	return GrizzlyAsyncHttpProvider.class.getName();
+    }
 }
diff --git a/providers/grizzly/src/test/java/org/asynchttpclient/providers/grizzly/GrizzlyProxyTunnelingTest.java b/providers/grizzly/src/test/java/org/asynchttpclient/providers/grizzly/GrizzlyProxyTunnelingTest.java
@@ -24,4 +24,8 @@ public AsyncHttpClient getAsyncHttpClient(AsyncHttpClientConfig config) {
         return GrizzlyProviderUtil.grizzlyProvider(config);
     }
 
+    @Override
+    public String getProviderClass() {
+    	return GrizzlyAsyncHttpProvider.class.getName();
+    }
 }
diff --git a/providers/netty/src/main/java/org/asynchttpclient/providers/netty/ResponseBodyPart.java b/providers/netty/src/main/java/org/asynchttpclient/providers/netty/ResponseBodyPart.java
@@ -45,6 +45,7 @@ public class ResponseBodyPart extends HttpResponseBodyPart {
     /**
      * Constructor used for non-chunked GET requests and HEAD requests.
      */
+    // FIXME Why notify with a null chunk???
     public ResponseBodyPart(URI uri, HttpResponse response, AsyncHttpProvider provider, boolean last) {
         this(uri, response, provider, null, last);
     }
diff --git a/providers/netty/src/test/java/org/asynchttpclient/providers/netty/NettyBasicAuthTest.java b/providers/netty/src/test/java/org/asynchttpclient/providers/netty/NettyBasicAuthTest.java
@@ -16,7 +16,6 @@
 import java.util.concurrent.TimeoutException;
 
 import org.testng.annotations.Test;
-
 import org.asynchttpclient.AsyncHttpClient;
 import org.asynchttpclient.AsyncHttpClientConfig;
 import org.asynchttpclient.async.BasicAuthTest;
@@ -29,6 +28,11 @@ public AsyncHttpClient getAsyncHttpClient(AsyncHttpClientConfig config) {
         return NettyProviderUtil.nettyProvider(config);
     }
 
+    @Override
+    public String getProviderClass() {
+    	return NettyAsyncHttpProvider.class.getName();
+    }
+
     @Override
     @Test
     public void redirectAndBasicAuthTest() throws Exception, ExecutionException, TimeoutException, InterruptedException {
diff --git a/providers/netty/src/test/java/org/asynchttpclient/providers/netty/NettyProxyTunnellingTest.java b/providers/netty/src/test/java/org/asynchttpclient/providers/netty/NettyProxyTunnellingTest.java
@@ -21,4 +21,8 @@ public class NettyProxyTunnellingTest extends ProxyTunnellingTest {
     public AsyncHttpClient getAsyncHttpClient(AsyncHttpClientConfig config) {
         return NettyProviderUtil.nettyProvider(config);
     }
+
+    public String getProviderClass() {
+    	return NettyAsyncHttpProvider.class.getName();
+    }
 }
diff --git a/providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/Channels.java b/providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/Channels.java
@@ -238,14 +238,14 @@ public Bootstrap getBootstrap(String url, boolean useSSl) {
 
     public void close() {
         connectionsPool.destroy();
-        openChannels.close();
         for (Channel channel : openChannels) {
             Object attribute = getDefaultAttribute(channel);
             if (attribute instanceof NettyResponseFuture<?>) {
                 NettyResponseFuture<?> future = (NettyResponseFuture<?>) attribute;
                 future.setReaperFuture(null);
             }
         }
+        openChannels.close();
         if (this.allowReleaseSocketChannelFactory) {
             eventLoop.shutdownGracefully();
         }
diff --git a/providers/netty4/src/test/java/org/asynchttpclient/providers/netty4/NettyBasicAuthTest.java b/providers/netty4/src/test/java/org/asynchttpclient/providers/netty4/NettyBasicAuthTest.java
@@ -15,11 +15,17 @@
 import org.asynchttpclient.AsyncHttpClient;
 import org.asynchttpclient.AsyncHttpClientConfig;
 import org.asynchttpclient.async.BasicAuthTest;
+import org.asynchttpclient.providers.netty4.NettyAsyncHttpProvider;
 
 public class NettyBasicAuthTest extends BasicAuthTest {
 
     @Override
     public AsyncHttpClient getAsyncHttpClient(AsyncHttpClientConfig config) {
         return NettyProviderUtil.nettyProvider(config);
     }
+
+    @Override
+    public String getProviderClass() {
+    	return NettyAsyncHttpProvider.class.getName();
+    }
 }
diff --git a/providers/netty4/src/test/java/org/asynchttpclient/providers/netty4/NettyProxyTunnellingTest.java b/providers/netty4/src/test/java/org/asynchttpclient/providers/netty4/NettyProxyTunnellingTest.java
@@ -15,10 +15,15 @@
 import org.asynchttpclient.AsyncHttpClient;
 import org.asynchttpclient.AsyncHttpClientConfig;
 import org.asynchttpclient.async.ProxyTunnellingTest;
+import org.asynchttpclient.providers.netty4.NettyAsyncHttpProvider;
 
 public class NettyProxyTunnellingTest extends ProxyTunnellingTest {
     @Override
     public AsyncHttpClient getAsyncHttpClient(AsyncHttpClientConfig config) {
         return NettyProviderUtil.nettyProvider(config);
     }
+
+    public String getProviderClass() {
+    	return NettyAsyncHttpProvider.class.getName();
+    }
 }
diff --git a/providers/netty4/src/test/java/org/asynchttpclient/providers/netty4/NettyRedirectConnectionUsageTest.java b/providers/netty4/src/test/java/org/asynchttpclient/providers/netty4/NettyRedirectConnectionUsageTest.java
@@ -16,7 +16,6 @@
 import org.asynchttpclient.AsyncHttpClientConfig;
 import org.asynchttpclient.AsyncHttpProviderConfig;
 import org.asynchttpclient.async.RedirectConnectionUsageTest;
-import org.asynchttpclient.providers.netty4.NettyAsyncHttpProviderConfig;
 
 public class NettyRedirectConnectionUsageTest extends RedirectConnectionUsageTest {
     @Override

Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,13 @@`
`19`	`19`
`20`	`20`	`public class GrizzlyBasicAuthTest extends BasicAuthTest {`
`21`	`21`
`22`		`-`
`23`	`22`	`@Override`
`24`	`23`	`public AsyncHttpClient getAsyncHttpClient(AsyncHttpClientConfig config) {`
`25`	`24`	`return GrizzlyProviderUtil.grizzlyProvider(config);`
`26`	`25`	`}`
`27`	`26`
	`27`	`+ @Override`
	`28`	`+ public String getProviderClass() {`
	`29`	`+ return GrizzlyAsyncHttpProvider.class.getName();`
	`30`	`+ }`
`28`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,4 +24,8 @@ public AsyncHttpClient getAsyncHttpClient(AsyncHttpClientConfig config) {`
`24`	`24`	`return GrizzlyProviderUtil.grizzlyProvider(config);`
`25`	`25`	`}`
`26`	`26`
	`27`	`+ @Override`
	`28`	`+ public String getProviderClass() {`
	`29`	`+ return GrizzlyAsyncHttpProvider.class.getName();`
	`30`	`+ }`
`27`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ public class ResponseBodyPart extends HttpResponseBodyPart {`
`45`	`45`	`/**`
`46`	`46`	`* Constructor used for non-chunked GET requests and HEAD requests.`
`47`	`47`	`*/`
	`48`	`+ // FIXME Why notify with a null chunk???`
`48`	`49`	`public ResponseBodyPart(URI uri, HttpResponse response, AsyncHttpProvider provider, boolean last) {`
`49`	`50`	`this(uri, response, provider, null, last);`
`50`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,4 +21,8 @@ public class NettyProxyTunnellingTest extends ProxyTunnellingTest {`
`21`	`21`	`public AsyncHttpClient getAsyncHttpClient(AsyncHttpClientConfig config) {`
`22`	`22`	`return NettyProviderUtil.nettyProvider(config);`
`23`	`23`	`}`
	`24`	`+`
	`25`	`+ public String getProviderClass() {`
	`26`	`+ return NettyAsyncHttpProvider.class.getName();`
	`27`	`+ }`
`24`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -238,14 +238,14 @@ public Bootstrap getBootstrap(String url, boolean useSSl) {`
`238`	`238`
`239`	`239`	`public void close() {`
`240`	`240`	`connectionsPool.destroy();`
`241`		`- openChannels.close();`
`242`	`241`	`for (Channel channel : openChannels) {`
`243`	`242`	`Object attribute = getDefaultAttribute(channel);`
`244`	`243`	`if (attribute instanceof NettyResponseFuture<?>) {`
`245`	`244`	`NettyResponseFuture<?> future = (NettyResponseFuture<?>) attribute;`
`246`	`245`	`future.setReaperFuture(null);`
`247`	`246`	`}`
`248`	`247`	`}`
	`248`	`+ openChannels.close();`
`249`	`249`	`if (this.allowReleaseSocketChannelFactory) {`
`250`	`250`	`eventLoop.shutdownGracefully();`
`251`	`251`	`}`