Initial rough pass at Netty 4 upgrade - main code compiles

bbbbbbzc · Aug 7, 2013 · abf6ac0 · abf6ac0
1 parent fa30985
commit abf6ac0
Show file tree

Hide file tree

Showing 16 changed files with 96 additions and 843 deletions.
diff --git a/Netty_4_Upgrade_Notes.md b/Netty_4_Upgrade_Notes.md
@@ -52,4 +52,6 @@ Relevant Changes
 * ChannelBuffer -> ByteBuf
 
 * Headers on HttpObject are no longer accessed directly, but first by getting
-  the headers object using .headers()
+  the headers object using .headers()
+
+* ChannelBuffers class is gone.  Using ByteBufAllocator directly, plus EmptyByteBuf in place of EMPTY_BUFFER
diff --git a/src/main/java/org/littleshoot/proxy/CachedHttpChunks.java b/src/main/java/org/littleshoot/proxy/CachedHttpChunks.java
diff --git a/src/main/java/org/littleshoot/proxy/CachedHttpResponse.java b/src/main/java/org/littleshoot/proxy/CachedHttpResponse.java
diff --git a/src/main/java/org/littleshoot/proxy/DefaultCachedHttpChunks.java b/src/main/java/org/littleshoot/proxy/DefaultCachedHttpChunks.java
diff --git a/src/main/java/org/littleshoot/proxy/DefaultCachedHttpResponse.java b/src/main/java/org/littleshoot/proxy/DefaultCachedHttpResponse.java
diff --git a/src/main/java/org/littleshoot/proxy/DefaultHttpProxyServer.java b/src/main/java/org/littleshoot/proxy/DefaultHttpProxyServer.java
@@ -69,8 +69,6 @@ public class DefaultHttpProxyServer implements HttpProxyServer {
      */
     private final EventLoopGroup clientWorker;
 
-    private final ProxyCacheManager cacheManager;
-
     /**
      * Creates a new proxy server.
      * 
@@ -102,25 +100,6 @@ public DefaultHttpProxyServer(final int port,
                 new NioEventLoopGroup(MAXIMUM_SERVER_THREADS, SERVER_THREAD_FACTORY));
     }
 
-    /**
-     * Creates a new proxy server.
-     * 
-     * @param port
-     *            The port the server should run on.
-     * @param responseFilters
-     *            The {@link Map} of request domains to match with associated
-     *            {@link HttpFilter}s for filtering responses to those requests.
-     */
-    public DefaultHttpProxyServer(final int port,
-            final HttpResponseFilters responseFilters,
-            final ProxyCacheManager cacheManager) {
-        this(port, responseFilters, null, null, null,
-                new NioEventLoopGroup(MAXIMUM_CLIENT_THREADS, CLIENT_THREAD_FACTORY),
-                new NioEventLoopGroup(MAXIMUM_SERVER_THREADS, SERVER_THREAD_FACTORY),
-                new NioEventLoopGroup(MAXIMUM_SERVER_THREADS, SERVER_THREAD_FACTORY),
-                cacheManager);
-    }
-
     /**
      * Creates a new proxy server.
      * 
@@ -138,23 +117,6 @@ public HttpFilter getFilter(String hostAndPort) {
         });
     }
 
-    /**
-     * Creates a new proxy server.
-     * 
-     * @param port
-     *            The port the server should run on.
-     * @param requestFilter
-     *            The filter for HTTP requests.
-     */
-    public DefaultHttpProxyServer(final int port,
-            final ProxyCacheManager cacheManager) {
-        this(port, new HttpResponseFilters() {
-            public HttpFilter getFilter(String hostAndPort) {
-                return null;
-            }
-        }, cacheManager);
-    }
-
     /**
      * Creates a new proxy server.
      * 
@@ -262,44 +224,6 @@ public DefaultHttpProxyServer(final int port,
             final EventLoopGroup clientWorker,
             final EventLoopGroup serverBoss,
             final EventLoopGroup serverWorker) {
-        this(port, responseFilters, chainProxyManager, handshakeHandlerFactory,
-                requestFilter, clientWorker,
-                serverBoss, serverWorker, ProxyUtils.loadCacheManager());
-    }
-
-    /**
-     * Creates a new proxy server.
-     * 
-     * @param port
-     *            The port the server should run on.
-     * @param responseFilters
-     *            The {@link Map} of request domains to match with associated
-     *            {@link HttpFilter}s for filtering responses to those requests.
-     * @param chainProxyManager
-     *            The proxy to send requests to if chaining proxies. Typically
-     *            <code>null</code>.
-     * @param ksm
-     *            The key manager if running the proxy over SSL.
-     * @param requestFilter
-     *            Optional filter for modifying incoming requests. Often
-     *            <code>null</code>.
-     * 
-     * @param clientWorker
-     *            The EventLoopGroup for creating outgoing channels to external sites.
-     * @param serverBoss
-     *            The EventLoopGroup for accepting incoming connections 
-     * @param serverWorker
-     *            The EventLoopGroup for processing incoming connections           
-     */
-    public DefaultHttpProxyServer(final int port,
-            final HttpResponseFilters responseFilters,
-            final ChainProxyManager chainProxyManager,
-            final HandshakeHandlerFactory handshakeHandlerFactory,
-            final HttpRequestFilter requestFilter,
-            final EventLoopGroup clientWorker,
-            final EventLoopGroup serverBoss,
-            final EventLoopGroup serverWorker,
-            final ProxyCacheManager cacheManager) {
         this.port = port;
         this.responseFilters = responseFilters;
         this.handshakeHandlerFactory = handshakeHandlerFactory;
@@ -308,11 +232,6 @@ public DefaultHttpProxyServer(final int port,
         this.clientWorker = clientWorker;
         this.serverBoss = serverBoss;
         this.serverWorker = serverWorker;
-        if (cacheManager == null) {
-            this.cacheManager = ProxyUtils.loadCacheManager();
-        } else {
-            this.cacheManager = cacheManager;
-        }
         Thread.setDefaultUncaughtExceptionHandler(new UncaughtExceptionHandler() {
             public void uncaughtException(final Thread t, final Throwable e) {
                 log.error("Uncaught throwable", e);
@@ -339,7 +258,7 @@ public void start(final boolean localOnly, final boolean anyAddress) {
                 new DefaultRelayChannelInitializerFactory(chainProxyManager,
                         this.responseFilters, this.requestFilter,
                         this.allChannels),
-                this.clientWorker, this.cacheManager);
+                this.clientWorker);
         serverBootstrap.handler(initializer);