Introduce Netty 4 support (disabled)

Author: Stephane Landelle

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

@@ -855,13 +855,8 @@ public Builder setSSLEngineFactory(SSLEngineFactory sslEngineFactory) {
          * @return a {@link Builder}
          */
         public Builder setSSLContext(final SSLContext sslContext) {
-            this.sslEngineFactory = new SSLEngineFactory() {
-                public SSLEngine newSSLEngine() throws GeneralSecurityException {
-                    SSLEngine sslEngine = sslContext.createSSLEngine();
-                    sslEngine.setUseClientMode(true);
-                    return sslEngine;
-                }
-            };
+            // reset previously set value so it will be lazily recreated
+            this.sslEngineFactory = null;
             this.sslContext = sslContext;
             return this;
         }

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

@@ -109,6 +109,7 @@ public RequestBuilder setBody(EntityWriter dataWriter) {
      * @deprecated {@link #setBody(BodyGenerator)} setBody(new InputStreamBodyGenerator(inputStream))
      */
     @Override
+    // FIXME I'd do the exact opposite: deprecate InputStreamBodyGenerator
     @Deprecated
     public RequestBuilder setBody(InputStream stream) throws IllegalArgumentException {
         return super.setBody(stream);

api/src/main/java/org/asynchttpclient/generators/InputStreamBodyGenerator.java

@@ -47,6 +47,10 @@ public InputStreamBodyGenerator(InputStream inputStream) {
         }
     }
 
+    public InputStream getInputStream() {
+        return inputStream;
+    }
+
     /**
      * {@inheritDoc}
      */

api/src/main/java/org/asynchttpclient/ntlm/NTLMEngine.java

@@ -108,6 +108,8 @@ public class NTLMEngine {
         SIGNATURE[bytesWithoutNull.length] = (byte) 0x00;
     }
 
+    public static final NTLMEngine INSTANCE = new NTLMEngine();
+
     /**
      * Returns the response for the given message.
      *

api/src/main/java/org/asynchttpclient/providers/ResponseBase.java

@@ -46,7 +46,7 @@ public final String getStatusText() {
     }
 
     /* @Override */
-    public final URI getUri() /*throws MalformedURLException*/ {
+    public final URI getUri() {
         return status.getUrl();
     }
 

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

@@ -340,7 +340,11 @@ public void asyncStream301WithBody() throws Throwable {
         AsyncHttpClient c = getAsyncHttpClient(null);
         try {
             c.prepareGet("http://google.com/").execute(new AsyncHandlerAdapter() {
-                private StringBuilder builder = new StringBuilder();
+
+                public STATE onStatusReceived(HttpResponseStatus status) throws Exception {
+                    Assert.assertEquals(301, status.getStatusCode());
+                    return STATE.CONTINUE; 
+                }
 
                 @Override
                 public STATE onHeadersReceived(HttpResponseHeaders content) throws Exception {
@@ -352,16 +356,13 @@ public STATE onHeadersReceived(HttpResponseHeaders content) throws Exception {
 
                 @Override
                 public STATE onBodyPartReceived(HttpResponseBodyPart content) throws Exception {
-                    builder.append(new String(content.getBodyPartBytes()));
                     return STATE.CONTINUE;
                 }
 
                 @Override
                 public String onCompleted() throws Exception {
-                    String r = builder.toString();
-                    Assert.assertTrue(r.contains("301 Moved"));
                     l.countDown();
-                    return r;
+                    return null;
                 }
             });
 
@@ -379,7 +380,11 @@ public void asyncStream301RedirectWithBody() throws Throwable {
         AsyncHttpClient c = getAsyncHttpClient(new AsyncHttpClientConfig.Builder().setFollowRedirects(true).build());
         try {
             c.prepareGet("http://google.com/").execute(new AsyncHandlerAdapter() {
-                private StringBuilder builder = new StringBuilder();
+
+                public STATE onStatusReceived(HttpResponseStatus status) throws Exception {
+                    Assert.assertTrue(status.getStatusCode() != 301);
+                    return STATE.CONTINUE; 
+                }
 
                 @Override
                 public STATE onHeadersReceived(HttpResponseHeaders content) throws Exception {
@@ -397,19 +402,10 @@ public STATE onHeadersReceived(HttpResponseHeaders content) throws Exception {
                     return STATE.CONTINUE;
                 }
 
-                @Override
-                public STATE onBodyPartReceived(HttpResponseBodyPart content) throws Exception {
-                    builder.append(new String(content.getBodyPartBytes()));
-                    return STATE.CONTINUE;
-                }
-
                 @Override
                 public String onCompleted() throws Exception {
-                    String r = builder.toString();
-                    Assert.assertTrue(!r.contains("301 Moved"));
                     l.countDown();
-
-                    return r;
+                    return null;
                 }
             });
 

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

@@ -119,10 +119,6 @@ public void onThrowable(Throwable t) {
                 public STATE onBodyPartReceived(HttpResponseBodyPart e) throws Exception {
                     String s = new String(e.getBodyPartBytes());
                     log.info("got part: {}", s);
-                    if (s.equals("")) {
-                        // noinspection ThrowableInstanceNeverThrown
-                        log.warn("Sampling stacktrace.", new Throwable("trace that, we should not get called for empty body."));
-                    }
                     queue.put(s);
                     return STATE.CONTINUE;
                 }

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

@@ -73,11 +73,6 @@ abstract public class ChunkingTest extends AbstractBasicTest {
      */
     @Test()
     public void testCustomChunking() throws Throwable {
-        doTest(true);
-    }
-
-
-    private void doTest(boolean customChunkedInputStream) throws Exception {
         AsyncHttpClient c = null;
         try {
             AsyncHttpClientConfig.Builder bc =
@@ -95,13 +90,9 @@ private void doTest(boolean customChunkedInputStream) throws Exception {
 
             RequestBuilder builder = new RequestBuilder("POST");
             builder.setUrl(getTargetUrl());
-            if (customChunkedInputStream) {
-                // made buff in stream big enough to mark.
-                builder.setBody(new InputStreamBodyGenerator(new BufferedInputStream(new FileInputStream(getTestFile()), 400000)));
-            } else {
-                // made buff in stream big enough to mark.
-                builder.setBody(new InputStreamBodyGenerator(new BufferedInputStream(new FileInputStream(getTestFile()), 400000)));
-            }
+            // made buff in stream big enough to mark.
+            builder.setBody(new InputStreamBodyGenerator(new BufferedInputStream(new FileInputStream(getTestFile()), 400000)));
+
             Request r = builder.build();
             Response res = null;
 

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

@@ -111,8 +111,6 @@ public void handle(String arg0, Request arg1, HttpServletRequest req, HttpServle
                     b = new byte[8192];
                     total += count;
                 }
-                System.err.println("consumed " + total + " bytes.");
-
                 resp.setStatus(200);
                 resp.addHeader("X-TRANFERED", String.valueOf(total));
                 resp.getOutputStream().flush();

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

@@ -27,6 +27,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.ByteArrayOutputStream;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
 
@@ -38,11 +39,18 @@ public abstract class InputStreamTest extends AbstractBasicTest {
     private class InputStreamHandler extends AbstractHandler {
         public void handle(String s, Request r, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
             if ("POST".equalsIgnoreCase(request.getMethod())) {
-                byte[] b = new byte[3];
-                request.getInputStream().read(b, 0, 3);
+                byte[] bytes = new byte[3];
+                ByteArrayOutputStream bos = new ByteArrayOutputStream();
+                int read = 0;
+                while (read > -1) {
+                    read = request.getInputStream().read(bytes);
+                    if (read > 0) {
+                        bos.write(bytes, 0, read);
+                    }
+                }
 
                 response.setStatus(HttpServletResponse.SC_OK);
-                response.addHeader("X-Param", new String(b));
+                response.addHeader("X-Param", new String(bos.toByteArray()));
             } else { // this handler is to handle POST request
                 response.sendError(HttpServletResponse.SC_FORBIDDEN);
             }
@@ -80,7 +88,6 @@ public int read() throws IOException {
                     } else {
                         return -1;
                     }
-
                 }
             };
 

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

@@ -98,14 +98,11 @@ public void handle(String arg0, Request arg1, HttpServletRequest req, HttpServle
                     total += count;
                 }
 
-                System.err.println("consumed " + total + " bytes.");
-
                 resp.setStatus(200);
                 resp.getOutputStream().flush();
                 resp.getOutputStream().close();
 
                 arg1.setHandled(true);
-
             }
         };
     }