* Returns the maximum number of messages to read per read loop. - * a {@link ChannelInboundHandler#channelRead(ChannelHandlerContext, Object) channelRead()} event. + * a {@link ChannelHandler#channelRead(ChannelHandlerContext, Object) channelRead()} event. * If this value is greater than 1, an event loop might attempt to read multiple times to procure multiple messages. */ @Deprecated diff --git a/transport/src/main/java/io/netty/channel/ChannelHandlerContext.java b/transport/src/main/java/io/netty/channel/ChannelHandlerContext.java index a47f1bd2b7..112c36b0a9 100644 --- a/transport/src/main/java/io/netty/channel/ChannelHandlerContext.java +++ b/transport/src/main/java/io/netty/channel/ChannelHandlerContext.java @@ -82,7 +82,7 @@ import java.nio.channels.Channels; * as how many times it is added to pipelines, regardless if it is added to the * same pipeline multiple times or added to different pipelines multiple times: *
- * public class FactorialHandler implements {@link ChannelInboundHandler} {
+ * public class FactorialHandler implements {@link ChannelHandler} {
*
* private final {@link AttributeKey}<{@link Integer}> counter = {@link AttributeKey}.valueOf("counter");
*
diff --git a/transport/src/main/java/io/netty/channel/ChannelInboundInvoker.java b/transport/src/main/java/io/netty/channel/ChannelInboundInvoker.java
index 5a04ae9baa..f0123f2019 100644
--- a/transport/src/main/java/io/netty/channel/ChannelInboundInvoker.java
+++ b/transport/src/main/java/io/netty/channel/ChannelInboundInvoker.java
@@ -20,8 +20,8 @@ public interface ChannelInboundInvoker {
/**
* A {@link Channel} was registered to its {@link EventLoop}.
*
- * This will result in having the {@link ChannelInboundHandler#channelRegistered(ChannelHandlerContext)} method
- * called of the next {@link ChannelInboundHandler} contained in the {@link ChannelPipeline} of the
+ * This will result in having the {@link ChannelHandler#channelRegistered(ChannelHandlerContext)} method
+ * called of the next {@link ChannelHandler} contained in the {@link ChannelPipeline} of the
* {@link Channel}.
*/
ChannelInboundInvoker fireChannelRegistered();
@@ -29,8 +29,8 @@ public interface ChannelInboundInvoker {
/**
* A {@link Channel} was unregistered from its {@link EventLoop}.
*
- * This will result in having the {@link ChannelInboundHandler#channelUnregistered(ChannelHandlerContext)} method
- * called of the next {@link ChannelInboundHandler} contained in the {@link ChannelPipeline} of the
+ * This will result in having the {@link ChannelHandler#channelUnregistered(ChannelHandlerContext)} method
+ * called of the next {@link ChannelHandler} contained in the {@link ChannelPipeline} of the
* {@link Channel}.
*/
ChannelInboundInvoker fireChannelUnregistered();
@@ -38,8 +38,8 @@ public interface ChannelInboundInvoker {
/**
* A {@link Channel} is active now, which means it is connected.
*
- * This will result in having the {@link ChannelInboundHandler#channelActive(ChannelHandlerContext)} method
- * called of the next {@link ChannelInboundHandler} contained in the {@link ChannelPipeline} of the
+ * This will result in having the {@link ChannelHandler#channelActive(ChannelHandlerContext)} method
+ * called of the next {@link ChannelHandler} contained in the {@link ChannelPipeline} of the
* {@link Channel}.
*/
ChannelInboundInvoker fireChannelActive();
@@ -47,8 +47,8 @@ public interface ChannelInboundInvoker {
/**
* A {@link Channel} is inactive now, which means it is closed.
*
- * This will result in having the {@link ChannelInboundHandler#channelInactive(ChannelHandlerContext)} method
- * called of the next {@link ChannelInboundHandler} contained in the {@link ChannelPipeline} of the
+ * This will result in having the {@link ChannelHandler#channelInactive(ChannelHandlerContext)} method
+ * called of the next {@link ChannelHandler} contained in the {@link ChannelPipeline} of the
* {@link Channel}.
*/
ChannelInboundInvoker fireChannelInactive();
@@ -56,8 +56,8 @@ public interface ChannelInboundInvoker {
/**
* A {@link Channel} received an {@link Throwable} in one of its inbound operations.
*
- * This will result in having the {@link ChannelInboundHandler#exceptionCaught(ChannelHandlerContext, Throwable)}
- * method called of the next {@link ChannelInboundHandler} contained in the {@link ChannelPipeline} of the
+ * This will result in having the {@link ChannelHandler#exceptionCaught(ChannelHandlerContext, Throwable)}
+ * method called of the next {@link ChannelHandler} contained in the {@link ChannelPipeline} of the
* {@link Channel}.
*/
ChannelInboundInvoker fireExceptionCaught(Throwable cause);
@@ -65,8 +65,8 @@ public interface ChannelInboundInvoker {
/**
* A {@link Channel} received an user defined event.
*
- * This will result in having the {@link ChannelInboundHandler#userEventTriggered(ChannelHandlerContext, Object)}
- * method called of the next {@link ChannelInboundHandler} contained in the {@link ChannelPipeline} of the
+ * This will result in having the {@link ChannelHandler#userEventTriggered(ChannelHandlerContext, Object)}
+ * method called of the next {@link ChannelHandler} contained in the {@link ChannelPipeline} of the
* {@link Channel}.
*/
ChannelInboundInvoker fireUserEventTriggered(Object event);
@@ -74,21 +74,21 @@ public interface ChannelInboundInvoker {
/**
* A {@link Channel} received a message.
*
- * This will result in having the {@link ChannelInboundHandler#channelRead(ChannelHandlerContext, Object)}
- * method called of the next {@link ChannelInboundHandler} contained in the {@link ChannelPipeline} of the
+ * This will result in having the {@link ChannelHandler#channelRead(ChannelHandlerContext, Object)}
+ * method called of the next {@link ChannelHandler} contained in the {@link ChannelPipeline} of the
* {@link Channel}.
*/
ChannelInboundInvoker fireChannelRead(Object msg);
/**
- * Triggers an {@link ChannelInboundHandler#channelReadComplete(ChannelHandlerContext)}
- * event to the next {@link ChannelInboundHandler} in the {@link ChannelPipeline}.
+ * Triggers an {@link ChannelHandler#channelReadComplete(ChannelHandlerContext)}
+ * event to the next {@link ChannelHandler} in the {@link ChannelPipeline}.
*/
ChannelInboundInvoker fireChannelReadComplete();
/**
- * Triggers an {@link ChannelInboundHandler#channelWritabilityChanged(ChannelHandlerContext)}
- * event to the next {@link ChannelInboundHandler} in the {@link ChannelPipeline}.
+ * Triggers an {@link ChannelHandler#channelWritabilityChanged(ChannelHandlerContext)}
+ * event to the next {@link ChannelHandler} in the {@link ChannelPipeline}.
*/
ChannelInboundInvoker fireChannelWritabilityChanged();
}
diff --git a/transport/src/main/java/io/netty/channel/ChannelInitializer.java b/transport/src/main/java/io/netty/channel/ChannelInitializer.java
index 810891b233..a82e804fd5 100644
--- a/transport/src/main/java/io/netty/channel/ChannelInitializer.java
+++ b/transport/src/main/java/io/netty/channel/ChannelInitializer.java
@@ -22,7 +22,7 @@ import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.logging.InternalLoggerFactory;
/**
- * A special {@link ChannelInboundHandler} which offers an easy way to initialize a {@link Channel} once it was
+ * A special {@link ChannelHandler} which offers an easy way to initialize a {@link Channel} once it was
* registered to its {@link EventLoop}.
*
* Implementations are most often used in the context of {@link Bootstrap#handler(ChannelHandler)} ,
@@ -47,7 +47,7 @@ import io.netty.util.internal.logging.InternalLoggerFactory;
* @param A sub-type of {@link Channel}
*/
@Sharable
-public abstract class ChannelInitializer implements ChannelInboundHandler {
+public abstract class ChannelInitializer implements ChannelHandler {
private static final InternalLogger logger = InternalLoggerFactory.getInstance(ChannelInitializer.class);
diff --git a/transport/src/main/java/io/netty/channel/ChannelOutboundInvoker.java b/transport/src/main/java/io/netty/channel/ChannelOutboundInvoker.java
index 5263cbe5df..fab719286a 100644
--- a/transport/src/main/java/io/netty/channel/ChannelOutboundInvoker.java
+++ b/transport/src/main/java/io/netty/channel/ChannelOutboundInvoker.java
@@ -179,8 +179,8 @@ public interface ChannelOutboundInvoker {
* The given {@link ChannelPromise} will be notified.
*
* This will result in having the
- * {@link ChannelOutboundHandler#close(ChannelHandlerContext, ChannelPromise)}
- * method called of the next {@link ChannelOutboundHandler} contained in the {@link ChannelPipeline} of the
+ * {@link ChannelHandler#close(ChannelHandlerContext, ChannelPromise)}
+ * method called of the next {@link ChannelHandler} contained in the {@link ChannelPipeline} of the
* {@link Channel}.
*/
ChannelFuture close(ChannelPromise promise);
@@ -193,8 +193,8 @@ public interface ChannelOutboundInvoker {
* The given {@link ChannelPromise} will be notified.
*
* This will result in having the
- * {@link ChannelOutboundHandler#register(ChannelHandlerContext, ChannelPromise)}
- * method called of the next {@link ChannelOutboundHandler} contained in the {@link ChannelPipeline} of the
+ * {@link ChannelHandler#register(ChannelHandlerContext, ChannelPromise)}
+ * method called of the next {@link ChannelHandler} contained in the {@link ChannelPipeline} of the
* {@link Channel}.
*/
ChannelFuture register(ChannelPromise promise);
diff --git a/transport/src/main/java/io/netty/channel/CombinedChannelDuplexHandler.java b/transport/src/main/java/io/netty/channel/CombinedChannelDuplexHandler.java
index 6b9d000432..72a3130534 100644
--- a/transport/src/main/java/io/netty/channel/CombinedChannelDuplexHandler.java
+++ b/transport/src/main/java/io/netty/channel/CombinedChannelDuplexHandler.java
@@ -103,7 +103,7 @@ public class CombinedChannelDuplexHandler, String>> nameCaches =
new FastThreadLocal, String>>() {
@Override
- protected Map, String> initialValue() throws Exception {
+ protected Map, String> initialValue() {
return new WeakHashMap<>();
}
};
@@ -1011,7 +1011,7 @@ public class DefaultChannelPipeline implements ChannelPipeline {
/**
* Called once a {@link Throwable} hit the end of the {@link ChannelPipeline} without been handled by the user
- * in {@link ChannelInboundHandler#exceptionCaught(ChannelHandlerContext, Throwable)}.
+ * in {@link ChannelHandler#exceptionCaught(ChannelHandlerContext, Throwable)}.
*/
protected void onUnhandledInboundException(Throwable cause) {
try {
@@ -1025,14 +1025,14 @@ public class DefaultChannelPipeline implements ChannelPipeline {
}
/**
- * Called once the {@link ChannelInboundHandler#channelActive(ChannelHandlerContext)}event hit
+ * Called once the {@link ChannelHandler#channelActive(ChannelHandlerContext)}event hit
* the end of the {@link ChannelPipeline}.
*/
protected void onUnhandledInboundChannelActive() {
}
/**
- * Called once the {@link ChannelInboundHandler#channelInactive(ChannelHandlerContext)} event hit
+ * Called once the {@link ChannelHandler#channelInactive(ChannelHandlerContext)} event hit
* the end of the {@link ChannelPipeline}.
*/
protected void onUnhandledInboundChannelInactive() {
@@ -1040,7 +1040,7 @@ public class DefaultChannelPipeline implements ChannelPipeline {
/**
* Called once a message hit the end of the {@link ChannelPipeline} without been handled by the user
- * in {@link ChannelInboundHandler#channelRead(ChannelHandlerContext, Object)}. This method is responsible
+ * in {@link ChannelHandler#channelRead(ChannelHandlerContext, Object)}. This method is responsible
* to call {@link ReferenceCountUtil#release(Object)} on the given msg at some point.
*/
protected void onUnhandledInboundMessage(ChannelHandlerContext ctx, Object msg) {
@@ -1055,7 +1055,7 @@ public class DefaultChannelPipeline implements ChannelPipeline {
}
/**
- * Called once the {@link ChannelInboundHandler#channelReadComplete(ChannelHandlerContext)} event hit
+ * Called once the {@link ChannelHandler#channelReadComplete(ChannelHandlerContext)} event hit
* the end of the {@link ChannelPipeline}.
*/
protected void onUnhandledInboundChannelReadComplete() {
@@ -1063,7 +1063,7 @@ public class DefaultChannelPipeline implements ChannelPipeline {
/**
* Called once an user event hit the end of the {@link ChannelPipeline} without been handled by the user
- * in {@link ChannelInboundHandler#userEventTriggered(ChannelHandlerContext, Object)}. This method is responsible
+ * in {@link ChannelHandler#userEventTriggered(ChannelHandlerContext, Object)}. This method is responsible
* to call {@link ReferenceCountUtil#release(Object)} on the given event at some point.
*/
protected void onUnhandledInboundUserEventTriggered(Object evt) {
@@ -1073,7 +1073,7 @@ public class DefaultChannelPipeline implements ChannelPipeline {
}
/**
- * Called once the {@link ChannelInboundHandler#channelWritabilityChanged(ChannelHandlerContext)} event hit
+ * Called once the {@link ChannelHandler#channelWritabilityChanged(ChannelHandlerContext)} event hit
* the end of the {@link ChannelPipeline}.
*/
protected void onUnhandledChannelWritabilityChanged() {
@@ -1096,7 +1096,7 @@ public class DefaultChannelPipeline implements ChannelPipeline {
}
// A special catch-all handler that handles both bytes and messages.
- private static final class TailHandler implements ChannelInboundHandler {
+ private static final class TailHandler implements ChannelHandler {
@Override
public void channelRegistered(ChannelHandlerContext ctx) { }
diff --git a/transport/src/main/java/io/netty/channel/MaxBytesRecvByteBufAllocator.java b/transport/src/main/java/io/netty/channel/MaxBytesRecvByteBufAllocator.java
index 2222e2fdb4..e82f112bef 100644
--- a/transport/src/main/java/io/netty/channel/MaxBytesRecvByteBufAllocator.java
+++ b/transport/src/main/java/io/netty/channel/MaxBytesRecvByteBufAllocator.java
@@ -24,7 +24,7 @@ import java.util.Map.Entry;
public interface MaxBytesRecvByteBufAllocator extends RecvByteBufAllocator {
/**
* Returns the maximum number of bytes to read per read loop.
- * a {@link ChannelInboundHandler#channelRead(ChannelHandlerContext, Object) channelRead()} event.
+ * a {@link ChannelHandler#channelRead(ChannelHandlerContext, Object) channelRead()} event.
* If this value is greater than 1, an event loop might attempt to read multiple times to procure bytes.
*/
int maxBytesPerRead();
@@ -37,7 +37,7 @@ public interface MaxBytesRecvByteBufAllocator extends RecvByteBufAllocator {
/**
* Returns the maximum number of bytes to read per individual read operation.
- * a {@link ChannelInboundHandler#channelRead(ChannelHandlerContext, Object) channelRead()} event.
+ * a {@link ChannelHandler#channelRead(ChannelHandlerContext, Object) channelRead()} event.
* If this value is greater than 1, an event loop might attempt to read multiple times to procure bytes.
*/
int maxBytesPerIndividualRead();
diff --git a/transport/src/main/java/io/netty/channel/MaxMessagesRecvByteBufAllocator.java b/transport/src/main/java/io/netty/channel/MaxMessagesRecvByteBufAllocator.java
index c4ed288ac5..9f2d06c52e 100644
--- a/transport/src/main/java/io/netty/channel/MaxMessagesRecvByteBufAllocator.java
+++ b/transport/src/main/java/io/netty/channel/MaxMessagesRecvByteBufAllocator.java
@@ -22,7 +22,7 @@ package io.netty.channel;
public interface MaxMessagesRecvByteBufAllocator extends RecvByteBufAllocator {
/**
* Returns the maximum number of messages to read per read loop.
- * a {@link ChannelInboundHandler#channelRead(ChannelHandlerContext, Object) channelRead()} event.
+ * a {@link ChannelHandler#channelRead(ChannelHandlerContext, Object) channelRead()} event.
* If this value is greater than 1, an event loop might attempt to read multiple times to procure multiple messages.
*/
int maxMessagesPerRead();
diff --git a/transport/src/main/java/io/netty/channel/SimpleChannelInboundHandler.java b/transport/src/main/java/io/netty/channel/SimpleChannelInboundHandler.java
index c30f360664..3a4161ccc4 100644
--- a/transport/src/main/java/io/netty/channel/SimpleChannelInboundHandler.java
+++ b/transport/src/main/java/io/netty/channel/SimpleChannelInboundHandler.java
@@ -19,7 +19,7 @@ import io.netty.util.ReferenceCountUtil;
import io.netty.util.internal.TypeParameterMatcher;
/**
- * {@link ChannelInboundHandler} which allows to explicit only handle a specific type of messages.
+ * {@link ChannelHandler} which allows to explicit only handle a specific type of messages.
*
* For example here is an implementation which only handle {@link String} messages.
*
@@ -39,7 +39,7 @@ import io.netty.util.internal.TypeParameterMatcher;
* {@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}.
*/
-public abstract class SimpleChannelInboundHandler implements ChannelInboundHandler {
+public abstract class SimpleChannelInboundHandler implements ChannelHandler {
private final TypeParameterMatcher matcher;
private final boolean autoRelease;
@@ -83,7 +83,7 @@ public abstract class SimpleChannelInboundHandler implements ChannelInboundHa
/**
* Returns {@code true} if the given message should be handled. If {@code false} it will be passed to the next
- * {@link ChannelInboundHandler} in the {@link ChannelPipeline}.
+ * {@link ChannelHandler} in the {@link ChannelPipeline}.
*/
public boolean acceptInboundMessage(Object msg) throws Exception {
return matcher.match(msg);
diff --git a/transport/src/main/java/io/netty/channel/SimpleUserEventChannelHandler.java b/transport/src/main/java/io/netty/channel/SimpleUserEventChannelHandler.java
index c26fb807ad..e08031ebf5 100644
--- a/transport/src/main/java/io/netty/channel/SimpleUserEventChannelHandler.java
+++ b/transport/src/main/java/io/netty/channel/SimpleUserEventChannelHandler.java
@@ -19,7 +19,7 @@ import io.netty.util.ReferenceCountUtil;
import io.netty.util.internal.TypeParameterMatcher;
/**
- * {@link ChannelInboundHandler} which allows to conveniently only handle a specific type of user events.
+ * {@link ChannelHandler} which allows to conveniently only handle a specific type of user events.
*
* For example, here is an implementation which only handle {@link String} user events.
*
@@ -39,7 +39,7 @@ import io.netty.util.internal.TypeParameterMatcher;
* {@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}.
*/
-public abstract class SimpleUserEventChannelHandler implements ChannelInboundHandler {
+public abstract class SimpleUserEventChannelHandler implements ChannelHandler {
private final TypeParameterMatcher matcher;
private final boolean autoRelease;
@@ -83,7 +83,7 @@ public abstract class SimpleUserEventChannelHandler implements ChannelInbound
/**
* Returns {@code true} if the given user event should be handled. If {@code false} it will be passed to the next
- * {@link ChannelInboundHandler} in the {@link ChannelPipeline}.
+ * {@link ChannelHandler} in the {@link ChannelPipeline}.
*/
protected boolean acceptEvent(Object evt) throws Exception {
return matcher.match(evt);
diff --git a/transport/src/main/java/io/netty/channel/group/ChannelGroup.java b/transport/src/main/java/io/netty/channel/group/ChannelGroup.java
index 1fd7f93b5a..96a23d1dc1 100644
--- a/transport/src/main/java/io/netty/channel/group/ChannelGroup.java
+++ b/transport/src/main/java/io/netty/channel/group/ChannelGroup.java
@@ -21,8 +21,8 @@ import io.netty.buffer.ByteBufHolder;
import io.netty.buffer.Unpooled;
import io.netty.channel.Channel;
import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelId;
-import io.netty.channel.ChannelInboundHandler;
import io.netty.channel.EventLoop;
import io.netty.channel.ServerChannel;
import io.netty.util.CharsetUtil;
@@ -82,7 +82,7 @@ import java.util.Set;
* allChannels.close().awaitUninterruptibly();
* }
*
- * public class MyHandler implements {@link ChannelInboundHandler} {
+ * public class MyHandler implements {@link ChannelHandler} {
* {@code @Override}
* public void channelActive({@link ChannelHandlerContext} ctx) {
* // closed on shutdown.
diff --git a/transport/src/main/java/io/netty/channel/socket/ChannelInputShutdownEvent.java b/transport/src/main/java/io/netty/channel/socket/ChannelInputShutdownEvent.java
index c63090976e..935223cc9b 100644
--- a/transport/src/main/java/io/netty/channel/socket/ChannelInputShutdownEvent.java
+++ b/transport/src/main/java/io/netty/channel/socket/ChannelInputShutdownEvent.java
@@ -16,11 +16,11 @@
package io.netty.channel.socket;
import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandler;
+import io.netty.channel.ChannelHandler;
/**
* Special event which will be fired and passed to the
- * {@link ChannelInboundHandler#userEventTriggered(ChannelHandlerContext, Object)} methods once the input of
+ * {@link ChannelHandler#userEventTriggered(ChannelHandlerContext, Object)} methods once the input of
* a {@link SocketChannel} was shutdown and the {@link SocketChannelConfig#isAllowHalfClosure()} method returns
* {@code true}.
*/
diff --git a/transport/src/main/java/io/netty/channel/socket/ChannelOutputShutdownEvent.java b/transport/src/main/java/io/netty/channel/socket/ChannelOutputShutdownEvent.java
index 49d882f92e..02329b1ba8 100644
--- a/transport/src/main/java/io/netty/channel/socket/ChannelOutputShutdownEvent.java
+++ b/transport/src/main/java/io/netty/channel/socket/ChannelOutputShutdownEvent.java
@@ -16,12 +16,12 @@
package io.netty.channel.socket;
import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandler;
+import io.netty.channel.ChannelHandler;
import io.netty.util.internal.UnstableApi;
/**
* Special event which will be fired and passed to the
- * {@link ChannelInboundHandler#userEventTriggered(ChannelHandlerContext, Object)} methods once the output of
+ * {@link ChannelHandler#userEventTriggered(ChannelHandlerContext, Object)} methods once the output of
* a {@link SocketChannel} was shutdown.
*/
@UnstableApi
diff --git a/transport/src/main/java/io/netty/channel/socket/SocketChannelConfig.java b/transport/src/main/java/io/netty/channel/socket/SocketChannelConfig.java
index ecea2d8214..d33f16bee2 100644
--- a/transport/src/main/java/io/netty/channel/socket/SocketChannelConfig.java
+++ b/transport/src/main/java/io/netty/channel/socket/SocketChannelConfig.java
@@ -18,7 +18,7 @@ package io.netty.channel.socket;
import io.netty.buffer.ByteBufAllocator;
import io.netty.channel.ChannelConfig;
import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandler;
+import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelOption;
import io.netty.channel.MessageSizeEstimator;
import io.netty.channel.RecvByteBufAllocator;
@@ -152,7 +152,7 @@ public interface SocketChannelConfig extends ChannelConfig {
* Sets whether the channel should not close itself when its remote peer shuts down output to
* make the connection half-closed. If {@code true} the connection is not closed when the
* remote peer shuts down output. Instead,
- * {@link ChannelInboundHandler#userEventTriggered(ChannelHandlerContext, Object)}
+ * {@link ChannelHandler#userEventTriggered(ChannelHandlerContext, Object)}
* is invoked with a {@link ChannelInputShutdownEvent} object. If {@code false}, the connection
* is closed automatically.
*/
diff --git a/transport/src/test/java/io/netty/bootstrap/ServerBootstrapTest.java b/transport/src/test/java/io/netty/bootstrap/ServerBootstrapTest.java
index cfc6c53f68..a353061ae4 100644
--- a/transport/src/test/java/io/netty/bootstrap/ServerBootstrapTest.java
+++ b/transport/src/test/java/io/netty/bootstrap/ServerBootstrapTest.java
@@ -17,7 +17,6 @@ package io.netty.bootstrap;
import io.netty.channel.Channel;
import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelHandlerAdapter;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInitializer;
import io.netty.channel.MultithreadEventLoopGroup;
@@ -47,7 +46,7 @@ public class ServerBootstrapTest {
sb.channel(LocalServerChannel.class)
.group(group)
.childHandler(new ChannelHandler() { })
- .handler(new ChannelHandlerAdapter() {
+ .handler(new ChannelHandler() {
@Override
public void handlerAdded(ChannelHandlerContext ctx) throws Exception {
try {
diff --git a/transport/src/test/java/io/netty/channel/ChannelInitializerTest.java b/transport/src/test/java/io/netty/channel/ChannelInitializerTest.java
index 65b9e9c7f7..4f82e2d1dd 100644
--- a/transport/src/test/java/io/netty/channel/ChannelInitializerTest.java
+++ b/transport/src/test/java/io/netty/channel/ChannelInitializerTest.java
@@ -251,7 +251,7 @@ public class ChannelInitializerTest {
}
}
- private static final class InspectableHandler extends ChannelDuplexHandler {
+ private static final class InspectableHandler implements ChannelHandler {
final AtomicInteger channelRegisteredCount = new AtomicInteger(0);
@Override
diff --git a/transport/src/test/java/io/netty/channel/CombinedChannelDuplexHandlerTest.java b/transport/src/test/java/io/netty/channel/CombinedChannelDuplexHandlerTest.java
index 0cf5b9c458..32f3b23959 100644
--- a/transport/src/test/java/io/netty/channel/CombinedChannelDuplexHandlerTest.java
+++ b/transport/src/test/java/io/netty/channel/CombinedChannelDuplexHandlerTest.java
@@ -191,7 +191,7 @@ public class CombinedChannelDuplexHandlerTest {
CombinedChannelDuplexHandler handler =
new CombinedChannelDuplexHandler<>(
- inboundHandler, new ChannelOutboundHandler() { });
+ inboundHandler, new ChannelHandler() { });
EmbeddedChannel channel = new EmbeddedChannel(handler);
channel.pipeline().fireChannelWritabilityChanged();
@@ -359,9 +359,9 @@ public class CombinedChannelDuplexHandlerTest {
}
};
EmbeddedChannel ch = new EmbeddedChannel(outboundHandler,
- new CombinedChannelDuplexHandler(
- new ChannelInboundHandler() {
- }, new ChannelOutboundHandler() { }));
+ new CombinedChannelDuplexHandler(
+ new ChannelHandler() {
+ }, new ChannelHandler() { }));
ChannelPipeline pipeline = ch.pipeline();
ChannelPromise promise = ch.newPromise();
@@ -392,7 +392,7 @@ public class CombinedChannelDuplexHandlerTest {
@Test(expected = IllegalStateException.class)
public void testNotSharable() {
- new CombinedChannelDuplexHandler() {
+ new CombinedChannelDuplexHandler() {
@Override
public boolean isSharable() {
return true;
diff --git a/transport/src/test/java/io/netty/channel/DefaultChannelPipelineTest.java b/transport/src/test/java/io/netty/channel/DefaultChannelPipelineTest.java
index 0a09e7b50b..6125296e00 100644
--- a/transport/src/test/java/io/netty/channel/DefaultChannelPipelineTest.java
+++ b/transport/src/test/java/io/netty/channel/DefaultChannelPipelineTest.java
@@ -146,7 +146,7 @@ public class DefaultChannelPipelineTest {
assertTrue(handler.called);
}
- private static final class StringInboundHandler implements ChannelInboundHandler {
+ private static final class StringInboundHandler implements ChannelHandler {
boolean called;
@Override
@@ -946,7 +946,7 @@ public class DefaultChannelPipelineTest {
EmbeddedChannel channel = new EmbeddedChannel(true);
ChannelPipeline pipeline = channel.pipeline();
- final class SkipHandler implements ChannelInboundHandler, ChannelOutboundHandler {
+ final class SkipHandler implements ChannelHandler {
private int state = 2;
private Error errorRef;
@@ -1100,7 +1100,7 @@ public class DefaultChannelPipelineTest {
}
}
- final class OutboundCalledHandler implements ChannelOutboundHandler {
+ final class OutboundCalledHandler implements ChannelHandler {
private static final int MASK_BIND = 1;
private static final int MASK_CONNECT = 1 << 1;
private static final int MASK_DISCONNECT = 1 << 2;
@@ -1197,7 +1197,7 @@ public class DefaultChannelPipelineTest {
}
}
- final class InboundCalledHandler implements ChannelInboundHandler {
+ final class InboundCalledHandler implements ChannelHandler {
private static final int MASK_CHANNEL_REGISTER = 1;
private static final int MASK_CHANNEL_UNREGISTER = 1 << 1;
@@ -1463,7 +1463,7 @@ public class DefaultChannelPipelineTest {
}
}
- private static final class CheckExceptionHandler implements ChannelInboundHandler {
+ private static final class CheckExceptionHandler implements ChannelHandler {
private final Throwable expected;
private final Promise promise;
@@ -1492,7 +1492,7 @@ public class DefaultChannelPipelineTest {
fail("handler was not one of the expected handlers");
}
- private static final class CheckOrderHandler implements ChannelInboundHandler {
+ private static final class CheckOrderHandler implements ChannelHandler {
private final Queue addedQueue;
private final Queue removedQueue;
private final AtomicReference error = new AtomicReference<>();
diff --git a/transport/src/test/java/io/netty/channel/PendingWriteQueueTest.java b/transport/src/test/java/io/netty/channel/PendingWriteQueueTest.java
index 182d1f7de8..8d63c59e7b 100644
--- a/transport/src/test/java/io/netty/channel/PendingWriteQueueTest.java
+++ b/transport/src/test/java/io/netty/channel/PendingWriteQueueTest.java
@@ -193,7 +193,7 @@ public class PendingWriteQueueTest {
private static EmbeddedChannel newChannel() {
// Add a handler so we can access a ChannelHandlerContext via the ChannelPipeline.
- return new EmbeddedChannel(new ChannelHandlerAdapter() { });
+ return new EmbeddedChannel(new ChannelHandler() { });
}
@Test
diff --git a/transport/src/test/java/io/netty/channel/SimpleUserEventChannelHandlerTest.java b/transport/src/test/java/io/netty/channel/SimpleUserEventChannelHandlerTest.java
index 0023a632c2..dcd05fbe1c 100644
--- a/transport/src/test/java/io/netty/channel/SimpleUserEventChannelHandlerTest.java
+++ b/transport/src/test/java/io/netty/channel/SimpleUserEventChannelHandlerTest.java
@@ -85,7 +85,7 @@ public class SimpleUserEventChannelHandlerTest {
}
}
- static final class AllEventCatcher implements ChannelInboundHandler {
+ static final class AllEventCatcher implements ChannelHandler {
public List