Minor clean up

Author: slandelle

api/src/main/java/org/asynchttpclient/filter/FilterContext.java

@@ -23,7 +23,7 @@
  * A {@link FilterContext} can be used to decorate {@link Request} and {@link AsyncHandler} from a list of {@link RequestFilter}.
  * {@link RequestFilter} gets executed before the HTTP request is made to the remote server. Once the response bytes are
  * received, a {@link FilterContext} is then passed to the list of {@link ResponseFilter}. {@link ResponseFilter}
- * gets invoked before the response gets processed, e.g. before authorization, redirection and invokation of {@link AsyncHandler}
+ * gets invoked before the response gets processed, e.g. before authorization, redirection and invocation of {@link AsyncHandler}
  * gets processed.
  * <p/>
  * Invoking {@link FilterContext#getResponseStatus()} returns an instance of {@link HttpResponseStatus}

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

@@ -150,6 +150,7 @@ public void testProxyProperties() throws IOException, ExecutionException, Timeou
             Properties props = new Properties();
             props.putAll(originalProps);
 
+            // FIXME most likely non threadsafe!
             System.setProperties(props);
 
             System.setProperty("http.proxyHost", "127.0.0.1");
@@ -189,6 +190,7 @@ public void testIgnoreProxyPropertiesByDefault() throws IOException, ExecutionEx
             Properties props = new Properties();
             props.putAll(originalProps);
 
+            // FIXME most likely non threadsafe!
             System.setProperties(props);
 
             System.setProperty("http.proxyHost", "127.0.0.1");
@@ -220,6 +222,7 @@ public void testProxyActivationProperty() throws IOException, ExecutionException
             Properties props = new Properties();
             props.putAll(originalProps);
 
+            // FIXME most likely non threadsafe!
             System.setProperties(props);
 
             System.setProperty("http.proxyHost", "127.0.0.1");
@@ -259,6 +262,7 @@ public void testWildcardNonProxyHosts() throws IOException, ExecutionException,
             Properties props = new Properties();
             props.putAll(originalProps);
 
+            // FIXME most likely non threadsafe!
             System.setProperties(props);
 
             System.setProperty("http.proxyHost", "127.0.0.1");
@@ -323,8 +327,8 @@ public void connectFailed(URI uri, SocketAddress sa, IOException ioe) {
                 client.close();
             }
         } finally {
+            // FIXME is this threadsafe???
             ProxySelector.setDefault(originalProxySelector);
         }
     }
-
 }

extras/jdeferred/pom.xml

@@ -22,6 +22,7 @@
     <relativePath>..</relativePath>
   </parent>
   <artifactId>async-http-client-extras-jdeferred</artifactId>
+  <name>Async Http Client jDeffered Extras</name>
   <description>The Async Http Client jDeffered Extras.</description>
   <dependencies>
         <dependency>

providers/netty/src/test/java/org/asynchttpclient/providers/netty/NettyBasicAuthTest.java

@@ -12,13 +12,10 @@
  */
 package org.asynchttpclient.providers.netty;
 
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeoutException;
-
-import org.testng.annotations.Test;
 import org.asynchttpclient.AsyncHttpClient;
 import org.asynchttpclient.AsyncHttpClientConfig;
 import org.asynchttpclient.async.BasicAuthTest;
