From 7df012884f1539d59366c532f9235aef0ea7e4d8 Mon Sep 17 00:00:00 2001 From: Nick Hill Date: Thu, 31 Oct 2019 23:23:07 -0700 Subject: [PATCH] Rename SimpleChannelInboundHandler.channelRead0() to messageReceived() (#8819) Motivation Per javadoc in 4.1.x SimpleChannelInboundHandler: "Please keep in mind that channelRead0(ChannelHandlerContext, I) will be renamed to messageReceived(ChannelHandlerContext, I) in 5.0." Modifications Rename aforementioned method and all references/overrides. Result Method is renamed. --- .../websocketx/WebSocketClientHandshaker.java | 2 +- .../websocketx/WebSocketServerHandshaker.java | 2 +- .../handler/codec/http/HttpClientCodecTest.java | 4 ++-- .../handler/codec/http/cors/CorsHandlerTest.java | 2 +- .../websocketx/WebSocketClientHandshakerTest.java | 2 +- .../WebSocketHandshakeHandOverTest.java | 12 ++++++------ .../http2/InboundHttp2ToHttpAdapterTest.java | 4 ++-- .../example/discard/DiscardClientHandler.java | 2 +- .../example/discard/DiscardServerHandler.java | 2 +- .../example/factorial/FactorialClientHandler.java | 2 +- .../example/factorial/FactorialServerHandler.java | 2 +- .../io/netty/example/file/FileServerHandler.java | 2 +- .../example/http/cors/OkResponseHandler.java | 2 +- .../http/file/HttpStaticFileServerHandler.java | 2 +- .../helloworld/HttpHelloWorldServerHandler.java | 2 +- .../http/snoop/HttpSnoopClientHandler.java | 2 +- .../http/snoop/HttpSnoopServerHandler.java | 2 +- .../http/upload/HttpUploadClientHandler.java | 2 +- .../http/upload/HttpUploadServerHandler.java | 2 +- .../benchmarkserver/WebSocketServerHandler.java | 2 +- .../websocketx/client/WebSocketClientHandler.java | 2 +- .../websocketx/server/WebSocketFrameHandler.java | 2 +- .../server/WebSocketIndexPageHandler.java | 2 +- .../helloworld/client/Http2SettingsHandler.java | 2 +- .../helloworld/client/HttpResponseHandler.java | 2 +- .../frame/server/Http2ServerInitializer.java | 2 +- .../multiplex/server/Http2ServerInitializer.java | 2 +- .../helloworld/server/HelloWorldHttp1Handler.java | 2 +- .../helloworld/server/Http2ServerInitializer.java | 2 +- .../http2/tiles/FallbackRequestHandler.java | 2 +- .../example/http2/tiles/Http1RequestHandler.java | 4 ++-- .../example/http2/tiles/Http2RequestHandler.java | 2 +- .../example/localecho/LocalEchoClientHandler.java | 2 +- .../qotm/QuoteOfTheMomentClientHandler.java | 2 +- .../qotm/QuoteOfTheMomentServerHandler.java | 2 +- .../securechat/SecureChatClientHandler.java | 2 +- .../securechat/SecureChatServerHandler.java | 2 +- .../socksproxy/SocksServerConnectHandler.java | 2 +- .../example/socksproxy/SocksServerHandler.java | 2 +- .../netty/example/stomp/StompClientHandler.java | 2 +- .../netty/example/telnet/TelnetClientHandler.java | 2 +- .../netty/example/telnet/TelnetServerHandler.java | 2 +- .../netty/example/uptime/UptimeClientHandler.java | 2 +- .../netty/example/uptime/UptimeServerHandler.java | 2 +- .../worldclock/WorldClockClientHandler.java | 2 +- .../worldclock/WorldClockServerHandler.java | 2 +- .../io/netty/handler/proxy/ProxyHandlerTest.java | 4 ++-- .../java/io/netty/handler/proxy/ProxyServer.java | 4 ++-- .../netty/handler/proxy/UnresponsiveHandler.java | 2 +- .../netty/handler/ssl/CipherSuiteCanaryTest.java | 4 ++-- .../handler/ssl/OpenSslPrivateKeyMethodTest.java | 4 ++-- .../java/io/netty/handler/ssl/SSLEngineTest.java | 2 +- .../java/io/netty/handler/ssl/SslHandlerTest.java | 3 ++- .../testsuite/http2/HelloWorldHttp1Handler.java | 2 +- .../testsuite/http2/Http2ServerInitializer.java | 2 +- .../testsuite/svm/HttpNativeServerHandler.java | 2 +- .../testsuite/transport/sctp/SctpEchoTest.java | 2 +- .../AbstractSocketShutdownOutputByPeerTest.java | 2 +- .../transport/socket/DatagramMulticastTest.java | 4 ++-- .../transport/socket/DatagramUnicastTest.java | 6 +++--- .../transport/socket/SocketBufReleaseTest.java | 2 +- .../transport/socket/SocketCancelWriteTest.java | 2 +- .../socket/SocketDataReadInitialStateTest.java | 8 ++++---- .../transport/socket/SocketEchoTest.java | 2 +- .../transport/socket/SocketFileRegionTest.java | 6 +++--- .../socket/SocketFixedLengthEchoTest.java | 2 +- .../socket/SocketGatheringWriteTest.java | 4 ++-- .../transport/socket/SocketHalfClosedTest.java | 4 ++-- .../socket/SocketShutdownOutputBySelfTest.java | 2 +- .../socket/SocketSslClientRenegotiateTest.java | 2 +- .../transport/socket/SocketSslEchoTest.java | 4 ++-- .../transport/socket/SocketSslGreetingTest.java | 4 ++-- .../socket/SocketSslSessionReuseTest.java | 2 +- .../transport/socket/SocketStartTlsTest.java | 4 ++-- .../transport/socket/SocketStringEchoTest.java | 2 +- .../socket/TrafficShapingHandlerTest.java | 4 ++-- .../epoll/EpollDatagramScatteringReadTest.java | 4 ++-- .../io/netty/channel/epoll/EpollSpliceTest.java | 2 +- .../tests/DetectPeerCloseWithoutReadTest.java | 2 +- .../java/io/netty/channel/ChannelHandler.java | 2 +- .../channel/SimpleChannelInboundHandler.java | 15 +++------------ .../io/netty/channel/local/LocalChannelTest.java | 8 ++++---- .../channel/socket/nio/NioSocketChannelTest.java | 2 +- 83 files changed, 116 insertions(+), 124 deletions(-) diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java index 564854e702..d9bdd93f11 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java @@ -427,7 +427,7 @@ public abstract class WebSocketClientHandshaker { p.addAfter(ctx.name(), aggregatorName, new HttpObjectAggregator(8192)); p.addAfter(aggregatorName, "handshaker", new SimpleChannelInboundHandler() { @Override - protected void channelRead0(ChannelHandlerContext ctx, FullHttpResponse msg) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, FullHttpResponse msg) throws Exception { // Remove ourself and do the actual handshake ctx.pipeline().remove(this); try { diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java index 5ba5d32621..c4cbab370e 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java @@ -291,7 +291,7 @@ public abstract class WebSocketServerHandshaker { p.addAfter(ctx.name(), aggregatorName, new HttpObjectAggregator(8192)); p.addAfter(aggregatorName, "handshaker", new SimpleChannelInboundHandler() { @Override - protected void channelRead0(ChannelHandlerContext ctx, FullHttpRequest msg) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, FullHttpRequest msg) throws Exception { // Remove ourself and do the actual handshake ctx.pipeline().remove(this); handshake(channel, msg, responseHeaders, promise); diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/HttpClientCodecTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/HttpClientCodecTest.java index 3470161a1e..c0cc205c1f 100644 --- a/codec-http/src/test/java/io/netty/handler/codec/http/HttpClientCodecTest.java +++ b/codec-http/src/test/java/io/netty/handler/codec/http/HttpClientCodecTest.java @@ -136,7 +136,7 @@ public class HttpClientCodecTest { ch.pipeline().addLast(new HttpObjectAggregator(4096)); ch.pipeline().addLast(new SimpleChannelInboundHandler() { @Override - protected void channelRead0(ChannelHandlerContext ctx, FullHttpRequest msg) { + protected void messageReceived(ChannelHandlerContext ctx, FullHttpRequest msg) { // This is just a simple demo...don't block in IO assertTrue(ctx.channel() instanceof SocketChannel); final SocketChannel sChannel = (SocketChannel) ctx.channel(); @@ -174,7 +174,7 @@ public class HttpClientCodecTest { ch.pipeline().addLast(new HttpObjectAggregator(4096)); ch.pipeline().addLast(new SimpleChannelInboundHandler() { @Override - protected void channelRead0(ChannelHandlerContext ctx, FullHttpResponse msg) { + protected void messageReceived(ChannelHandlerContext ctx, FullHttpResponse msg) { responseReceivedLatch.countDown(); } }); diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/cors/CorsHandlerTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/cors/CorsHandlerTest.java index 1cd4c82ae2..c957f9efd2 100644 --- a/codec-http/src/test/java/io/netty/handler/codec/http/cors/CorsHandlerTest.java +++ b/codec-http/src/test/java/io/netty/handler/codec/http/cors/CorsHandlerTest.java @@ -542,7 +542,7 @@ public class CorsHandlerTest { private static class EchoHandler extends SimpleChannelInboundHandler { @Override - public void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, Object msg) throws Exception { ctx.writeAndFlush(new DefaultFullHttpResponse(HTTP_1_1, OK, true, true)); } } diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshakerTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshakerTest.java index d92fce7378..3cf81435a7 100644 --- a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshakerTest.java +++ b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshakerTest.java @@ -294,7 +294,7 @@ public abstract class WebSocketClientHandshakerTest { EmbeddedChannel ch = new EmbeddedChannel(new HttpObjectAggregator(Integer.MAX_VALUE), new SimpleChannelInboundHandler() { @Override - protected void channelRead0(ChannelHandlerContext ctx, FullHttpResponse msg) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, FullHttpResponse msg) throws Exception { handshaker.finishHandshake(ctx.channel(), msg); ctx.pipeline().remove(this); } diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketHandshakeHandOverTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketHandshakeHandOverTest.java index 96699b8853..b1ba38f106 100644 --- a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketHandshakeHandOverTest.java +++ b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketHandshakeHandOverTest.java @@ -88,7 +88,7 @@ public class WebSocketHandshakeHandOverTest { } } @Override - protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, Object msg) throws Exception { } }); @@ -100,7 +100,7 @@ public class WebSocketHandshakeHandOverTest { } } @Override - protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, Object msg) throws Exception { if (msg instanceof TextWebSocketFrame) { clientReceivedMessage = true; } @@ -136,7 +136,7 @@ public class WebSocketHandshakeHandOverTest { } @Override - protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, Object msg) throws Exception { } }); @@ -151,7 +151,7 @@ public class WebSocketHandshakeHandOverTest { } @Override - protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, Object msg) throws Exception { if (msg instanceof TextWebSocketFrame) { clientReceivedMessage = true; } @@ -193,7 +193,7 @@ public class WebSocketHandshakeHandOverTest { new CloseNoOpServerProtocolHandler("/test"), new SimpleChannelInboundHandler() { @Override - protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, Object msg) throws Exception { } }); @@ -211,7 +211,7 @@ public class WebSocketHandshakeHandOverTest { } } @Override - protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, Object msg) throws Exception { } }); diff --git a/codec-http2/src/test/java/io/netty/handler/codec/http2/InboundHttp2ToHttpAdapterTest.java b/codec-http2/src/test/java/io/netty/handler/codec/http2/InboundHttp2ToHttpAdapterTest.java index 3b042c9d40..d1f8e4e6db 100644 --- a/codec-http2/src/test/java/io/netty/handler/codec/http2/InboundHttp2ToHttpAdapterTest.java +++ b/codec-http2/src/test/java/io/netty/handler/codec/http2/InboundHttp2ToHttpAdapterTest.java @@ -793,7 +793,7 @@ public class InboundHttp2ToHttpAdapterTest { } @Override - protected void channelRead0(ChannelHandlerContext ctx, HttpObject msg) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, HttpObject msg) throws Exception { listener.messageReceived(msg); latch.countDown(); latch2.countDown(); @@ -811,7 +811,7 @@ public class InboundHttp2ToHttpAdapterTest { } @Override - protected void channelRead0(ChannelHandlerContext ctx, Http2Settings settings) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, Http2Settings settings) throws Exception { listener.messageReceived(settings); latch.countDown(); } diff --git a/example/src/main/java/io/netty/example/discard/DiscardClientHandler.java b/example/src/main/java/io/netty/example/discard/DiscardClientHandler.java index 0867c18c78..ddd62bd363 100644 --- a/example/src/main/java/io/netty/example/discard/DiscardClientHandler.java +++ b/example/src/main/java/io/netty/example/discard/DiscardClientHandler.java @@ -46,7 +46,7 @@ public class DiscardClientHandler extends SimpleChannelInboundHandler { } @Override - public void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, Object msg) throws Exception { // Server is supposed to send nothing, but if it sends something, discard it. } diff --git a/example/src/main/java/io/netty/example/discard/DiscardServerHandler.java b/example/src/main/java/io/netty/example/discard/DiscardServerHandler.java index 1f72a878ed..4f8f861328 100644 --- a/example/src/main/java/io/netty/example/discard/DiscardServerHandler.java +++ b/example/src/main/java/io/netty/example/discard/DiscardServerHandler.java @@ -24,7 +24,7 @@ import io.netty.channel.SimpleChannelInboundHandler; public class DiscardServerHandler extends SimpleChannelInboundHandler { @Override - public void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, Object msg) throws Exception { // discard } diff --git a/example/src/main/java/io/netty/example/factorial/FactorialClientHandler.java b/example/src/main/java/io/netty/example/factorial/FactorialClientHandler.java index 23fb772819..84cd52c9ec 100644 --- a/example/src/main/java/io/netty/example/factorial/FactorialClientHandler.java +++ b/example/src/main/java/io/netty/example/factorial/FactorialClientHandler.java @@ -62,7 +62,7 @@ public class FactorialClientHandler extends SimpleChannelInboundHandler { } @Override - public void channelRead0(ChannelHandlerContext ctx, String msg) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, String msg) throws Exception { RandomAccessFile raf = null; long length = -1; try { diff --git a/example/src/main/java/io/netty/example/http/cors/OkResponseHandler.java b/example/src/main/java/io/netty/example/http/cors/OkResponseHandler.java index 6616965c10..45ecf882ad 100644 --- a/example/src/main/java/io/netty/example/http/cors/OkResponseHandler.java +++ b/example/src/main/java/io/netty/example/http/cors/OkResponseHandler.java @@ -30,7 +30,7 @@ import io.netty.handler.codec.http.HttpVersion; */ public class OkResponseHandler extends SimpleChannelInboundHandler { @Override - public void channelRead0(ChannelHandlerContext ctx, Object msg) { + public void messageReceived(ChannelHandlerContext ctx, Object msg) { final FullHttpResponse response = new DefaultFullHttpResponse( HttpVersion.HTTP_1_1, HttpResponseStatus.OK, Unpooled.EMPTY_BUFFER); response.headers().set("custom-response-header", "Some value"); diff --git a/example/src/main/java/io/netty/example/http/file/HttpStaticFileServerHandler.java b/example/src/main/java/io/netty/example/http/file/HttpStaticFileServerHandler.java index c803677733..0c108b4ec3 100644 --- a/example/src/main/java/io/netty/example/http/file/HttpStaticFileServerHandler.java +++ b/example/src/main/java/io/netty/example/http/file/HttpStaticFileServerHandler.java @@ -113,7 +113,7 @@ public class HttpStaticFileServerHandler extends SimpleChannelInboundHandler { @Override - public void channelRead0(ChannelHandlerContext ctx, HttpObject msg) { + public void messageReceived(ChannelHandlerContext ctx, HttpObject msg) { if (msg instanceof HttpResponse) { HttpResponse response = (HttpResponse) msg; diff --git a/example/src/main/java/io/netty/example/http/snoop/HttpSnoopServerHandler.java b/example/src/main/java/io/netty/example/http/snoop/HttpSnoopServerHandler.java index df5b64f2ab..bfb4e4b4cd 100644 --- a/example/src/main/java/io/netty/example/http/snoop/HttpSnoopServerHandler.java +++ b/example/src/main/java/io/netty/example/http/snoop/HttpSnoopServerHandler.java @@ -57,7 +57,7 @@ public class HttpSnoopServerHandler extends SimpleChannelInboundHandler } @Override - protected void channelRead0(ChannelHandlerContext ctx, Object msg) { + protected void messageReceived(ChannelHandlerContext ctx, Object msg) { if (msg instanceof HttpRequest) { HttpRequest request = this.request = (HttpRequest) msg; diff --git a/example/src/main/java/io/netty/example/http/upload/HttpUploadClientHandler.java b/example/src/main/java/io/netty/example/http/upload/HttpUploadClientHandler.java index 82a8055206..4a3b87aec1 100644 --- a/example/src/main/java/io/netty/example/http/upload/HttpUploadClientHandler.java +++ b/example/src/main/java/io/netty/example/http/upload/HttpUploadClientHandler.java @@ -32,7 +32,7 @@ public class HttpUploadClientHandler extends SimpleChannelInboundHandler private WebSocketServerHandshaker handshaker; @Override - public void channelRead0(ChannelHandlerContext ctx, Object msg) { + public void messageReceived(ChannelHandlerContext ctx, Object msg) { if (msg instanceof FullHttpRequest) { handleHttpRequest(ctx, (FullHttpRequest) msg); } else if (msg instanceof WebSocketFrame) { diff --git a/example/src/main/java/io/netty/example/http/websocketx/client/WebSocketClientHandler.java b/example/src/main/java/io/netty/example/http/websocketx/client/WebSocketClientHandler.java index fb10576e2e..b0eab1a191 100644 --- a/example/src/main/java/io/netty/example/http/websocketx/client/WebSocketClientHandler.java +++ b/example/src/main/java/io/netty/example/http/websocketx/client/WebSocketClientHandler.java @@ -80,7 +80,7 @@ public class WebSocketClientHandler extends SimpleChannelInboundHandler } @Override - public void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, Object msg) throws Exception { Channel ch = ctx.channel(); if (!handshaker.isHandshakeComplete()) { try { diff --git a/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketFrameHandler.java b/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketFrameHandler.java index a4536682e1..96db806089 100644 --- a/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketFrameHandler.java +++ b/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketFrameHandler.java @@ -28,7 +28,7 @@ import io.netty.handler.codec.http.websocketx.WebSocketFrame; public class WebSocketFrameHandler extends SimpleChannelInboundHandler { @Override - protected void channelRead0(ChannelHandlerContext ctx, WebSocketFrame frame) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, WebSocketFrame frame) throws Exception { // ping and pong frames already handled if (frame instanceof TextWebSocketFrame) { diff --git a/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketIndexPageHandler.java b/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketIndexPageHandler.java index 03c57fcd2e..2c1f11fa73 100644 --- a/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketIndexPageHandler.java +++ b/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketIndexPageHandler.java @@ -54,7 +54,7 @@ public class WebSocketIndexPageHandler extends SimpleChannelInboundHandler { p.addLast(new HttpServerUpgradeHandler(sourceCodec, upgradeCodecFactory)); p.addLast(new SimpleChannelInboundHandler() { @Override - protected void channelRead0(ChannelHandlerContext ctx, HttpMessage msg) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, HttpMessage msg) throws Exception { // If this handler is hit then no upgrade has been attempted and the client is just talking HTTP. System.err.println("Directly talking: " + msg.protocolVersion() + " (no upgrade was attempted)"); ChannelPipeline pipeline = ctx.pipeline(); diff --git a/example/src/main/java/io/netty/example/http2/helloworld/multiplex/server/Http2ServerInitializer.java b/example/src/main/java/io/netty/example/http2/helloworld/multiplex/server/Http2ServerInitializer.java index c42dbd55b4..b5a6d4d285 100644 --- a/example/src/main/java/io/netty/example/http2/helloworld/multiplex/server/Http2ServerInitializer.java +++ b/example/src/main/java/io/netty/example/http2/helloworld/multiplex/server/Http2ServerInitializer.java @@ -94,7 +94,7 @@ public class Http2ServerInitializer extends ChannelInitializer { p.addLast(new HttpServerUpgradeHandler(sourceCodec, upgradeCodecFactory)); p.addLast(new SimpleChannelInboundHandler() { @Override - protected void channelRead0(ChannelHandlerContext ctx, HttpMessage msg) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, HttpMessage msg) throws Exception { // If this handler is hit then no upgrade has been attempted and the client is just talking HTTP. System.err.println("Directly talking: " + msg.protocolVersion() + " (no upgrade was attempted)"); ChannelPipeline pipeline = ctx.pipeline(); diff --git a/example/src/main/java/io/netty/example/http2/helloworld/server/HelloWorldHttp1Handler.java b/example/src/main/java/io/netty/example/http2/helloworld/server/HelloWorldHttp1Handler.java index 49cef5d472..964d976077 100644 --- a/example/src/main/java/io/netty/example/http2/helloworld/server/HelloWorldHttp1Handler.java +++ b/example/src/main/java/io/netty/example/http2/helloworld/server/HelloWorldHttp1Handler.java @@ -48,7 +48,7 @@ public class HelloWorldHttp1Handler extends SimpleChannelInboundHandler { p.addLast(cleartextHttp2ServerUpgradeHandler); p.addLast(new SimpleChannelInboundHandler() { @Override - protected void channelRead0(ChannelHandlerContext ctx, HttpMessage msg) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, HttpMessage msg) throws Exception { // If this handler is hit then no upgrade has been attempted and the client is just talking HTTP. System.err.println("Directly talking: " + msg.protocolVersion() + " (no upgrade was attempted)"); ChannelPipeline pipeline = ctx.pipeline(); diff --git a/example/src/main/java/io/netty/example/http2/tiles/FallbackRequestHandler.java b/example/src/main/java/io/netty/example/http2/tiles/FallbackRequestHandler.java index ee3e7327b7..fe205f066f 100644 --- a/example/src/main/java/io/netty/example/http2/tiles/FallbackRequestHandler.java +++ b/example/src/main/java/io/netty/example/http2/tiles/FallbackRequestHandler.java @@ -46,7 +46,7 @@ public final class FallbackRequestHandler extends SimpleChannelInboundHandler", UTF_8)).asReadOnly(); @Override - protected void channelRead0(ChannelHandlerContext ctx, HttpRequest req) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, HttpRequest req) throws Exception { if (HttpUtil.is100ContinueExpected(req)) { ctx.write(new DefaultFullHttpResponse(HTTP_1_1, CONTINUE, EMPTY_BUFFER)); } diff --git a/example/src/main/java/io/netty/example/http2/tiles/Http1RequestHandler.java b/example/src/main/java/io/netty/example/http2/tiles/Http1RequestHandler.java index 33ecbe7df8..3052793089 100644 --- a/example/src/main/java/io/netty/example/http2/tiles/Http1RequestHandler.java +++ b/example/src/main/java/io/netty/example/http2/tiles/Http1RequestHandler.java @@ -40,11 +40,11 @@ import java.util.concurrent.TimeUnit; public final class Http1RequestHandler extends Http2RequestHandler { @Override - protected void channelRead0(ChannelHandlerContext ctx, FullHttpRequest request) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, FullHttpRequest request) throws Exception { if (HttpUtil.is100ContinueExpected(request)) { ctx.write(new DefaultFullHttpResponse(HTTP_1_1, CONTINUE, Unpooled.EMPTY_BUFFER)); } - super.channelRead0(ctx, request); + super.messageReceived(ctx, request); } @Override diff --git a/example/src/main/java/io/netty/example/http2/tiles/Http2RequestHandler.java b/example/src/main/java/io/netty/example/http2/tiles/Http2RequestHandler.java index 72e35e8ac8..bc3c0e741d 100644 --- a/example/src/main/java/io/netty/example/http2/tiles/Http2RequestHandler.java +++ b/example/src/main/java/io/netty/example/http2/tiles/Http2RequestHandler.java @@ -52,7 +52,7 @@ public class Http2RequestHandler extends SimpleChannelInboundHandler { @Override - public void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, Object msg) throws Exception { // Print as received System.out.println(msg); } diff --git a/example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentClientHandler.java b/example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentClientHandler.java index de5fbb0b0f..9109cac350 100644 --- a/example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentClientHandler.java +++ b/example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentClientHandler.java @@ -23,7 +23,7 @@ import io.netty.util.CharsetUtil; public class QuoteOfTheMomentClientHandler extends SimpleChannelInboundHandler { @Override - public void channelRead0(ChannelHandlerContext ctx, DatagramPacket msg) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, DatagramPacket msg) throws Exception { String response = msg.content().toString(CharsetUtil.UTF_8); if (response.startsWith("QOTM: ")) { System.out.println("Quote of the Moment: " + response.substring(6)); diff --git a/example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentServerHandler.java b/example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentServerHandler.java index 302c731c3d..4d1ac6d485 100644 --- a/example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentServerHandler.java +++ b/example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentServerHandler.java @@ -44,7 +44,7 @@ public class QuoteOfTheMomentServerHandler extends SimpleChannelInboundHandler { @Override - public void channelRead0(ChannelHandlerContext ctx, String msg) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, String msg) throws Exception { System.err.println(msg); } diff --git a/example/src/main/java/io/netty/example/securechat/SecureChatServerHandler.java b/example/src/main/java/io/netty/example/securechat/SecureChatServerHandler.java index 7e60b4b2f8..f5a4295283 100644 --- a/example/src/main/java/io/netty/example/securechat/SecureChatServerHandler.java +++ b/example/src/main/java/io/netty/example/securechat/SecureChatServerHandler.java @@ -52,7 +52,7 @@ public class SecureChatServerHandler extends SimpleChannelInboundHandler } @Override - public void channelRead0(ChannelHandlerContext ctx, String msg) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, String msg) throws Exception { // Send the received message to all channels but the current one. for (Channel c: channels) { if (c != ctx.channel()) { diff --git a/example/src/main/java/io/netty/example/socksproxy/SocksServerConnectHandler.java b/example/src/main/java/io/netty/example/socksproxy/SocksServerConnectHandler.java index 01fa62536a..e61b9b69c9 100644 --- a/example/src/main/java/io/netty/example/socksproxy/SocksServerConnectHandler.java +++ b/example/src/main/java/io/netty/example/socksproxy/SocksServerConnectHandler.java @@ -41,7 +41,7 @@ public final class SocksServerConnectHandler extends SimpleChannelInboundHandler private final Bootstrap b = new Bootstrap(); @Override - public void channelRead0(final ChannelHandlerContext ctx, final SocksMessage message) throws Exception { + public void messageReceived(final ChannelHandlerContext ctx, final SocksMessage message) throws Exception { if (message instanceof Socks4CommandRequest) { final Socks4CommandRequest request = (Socks4CommandRequest) message; Promise promise = ctx.executor().newPromise(); diff --git a/example/src/main/java/io/netty/example/socksproxy/SocksServerHandler.java b/example/src/main/java/io/netty/example/socksproxy/SocksServerHandler.java index d307bfdbed..2cb2655bf8 100644 --- a/example/src/main/java/io/netty/example/socksproxy/SocksServerHandler.java +++ b/example/src/main/java/io/netty/example/socksproxy/SocksServerHandler.java @@ -39,7 +39,7 @@ public final class SocksServerHandler extends SimpleChannelInboundHandler } @Override - protected void channelRead0(ChannelHandlerContext ctx, StompFrame frame) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, StompFrame frame) throws Exception { String subscrReceiptId = "001"; String disconReceiptId = "002"; switch (frame.command()) { diff --git a/example/src/main/java/io/netty/example/telnet/TelnetClientHandler.java b/example/src/main/java/io/netty/example/telnet/TelnetClientHandler.java index 508a309149..10997827e3 100644 --- a/example/src/main/java/io/netty/example/telnet/TelnetClientHandler.java +++ b/example/src/main/java/io/netty/example/telnet/TelnetClientHandler.java @@ -26,7 +26,7 @@ import io.netty.channel.SimpleChannelInboundHandler; public class TelnetClientHandler extends SimpleChannelInboundHandler { @Override - protected void channelRead0(ChannelHandlerContext ctx, String msg) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, String msg) throws Exception { System.err.println(msg); } diff --git a/example/src/main/java/io/netty/example/telnet/TelnetServerHandler.java b/example/src/main/java/io/netty/example/telnet/TelnetServerHandler.java index bb788101d4..f5a74edeb5 100644 --- a/example/src/main/java/io/netty/example/telnet/TelnetServerHandler.java +++ b/example/src/main/java/io/netty/example/telnet/TelnetServerHandler.java @@ -39,7 +39,7 @@ public class TelnetServerHandler extends SimpleChannelInboundHandler { } @Override - public void channelRead0(ChannelHandlerContext ctx, String request) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, String request) throws Exception { // Generate and write a response. String response; boolean close = false; diff --git a/example/src/main/java/io/netty/example/uptime/UptimeClientHandler.java b/example/src/main/java/io/netty/example/uptime/UptimeClientHandler.java index 40b18ec2f3..049d3540e6 100644 --- a/example/src/main/java/io/netty/example/uptime/UptimeClientHandler.java +++ b/example/src/main/java/io/netty/example/uptime/UptimeClientHandler.java @@ -41,7 +41,7 @@ public class UptimeClientHandler extends SimpleChannelInboundHandler { } @Override - public void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, Object msg) throws Exception { // Discard received data } diff --git a/example/src/main/java/io/netty/example/uptime/UptimeServerHandler.java b/example/src/main/java/io/netty/example/uptime/UptimeServerHandler.java index 3fe1374312..a19e132e10 100644 --- a/example/src/main/java/io/netty/example/uptime/UptimeServerHandler.java +++ b/example/src/main/java/io/netty/example/uptime/UptimeServerHandler.java @@ -22,7 +22,7 @@ import io.netty.channel.SimpleChannelInboundHandler; @Sharable public class UptimeServerHandler extends SimpleChannelInboundHandler { @Override - public void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, Object msg) throws Exception { // discard } diff --git a/example/src/main/java/io/netty/example/worldclock/WorldClockClientHandler.java b/example/src/main/java/io/netty/example/worldclock/WorldClockClientHandler.java index 93574d7bf1..88bfd6b50c 100644 --- a/example/src/main/java/io/netty/example/worldclock/WorldClockClientHandler.java +++ b/example/src/main/java/io/netty/example/worldclock/WorldClockClientHandler.java @@ -94,7 +94,7 @@ public class WorldClockClientHandler extends SimpleChannelInboundHandler { @Override - public void channelRead0(ChannelHandlerContext ctx, Locations locations) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, Locations locations) throws Exception { long currentTime = System.currentTimeMillis(); LocalTimes.Builder builder = LocalTimes.newBuilder(); 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 0dd3a0cf17..07e8896157 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 @@ -489,7 +489,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)) { @@ -543,7 +543,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 4020c62e42..ba0660ad4d 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 @@ -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(); @@ -265,7 +265,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/handler/src/test/java/io/netty/handler/ssl/CipherSuiteCanaryTest.java b/handler/src/test/java/io/netty/handler/ssl/CipherSuiteCanaryTest.java index 3644cdcc55..9f55c447d2 100644 --- a/handler/src/test/java/io/netty/handler/ssl/CipherSuiteCanaryTest.java +++ b/handler/src/test/java/io/netty/handler/ssl/CipherSuiteCanaryTest.java @@ -174,7 +174,7 @@ public class CipherSuiteCanaryTest { } @Override - public void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, Object msg) throws Exception { if (serverPromise.trySuccess(null)) { ctx.writeAndFlush(Unpooled.wrappedBuffer(new byte[] {'P', 'O', 'N', 'G'})); } @@ -210,7 +210,7 @@ public class CipherSuiteCanaryTest { } @Override - public void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, Object msg) throws Exception { clientPromise.trySuccess(null); ctx.close(); } diff --git a/handler/src/test/java/io/netty/handler/ssl/OpenSslPrivateKeyMethodTest.java b/handler/src/test/java/io/netty/handler/ssl/OpenSslPrivateKeyMethodTest.java index 38eb4b6e2a..5e8a35cd08 100644 --- a/handler/src/test/java/io/netty/handler/ssl/OpenSslPrivateKeyMethodTest.java +++ b/handler/src/test/java/io/netty/handler/ssl/OpenSslPrivateKeyMethodTest.java @@ -240,7 +240,7 @@ public class OpenSslPrivateKeyMethodTest { } @Override - public void channelRead0(ChannelHandlerContext ctx, Object msg) { + public void messageReceived(ChannelHandlerContext ctx, Object msg) { if (serverPromise.trySuccess(null)) { ctx.writeAndFlush(Unpooled.wrappedBuffer(new byte[] {'P', 'O', 'N', 'G'})); } @@ -276,7 +276,7 @@ public class OpenSslPrivateKeyMethodTest { } @Override - public void channelRead0(ChannelHandlerContext ctx, Object msg) { + public void messageReceived(ChannelHandlerContext ctx, Object msg) { clientPromise.trySuccess(null); ctx.close(); } diff --git a/handler/src/test/java/io/netty/handler/ssl/SSLEngineTest.java b/handler/src/test/java/io/netty/handler/ssl/SSLEngineTest.java index 0305597cb5..12a17c1140 100644 --- a/handler/src/test/java/io/netty/handler/ssl/SSLEngineTest.java +++ b/handler/src/test/java/io/netty/handler/ssl/SSLEngineTest.java @@ -238,7 +238,7 @@ public abstract class SSLEngineTest { } @Override - protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, ByteBuf msg) throws Exception { receiver.messageReceived(msg); latch.countDown(); } diff --git a/handler/src/test/java/io/netty/handler/ssl/SslHandlerTest.java b/handler/src/test/java/io/netty/handler/ssl/SslHandlerTest.java index fd3bebfe8e..bc5d4fc3a9 100644 --- a/handler/src/test/java/io/netty/handler/ssl/SslHandlerTest.java +++ b/handler/src/test/java/io/netty/handler/ssl/SslHandlerTest.java @@ -630,7 +630,8 @@ public class SslHandlerTest { ch.pipeline().addLast(new SimpleChannelInboundHandler() { private int readBytes; @Override - protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, + ByteBuf msg) throws Exception { readBytes += msg.readableBytes(); if (readBytes >= expectedBytes) { serverReceiveLatch.countDown(); diff --git a/testsuite-http2/src/main/java/io/netty/testsuite/http2/HelloWorldHttp1Handler.java b/testsuite-http2/src/main/java/io/netty/testsuite/http2/HelloWorldHttp1Handler.java index aa5ef32d29..0e8ac0cb48 100644 --- a/testsuite-http2/src/main/java/io/netty/testsuite/http2/HelloWorldHttp1Handler.java +++ b/testsuite-http2/src/main/java/io/netty/testsuite/http2/HelloWorldHttp1Handler.java @@ -45,7 +45,7 @@ public class HelloWorldHttp1Handler extends SimpleChannelInboundHandler { p.addLast(cleartextHttp2ServerUpgradeHandler); p.addLast(new SimpleChannelInboundHandler() { @Override - protected void channelRead0(ChannelHandlerContext ctx, HttpMessage msg) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, HttpMessage msg) throws Exception { // If this handler is hit then no upgrade has been attempted and the client is just talking HTTP. System.err.println("Directly talking: " + msg.protocolVersion() + " (no upgrade was attempted)"); ChannelPipeline pipeline = ctx.pipeline(); diff --git a/testsuite-native-image/src/main/java/io/netty/testsuite/svm/HttpNativeServerHandler.java b/testsuite-native-image/src/main/java/io/netty/testsuite/svm/HttpNativeServerHandler.java index 33531dca54..42efaf1c9a 100644 --- a/testsuite-native-image/src/main/java/io/netty/testsuite/svm/HttpNativeServerHandler.java +++ b/testsuite-native-image/src/main/java/io/netty/testsuite/svm/HttpNativeServerHandler.java @@ -41,7 +41,7 @@ public class HttpNativeServerHandler extends SimpleChannelInboundHandler extends Abs } @Override - public void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, ByteBuf msg) throws Exception { queue.offer(msg.readByte()); } diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/DatagramMulticastTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/DatagramMulticastTest.java index b47a0488bc..4fcac2b713 100644 --- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/DatagramMulticastTest.java +++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/DatagramMulticastTest.java @@ -57,7 +57,7 @@ public class DatagramMulticastTest extends AbstractDatagramTest { sb.handler(new SimpleChannelInboundHandler() { @Override - public void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, Object msg) throws Exception { // Nothing will be sent. } }); @@ -131,7 +131,7 @@ public class DatagramMulticastTest extends AbstractDatagramTest { private volatile boolean fail; @Override - protected void channelRead0(ChannelHandlerContext ctx, DatagramPacket msg) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, DatagramPacket msg) throws Exception { if (done) { fail = true; } diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/DatagramUnicastTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/DatagramUnicastTest.java index aca8b607be..afbc664760 100644 --- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/DatagramUnicastTest.java +++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/DatagramUnicastTest.java @@ -159,7 +159,7 @@ public class DatagramUnicastTest extends AbstractDatagramTest { try { cb.handler(new SimpleChannelInboundHandler() { @Override - public void channelRead0(ChannelHandlerContext ctx, Object msgs) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, Object msgs) throws Exception { // Nothing will be sent. } }); @@ -236,7 +236,7 @@ public class DatagramUnicastTest extends AbstractDatagramTest { final AtomicReference clientErrorRef = new AtomicReference(); cb.handler(new SimpleChannelInboundHandler() { @Override - public void channelRead0(ChannelHandlerContext ctx, DatagramPacket msg) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, DatagramPacket msg) throws Exception { try { ByteBuf buf = msg.content(); assertEquals(bytes.length, buf.readableBytes()); @@ -345,7 +345,7 @@ public class DatagramUnicastTest extends AbstractDatagramTest { protected void initChannel(Channel ch) throws Exception { ch.pipeline().addLast(new SimpleChannelInboundHandler() { @Override - public void channelRead0(ChannelHandlerContext ctx, DatagramPacket msg) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, DatagramPacket msg) throws Exception { try { if (sender == null) { assertNotNull(msg.sender()); diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketBufReleaseTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketBufReleaseTest.java index 35daf21af1..4f0be9e8fb 100644 --- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketBufReleaseTest.java +++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketBufReleaseTest.java @@ -94,7 +94,7 @@ public class SocketBufReleaseTest extends AbstractSocketTest { } @Override - public void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, Object msg) throws Exception { // discard } diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketCancelWriteTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketCancelWriteTest.java index 125b0c7f95..7093b53dd0 100644 --- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketCancelWriteTest.java +++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketCancelWriteTest.java @@ -106,7 +106,7 @@ public class SocketCancelWriteTest extends AbstractSocketTest { } @Override - public void channelRead0(ChannelHandlerContext ctx, ByteBuf in) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, ByteBuf in) throws Exception { counter += in.readableBytes(); received.writeBytes(in); } diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketDataReadInitialStateTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketDataReadInitialStateTest.java index aa5efaabaa..c468df4f80 100644 --- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketDataReadInitialStateTest.java +++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketDataReadInitialStateTest.java @@ -71,7 +71,7 @@ public class SocketDataReadInitialStateTest extends AbstractSocketTest { serverConnectedChannelRef.set(ch); ch.pipeline().addLast(new SimpleChannelInboundHandler() { @Override - protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) { + protected void messageReceived(ChannelHandlerContext ctx, ByteBuf msg) { ctx.writeAndFlush(msg.retainedDuplicate()); serverReadLatch.countDown(); } @@ -85,7 +85,7 @@ public class SocketDataReadInitialStateTest extends AbstractSocketTest { protected void initChannel(Channel ch) { ch.pipeline().addLast(new SimpleChannelInboundHandler() { @Override - protected void channelRead0(ChannelHandlerContext ctx, Object msg) { + protected void messageReceived(ChannelHandlerContext ctx, Object msg) { clientReadLatch.countDown(); } }); @@ -147,7 +147,7 @@ public class SocketDataReadInitialStateTest extends AbstractSocketTest { protected void initChannel(Channel ch) { ch.pipeline().addLast(new SimpleChannelInboundHandler() { @Override - protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) { + protected void messageReceived(ChannelHandlerContext ctx, ByteBuf msg) { ctx.writeAndFlush(msg.retainedDuplicate()); serverReadLatch.countDown(); } @@ -160,7 +160,7 @@ public class SocketDataReadInitialStateTest extends AbstractSocketTest { protected void initChannel(Channel ch) { ch.pipeline().addLast(new SimpleChannelInboundHandler() { @Override - protected void channelRead0(ChannelHandlerContext ctx, Object msg) { + protected void messageReceived(ChannelHandlerContext ctx, Object msg) { clientReadLatch.countDown(); } }); diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketEchoTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketEchoTest.java index 14ea1ba710..bf173a2d0a 100644 --- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketEchoTest.java +++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketEchoTest.java @@ -177,7 +177,7 @@ public class SocketEchoTest extends AbstractSocketTest { } @Override - public void channelRead0(ChannelHandlerContext ctx, ByteBuf in) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, ByteBuf in) throws Exception { byte[] actual = new byte[in.readableBytes()]; in.readBytes(actual); diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketFileRegionTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketFileRegionTest.java index cda796c219..8355f256ec 100644 --- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketFileRegionTest.java +++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketFileRegionTest.java @@ -109,7 +109,7 @@ public class SocketFileRegionTest extends AbstractSocketTest { sb.childHandler(new SimpleChannelInboundHandler() { @Override - protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) { + protected void messageReceived(ChannelHandlerContext ctx, ByteBuf msg) { // Just drop the message. } }); @@ -158,7 +158,7 @@ public class SocketFileRegionTest extends AbstractSocketTest { ChannelHandler ch = new SimpleChannelInboundHandler() { @Override - public void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, Object msg) throws Exception { } @Override @@ -252,7 +252,7 @@ public class SocketFileRegionTest extends AbstractSocketTest { } @Override - public void channelRead0(ChannelHandlerContext ctx, ByteBuf in) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, ByteBuf in) throws Exception { byte[] actual = new byte[in.readableBytes()]; in.readBytes(actual); diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketFixedLengthEchoTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketFixedLengthEchoTest.java index 7145f45424..c6acaf2da9 100644 --- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketFixedLengthEchoTest.java +++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketFixedLengthEchoTest.java @@ -157,7 +157,7 @@ public class SocketFixedLengthEchoTest extends AbstractSocketTest { } @Override - public void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, ByteBuf msg) throws Exception { assertEquals(1024, msg.readableBytes()); byte[] actual = new byte[msg.readableBytes()]; diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketGatheringWriteTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketGatheringWriteTest.java index a9879f28f5..45c0e8f10e 100644 --- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketGatheringWriteTest.java +++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketGatheringWriteTest.java @@ -184,7 +184,7 @@ public class SocketGatheringWriteTest extends AbstractSocketTest { } @Override - public void channelRead0(ChannelHandlerContext ctx, ByteBuf in) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, ByteBuf in) throws Exception { received.writeBytes(in); if (received.readableBytes() >= expectedBytes) { doneReadingPromise.setSuccess(null); @@ -223,7 +223,7 @@ public class SocketGatheringWriteTest extends AbstractSocketTest { } @Override - public void channelRead0(ChannelHandlerContext ctx, ByteBuf in) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, ByteBuf in) throws Exception { } @Override diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketHalfClosedTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketHalfClosedTest.java index 3252d258f3..a5919afebc 100644 --- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketHalfClosedTest.java +++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketHalfClosedTest.java @@ -311,7 +311,7 @@ public class SocketHalfClosedTest extends AbstractSocketTest { } @Override - protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, ByteBuf msg) throws Exception { bytesRead += msg.readableBytes(); if (bytesRead >= expectedBytes) { // We write a reply and immediately close our end of the socket. @@ -373,7 +373,7 @@ public class SocketHalfClosedTest extends AbstractSocketTest { } @Override - protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, ByteBuf msg) throws Exception { bytesRead += msg.readableBytes(); if (bytesRead >= expectedBytes) { if (!seenOutputShutdown) { diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketShutdownOutputBySelfTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketShutdownOutputBySelfTest.java index d10c6e80fa..2ebfb1e920 100644 --- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketShutdownOutputBySelfTest.java +++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketShutdownOutputBySelfTest.java @@ -260,7 +260,7 @@ public class SocketShutdownOutputBySelfTest extends AbstractClientSocketTest { } @Override - public void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, ByteBuf msg) throws Exception { queue.offer(msg.readByte()); } diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslClientRenegotiateTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslClientRenegotiateTest.java index dd598adea7..59f2945e65 100644 --- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslClientRenegotiateTest.java +++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslClientRenegotiateTest.java @@ -267,6 +267,6 @@ public class SocketSslClientRenegotiateTest extends AbstractSocketTest { } @Override - public void channelRead0(ChannelHandlerContext ctx, ByteBuf in) throws Exception { } + public void messageReceived(ChannelHandlerContext ctx, ByteBuf in) throws Exception { } } } diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslEchoTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslEchoTest.java index b187d2ccf2..008d2f2728 100644 --- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslEchoTest.java +++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslEchoTest.java @@ -504,7 +504,7 @@ public class SocketSslEchoTest extends AbstractSocketTest { } @Override - public void channelRead0(ChannelHandlerContext ctx, ByteBuf in) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, ByteBuf in) throws Exception { byte[] actual = new byte[in.readableBytes()]; in.readBytes(actual); @@ -533,7 +533,7 @@ public class SocketSslEchoTest extends AbstractSocketTest { } @Override - public void channelRead0(ChannelHandlerContext ctx, ByteBuf in) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, ByteBuf in) throws Exception { byte[] actual = new byte[in.readableBytes()]; in.readBytes(actual); diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslGreetingTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslGreetingTest.java index 53dc1d552b..f6fd731e73 100644 --- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslGreetingTest.java +++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslGreetingTest.java @@ -190,7 +190,7 @@ public class SocketSslGreetingTest extends AbstractSocketTest { final CountDownLatch latch = new CountDownLatch(1); @Override - public void channelRead0(ChannelHandlerContext ctx, ByteBuf buf) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, ByteBuf buf) throws Exception { assertEquals('a', buf.readByte()); assertFalse(buf.isReadable()); latch.countDown(); @@ -214,7 +214,7 @@ public class SocketSslGreetingTest extends AbstractSocketTest { final AtomicReference exception = new AtomicReference<>(); @Override - protected void channelRead0(ChannelHandlerContext ctx, String msg) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, String msg) throws Exception { // discard } diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslSessionReuseTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslSessionReuseTest.java index e16d23613a..afdfb0ffde 100644 --- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslSessionReuseTest.java +++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslSessionReuseTest.java @@ -183,7 +183,7 @@ public class SocketSslSessionReuseTest extends AbstractSocketTest { } @Override - public void channelRead0(ChannelHandlerContext ctx, ByteBuf in) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, ByteBuf in) throws Exception { byte[] actual = new byte[in.readableBytes()]; in.readBytes(actual); ctx.close(); diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketStartTlsTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketStartTlsTest.java index 73e1e6f7c6..02bc062845 100644 --- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketStartTlsTest.java +++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketStartTlsTest.java @@ -230,7 +230,7 @@ public class SocketStartTlsTest extends AbstractSocketTest { } @Override - public void channelRead0(ChannelHandlerContext ctx, String msg) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, String msg) throws Exception { if ("StartTlsResponse".equals(msg)) { ctx.pipeline().addAfter("logger", "ssl", sslHandler); handshakeFuture = sslHandler.handshakeFuture(); @@ -284,7 +284,7 @@ public class SocketStartTlsTest extends AbstractSocketTest { } @Override - public void channelRead0(ChannelHandlerContext ctx, String msg) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, String msg) throws Exception { if ("StartTlsRequest".equals(msg)) { ctx.pipeline().addAfter("logger", "ssl", sslHandler); ctx.writeAndFlush("StartTlsResponse\n"); diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketStringEchoTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketStringEchoTest.java index d3afcccc8c..c8c35da88c 100644 --- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketStringEchoTest.java +++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketStringEchoTest.java @@ -147,7 +147,7 @@ public class SocketStringEchoTest extends AbstractSocketTest { } @Override - public void channelRead0(ChannelHandlerContext ctx, String msg) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, String msg) throws Exception { if (!data[dataIndex].equals(msg)) { donePromise.tryFailure(new IllegalStateException("index: " + dataIndex + " didn't match!")); ctx.close(); diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/TrafficShapingHandlerTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/TrafficShapingHandlerTest.java index c9269d95b8..db901d70b8 100644 --- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/TrafficShapingHandlerTest.java +++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/TrafficShapingHandlerTest.java @@ -406,7 +406,7 @@ public class TrafficShapingHandlerTest extends AbstractSocketTest { } @Override - public void channelRead0(ChannelHandlerContext ctx, ByteBuf in) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, ByteBuf in) throws Exception { long lastTimestamp = 0; loggerClient.debug("Step: " + step + " Read: " + in.readableBytes() / 8 + " blocks"); while (in.isReadable()) { @@ -469,7 +469,7 @@ public class TrafficShapingHandlerTest extends AbstractSocketTest { } @Override - public void channelRead0(final ChannelHandlerContext ctx, ByteBuf in) throws Exception { + public void messageReceived(final ChannelHandlerContext ctx, ByteBuf in) throws Exception { byte[] actual = new byte[in.readableBytes()]; int nb = actual.length / messageSize; loggerServer.info("Step: " + step + " Read: " + nb + " blocks"); diff --git a/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollDatagramScatteringReadTest.java b/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollDatagramScatteringReadTest.java index 56269997d8..d7f5d480c6 100644 --- a/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollDatagramScatteringReadTest.java +++ b/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollDatagramScatteringReadTest.java @@ -98,7 +98,7 @@ public class EpollDatagramScatteringReadTest extends AbstractDatagramTest { try { cb.handler(new SimpleChannelInboundHandler() { @Override - public void channelRead0(ChannelHandlerContext ctx, Object msgs) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, Object msgs) throws Exception { // Nothing will be sent. } }); @@ -120,7 +120,7 @@ public class EpollDatagramScatteringReadTest extends AbstractDatagramTest { } @Override - protected void channelRead0(ChannelHandlerContext ctx, DatagramPacket msg) { + protected void messageReceived(ChannelHandlerContext ctx, DatagramPacket msg) { assertEquals(ccAddress, msg.sender()); assertEquals(bytes.length, msg.content().readableBytes()); diff --git a/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSpliceTest.java b/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSpliceTest.java index f6882fcc68..a1ee7a8213 100644 --- a/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSpliceTest.java +++ b/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSpliceTest.java @@ -247,7 +247,7 @@ public class EpollSpliceTest { } @Override - public void channelRead0(ChannelHandlerContext ctx, ByteBuf in) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, ByteBuf in) throws Exception { byte[] actual = new byte[in.readableBytes()]; in.readBytes(actual); diff --git a/transport-native-unix-common-tests/src/main/java/io/netty/channel/unix/tests/DetectPeerCloseWithoutReadTest.java b/transport-native-unix-common-tests/src/main/java/io/netty/channel/unix/tests/DetectPeerCloseWithoutReadTest.java index 8e8894b166..adcb76e709 100644 --- a/transport-native-unix-common-tests/src/main/java/io/netty/channel/unix/tests/DetectPeerCloseWithoutReadTest.java +++ b/transport-native-unix-common-tests/src/main/java/io/netty/channel/unix/tests/DetectPeerCloseWithoutReadTest.java @@ -190,7 +190,7 @@ public abstract class DetectPeerCloseWithoutReadTest { } @Override - protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) { + protected void messageReceived(ChannelHandlerContext ctx, ByteBuf msg) { bytesRead.addAndGet(msg.readableBytes()); if (extraReadRequested) { diff --git a/transport/src/main/java/io/netty/channel/ChannelHandler.java b/transport/src/main/java/io/netty/channel/ChannelHandler.java index 93344a1fa3..785df70179 100644 --- a/transport/src/main/java/io/netty/channel/ChannelHandler.java +++ b/transport/src/main/java/io/netty/channel/ChannelHandler.java @@ -55,7 +55,7 @@ import java.net.SocketAddress; * private boolean loggedIn; * * {@code @Override} - * public void channelRead0({@link ChannelHandlerContext} ctx, Message message) { + * public void messageReceived({@link ChannelHandlerContext} ctx, Message message) { * if (message instanceof LoginMessage) { * authenticate((LoginMessage) message); * loggedIn = true; diff --git a/transport/src/main/java/io/netty/channel/SimpleChannelInboundHandler.java b/transport/src/main/java/io/netty/channel/SimpleChannelInboundHandler.java index 65251a1790..c30f360664 100644 --- a/transport/src/main/java/io/netty/channel/SimpleChannelInboundHandler.java +++ b/transport/src/main/java/io/netty/channel/SimpleChannelInboundHandler.java @@ -28,7 +28,7 @@ import io.netty.util.internal.TypeParameterMatcher; * {@link SimpleChannelInboundHandler}<{@link String}> { * * {@code @Override} - * protected void channelRead0({@link ChannelHandlerContext} ctx, {@link String} message) + * protected void messageReceived({@link ChannelHandlerContext} ctx, {@link String} message) * throws {@link Exception} { * System.out.println(message); * } @@ -38,12 +38,6 @@ import io.netty.util.internal.TypeParameterMatcher; * Be aware that depending of the constructor parameters it will release all handled messages by passing them to * {@link ReferenceCountUtil#release(Object)}. In this case you may need to use * {@link ReferenceCountUtil#retain(Object)} if you pass the object to the next handler in the {@link ChannelPipeline}. - * - *

Forward compatibility notice

- *

- * Please keep in mind that {@link #channelRead0(ChannelHandlerContext, I)} will be renamed to - * {@code messageReceived(ChannelHandlerContext, I)} in 5.0. - *

*/ public abstract class SimpleChannelInboundHandler implements ChannelInboundHandler { @@ -102,7 +96,7 @@ public abstract class SimpleChannelInboundHandler implements ChannelInboundHa if (acceptInboundMessage(msg)) { @SuppressWarnings("unchecked") I imsg = (I) msg; - channelRead0(ctx, imsg); + messageReceived(ctx, imsg); } else { release = false; ctx.fireChannelRead(msg); @@ -115,9 +109,6 @@ public abstract class SimpleChannelInboundHandler implements ChannelInboundHa } /** - * Please keep in mind that this method will be renamed to - * {@code messageReceived(ChannelHandlerContext, I)} in 5.0. - * * Is called for each message of type {@link I}. * * @param ctx the {@link ChannelHandlerContext} which this {@link SimpleChannelInboundHandler} @@ -125,5 +116,5 @@ public abstract class SimpleChannelInboundHandler implements ChannelInboundHa * @param msg the message to handle * @throws Exception is thrown if an error occurred */ - protected abstract void channelRead0(ChannelHandlerContext ctx, I msg) throws Exception; + protected abstract void messageReceived(ChannelHandlerContext ctx, I msg) throws Exception; } diff --git a/transport/src/test/java/io/netty/channel/local/LocalChannelTest.java b/transport/src/test/java/io/netty/channel/local/LocalChannelTest.java index d4ff8d2834..f3fb5b69af 100644 --- a/transport/src/test/java/io/netty/channel/local/LocalChannelTest.java +++ b/transport/src/test/java/io/netty/channel/local/LocalChannelTest.java @@ -198,7 +198,7 @@ public class LocalChannelTest { .channel(LocalServerChannel.class) .childHandler(new SimpleChannelInboundHandler() { @Override - protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, Object msg) throws Exception { ctx.close(); latch.countDown(); } @@ -213,7 +213,7 @@ public class LocalChannelTest { .channel(LocalChannel.class) .handler(new SimpleChannelInboundHandler() { @Override - protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, Object msg) throws Exception { // discard } }); @@ -867,7 +867,7 @@ public class LocalChannelTest { } @Override - public void channelRead0(ChannelHandlerContext ctx, ByteBuf buffer) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, ByteBuf buffer) throws Exception { // Just drop the buffer } }); @@ -880,7 +880,7 @@ public class LocalChannelTest { ch.pipeline().addLast(new SimpleChannelInboundHandler() { @Override - public void channelRead0(ChannelHandlerContext ctx, ByteBuf buffer) throws Exception { + public void messageReceived(ChannelHandlerContext ctx, ByteBuf buffer) throws Exception { while (buffer.isReadable()) { // Fill the ChannelOutboundBuffer with multiple buffers ctx.write(buffer.readRetainedSlice(1)); diff --git a/transport/src/test/java/io/netty/channel/socket/nio/NioSocketChannelTest.java b/transport/src/test/java/io/netty/channel/socket/nio/NioSocketChannelTest.java index 599094840e..6885307f4c 100644 --- a/transport/src/test/java/io/netty/channel/socket/nio/NioSocketChannelTest.java +++ b/transport/src/test/java/io/netty/channel/socket/nio/NioSocketChannelTest.java @@ -179,7 +179,7 @@ public class NioSocketChannelTest extends AbstractNioChannelTest() { @Override - protected void channelRead0(ChannelHandlerContext ctx, ByteBuf byteBuf) { + protected void messageReceived(ChannelHandlerContext ctx, ByteBuf byteBuf) { // We was able to read something from the Channel after reregister. latch.countDown(); }