Refactor Netty provider config

Author: Stephane Landelle

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

@@ -22,8 +22,6 @@
 import org.asynchttpclient.providers.netty.response.EagerResponseBodyPart;
 import org.asynchttpclient.providers.netty.response.LazyResponseBodyPart;
 import org.asynchttpclient.providers.netty.response.NettyResponseBodyPart;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
@@ -38,67 +36,9 @@
 /**
  * This class can be used to pass Netty's internal configuration options. See Netty documentation for more information.
  */
-public class NettyAsyncHttpProviderConfig implements AsyncHttpProviderConfig<String, Object> {
+public class NettyAsyncHttpProviderConfig implements AsyncHttpProviderConfig<ChannelOption<Object>, Object> {
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(NettyAsyncHttpProviderConfig.class);
-
-    /**
-     * Allow configuring the Netty's event loop.
-     */
-    private EventLoopGroup eventLoopGroup;
-
-    private AdditionalChannelInitializer httpAdditionalChannelInitializer;
-    private AdditionalChannelInitializer wsAdditionalChannelInitializer;
-    private AdditionalChannelInitializer httpsAdditionalChannelInitializer;
-    private AdditionalChannelInitializer wssAdditionalChannelInitializer;
-
-    /**
-     * HttpClientCodec's maxInitialLineLength
-     */
-    private int maxInitialLineLength = 4096;
-
-    /**
-     * HttpClientCodec's maxHeaderSize
-     */
-    private int maxHeaderSize = 8192;
-
-    /**
-     * HttpClientCodec's maxChunkSize
-     */
-    private int maxChunkSize = 8192;
-
-    /**
-     * Use direct {@link java.nio.ByteBuffer}
-     */
-    public final static String USE_DIRECT_BYTEBUFFER = "bufferFactory";
-
-    /**
-     * Allow nested request from any {@link org.asynchttpclient.AsyncHandler}
-     */
-    public final static String DISABLE_NESTED_REQUEST = "disableNestedRequest";
-
-    /**
-     * See {@link java.net.Socket#setReuseAddress(boolean)}
-     */
-    public final static String REUSE_ADDRESS = ChannelOption.SO_REUSEADDR.name();
-
-    private final Map<String, Object> properties = new HashMap<String, Object>();
-
-    private ResponseBodyPartFactory bodyPartFactory = new EagerResponseBodyPartFactory();
-
-    private ChannelPool channelPool;
-
-    private boolean disableZeroCopy;
-
-    private Timer nettyTimer;
-
-    private long handshakeTimeoutInMillis;
-
-    private SSLEngineFactory sslEngineFactory;
-
-    public NettyAsyncHttpProviderConfig() {
-        properties.put(REUSE_ADDRESS, Boolean.FALSE);
-    }
+    private final Map<ChannelOption<Object>, Object> properties = new HashMap<ChannelOption<Object>, Object>();
 
     /**
      * Add a property that will be used when the AsyncHttpClient initialize its
@@ -108,16 +48,14 @@ public NettyAsyncHttpProviderConfig() {
      * @param value the value of the property
      * @return this instance of AsyncHttpProviderConfig
      */
-    public NettyAsyncHttpProviderConfig addProperty(String name, Object value) {
-
-        if (name.equals(REUSE_ADDRESS)//
-                && value == Boolean.TRUE//
-                && System.getProperty("os.name").toLowerCase().contains("win")) {
-            LOGGER.warn("Can't enable {} on Windows", REUSE_ADDRESS);
-        } else {
-            properties.put(name, value);
-        }
+    public NettyAsyncHttpProviderConfig addProperty(ChannelOption<Object> name, Object value) {
+        properties.put(name, value);
+        return this;
+    }
 
+    @SuppressWarnings("unchecked")
+    public <T> NettyAsyncHttpProviderConfig addChannelOption(ChannelOption<T> name, T value) {
+        properties.put((ChannelOption<Object>) name, value);
         return this;
     }
 
@@ -127,7 +65,7 @@ public NettyAsyncHttpProviderConfig addProperty(String name, Object value) {
      * @param name
      * @return this instance of AsyncHttpProviderConfig
      */
-    public Object getProperty(String name) {
+    public Object getProperty(ChannelOption<Object> name) {
         return properties.get(name);
     }
 
@@ -137,7 +75,7 @@ public Object getProperty(String name) {
      * @param name
      * @return true if removed
      */
-    public Object removeProperty(String name) {
+    public Object removeProperty(ChannelOption<Object> name) {
         return properties.remove(name);
     }
 
@@ -146,40 +84,79 @@ public Object removeProperty(String name) {
      * 
      * @return a the curent entry set.
      */
-    public Set<Map.Entry<String, Object>> propertiesSet() {
+    public Set<Map.Entry<ChannelOption<Object>, Object>> propertiesSet() {
         return properties.entrySet();
     }
 
-    public EventLoopGroup getEventLoopGroup() {
-        return eventLoopGroup;
-    }
+    public static interface AdditionalChannelInitializer {
 
-    public void setEventLoopGroup(EventLoopGroup eventLoopGroup) {
-        this.eventLoopGroup = eventLoopGroup;
+        void initChannel(Channel ch) throws Exception;
     }
 
-    public int getMaxInitialLineLength() {
-        return maxInitialLineLength;
-    }
+    public static interface ResponseBodyPartFactory {
 
-    public void setMaxInitialLineLength(int maxInitialLineLength) {
-        this.maxInitialLineLength = maxInitialLineLength;
+        NettyResponseBodyPart newResponseBodyPart(ByteBuf buf, boolean last);
     }
 
-    public int getMaxHeaderSize() {
-        return maxHeaderSize;
+    public static class EagerResponseBodyPartFactory implements ResponseBodyPartFactory {
+
+        @Override
+        public NettyResponseBodyPart newResponseBodyPart(ByteBuf buf, boolean last) {
+            return new EagerResponseBodyPart(buf, last);
+        }
     }
 
-    public void setMaxHeaderSize(int maxHeaderSize) {
-        this.maxHeaderSize = maxHeaderSize;
+    public static class LazyResponseBodyPartFactory implements ResponseBodyPartFactory {
+
+        @Override
+        public NettyResponseBodyPart newResponseBodyPart(ByteBuf buf, boolean last) {
+            return new LazyResponseBodyPart(buf, last);
+        }
     }
 
-    public int getMaxChunkSize() {
-        return maxChunkSize;
+    /**
+     * Allow configuring the Netty's event loop.
+     */
+    private EventLoopGroup eventLoopGroup;
+
+    private AdditionalChannelInitializer httpAdditionalChannelInitializer;
+    private AdditionalChannelInitializer wsAdditionalChannelInitializer;
+    private AdditionalChannelInitializer httpsAdditionalChannelInitializer;
+    private AdditionalChannelInitializer wssAdditionalChannelInitializer;
+
+    /**
+     * HttpClientCodec's maxInitialLineLength
+     */
+    private int maxInitialLineLength = 4096;
+
+    /**
+     * HttpClientCodec's maxHeaderSize
+     */
+    private int maxHeaderSize = 8192;
+
+    /**
+     * HttpClientCodec's maxChunkSize
+     */
+    private int maxChunkSize = 8192;
+
+    private ResponseBodyPartFactory bodyPartFactory = new EagerResponseBodyPartFactory();
+
+    private ChannelPool channelPool;
+
+    private boolean disableZeroCopy;
+
+    private Timer nettyTimer;
+
+    private long handshakeTimeoutInMillis;
+
+    private SSLEngineFactory sslEngineFactory;
+
+    public EventLoopGroup getEventLoopGroup() {
+        return eventLoopGroup;
     }
 
-    public void setMaxChunkSize(int maxChunkSize) {
-        this.maxChunkSize = maxChunkSize;
+    public void setEventLoopGroup(EventLoopGroup eventLoopGroup) {
+        this.eventLoopGroup = eventLoopGroup;
     }
 
     public AdditionalChannelInitializer getHttpAdditionalChannelInitializer() {
@@ -214,6 +191,30 @@ public void setWssAdditionalChannelInitializer(AdditionalChannelInitializer wssA
         this.wssAdditionalChannelInitializer = wssAdditionalChannelInitializer;
     }
 
+    public int getMaxInitialLineLength() {
+        return maxInitialLineLength;
+    }
+
+    public void setMaxInitialLineLength(int maxInitialLineLength) {
+        this.maxInitialLineLength = maxInitialLineLength;
+    }
+
+    public int getMaxHeaderSize() {
+        return maxHeaderSize;
+    }
+
+    public void setMaxHeaderSize(int maxHeaderSize) {
+        this.maxHeaderSize = maxHeaderSize;
+    }
+
+    public int getMaxChunkSize() {
+        return maxChunkSize;
+    }
+
+    public void setMaxChunkSize(int maxChunkSize) {
+        this.maxChunkSize = maxChunkSize;
+    }
+
     public ResponseBodyPartFactory getBodyPartFactory() {
         return bodyPartFactory;
     }
@@ -253,38 +254,12 @@ public long getHandshakeTimeoutInMillis() {
     public void setHandshakeTimeoutInMillis(long handshakeTimeoutInMillis) {
         this.handshakeTimeoutInMillis = handshakeTimeoutInMillis;
     }
-    
+
     public SSLEngineFactory getSslEngineFactory() {
         return sslEngineFactory;
     }
 
     public void setSslEngineFactory(SSLEngineFactory sslEngineFactory) {
         this.sslEngineFactory = sslEngineFactory;
     }
-
-    public static interface AdditionalChannelInitializer {
-
-        void initChannel(Channel ch) throws Exception;
-    }
-
-    public static interface ResponseBodyPartFactory {
-
-        NettyResponseBodyPart newResponseBodyPart(ByteBuf buf, boolean last);
-    }
-
-    public static class EagerResponseBodyPartFactory implements ResponseBodyPartFactory {
-
-        @Override
-        public NettyResponseBodyPart newResponseBodyPart(ByteBuf buf, boolean last) {
-            return new EagerResponseBodyPart(buf, last);
-        }
-    }
-
-    public static class LazyResponseBodyPartFactory implements ResponseBodyPartFactory {
-
-        @Override
-        public NettyResponseBodyPart newResponseBodyPart(ByteBuf buf, boolean last) {
-            return new LazyResponseBodyPart(buf, last);
-        }
-    }
 }

providers/netty/src/main/java/org/asynchttpclient/providers/netty/channel/Channels.java

@@ -63,10 +63,7 @@
 import javax.net.ssl.SSLEngine;
 
 import java.io.IOException;
-import java.lang.reflect.Field;
 import java.security.GeneralSecurityException;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
@@ -162,31 +159,13 @@ public Channels(final AsyncHttpClientConfig config, NettyAsyncHttpProviderConfig
             freeConnections = null;
         }
 
-        Map<String, ChannelOption<Object>> optionMap = new HashMap<String, ChannelOption<Object>>();
-        for (Field field : ChannelOption.class.getDeclaredFields()) {
-            if (field.getType().isAssignableFrom(ChannelOption.class)) {
-                field.setAccessible(true);
-                try {
-                    optionMap.put(field.getName(), (ChannelOption<Object>) field.get(null));
-                } catch (IllegalAccessException ex) {
-                    throw new Error(ex);
-                }
-            }
-        }
-
-        if (nettyProviderConfig != null) {
-            for (Entry<String, Object> entry : nettyProviderConfig.propertiesSet()) {
-                ChannelOption<Object> key = optionMap.get(entry.getKey());
-                if (key != null) {
-                    Object value = entry.getValue();
-                    plainBootstrap.option(key, value);
-                    webSocketBootstrap.option(key, value);
-                    secureBootstrap.option(key, value);
-                    secureWebSocketBootstrap.option(key, value);
-                } else {
-                    throw new IllegalArgumentException("Unknown config property " + entry.getKey());
-                }
-            }
+        for (Entry<ChannelOption<Object>, Object> entry : nettyProviderConfig.propertiesSet()) {
+            ChannelOption<Object> key = entry.getKey();
+            Object value = entry.getValue();
+            plainBootstrap.option(key, value);
+            webSocketBootstrap.option(key, value);
+            secureBootstrap.option(key, value);
+            secureWebSocketBootstrap.option(key, value);
         }
 
         int timeOut = config.getConnectionTimeoutInMs() > 0 ? config.getConnectionTimeoutInMs() : Integer.MAX_VALUE;

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

@@ -17,6 +17,8 @@
 import org.asynchttpclient.AsyncHttpProviderConfig;
 import org.asynchttpclient.async.AsyncProvidersBasicTest;
 
+import io.netty.channel.ChannelOption;
+
 public class NettyAsyncProviderBasicTest extends AsyncProvidersBasicTest {
 
     @Override
@@ -26,9 +28,7 @@ public AsyncHttpClient getAsyncHttpClient(AsyncHttpClientConfig config) {
 
     @Override
     protected AsyncHttpProviderConfig<?, ?> getProviderConfig() {
-        final NettyAsyncHttpProviderConfig config = new NettyAsyncHttpProviderConfig();
-        config.addProperty("TCP_NODELAY", true);
-        return config;
+        return new NettyAsyncHttpProviderConfig().addChannelOption(ChannelOption.TCP_NODELAY, Boolean.TRUE);
     }
 
     @Override