Minor clean up

Author: Stephane Landelle

src/test/java/com/ning/http/client/async/AsyncProvidersBasicTest.java

@@ -828,7 +828,7 @@ public void onThrowable(Throwable t) {
 
     @Test(groups = { "standalone", "default_provider", "async" })
     public void asyncRequestVirtualServerPOSTTest() throws Throwable {
-        AsyncHttpClient client = getAsyncHttpClient(new AsyncHttpClientConfig.Builder().build());
+        AsyncHttpClient client = getAsyncHttpClient(null);
         try {
             FluentCaseInsensitiveStringsMap h = new FluentCaseInsensitiveStringsMap();
             h.add("Content-Type", "application/x-www-form-urlencoded");
@@ -1716,7 +1716,7 @@ public void bodyAsByteTest() throws Throwable {
 
     @Test(groups = { "default_provider", "async" })
     public void mirrorByteTest() throws Throwable {
-        AsyncHttpClient client = getAsyncHttpClient(new AsyncHttpClientConfig.Builder().build());
+        AsyncHttpClient client = getAsyncHttpClient(null);
         try {
             Response r = client.preparePost(getTargetUrl()).setBody("MIRROR").execute().get();
 

src/test/java/com/ning/http/client/async/ConnectionPoolTest.java

@@ -282,7 +282,7 @@ public void multipleMaxConnectionOpenTestWithQuery() throws Throwable {
     public void win7DisconnectTest() throws Throwable {
         final AtomicInteger count = new AtomicInteger(0);
 
-        AsyncHttpClient client = getAsyncHttpClient(new AsyncHttpClientConfig.Builder().build());
+        AsyncHttpClient client = getAsyncHttpClient(null);
         try {
             AsyncCompletionHandler<Response> handler = new AsyncCompletionHandlerAdapter() {
 
@@ -313,7 +313,7 @@ public Response onCompleted(Response response) throws Exception {
 
     @Test(groups = { "standalone", "default_provider" })
     public void asyncHandlerOnThrowableTest() throws Throwable {
-        AsyncHttpClient client = getAsyncHttpClient(new AsyncHttpClientConfig.Builder().build());
+        AsyncHttpClient client = getAsyncHttpClient(null);
         try {
             final AtomicInteger count = new AtomicInteger();
             final String THIS_IS_NOT_FOR_YOU = "This is not for you";

src/test/java/com/ning/http/client/async/FilePartLargeFileTest.java

@@ -64,8 +64,7 @@ public void testPutLargeTextFile() throws Exception {
         long repeats = (1024 * 1024 / bytes.length) + 1;
         largeFile = createTempFile(bytes, (int) repeats);
 
-        AsyncHttpClientConfig config = new AsyncHttpClientConfig.Builder().build();
-        AsyncHttpClient client = getAsyncHttpClient(config);
+        AsyncHttpClient client = getAsyncHttpClient(null);
         try {
             BoundRequestBuilder rb = client.preparePut(getTargetUrl());
 

src/test/java/com/ning/http/client/async/NonAsciiContentLengthTest.java

@@ -14,7 +14,6 @@
 
 import com.ning.http.client.AsyncHttpClient;
 import com.ning.http.client.AsyncHttpClient.BoundRequestBuilder;
-import com.ning.http.client.AsyncHttpClientConfig;
 import com.ning.http.client.Response;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Request;
@@ -82,7 +81,7 @@ public void testNonAsciiContentLength() throws Exception {
     }
 
     protected void execute(String body) throws IOException, InterruptedException, ExecutionException {
-        AsyncHttpClient client = getAsyncHttpClient(new AsyncHttpClientConfig.Builder().build());
+        AsyncHttpClient client = getAsyncHttpClient(null);
         try {
             BoundRequestBuilder r = client.preparePost(getTargetUrl()).setBody(body).setBodyEncoding("UTF-8");
             Future<Response> f = r.execute();

src/test/java/com/ning/http/client/async/PerRequestRelative302Test.java

@@ -88,8 +88,7 @@ public void setUpGlobal() throws Exception {
     @Test(groups = { "online", "default_provider" })
     public void redirected302Test() throws Throwable {
         isSet.getAndSet(false);
-        AsyncHttpClientConfig cg = new AsyncHttpClientConfig.Builder().build();
-        AsyncHttpClient c = getAsyncHttpClient(cg);
+        AsyncHttpClient c = getAsyncHttpClient(null);
         try {
 
             // once
@@ -143,8 +142,7 @@ private static int getPort(URI uri) {
     @Test(groups = { "standalone", "default_provider" })
     public void redirected302InvalidTest() throws Throwable {
         isSet.getAndSet(false);
-        AsyncHttpClientConfig cg = new AsyncHttpClientConfig.Builder().build();
-        AsyncHttpClient c = getAsyncHttpClient(cg);
+        AsyncHttpClient c = getAsyncHttpClient(null);
 
         // If the test hit a proxy, no ConnectException will be thrown and instead of 404 will be returned.
         try {
@@ -163,8 +161,7 @@ public void redirected302InvalidTest() throws Throwable {
     public void relativeLocationUrl() throws Throwable {
         isSet.getAndSet(false);
 
-        AsyncHttpClientConfig cg = new AsyncHttpClientConfig.Builder().build();
-        AsyncHttpClient c = getAsyncHttpClient(cg);
+        AsyncHttpClient c = getAsyncHttpClient(null);
         try {
             Response response = c.preparePost(getTargetUrl()).setFollowRedirects(true).setHeader("X-redirect", "/foo/test").execute().get();
             assertNotNull(response);

src/test/java/com/ning/http/client/async/ProxyTest.java

@@ -178,8 +178,7 @@ public void testIgnoreProxyPropertiesByDefault() throws IOException, ExecutionEx
             System.setProperty("http.proxyPort", String.valueOf(port1));
             System.setProperty("http.nonProxyHosts", "localhost");
 
-            AsyncHttpClientConfig cfg = new AsyncHttpClientConfig.Builder().build();
-            AsyncHttpClient client = getAsyncHttpClient(cfg);
+            AsyncHttpClient client = getAsyncHttpClient(null);
             try {
                 String target = "http://127.0.0.1:1234/";
                 Future<Response> f = client.prepareGet(target).execute();
@@ -212,8 +211,7 @@ public void testProxyActivationProperty() throws IOException, ExecutionException
             System.setProperty("http.nonProxyHosts", "localhost");
             System.setProperty("com.ning.http.client.AsyncHttpClientConfig.useProxyProperties", "true");
 
-            AsyncHttpClientConfig cfg = new AsyncHttpClientConfig.Builder().build();
-            AsyncHttpClient client = getAsyncHttpClient(cfg);
+            AsyncHttpClient client = getAsyncHttpClient(null);
             try {
                 String target = "http://127.0.0.1:1234/";
                 Future<Response> f = client.prepareGet(target).execute();

src/test/java/com/ning/http/client/async/PutLargeFileTest.java

@@ -64,8 +64,7 @@ public void testPutSmallFile() throws Exception {
         long repeats = (1024 / bytes.length) + 1;
         largeFile = createTempFile(bytes, (int) repeats);
 
-        AsyncHttpClientConfig config = new AsyncHttpClientConfig.Builder().build();
-        AsyncHttpClient client = getAsyncHttpClient(config);
+        AsyncHttpClient client = getAsyncHttpClient(null);
         try {
             BoundRequestBuilder rb = client.preparePut(getTargetUrl());
 

src/test/java/com/ning/http/client/async/RemoteSiteTest.java

@@ -165,7 +165,7 @@ public void invalidStreamTest2() throws Throwable {
 
     @Test(groups = { "online", "default_provider" })
     public void asyncFullBodyProperlyRead() throws Throwable {
-        final AsyncHttpClient client = getAsyncHttpClient(new AsyncHttpClientConfig.Builder().build());
+        final AsyncHttpClient client = getAsyncHttpClient(null);
         try {
             Response r = client.prepareGet("http://www.cyberpresse.ca/").execute().get();
 

src/test/java/com/ning/http/client/websocket/ByteMessageTest.java

@@ -66,7 +66,7 @@ public org.eclipse.jetty.websocket.WebSocket doWebSocketConnect(HttpServletReque
 
     @Test
     public void echoByte() throws Throwable {
-        AsyncHttpClient c = getAsyncHttpClient(new AsyncHttpClientConfig.Builder().build());
+        AsyncHttpClient c = getAsyncHttpClient(null);
         try {
             final CountDownLatch latch = new CountDownLatch(1);
             final AtomicReference<byte[]> text = new AtomicReference<byte[]>(new byte[0]);
@@ -110,7 +110,7 @@ public void onFragment(byte[] fragment, boolean last) {
 
     @Test
     public void echoTwoMessagesTest() throws Throwable {
-        AsyncHttpClient c = getAsyncHttpClient(new AsyncHttpClientConfig.Builder().build());
+        AsyncHttpClient c = getAsyncHttpClient(null);
         try {
             final CountDownLatch latch = new CountDownLatch(2);
             final AtomicReference<byte[]> text = new AtomicReference<byte[]>(null);
@@ -161,7 +161,7 @@ public void onFragment(byte[] fragment, boolean last) {
 
     @Test
     public void echoOnOpenMessagesTest() throws Throwable {
-        AsyncHttpClient c = getAsyncHttpClient(new AsyncHttpClientConfig.Builder().build());
+        AsyncHttpClient c = getAsyncHttpClient(null);
         try {
             final CountDownLatch latch = new CountDownLatch(2);
             final AtomicReference<byte[]> text = new AtomicReference<byte[]>(null);
@@ -210,7 +210,7 @@ public void onFragment(byte[] fragment, boolean last) {
     }
 
     public void echoFragments() throws Exception {
-        AsyncHttpClient c = getAsyncHttpClient(new AsyncHttpClientConfig.Builder().build());
+        AsyncHttpClient c = getAsyncHttpClient(null);
         try {
             final CountDownLatch latch = new CountDownLatch(1);
             final AtomicReference<byte[]> text = new AtomicReference<byte[]>(null);

src/test/java/com/ning/http/client/websocket/CloseCodeReasonMessageTest.java

@@ -13,16 +13,11 @@
 package com.ning.http.client.websocket;
 
 import com.ning.http.client.AsyncHttpClient;
-import com.ning.http.client.AsyncHttpClientConfig;
-import com.ning.http.client.async.ProviderUtil;
 import com.ning.http.client.websocket.TextMessageTest;
 import com.ning.http.client.websocket.WebSocket;
 import com.ning.http.client.websocket.WebSocketCloseCodeReasonListener;
 import com.ning.http.client.websocket.WebSocketListener;
 import com.ning.http.client.websocket.WebSocketUpgradeHandler;
-import com.ning.http.client.websocket.netty.NettyTextMessageTest;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
-import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import java.util.concurrent.CountDownLatch;
@@ -35,7 +30,7 @@ public abstract class CloseCodeReasonMessageTest extends TextMessageTest {
 
     @Test(timeOut = 60000)
     public void onCloseWithCode() throws Throwable {
-        AsyncHttpClient c = getAsyncHttpClient(new AsyncHttpClientConfig.Builder().build());
+        AsyncHttpClient c = getAsyncHttpClient(null);
         try {
             final CountDownLatch latch = new CountDownLatch(1);
             final AtomicReference<String> text = new AtomicReference<String>("");
@@ -53,7 +48,7 @@ public void onCloseWithCode() throws Throwable {
 
     @Test(timeOut = 60000)
     public void onCloseWithCodeServerClose() throws Throwable {
-        AsyncHttpClient c = getAsyncHttpClient(new AsyncHttpClientConfig.Builder().build());
+        AsyncHttpClient c = getAsyncHttpClient(null);
         try {
             final CountDownLatch latch = new CountDownLatch(1);
             final AtomicReference<String> text = new AtomicReference<String>("");