clean up

Author: Stephane Landelle

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

@@ -1,17 +1,15 @@
 /*
- * Copyright 2010 Ning, Inc.
+ * Copyright (c) 2014 AsyncHttpClient Project. All rights reserved.
  *
- * Ning licenses this file to you under the Apache License, version 2.0
- * (the "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at:
+ * This program is licensed to you under the Apache License Version 2.0,
+ * and you may not use this file except in compliance with the Apache License Version 2.0.
+ * You may obtain a copy of the Apache License Version 2.0 at
+ *     http://www.apache.org/licenses/LICENSE-2.0.
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the Apache License Version 2.0 is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
  */
 package org.asynchttpclient;
 

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

@@ -31,7 +31,8 @@
 import java.util.Set;
 
 /**
- * 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<ChannelOption<Object>, Object> {
 
@@ -41,8 +42,10 @@ public class NettyAsyncHttpProviderConfig implements AsyncHttpProviderConfig<Cha
      * Add a property that will be used when the AsyncHttpClient initialize its
      * {@link org.asynchttpclient.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(ChannelOption<Object> name, Object value) {
@@ -122,24 +125,19 @@ public NettyResponseBodyPart newResponseBodyPart(ByteBuf buf, boolean last) {
     private AdditionalChannelInitializer wssAdditionalChannelInitializer;
 
     /**
-     * HttpClientCodec's maxInitialLineLength
+     * Allow configuring Netty's HttpClientCodecs.
      */
     private int httpClientCodecMaxInitialLineLength = 4096;
-
-    /**
-     * HttpClientCodec's maxHeaderSize
-     */
     private int httpClientCodecMaxHeaderSize = 8192;
-
-    /**
-     * HttpClientCodec's maxChunkSize
-     */
     private int httpClientCodecMaxChunkSize = 8192;
 
     private ResponseBodyPartFactory bodyPartFactory = new EagerResponseBodyPartFactory();
 
     private ChannelPool channelPool;
 
+    /**
+     * Allow one to disable zero copy for bodies and use chunking instead
+     */
     private boolean disableZeroCopy;
 
     private Timer nettyTimer;
@@ -148,6 +146,11 @@ public NettyResponseBodyPart newResponseBodyPart(ByteBuf buf, boolean last) {
 
     private SSLEngineFactory sslEngineFactory;
 
+    /**
+     * chunkedFileChunkSize
+     */
+    private int chunkedFileChunkSize = 8192;
+
     public EventLoopGroup getEventLoopGroup() {
         return eventLoopGroup;
     }
@@ -259,4 +262,12 @@ public SSLEngineFactory getSslEngineFactory() {
     public void setSslEngineFactory(SSLEngineFactory sslEngineFactory) {
         this.sslEngineFactory = sslEngineFactory;
     }
+
+    public int getChunkedFileChunkSize() {
+        return chunkedFileChunkSize;
+    }
+
+    public void setChunkedFileChunkSize(int chunkedFileChunkSize) {
+        this.chunkedFileChunkSize = chunkedFileChunkSize;
+    }
 }

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

@@ -362,11 +362,11 @@ public SslHandler createSslHandler(String peerHost, int peerPort) throws IOExcep
         return sslHandler;
     }
 
