Initial rough pass at Netty 4 upgrade

Netty_4_Upgrade_Notes.md

@@ -8,20 +8,22 @@ http://docs.jboss.org/netty/3.2/api/
 
 Relevant Changes
 ----------------
-1. ServerBootstrap no longer takes a ServerSocketChannelFactory in its constructor.  We used to use this to configure the thread pools.  Looks like EventLoopGroup or its relatives are the place to look.
+* ServerBootstrap no longer takes a ServerSocketChannelFactory in its constructor.  We used to use this to configure the thread pools.  Looks like EventLoopGroup or its relatives are the place to look.
 
-2. Same thing as #1 is true for ClientSocketChannelFactory.
+* Same thing as #1 is true for ClientSocketChannelFactory.
 
-3. ChannelPipelineFactory is gone.  Looks like one uses .childHandler() with a ChannelInitializer instead.
+* ChannelPipelineFactory is gone.  Looks like one uses .childHandler() with a ChannelInitializer instead.
 
-4. What's up with ThreadRenamingRunnable in DefaultHttpProxyServer?
+* What's up with ThreadRenamingRunnable in DefaultHttpProxyServer?
 
-5. DefaultChannelGroup?
+* DefaultChannelGroup?
 
-6. SimpleChannelUpstreamHandler -> SimpleChanneInboundHandler
+* SimpleChannelUpstreamHandler -> SimpleChanneInboundHandler
 
-7. InterestOps is gone - what does this mean to setReadable() and channelInterestChanged()  ?
+* InterestOps is gone - what does this mean to setReadable() and channelInterestChanged()  ?
 
-8. channelOpened() -> channelRegistered() ?
+* channelOpened() -> channelRegistered() ?
 
-9. channelClosed() -> channelDeregistered() ?
+* channelClosed() -> channelDeregistered() ?
+
+* IdleStateHandler no longer users Timer

pom.xml

@@ -139,8 +139,8 @@
 
     <dependency>
       <groupId>io.netty</groupId>
-      <artifactId>netty</artifactId>
-      <version>3.6.5.Final</version>
+      <artifactId>netty-all</artifactId>
+      <version>4.0.6.Final</version>
       <scope>compile</scope>
     </dependency>
 

src/main/java/org/littleshoot/proxy/CachedHttpChunks.java

@@ -1,8 +1,8 @@
 package org.littleshoot.proxy;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.handler.codec.http.HttpChunk;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.Channel;
+import io.netty.handler.codec.http.HttpChunk;
 
 /**
  * Interface for classes that fetch HTTP chunks from a cache. This is tricky

src/main/java/org/littleshoot/proxy/CachedHttpResponse.java

@@ -1,7 +1,7 @@
 package org.littleshoot.proxy;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.ChannelFutureListener;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.ChannelFutureListener;
 
 /**
  * HTTP response object stored in the cache.

src/main/java/org/littleshoot/proxy/ChainProxyManager.java

@@ -1,6 +1,6 @@
 package org.littleshoot.proxy;
 
-import org.jboss.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpRequest;
 
 /**
  * Interface for classes that manage chain proxies.

src/main/java/org/littleshoot/proxy/DefaultCachedHttpChunks.java

@@ -1,11 +1,11 @@
 package org.littleshoot.proxy;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.handler.codec.http.HttpChunk;
-import org.jboss.netty.handler.codec.http.HttpRequest;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.handler.codec.http.HttpChunk;
+import io.netty.handler.codec.http.HttpRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/org/littleshoot/proxy/DefaultCachedHttpResponse.java

@@ -1,7 +1,7 @@
 package org.littleshoot.proxy;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.ChannelFutureListener;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.ChannelFutureListener;
 
 /**
  * Default implementation for storing HTTP response data in the cache.

src/main/java/org/littleshoot/proxy/DefaultHttpFilter.java

@@ -3,8 +3,8 @@
 import java.util.Arrays;
 import java.util.Collection;
 
-import org.jboss.netty.handler.codec.http.HttpRequest;
-import org.jboss.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
 
 /**
  * Default implementation of a class for processing HTTP request rules.