Let user define ByteBufAllocator implementation, close AsyncHttpClient#1279

Author: slandelle

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

@@ -14,6 +14,7 @@
 package org.asynchttpclient;
 
 import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelOption;
 import io.netty.channel.EventLoopGroup;
@@ -285,7 +286,7 @@ public interface AsyncHttpClientConfig {
 
     int getSoRcvBuf();
 
-    boolean isUsePooledMemory();
+    ByteBufAllocator getAllocator();
 
     interface AdditionalChannelInitializer {
 

client/src/main/java/org/asynchttpclient/DefaultAsyncHttpClientConfig.java

@@ -16,6 +16,7 @@
 package org.asynchttpclient;
 
 import static org.asynchttpclient.config.AsyncHttpClientConfigDefaults.*;
+import io.netty.buffer.ByteBufAllocator;
 import io.netty.channel.ChannelOption;
 import io.netty.channel.EventLoopGroup;
 import io.netty.handler.ssl.SslContext;
@@ -119,7 +120,7 @@ public class DefaultAsyncHttpClientConfig implements AsyncHttpClientConfig {
     private final Map<ChannelOption<Object>, Object> channelOptions;
     private final EventLoopGroup eventLoopGroup;
     private final boolean useNativeTransport;
-    private final boolean usePooledMemory;
+    private final ByteBufAllocator allocator;
     private final boolean tcpNoDelay;
     private final boolean soReuseAddress;
     private final int soLinger;
@@ -197,7 +198,7 @@ private DefaultAsyncHttpClientConfig(//
             Map<ChannelOption<Object>, Object> channelOptions,//
             EventLoopGroup eventLoopGroup,//
             boolean useNativeTransport,//
-            boolean usePooledMemory,//
+            ByteBufAllocator allocator,//
             Timer nettyTimer,//
             ThreadFactory threadFactory,//
             AdditionalChannelInitializer httpAdditionalChannelInitializer,//
@@ -269,7 +270,7 @@ private DefaultAsyncHttpClientConfig(//
         this.channelOptions = channelOptions;
         this.eventLoopGroup = eventLoopGroup;
         this.useNativeTransport = useNativeTransport;
-        this.usePooledMemory = usePooledMemory;
+        this.allocator = allocator;
         this.nettyTimer = nettyTimer;
         this.threadFactory = threadFactory;
         this.httpAdditionalChannelInitializer = httpAdditionalChannelInitializer;
@@ -551,8 +552,8 @@ public boolean isUseNativeTransport() {
     }
 
     @Override
-    public boolean isUsePooledMemory() {
-        return usePooledMemory;
+    public ByteBufAllocator getAllocator() {
+        return allocator;
     }
 
     @Override
@@ -650,7 +651,7 @@ public static class Builder {
         private int webSocketMaxBufferSize = defaultWebSocketMaxBufferSize();
         private int webSocketMaxFrameSize = defaultWebSocketMaxFrameSize();
         private boolean useNativeTransport = defaultUseNativeTransport();
-        private boolean usePooledMemory = defaultUsePooledMemory();
+        private ByteBufAllocator allocator;
         private Map<ChannelOption<Object>, Object> channelOptions = new HashMap<>();
         private EventLoopGroup eventLoopGroup;
         private Timer nettyTimer;
@@ -725,7 +726,7 @@ public Builder(AsyncHttpClientConfig config) {
             channelOptions.putAll(config.getChannelOptions());
             eventLoopGroup = config.getEventLoopGroup();
             useNativeTransport = config.isUseNativeTransport();
-            usePooledMemory = config.isUsePooledMemory();
+            allocator = config.getAllocator();
             nettyTimer = config.getNettyTimer();
             threadFactory = config.getThreadFactory();
             httpAdditionalChannelInitializer = config.getHttpAdditionalChannelInitializer();
@@ -1035,8 +1036,8 @@ public Builder setUseNativeTransport(boolean useNativeTransport) {
             return this;
         }
 
-        public Builder setUsePooledMemory(boolean usePooledMemory) {
-            this.usePooledMemory = usePooledMemory;
+        public Builder setAllocator(ByteBufAllocator allocator) {
+            this.allocator = allocator;
             return this;
         }
 
@@ -1133,7 +1134,7 @@ public DefaultAsyncHttpClientConfig build() {
                     channelOptions.isEmpty() ? Collections.emptyMap() : Collections.unmodifiableMap(channelOptions),//
                     eventLoopGroup, //
                     useNativeTransport, //
-                    usePooledMemory, //
+                    allocator, //
                     nettyTimer, //
                     threadFactory, //
                     httpAdditionalChannelInitializer, //

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

@@ -197,8 +197,4 @@ public static int defaultShutdownTimeout() {
     public static boolean defaultUseNativeTransport() {
         return AsyncHttpClientConfigHelper.getAsyncHttpClientConfig().getBoolean(ASYNC_CLIENT_CONFIG_ROOT + "useNativeTransport");
     }
-
-    public static boolean defaultUsePooledMemory() {
-        return AsyncHttpClientConfigHelper.getAsyncHttpClientConfig().getBoolean(ASYNC_CLIENT_CONFIG_ROOT + "usePooledMemory");
-    }
 }

client/src/main/java/org/asynchttpclient/netty/channel/ChannelManager.java

@@ -16,8 +16,7 @@
 import static org.asynchttpclient.util.MiscUtils.trimStackTrace;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.bootstrap.ChannelFactory;
-import io.netty.buffer.PooledByteBufAllocator;
-import io.netty.buffer.UnpooledByteBufAllocator;
+import io.netty.buffer.ByteBufAllocator;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelOption;
@@ -198,7 +197,7 @@ private Bootstrap newBootstrap(ChannelFactory<? extends Channel> channelFactory,
         @SuppressWarnings("deprecation")
         Bootstrap bootstrap = new Bootstrap().channelFactory(channelFactory).group(eventLoopGroup)//
                 // default to PooledByteBufAllocator
-                .option(ChannelOption.ALLOCATOR, config.isUsePooledMemory() ? PooledByteBufAllocator.DEFAULT : UnpooledByteBufAllocator.DEFAULT)//
+                .option(ChannelOption.ALLOCATOR, config.getAllocator() != null ? config.getAllocator() : ByteBufAllocator.DEFAULT)//
                 .option(ChannelOption.TCP_NODELAY, config.isTcpNoDelay())//
                 .option(ChannelOption.SO_REUSEADDR, config.isSoReuseAddress())//
                 .option(ChannelOption.AUTO_CLOSE, false);

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

@@ -42,4 +42,3 @@ org.asynchttpclient.keepEncodingHeader=false
 org.asynchttpclient.shutdownQuietPeriod=2000
 org.asynchttpclient.shutdownTimeout=15000
 org.asynchttpclient.useNativeTransport=false
-org.asynchttpclient.usePooledMemory=true