diff --git a/transport/src/main/java/io/netty/channel/Channel.java b/transport/src/main/java/io/netty/channel/Channel.java index b849eb241c..39b8417762 100644 --- a/transport/src/main/java/io/netty/channel/Channel.java +++ b/transport/src/main/java/io/netty/channel/Channel.java @@ -226,6 +226,7 @@ public interface Channel extends AttributeMap, ChannelOutboundInvoker, ChannelPr * Deregister the {@link Channel} of the {@link ChannelPromise} from {@link EventLoop} and notify the * {@link ChannelPromise} once the operation was complete. */ + @Deprecated void deregister(ChannelPromise promise); /** diff --git a/transport/src/main/java/io/netty/channel/ChannelHandlerContext.java b/transport/src/main/java/io/netty/channel/ChannelHandlerContext.java index 995d223fd5..4c24ff1cc3 100644 --- a/transport/src/main/java/io/netty/channel/ChannelHandlerContext.java +++ b/transport/src/main/java/io/netty/channel/ChannelHandlerContext.java @@ -161,6 +161,7 @@ public interface ChannelHandlerContext ChannelHandlerContext fireChannelRegistered(); @Override + @Deprecated ChannelHandlerContext fireChannelUnregistered(); @Override diff --git a/transport/src/main/java/io/netty/channel/ChannelInboundHandler.java b/transport/src/main/java/io/netty/channel/ChannelInboundHandler.java index ca81c87f78..4cccc84405 100644 --- a/transport/src/main/java/io/netty/channel/ChannelInboundHandler.java +++ b/transport/src/main/java/io/netty/channel/ChannelInboundHandler.java @@ -28,7 +28,10 @@ public interface ChannelInboundHandler extends ChannelHandler { /** * The {@link Channel} of the {@link ChannelHandlerContext} was unregistered from its {@link EventLoop} + * + * @deprecated use {@link #channelInactive(ChannelHandlerContext)} */ + @Deprecated void channelUnregistered(ChannelHandlerContext ctx) throws Exception; /** diff --git a/transport/src/main/java/io/netty/channel/ChannelInboundInvoker.java b/transport/src/main/java/io/netty/channel/ChannelInboundInvoker.java index 1d87314725..64086f348e 100644 --- a/transport/src/main/java/io/netty/channel/ChannelInboundInvoker.java +++ b/transport/src/main/java/io/netty/channel/ChannelInboundInvoker.java @@ -37,6 +37,7 @@ interface ChannelInboundInvoker { * called of the next {@link ChannelInboundHandler} contained in the {@link ChannelPipeline} of the * {@link Channel}. */ + @Deprecated ChannelInboundInvoker fireChannelUnregistered(); /** diff --git a/transport/src/main/java/io/netty/channel/ChannelOutboundInvoker.java b/transport/src/main/java/io/netty/channel/ChannelOutboundInvoker.java index 3b6a326344..64b5ec64cc 100644 --- a/transport/src/main/java/io/netty/channel/ChannelOutboundInvoker.java +++ b/transport/src/main/java/io/netty/channel/ChannelOutboundInvoker.java @@ -97,7 +97,9 @@ interface ChannelOutboundInvoker { * {@link ChannelOutboundHandler#deregister(ChannelHandlerContext, ChannelPromise)} * method called of the next {@link ChannelOutboundHandler} contained in the {@link ChannelPipeline} of the * {@link Channel}. + * */ + @Deprecated ChannelFuture deregister(); /** @@ -185,6 +187,7 @@ interface ChannelOutboundInvoker { * method called of the next {@link ChannelOutboundHandler} contained in the {@link ChannelPipeline} of the * {@link Channel}. */ + @Deprecated ChannelFuture deregister(ChannelPromise promise); /** diff --git a/transport/src/main/java/io/netty/channel/ChannelPipeline.java b/transport/src/main/java/io/netty/channel/ChannelPipeline.java index c7a86fa0d4..f8e07bc9ee 100644 --- a/transport/src/main/java/io/netty/channel/ChannelPipeline.java +++ b/transport/src/main/java/io/netty/channel/ChannelPipeline.java @@ -598,6 +598,7 @@ public interface ChannelPipeline ChannelPipeline fireChannelRegistered(); @Override + @Deprecated ChannelPipeline fireChannelUnregistered(); @Override 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 91348582f7..88c7ab9c75 100644 --- a/transport/src/main/java/io/netty/channel/group/ChannelGroup.java +++ b/transport/src/main/java/io/netty/channel/group/ChannelGroup.java @@ -206,6 +206,7 @@ public interface ChannelGroup extends Set, Comparable { * @return the {@link ChannelGroupFuture} instance that notifies when * the operation is done for all channels */ + @Deprecated ChannelGroupFuture deregister(); /** @@ -215,5 +216,6 @@ public interface ChannelGroup extends Set, Comparable { * @return the {@link ChannelGroupFuture} instance that notifies when * the operation is done for all channels */ + @Deprecated ChannelGroupFuture deregister(ChannelMatcher matcher); }