+import org.testng.annotations.Test;
 
 @Test
 public class NettyBasicAuthTest extends BasicAuthTest {
@@ -32,10 +29,4 @@ public AsyncHttpClient getAsyncHttpClient(AsyncHttpClientConfig config) {
     public String getProviderClass() {
     	return NettyAsyncHttpProvider.class.getName();
     }
-
-    @Override
-    @Test
-    public void redirectAndBasicAuthTest() throws Exception, ExecutionException, TimeoutException, InterruptedException {
-        super.redirectAndBasicAuthTest(); // To change body of overridden methods use File | Settings | File Templates.
-    }
 }

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/Channels.java

@@ -25,6 +25,7 @@
 import io.netty.handler.codec.http.websocketx.WebSocket08FrameEncoder;
 import io.netty.handler.ssl.SslHandler;
 import io.netty.handler.stream.ChunkedWriteHandler;
+import io.netty.util.Attribute;
 import io.netty.util.AttributeKey;
 
 import java.io.IOException;
@@ -66,7 +67,7 @@ public class Channels {
     private final AsyncHttpClientConfig config;
     private final NettyAsyncHttpProviderConfig asyncHttpProviderConfig;
 
-    private EventLoopGroup eventLoop;
+    private EventLoopGroup eventLoopGroup;
     private final Class<? extends SocketChannel> socketChannelFactory;
     private final boolean allowReleaseSocketChannelFactory;
 
@@ -109,12 +110,12 @@ public Channels(final AsyncHttpClientConfig config, NettyAsyncHttpProviderConfig
                 this.allowReleaseSocketChannelFactory = false;
             } else {
                 socketChannelFactory = NioSocketChannel.class;
-                eventLoop = asyncHttpProviderConfig.getEventLoopGroup();
-                if (eventLoop == null) {
+                eventLoopGroup = asyncHttpProviderConfig.getEventLoopGroup();
+                if (eventLoopGroup == null) {
                     if (socketChannelFactory == OioSocketChannel.class) {
-                        eventLoop = new OioEventLoopGroup();
+                        eventLoopGroup = new OioEventLoopGroup();
                     } else if (socketChannelFactory == NioSocketChannel.class) {
-                        eventLoop = new NioEventLoopGroup();
+                        eventLoopGroup = new NioEventLoopGroup();
                     } else {
                         throw new IllegalArgumentException("No set event loop compatbile with socket channel " + scf);
                     }
@@ -125,10 +126,10 @@ public Channels(final AsyncHttpClientConfig config, NettyAsyncHttpProviderConfig
             }
         }
 
-        plainBootstrap = new Bootstrap().channel(socketChannelFactory).group(eventLoop);
-        secureBootstrap = new Bootstrap().channel(socketChannelFactory).group(eventLoop);
-        webSocketBootstrap = new Bootstrap().channel(socketChannelFactory).group(eventLoop);
-        secureWebSocketBootstrap = new Bootstrap().channel(socketChannelFactory).group(eventLoop);
+        plainBootstrap = new Bootstrap().channel(socketChannelFactory).group(eventLoopGroup);
+        secureBootstrap = new Bootstrap().channel(socketChannelFactory).group(eventLoopGroup);
+        webSocketBootstrap = new Bootstrap().channel(socketChannelFactory).group(eventLoopGroup);
+        secureWebSocketBootstrap = new Bootstrap().channel(socketChannelFactory).group(eventLoopGroup);
 
         // This is dangerous as we can't catch a wrong typed ConnectionsPool
         ConnectionsPool<String, Channel> cp = (ConnectionsPool<String, Channel>) config.getConnectionsPool();
@@ -247,7 +248,7 @@ public void close() {
         }
         openChannels.close();
         if (this.allowReleaseSocketChannelFactory) {
-            eventLoop.shutdownGracefully();
+            eventLoopGroup.shutdownGracefully();
         }
     }
 
@@ -494,7 +495,12 @@ public static Object getDefaultAttribute(Channel channel) {
     }
 
     public static Object getDefaultAttribute(ChannelHandlerContext ctx) {
-        return ctx.attr(DEFAULT_ATTRIBUTE).get();
+        if (ctx == null) {
+            // ctx might be null if the channel never reached the handler
+            return null;
+        }
+        Attribute<Object> attr = ctx.attr(DEFAULT_ATTRIBUTE);
+        return attr != null ? attr.get() : null;
     }
 
     public static void setDefaultAttribute(Channel channel, Object o) {

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/NettyChannelHandler.java

@@ -835,6 +835,8 @@ public void handle(ChannelHandlerContext ctx, NettyResponseFuture future, Object
                         LOGGER.debug("UpgradeHandler returned a null NettyWebSocket ");
                     }
                 }
+            } else if (e instanceof LastHttpContent) {
+                // FIXME what to do with this kind of messages?
             } else {
                 LOGGER.error("Invalid message {}", e);
             }

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/NettyRequestSender.java

@@ -340,6 +340,7 @@ protected final <T> void writeRequest(final Channel channel, final AsyncHttpClie
                             if (Channels.getSslHandler(channel) != null) {
                                 writeFuture = channel.write(new ChunkedFile(raf, 0, fileLength, Constants.MAX_BUFFERED_BYTES), channel.newProgressivePromise());
                             } else {
+                                // FIXME why not use io.netty.channel.DefaultFileRegion?
                                 FileRegion region = new OptimizedFileRegion(raf, 0, fileLength);
                                 writeFuture = channel.write(region, channel.newProgressivePromise());
                             }

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/Protocol.java

@@ -16,7 +16,7 @@
 
 public interface Protocol{
 
-    void handle(ChannelHandlerContext ctx, NettyResponseFuture future, Object message) throws Exception;
+    void handle(ChannelHandlerContext ctx, NettyResponseFuture<?> future, Object message) throws Exception;
 
     void onError(ChannelHandlerContext ctx, Throwable error);