From d9739126f246a3e7c61294385fef8d7daa5494fd Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Tue, 14 Oct 2014 12:46:35 +0900 Subject: [PATCH] Finish porting netty-proxy module - Fix problems introduced by de9c81bf6e021ec809d9a52d1f5895682c2cb59d - Fix inspector warnings --- .../main/java/io/netty/handler/proxy/ProxyHandler.java | 4 ++-- .../java/io/netty/handler/proxy/ProxyHandlerTest.java | 8 ++++---- .../src/test/java/io/netty/handler/proxy/ProxyServer.java | 8 ++++---- .../java/io/netty/handler/proxy/UnresponsiveHandler.java | 2 +- .../java/io/netty/channel/epoll/EpollSocketChannel.java | 2 -- .../src/main/java/io/netty/channel/AbstractChannel.java | 4 ++-- 6 files changed, 13 insertions(+), 15 deletions(-) diff --git a/handler-proxy/src/main/java/io/netty/handler/proxy/ProxyHandler.java b/handler-proxy/src/main/java/io/netty/handler/proxy/ProxyHandler.java index 3035ef3d49..0c0613515f 100644 --- a/handler-proxy/src/main/java/io/netty/handler/proxy/ProxyHandler.java +++ b/handler-proxy/src/main/java/io/netty/handler/proxy/ProxyHandler.java @@ -17,9 +17,9 @@ package io.netty.handler.proxy; import io.netty.channel.Channel; -import io.netty.channel.ChannelDuplexHandler; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFutureListener; +import io.netty.channel.ChannelHandlerAdapter; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPromise; import io.netty.channel.PendingWriteQueue; @@ -36,7 +36,7 @@ import java.net.SocketAddress; import java.nio.channels.ConnectionPendingException; import java.util.concurrent.TimeUnit; -public abstract class ProxyHandler extends ChannelDuplexHandler { +public abstract class ProxyHandler extends ChannelHandlerAdapter { private static final InternalLogger logger = InternalLoggerFactory.getInstance(ProxyHandler.class); diff --git a/handler-proxy/src/test/java/io/netty/handler/proxy/ProxyHandlerTest.java b/handler-proxy/src/test/java/io/netty/handler/proxy/ProxyHandlerTest.java index ceefa69f16..d50302c760 100644 --- a/handler-proxy/src/test/java/io/netty/handler/proxy/ProxyHandlerTest.java +++ b/handler-proxy/src/test/java/io/netty/handler/proxy/ProxyHandlerTest.java @@ -37,7 +37,7 @@ import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.util.InsecureTrustManagerFactory; import io.netty.handler.ssl.util.SelfSignedCertificate; import io.netty.util.CharsetUtil; -import io.netty.util.concurrent.DefaultThreadFactory; +import io.netty.util.concurrent.DefaultExecutorServiceFactory; import io.netty.util.concurrent.Future; import io.netty.util.internal.EmptyArrays; import io.netty.util.internal.StringUtil; @@ -77,7 +77,7 @@ public class ProxyHandlerTest { private static final String BAD_USERNAME = "badUser"; private static final String BAD_PASSWORD = "badPassword"; - static final EventLoopGroup group = new NioEventLoopGroup(3, new DefaultThreadFactory("proxy", true)); + static final EventLoopGroup group = new NioEventLoopGroup(3, new DefaultExecutorServiceFactory("proxy")); static final SslContext serverSslCtx; static final SslContext clientSslCtx; @@ -381,7 +381,7 @@ public class ProxyHandlerTest { } @Override - protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, Object msg) throws Exception { String str = ((ByteBuf) msg).toString(CharsetUtil.US_ASCII); received.add(str); if ("2".equals(str)) { @@ -437,7 +437,7 @@ public class ProxyHandlerTest { } @Override - protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, Object msg) throws Exception { fail("Unexpected message: " + msg); } diff --git a/handler-proxy/src/test/java/io/netty/handler/proxy/ProxyServer.java b/handler-proxy/src/test/java/io/netty/handler/proxy/ProxyServer.java index b2a726d394..19a91d19d0 100644 --- a/handler-proxy/src/test/java/io/netty/handler/proxy/ProxyServer.java +++ b/handler-proxy/src/test/java/io/netty/handler/proxy/ProxyServer.java @@ -24,8 +24,8 @@ import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelHandler; +import io.netty.channel.ChannelHandlerAdapter; import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelPipeline; import io.netty.channel.EventLoop; @@ -158,7 +158,7 @@ abstract class ProxyServer { private Channel backend; @Override - protected final void channelRead0(final ChannelHandlerContext ctx, Object msg) throws Exception { + protected final void messageReceived(final ChannelHandlerContext ctx, Object msg) throws Exception { if (finished) { received.add(ReferenceCountUtil.retain(msg)); flush(); @@ -232,7 +232,7 @@ abstract class ProxyServer { ctx.close(); } - private final class BackendHandler extends ChannelInboundHandlerAdapter { + private final class BackendHandler extends ChannelHandlerAdapter { private final ChannelHandlerContext frontend; @@ -268,7 +268,7 @@ abstract class ProxyServer { private boolean finished; @Override - protected final void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception { + protected final void messageReceived(ChannelHandlerContext ctx, Object msg) throws Exception { if (finished) { String str = ((ByteBuf) msg).toString(CharsetUtil.US_ASCII); if ("A\n".equals(str)) { diff --git a/handler-proxy/src/test/java/io/netty/handler/proxy/UnresponsiveHandler.java b/handler-proxy/src/test/java/io/netty/handler/proxy/UnresponsiveHandler.java index 32c753baef..f43a9b90c2 100644 --- a/handler-proxy/src/test/java/io/netty/handler/proxy/UnresponsiveHandler.java +++ b/handler-proxy/src/test/java/io/netty/handler/proxy/UnresponsiveHandler.java @@ -28,7 +28,7 @@ final class UnresponsiveHandler extends SimpleChannelInboundHandler { private UnresponsiveHandler() { } @Override - protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, Object msg) throws Exception { // Ignore } } diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollSocketChannel.java b/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollSocketChannel.java index c40352d245..6956c316c4 100644 --- a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollSocketChannel.java +++ b/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollSocketChannel.java @@ -37,7 +37,6 @@ import io.netty.util.internal.PlatformDependent; import io.netty.util.internal.StringUtil; import java.io.IOException; -import java.net.ConnectException; import java.net.InetSocketAddress; import java.net.SocketAddress; import java.nio.ByteBuffer; @@ -468,7 +467,6 @@ public final class EpollSocketChannel extends AbstractEpollChannel implements So } final class EpollSocketUnsafe extends AbstractEpollUnsafe { - private RecvByteBufAllocator.Handle allocHandle; private void closeOnRead(ChannelPipeline pipeline) { inputShutdown = true; diff --git a/transport/src/main/java/io/netty/channel/AbstractChannel.java b/transport/src/main/java/io/netty/channel/AbstractChannel.java index 8cef806819..9b42f38822 100644 --- a/transport/src/main/java/io/netty/channel/AbstractChannel.java +++ b/transport/src/main/java/io/netty/channel/AbstractChannel.java @@ -435,7 +435,7 @@ public abstract class AbstractChannel extends DefaultAttributeMap implements Cha @Override public final ChannelHandlerInvoker invoker() { // return the unwrapped invoker. - return ((PausableChannelEventLoop) eventLoop().asInvoker()).unwrapInvoker(); + return ((PausableChannelEventExecutor) eventLoop().asInvoker()).unwrapInvoker(); } @Override @@ -509,7 +509,7 @@ public abstract class AbstractChannel extends DefaultAttributeMap implements Cha } doRegister(); registered = true; - AbstractChannel.this.eventLoop.acceptNewTasks(); + eventLoop.acceptNewTasks(); safeSetSuccess(promise); pipeline.fireChannelRegistered(); if (isActive()) {