Work on porting to netty 4

Author: md-5

providers/netty-4/pom.xml

@@ -7,17 +7,17 @@
         <version>1.8.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>async-http-client-netty-provider</artifactId>
-    <name>Asynchronous Http Client Netty Provider</name>
+    <artifactId>async-http-client-netty-4-provider</artifactId>
+    <name>Asynchronous Http Client Netty 4 Provider</name>
     <description>
-        The Async Http Client Netty Provider.
+        The Async Http Client Netty 4 Provider.
     </description>
 
     <dependencies>
         <dependency>
             <groupId>io.netty</groupId>
-            <artifactId>netty</artifactId>
-            <version>3.6.3.Final</version>
+            <artifactId>netty-all</artifactId>
+            <version>4.0.0.Beta3</version>
         </dependency>
     </dependencies>
 

providers/netty-4/src/main/java/com/ning/http/client/providers/netty_4/BodyChunkedInput.java

@@ -13,8 +13,9 @@
 package com.ning.http.client.providers.netty_4;
 
 import com.ning.http.client.Body;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.handler.stream.ChunkedInput;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.stream.ChunkedInput;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -23,7 +24,7 @@
  * Adapts a {@link Body} to Netty's {@link ChunkedInput}.
  */
 class BodyChunkedInput
-        implements ChunkedInput {
+        implements ChunkedInput<ByteBuf> {
 
     private final Body body;
 
@@ -72,14 +73,16 @@ public boolean hasNextChunk() throws Exception {
         return peekNextChunk() != null;
     }
 
-    public Object nextChunk() throws Exception {
+    @Override
+    public boolean readChunk(ByteBuf b) throws Exception {
         ByteBuffer buffer = peekNextChunk();
         if (buffer == null || buffer == EOF) {
-            return null;
+            return false;
         }
         nextChunk = null;
 
-        return ChannelBuffers.wrappedBuffer(buffer);
+        b.writeBytes(buffer);
+        return true;
     }
 
     public boolean isEndOfInput() throws Exception {

providers/netty-4/src/main/java/com/ning/http/client/providers/netty_4/BodyFileRegion.java

@@ -13,7 +13,9 @@
 package com.ning.http.client.providers.netty_4;
 
 import com.ning.http.client.RandomAccessBody;
-import org.jboss.netty.channel.FileRegion;
+import io.netty.buffer.AbstractReferenceCounted;
+import io.netty.buffer.ReferenceCounted;
+import io.netty.channel.FileRegion;
 
 import java.io.IOException;
 import java.nio.channels.WritableByteChannel;
@@ -22,6 +24,7 @@
  * Adapts a {@link RandomAccessBody} to Netty's {@link FileRegion}.
  */
 class BodyFileRegion
+        extends AbstractReferenceCounted
         implements FileRegion {
 
     private final RandomAccessBody body;
@@ -33,11 +36,11 @@ public BodyFileRegion(RandomAccessBody body) {
         this.body = body;
     }
 
-    public long getPosition() {
+    public long position() {
         return 0;
     }
 
-    public long getCount() {
+    public long count() {
         return body.getContentLength();
     }
 
@@ -46,12 +49,11 @@ public long transferTo(WritableByteChannel target, long position)
         return body.transferTo(position, Long.MAX_VALUE, target);
     }
 
-    public void releaseExternalResources() {
+    public void deallocate() {
         try {
             body.close();
         } catch (IOException e) {
             // we tried
         }
     }
-
 }