From 41e03adf249ee9d23938fecf9be980a096710b36 Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Wed, 11 Nov 2015 10:32:03 -0800 Subject: [PATCH] Mark ChannelHandler.exceptionCaught(...) as deprected. Motivation: exceptionCaught(...) will only handle inbound exceptions which means it makes not much sense to have it also on ChannelOutboundHandler. Because of this we should move it to ChannelInboundHandler. Modifications: Add @deprecated annotation to ChannelHandler.exceptionCaught(...). Result: Preapre to cleanup the API in later release. --- transport/src/main/java/io/netty/channel/ChannelHandler.java | 3 +++ .../src/main/java/io/netty/channel/ChannelInboundHandler.java | 1 + 2 files changed, 4 insertions(+) diff --git a/transport/src/main/java/io/netty/channel/ChannelHandler.java b/transport/src/main/java/io/netty/channel/ChannelHandler.java index e99b78781f..898f7523bc 100644 --- a/transport/src/main/java/io/netty/channel/ChannelHandler.java +++ b/transport/src/main/java/io/netty/channel/ChannelHandler.java @@ -192,7 +192,10 @@ public interface ChannelHandler { /** * Gets called if a {@link Throwable} was thrown. + * + * @deprecated is part of {@link ChannelInboundHandler} */ + @Deprecated void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception; /** diff --git a/transport/src/main/java/io/netty/channel/ChannelInboundHandler.java b/transport/src/main/java/io/netty/channel/ChannelInboundHandler.java index 56693593f5..b70880ee28 100644 --- a/transport/src/main/java/io/netty/channel/ChannelInboundHandler.java +++ b/transport/src/main/java/io/netty/channel/ChannelInboundHandler.java @@ -70,5 +70,6 @@ public interface ChannelInboundHandler extends ChannelHandler { * Gets called if a {@link Throwable} was thrown. */ @Override + @SuppressWarnings("deprecated") void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception; }