Share common provider configuration

Author: slandelle

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

@@ -12,7 +12,6 @@
  */
 package org.asynchttpclient.config;
 
-
 public final class AsyncHttpClientConfigDefaults {
 
     private AsyncHttpClientConfigDefaults() {
@@ -109,10 +108,46 @@ public static boolean defaultAcceptAnyCertificate() {
     }
 
     public static Integer defaultSslSessionCacheSize() {
-        return Integer.getInteger(ASYNC_CLIENT_CONFIG_ROOT + "sslSessionCacheSize");
+        return AsyncHttpClientConfigHelper.getAsyncHttpClientConfig().getInteger(ASYNC_CLIENT_CONFIG_ROOT + "sslSessionCacheSize");
     }
 
     public static Integer defaultSslSessionTimeout() {
-        return Integer.getInteger(ASYNC_CLIENT_CONFIG_ROOT + "sslSessionTimeout");
+        return AsyncHttpClientConfigHelper.getAsyncHttpClientConfig().getInteger(ASYNC_CLIENT_CONFIG_ROOT + "sslSessionTimeout");
+    }
+    
+    public static int defaultHttpClientCodecMaxInitialLineLength() {
+        return AsyncHttpClientConfigHelper.getAsyncHttpClientConfig().getInt(ASYNC_CLIENT_CONFIG_ROOT + "httpClientCodecMaxInitialLineLength");
+    }
+    
+    public static int defaultHttpClientCodecMaxHeaderSize() {
+        return AsyncHttpClientConfigHelper.getAsyncHttpClientConfig().getInt(ASYNC_CLIENT_CONFIG_ROOT + "httpClientCodecMaxHeaderSize");
+    }
+    
+    public static int defaultHttpClientCodecMaxChunkSize() {
+        return AsyncHttpClientConfigHelper.getAsyncHttpClientConfig().getInt(ASYNC_CLIENT_CONFIG_ROOT + "httpClientCodecMaxChunkSize");
+    }
+    
+    public static boolean defaultDisableZeroCopy() {
+        return AsyncHttpClientConfigHelper.getAsyncHttpClientConfig().getBoolean(ASYNC_CLIENT_CONFIG_ROOT + "disableZeroCopy");
+    }
+    
+    public static long defaultHandshakeTimeout() {
+        return AsyncHttpClientConfigHelper.getAsyncHttpClientConfig().getLong(ASYNC_CLIENT_CONFIG_ROOT + "handshakeTimeout");
+    }
+    
+    public static int defaultChunkedFileChunkSize() {
+        return AsyncHttpClientConfigHelper.getAsyncHttpClientConfig().getInt(ASYNC_CLIENT_CONFIG_ROOT + "chunkedFileChunkSize");
+    }
+    
+    public static int defaultWebSocketMaxBufferSize() {
+        return AsyncHttpClientConfigHelper.getAsyncHttpClientConfig().getInt(ASYNC_CLIENT_CONFIG_ROOT + "webSocketMaxBufferSize");
+    }
+    
+    public static int defaultWebSocketMaxFrameSize() {
+        return AsyncHttpClientConfigHelper.getAsyncHttpClientConfig().getInt(ASYNC_CLIENT_CONFIG_ROOT + "webSocketMaxFrameSize");
+    }
+    
+    public static boolean defaultKeepEncodingHeader() {
+        return AsyncHttpClientConfigHelper.getAsyncHttpClientConfig().getBoolean(ASYNC_CLIENT_CONFIG_ROOT + "keepEncodingHeader");
     }
 }

api/src/main/java/org/asynchttpclient/config/AsyncHttpClientConfigDefaults.java

@@ -77,6 +77,15 @@ public int getInt(String key) {
             return Integer.parseInt(getString(key));
         }
 
+        public long getLong(String key) {
+            return Long.parseLong(getString(key));
+        }
+        
+        public int getInteger(String key) {
+            String s = getString(key);
+            return s != null ? Integer.valueOf(s) : null;
+        }
+        
         public boolean getBoolean(String key) {
             return Boolean.parseBoolean(getString(key));
         }

api/src/main/java/org/asynchttpclient/config/AsyncHttpClientConfigHelper.java

@@ -21,4 +21,13 @@ org.asynchttpclient.maxRequestRetry=5
 org.asynchttpclient.allowPoolingSslConnections=true
 org.asynchttpclient.disableUrlEncodingForBoundRequests=false
 org.asynchttpclient.removeQueryParamOnRedirect=true
-org.asynchttpclient.acceptAnyCertificate=false
+org.asynchttpclient.acceptAnyCertificate=false
+org.asynchttpclient.httpClientCodecMaxInitialLineLength=4096
+org.asynchttpclient.httpClientCodecMaxHeaderSize=8192
+org.asynchttpclient.httpClientCodecMaxChunkSize=8192
+org.asynchttpclient.disableZeroCopy=false
+org.asynchttpclient.handshakeTimeout=10000
+org.asynchttpclient.chunkedFileChunkSize=8192
+org.asynchttpclient.webSocketMaxBufferSize=128000000
+org.asynchttpclient.webSocketMaxFrameSize=10240
+org.asynchttpclient.keepEncodingHeader=false

api/src/main/resources/ahc-default.properties

@@ -38,7 +38,6 @@ public class NettyAsyncHttpProvider extends SimpleChannelUpstreamHandler impleme
     private final AsyncHttpClientConfig config;
     private final AtomicBoolean closed = new AtomicBoolean(false);
     private final ChannelManager channelManager;
-    private final NettyAsyncHttpProviderConfig nettyConfig;
     private final boolean allowStopNettyTimer;
     private final Timer nettyTimer;
 
@@ -47,15 +46,15 @@ public class NettyAsyncHttpProvider extends SimpleChannelUpstreamHandler impleme
     public NettyAsyncHttpProvider(AsyncHttpClientConfig config) {
 
         this.config = config;
-        nettyConfig = config.getAsyncHttpProviderConfig() instanceof NettyAsyncHttpProviderConfig ? //
+        NettyAsyncHttpProviderConfig nettyConfig = config.getAsyncHttpProviderConfig() instanceof NettyAsyncHttpProviderConfig ? //
         (NettyAsyncHttpProviderConfig) config.getAsyncHttpProviderConfig()
                 : new NettyAsyncHttpProviderConfig();
 
         allowStopNettyTimer = nettyConfig.getNettyTimer() == null;
         nettyTimer = allowStopNettyTimer ? newNettyTimer() : nettyConfig.getNettyTimer();
 
         channelManager = new ChannelManager(config, nettyConfig, nettyTimer);
-        requestSender = new NettyRequestSender(config, nettyConfig, channelManager, nettyTimer, closed);
+        requestSender = new NettyRequestSender(config, channelManager, nettyTimer, closed);
         channelManager.configureBootstraps(requestSender, closed);
     }
 

providers/netty3/src/main/java/org/asynchttpclient/netty/NettyAsyncHttpProvider.java

@@ -19,12 +19,11 @@
 import java.util.concurrent.ExecutorService;
 
 import org.asynchttpclient.AsyncHttpProviderConfig;
-import org.asynchttpclient.channel.SSLEngineFactory;
+import org.asynchttpclient.config.AsyncHttpClientConfig;
 import org.asynchttpclient.netty.channel.pool.ChannelPool;
 import org.asynchttpclient.netty.handler.ConnectionStrategy;
 import org.asynchttpclient.netty.handler.Http1Point1ConnectionStrategy;
 import org.asynchttpclient.netty.ws.NettyWebSocket;
-import org.asynchttpclient.netty.NettyAsyncHttpProviderConfig;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelPipeline;
 import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
@@ -33,19 +32,19 @@
 import org.jboss.netty.util.Timer;
 
 /**
- * This class can be used to pass Netty's internal configuration options. See Netty documentation for more information.
+ * 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> {
 
     private final ConcurrentHashMap<String, Object> properties = new ConcurrentHashMap<>();
 
     /**
-     * Add a property that will be used when the AsyncHttpClient initialize its {@link com.ning.http.client.AsyncHttpProvider}
+     * Add a property that will be used when the AsyncHttpClient initialize its
+     * {@link com.ning.http.client.AsyncHttpProvider}
      * 
-     * @param name
-     *            the name of the property
-     * @param value
-     *            the value of the property
+     * @param name the name of the property
+     * @param value the value of the property
      * @return this instance of AsyncHttpProviderConfig
      */
     public NettyAsyncHttpProviderConfig addProperty(String name, Object value) {
@@ -111,44 +110,17 @@ public Set<Map.Entry<String, Object>> propertiesSet() {
     private AdditionalPipelineInitializer httpsAdditionalPipelineInitializer;
     private AdditionalPipelineInitializer wssAdditionalPipelineInitializer;
 
-    /**
-     * Allow configuring Netty's HttpClientCodecs.
-     */
-    private int httpClientCodecMaxInitialLineLength = 4096;
-    private int httpClientCodecMaxHeaderSize = 8192;
-    private int httpClientCodecMaxChunkSize = 8192;
-
     /**
      * Allow configuring the Netty's socket channel factory.
      */
     private NioClientSocketChannelFactory socketChannelFactory;
 
     private ChannelPool channelPool;
 
-    /**
-     * Allow one to disable zero copy for bodies and use chunking instead
-     */
-    private boolean disableZeroCopy;
-
     private Timer nettyTimer;
 
-    private long handshakeTimeout = 10000L;
-
-    private SSLEngineFactory sslEngineFactory;
-
-    /**
-     * chunkedFileChunkSize
-     */
-    private int chunkedFileChunkSize = 8192;
-
     private NettyWebSocketFactory nettyWebSocketFactory = new DefaultNettyWebSocketFactory();
 
-    private int webSocketMaxBufferSize = 128000000;
-
-    private int webSocketMaxFrameSize = 10 * 1024;
-
-    private boolean keepEncodingHeader = false;
-
     private ConnectionStrategy<HttpRequest, HttpResponse> connectionStrategy = new Http1Point1ConnectionStrategy();
 
     public boolean isUseDeadLockChecker() {
@@ -166,7 +138,7 @@ public ExecutorService getBossExecutorService() {
     public void setBossExecutorService(ExecutorService bossExecutorService) {
         this.bossExecutorService = bossExecutorService;
     }
-    
+
     public AdditionalPipelineInitializer getHttpAdditionalPipelineInitializer() {
         return httpAdditionalPipelineInitializer;
     }
@@ -199,30 +171,6 @@ public void setWssAdditionalPipelineInitializer(AdditionalPipelineInitializer ws
         this.wssAdditionalPipelineInitializer = wssAdditionalPipelineInitializer;
     }
 
-    public int getHttpClientCodecMaxInitialLineLength() {
-        return httpClientCodecMaxInitialLineLength;
-    }
-
-    public void setHttpClientCodecMaxInitialLineLength(int httpClientCodecMaxInitialLineLength) {
-        this.httpClientCodecMaxInitialLineLength = httpClientCodecMaxInitialLineLength;
-    }
-
-    public int getHttpClientCodecMaxHeaderSize() {
-        return httpClientCodecMaxHeaderSize;
-    }
-
-    public void setHttpClientCodecMaxHeaderSize(int httpClientCodecMaxHeaderSize) {
-        this.httpClientCodecMaxHeaderSize = httpClientCodecMaxHeaderSize;
-    }
-
-    public int getHttpClientCodecMaxChunkSize() {
-        return httpClientCodecMaxChunkSize;
-    }
-
-    public void setHttpClientCodecMaxChunkSize(int httpClientCodecMaxChunkSize) {
-        this.httpClientCodecMaxChunkSize = httpClientCodecMaxChunkSize;
-    }
-
     public NioClientSocketChannelFactory getSocketChannelFactory() {
         return socketChannelFactory;
     }
@@ -231,14 +179,6 @@ public void setSocketChannelFactory(NioClientSocketChannelFactory socketChannelF
         this.socketChannelFactory = socketChannelFactory;
     }
 
-    public void setDisableZeroCopy(boolean disableZeroCopy) {
-        this.disableZeroCopy = disableZeroCopy;
-    }
-
-    public boolean isDisableZeroCopy() {
-        return disableZeroCopy;
-    }
-
     public Timer getNettyTimer() {
         return nettyTimer;
     }
@@ -247,14 +187,6 @@ public void setNettyTimer(Timer nettyTimer) {
         this.nettyTimer = nettyTimer;
     }
 
-    public long getHandshakeTimeout() {
-        return handshakeTimeout;
-    }
-
-    public void setHandshakeTimeout(long handshakeTimeout) {
-        this.handshakeTimeout = handshakeTimeout;
-    }
-
     public ChannelPool getChannelPool() {
         return channelPool;
     }
@@ -263,22 +195,6 @@ public void setChannelPool(ChannelPool channelPool) {
         this.channelPool = channelPool;
     }
 
-    public SSLEngineFactory getSslEngineFactory() {
-        return sslEngineFactory;
-    }
-
-    public void setSslEngineFactory(SSLEngineFactory sslEngineFactory) {
-        this.sslEngineFactory = sslEngineFactory;
-    }
-
-    public int getChunkedFileChunkSize() {
-        return chunkedFileChunkSize;
-    }
-
-    public void setChunkedFileChunkSize(int chunkedFileChunkSize) {
-        this.chunkedFileChunkSize = chunkedFileChunkSize;
-    }
-
     public NettyWebSocketFactory getNettyWebSocketFactory() {
         return nettyWebSocketFactory;
     }
@@ -287,30 +203,6 @@ public void setNettyWebSocketFactory(NettyWebSocketFactory nettyWebSocketFactory
         this.nettyWebSocketFactory = nettyWebSocketFactory;
     }
 
-    public int getWebSocketMaxBufferSize() {
-        return webSocketMaxBufferSize;
-    }
-
-    public void setWebSocketMaxBufferSize(int webSocketMaxBufferSize) {
-        this.webSocketMaxBufferSize = webSocketMaxBufferSize;
-    }
-    
-    public int getWebSocketMaxFrameSize() {
-        return webSocketMaxFrameSize;
-    }
-
-    public void setWebSocketMaxFrameSize(int webSocketMaxFrameSize) {
-        this.webSocketMaxFrameSize = webSocketMaxFrameSize;
-    }
-
-    public boolean isKeepEncodingHeader() {
-        return keepEncodingHeader;
-    }
-
-    public void setKeepEncodingHeader(boolean keepEncodingHeader) {
-        this.keepEncodingHeader = keepEncodingHeader;
-    }
-
     public ConnectionStrategy<HttpRequest, HttpResponse> getConnectionStrategy() {
         return connectionStrategy;
     }
@@ -320,7 +212,7 @@ public void setConnectionStrategy(ConnectionStrategy<HttpRequest, HttpResponse>
     }
 
     public static interface NettyWebSocketFactory {
-        NettyWebSocket newNettyWebSocket(Channel channel, NettyAsyncHttpProviderConfig nettyConfig);
+        NettyWebSocket newNettyWebSocket(Channel channel, AsyncHttpClientConfig config);
     }
 
     public static interface AdditionalPipelineInitializer {
@@ -331,8 +223,8 @@ public static interface AdditionalPipelineInitializer {
     public class DefaultNettyWebSocketFactory implements NettyWebSocketFactory {
 
         @Override
-        public NettyWebSocket newNettyWebSocket(Channel channel, NettyAsyncHttpProviderConfig nettyConfig) {
-            return new NettyWebSocket(channel, nettyConfig);
+        public NettyWebSocket newNettyWebSocket(Channel channel, AsyncHttpClientConfig config) {
+            return new NettyWebSocket(channel, config);
         }
     }
 }

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

@@ -113,7 +113,7 @@ public ChannelManager(final AsyncHttpClientConfig config, NettyAsyncHttpProvider
         this.config = config;
         this.nettyConfig = nettyConfig;
         this.nettyTimer = nettyTimer;
-        this.sslEngineFactory = nettyConfig.getSslEngineFactory() != null ? nettyConfig.getSslEngineFactory() : new SSLEngineFactory.DefaultSSLEngineFactory(config);
+        this.sslEngineFactory = config.getSslEngineFactory() != null ? config.getSslEngineFactory() : new SSLEngineFactory.DefaultSSLEngineFactory(config);
 
         ChannelPool channelPool = nettyConfig.getChannelPool();
         if (channelPool == null && config.isAllowPoolingConnections()) {
@@ -169,7 +169,7 @@ public Semaphore apply(Object partitionKey) {
             semaphoreComputer = null;
         }
 
-        handshakeTimeout = nettyConfig.getHandshakeTimeout();
+        handshakeTimeout = config.getHandshakeTimeout();
 
         if (nettyConfig.getSocketChannelFactory() != null) {
             socketChannelFactory = nettyConfig.getSocketChannelFactory();
@@ -278,7 +278,7 @@ public ChannelPipeline getPipeline() throws Exception {
     }
 
     private HttpContentDecompressor newHttpContentDecompressor() {
-        if (nettyConfig.isKeepEncodingHeader())
+        if (config.isKeepEncodingHeader())
             return new HttpContentDecompressor() {
                 @Override
                 protected String getTargetContentEncoding(String contentEncoding) throws Exception {
@@ -390,9 +390,9 @@ public void registerOpenChannel(Channel channel, Object partitionKey) {
 
     private HttpClientCodec newHttpClientCodec() {
         return new HttpClientCodec(//
-                nettyConfig.getHttpClientCodecMaxInitialLineLength(),//
-                nettyConfig.getHttpClientCodecMaxHeaderSize(),//
-                nettyConfig.getHttpClientCodecMaxChunkSize());
+                config.getHttpClientCodecMaxInitialLineLength(),//
+                config.getHttpClientCodecMaxHeaderSize(),//
+                config.getHttpClientCodecMaxChunkSize());
     }
 
     public SslHandler createSslHandler(String peerHost, int peerPort) throws GeneralSecurityException, IOException {
@@ -450,8 +450,8 @@ public ClientBootstrap getBootstrap(String scheme, boolean useProxy, boolean use
     public void upgradePipelineForWebSockets(ChannelPipeline pipeline) {
         pipeline.addAfter(HTTP_HANDLER, WS_ENCODER_HANDLER, new WebSocket08FrameEncoder(true));
         pipeline.remove(HTTP_HANDLER);
-        pipeline.addBefore(WS_PROCESSOR, WS_DECODER_HANDLER, new WebSocket08FrameDecoder(false, false, nettyConfig.getWebSocketMaxFrameSize()));
-        pipeline.addAfter(WS_DECODER_HANDLER, WS_FRAME_AGGREGATOR, new WebSocketFrameAggregator(nettyConfig.getWebSocketMaxBufferSize()));
+        pipeline.addBefore(WS_PROCESSOR, WS_DECODER_HANDLER, new WebSocket08FrameDecoder(false, false, config.getWebSocketMaxFrameSize()));
+        pipeline.addAfter(WS_DECODER_HANDLER, WS_FRAME_AGGREGATOR, new WebSocketFrameAggregator(config.getWebSocketMaxBufferSize()));
     }
 
     public final Callback newDrainCallback(final NettyResponseFuture<?> future, final Channel channel, final boolean keepAlive, final Object partitionKey) {