-    public SslHandler getSslHandler(ChannelPipeline pipeline) {
+    public static SslHandler getSslHandler(ChannelPipeline pipeline) {
         return (SslHandler) pipeline.get(SSL_HANDLER);
     }
 
-    private boolean isSslHandlerConfigured(ChannelPipeline pipeline) {
+    public static boolean isSslHandlerConfigured(ChannelPipeline pipeline) {
         return pipeline.get(SSL_HANDLER) != null;
     }
 

providers/netty/src/main/java/org/asynchttpclient/providers/netty/request/body/NettyBodyBody.java

@@ -18,6 +18,7 @@
 import org.asynchttpclient.BodyGenerator;
 import org.asynchttpclient.RandomAccessBody;
 import org.asynchttpclient.providers.netty.NettyAsyncHttpProviderConfig;
+import org.asynchttpclient.providers.netty.channel.ChannelManager;
 import org.asynchttpclient.providers.netty.channel.Channels;
 import org.asynchttpclient.providers.netty.future.NettyResponseFuture;
 import org.asynchttpclient.providers.netty.request.ProgressListener;
@@ -38,11 +39,11 @@ public class NettyBodyBody implements NettyBody {
     private static final Logger LOGGER = LoggerFactory.getLogger(NettyBodyBody.class);
 
     private final Body body;
-    private final boolean disableZeroCopy;
+    private final NettyAsyncHttpProviderConfig nettyConfig;
 
     public NettyBodyBody(Body body, NettyAsyncHttpProviderConfig nettyConfig) {
         this.body = body;
-        disableZeroCopy = nettyConfig.isDisableZeroCopy();
+        this.nettyConfig = nettyConfig;
     }
 
     public Body getBody() {
@@ -61,9 +62,9 @@ public String getContentType() {
 
     @Override
     public void write(final Channel channel, NettyResponseFuture<?> future, AsyncHttpClientConfig config) throws IOException {
-        Object msg;
 
-        if (Channels.getSslHandler(channel) == null && body instanceof RandomAccessBody && !disableZeroCopy) {
+        Object msg;
+        if (!ChannelManager.isSslHandlerConfigured(channel.pipeline()) && body instanceof RandomAccessBody && !nettyConfig.isDisableZeroCopy()) {
             msg = new BodyFileRegion((RandomAccessBody) body);
 
         } else {

providers/netty/src/main/java/org/asynchttpclient/providers/netty/request/body/NettyFileBody.java

@@ -13,14 +13,6 @@
  */
 package org.asynchttpclient.providers.netty.request.body;
 
-import org.asynchttpclient.AsyncHttpClientConfig;
-import org.asynchttpclient.providers.netty.NettyAsyncHttpProviderConfig;
-import org.asynchttpclient.providers.netty.channel.Channels;
-import org.asynchttpclient.providers.netty.future.NettyResponseFuture;
-import org.asynchttpclient.providers.netty.request.ProgressListener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelProgressiveFuture;
@@ -33,16 +25,22 @@
 import java.io.IOException;
 import java.io.RandomAccessFile;
 
+import org.asynchttpclient.AsyncHttpClientConfig;
+import org.asynchttpclient.providers.netty.NettyAsyncHttpProviderConfig;
+import org.asynchttpclient.providers.netty.channel.ChannelManager;
+import org.asynchttpclient.providers.netty.future.NettyResponseFuture;
+import org.asynchttpclient.providers.netty.request.ProgressListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class NettyFileBody implements NettyBody {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(NettyFileBody.class);
 
-    public final static int MAX_BUFFERED_BYTES = 8192;
-
     private final File file;
     private final long offset;
     private final long length;
-    private final boolean disableZeroCopy;
+    private final NettyAsyncHttpProviderConfig nettyConfig;
 
     public NettyFileBody(File file, NettyAsyncHttpProviderConfig nettyConfig) throws IOException {
         this(file, 0, file.length(), nettyConfig);
@@ -55,7 +53,7 @@ public NettyFileBody(File file, long offset, long length, NettyAsyncHttpProvider
         this.file = file;
         this.offset = offset;
         this.length = length;
-        disableZeroCopy = nettyConfig.isDisableZeroCopy();
+        this.nettyConfig = nettyConfig;
     }
 
     public File getFile() {
@@ -82,8 +80,8 @@ public void write(Channel channel, NettyResponseFuture<?> future, AsyncHttpClien
 
         try {
             ChannelFuture writeFuture;
-            if (Channels.getSslHandler(channel) != null || disableZeroCopy) {
-                writeFuture = channel.write(new ChunkedFile(raf, offset, length, MAX_BUFFERED_BYTES), channel.newProgressivePromise());
+            if (ChannelManager.isSslHandlerConfigured(channel.pipeline()) || nettyConfig.isDisableZeroCopy()) {
+                writeFuture = channel.write(new ChunkedFile(raf, offset, length, nettyConfig.getChunkedFileChunkSize()), channel.newProgressivePromise());
             } else {
                 FileRegion region = new DefaultFileRegion(raf.getChannel(), offset, length);
                 writeFuture = channel.write(region, channel.newProgressivePromise());