Skip to content

Commit 76eb40a

Browse files
trustintrustin
committed
Make ChannelOutboundMessageHandlerAdapter similar to ChannelInboundMessageHandlerAdapter
1 parent 1640b1f commit 76eb40a

26 files changed

Lines changed: 222 additions & 293 deletions

‎codec-http/src/main/java/io/netty/handler/codec/http/HttpObjectEncoder.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,6 @@ public abstract class HttpObjectEncoder<H extends HttpMessage> extends MessageTo
4848
@SuppressWarnings("RedundantFieldInitialization")
4949
private int state = ST_INIT;
5050

51-
/**
52-
* Creates a new instance.
53-
*/
54-
protected HttpObjectEncoder() {
55-
super(HttpObject.class);
56-
}
57-
5851
@Override
5952
protected void encode(ChannelHandlerContext ctx, HttpObject msg, ByteBuf out) throws Exception {
6053
if (msg instanceof HttpMessage) {

‎codec-http/src/main/java/io/netty/handler/codec/http/HttpRequestEncoder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ public class HttpRequestEncoder extends HttpObjectEncoder<HttpRequest> {
2828
private static final char SLASH = '/';
2929

3030
@Override
31-
public boolean isEncodable(Object msg) throws Exception {
32-
return super.isEncodable(msg) && !(msg instanceof HttpResponse);
31+
public boolean acceptOutboundMessage(Object msg) throws Exception {
32+
return super.acceptOutboundMessage(msg) && !(msg instanceof HttpResponse);
3333
}
3434

3535
@Override

‎codec-http/src/main/java/io/netty/handler/codec/http/HttpResponseEncoder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
public class HttpResponseEncoder extends HttpObjectEncoder<HttpResponse> {
2828

2929
@Override
30-
public boolean isEncodable(Object msg) throws Exception {
31-
return super.isEncodable(msg) && !(msg instanceof HttpRequest);
30+
public boolean acceptOutboundMessage(Object msg) throws Exception {
31+
return super.acceptOutboundMessage(msg) && !(msg instanceof HttpRequest);
3232
}
3333

3434
@Override

‎codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket00FrameEncoder.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,8 @@
3232
@Sharable
3333
public class WebSocket00FrameEncoder extends MessageToByteEncoder<WebSocketFrame> {
3434

35-
public WebSocket00FrameEncoder() {
36-
super(WebSocketFrame.class);
37-
}
38-
3935
@Override
40-
public void encode(
41-
ChannelHandlerContext ctx,
42-
WebSocketFrame msg, ByteBuf out) throws Exception {
36+
public void encode(ChannelHandlerContext ctx, WebSocketFrame msg, ByteBuf out) throws Exception {
4337
if (msg instanceof TextWebSocketFrame) {
4438
// Text frame
4539
ByteBuf data = msg.data();

‎codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameEncoder.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,11 @@ public class WebSocket08FrameEncoder extends MessageToByteEncoder<WebSocketFrame
9090
* false.
9191
*/
9292
public WebSocket08FrameEncoder(boolean maskPayload) {
93-
super(WebSocketFrame.class);
9493
this.maskPayload = maskPayload;
9594
}
9695

9796
@Override
98-
public void encode(
99-
ChannelHandlerContext ctx, WebSocketFrame msg, ByteBuf out) throws Exception {
97+
protected void encode(ChannelHandlerContext ctx, WebSocketFrame msg, ByteBuf out) throws Exception {
10098

10199
byte[] mask;
102100

‎codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspObjectEncoder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ protected RtspObjectEncoder() {
3838
}
3939

4040
@Override
41-
public boolean isEncodable(Object msg) throws Exception {
41+
public boolean acceptOutboundMessage(Object msg) throws Exception {
4242
return msg instanceof FullHttpMessage;
4343
}
4444
}

‎codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspRequestEncoder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
public class RtspRequestEncoder extends RtspObjectEncoder<HttpRequest> {
2929

3030
@Override
31-
public boolean isEncodable(Object msg) throws Exception {
31+
public boolean acceptOutboundMessage(Object msg) throws Exception {
3232
return msg instanceof FullHttpRequest;
3333
}
3434

‎codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspResponseEncoder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
public class RtspResponseEncoder extends RtspObjectEncoder<HttpResponse> {
2929

3030
@Override
31-
public boolean isEncodable(Object msg) throws Exception {
31+
public boolean acceptOutboundMessage(Object msg) throws Exception {
3232
return msg instanceof FullHttpResponse;
3333
}
3434

‎codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyFrameEncoder.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ public SpdyFrameEncoder(int version) {
5050
* Creates a new instance with the specified parameters.
5151
*/
5252
public SpdyFrameEncoder(int version, int compressionLevel, int windowBits, int memLevel) {
53-
super(SpdyDataFrame.class, SpdyControlFrame.class);
54-
5553
if (version < SpdyConstants.SPDY_MIN_VERSION || version > SpdyConstants.SPDY_MAX_VERSION) {
5654
throw new IllegalArgumentException(
5755
"unknown version: " + version);
@@ -61,6 +59,11 @@ public SpdyFrameEncoder(int version, int compressionLevel, int windowBits, int m
6159
version, compressionLevel, windowBits, memLevel);
6260
}
6361

62+
@Override
63+
public boolean acceptOutboundMessage(Object msg) throws Exception {
64+
return msg instanceof SpdyDataFrame || msg instanceof SpdyControlFrame;
65+
}
66+
6467
@Override
6568
public void beforeAdd(ChannelHandlerContext ctx) throws Exception {
6669
ctx.channel().closeFuture().addListener(new ChannelFutureListener() {

‎codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHttpEncoder.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,6 @@ public class SpdyHttpEncoder extends MessageToMessageEncoder<HttpObject> {
131131
* @param version the protocol version
132132
*/
133133
public SpdyHttpEncoder(int version) {
134-
super(HttpObject.class);
135-
136134
if (version < SpdyConstants.SPDY_MIN_VERSION || version > SpdyConstants.SPDY_MAX_VERSION) {
137135
throw new IllegalArgumentException(
138136
"unsupported version: " + version);

0 commit comments

Comments
 (0)