diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpChunkAggregator.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpChunkAggregator.java index f32963f308..b01f778fa0 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpChunkAggregator.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpChunkAggregator.java @@ -110,7 +110,7 @@ public class HttpChunkAggregator extends MessageToMessageDecoder { } @Override - public void encode(ChannelHandlerContext ctx, Object msg, ByteBuf out) throws Exception { + protected void encode(ChannelHandlerContext ctx, Object msg, ByteBuf out) throws Exception { if (msg instanceof HttpMessage) { HttpMessage m = (HttpMessage) msg; HttpTransferEncoding te = m.getTransferEncoding(); diff --git a/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspMessageDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspMessageDecoder.java index fbd5db0613..40f1f149a4 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspMessageDecoder.java +++ b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspMessageDecoder.java @@ -74,7 +74,7 @@ public abstract class RtspMessageDecoder extends HttpMessageDecoder { } @Override - public Object decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Exception { + protected Object decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Exception { Object o = super.decode(ctx, buffer); if (o != null && aggregator.writeInbound(o)) { return aggregator.readInbound(); diff --git a/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspMessageEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspMessageEncoder.java index 88a7e7a7a4..2e9d943c61 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspMessageEncoder.java +++ b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspMessageEncoder.java @@ -39,7 +39,7 @@ public abstract class RtspMessageEncoder extends HttpMessageEncoder { } @Override - public void encode(ChannelHandlerContext ctx, Object msg, + protected void encode(ChannelHandlerContext ctx, Object msg, ByteBuf out) throws Exception { // Ignore unrelated message types such as HttpChunk. if (!(msg instanceof HttpMessage)) { diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyFrameDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyFrameDecoder.java index 264e8da625..08d15c04f9 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyFrameDecoder.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyFrameDecoder.java @@ -101,7 +101,7 @@ public class SpdyFrameDecoder extends ByteToMessageDecoder { } @Override - public Object decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Exception { + protected Object decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Exception { switch(state) { case READ_COMMON_HEADER: state = readCommonHeader(buffer); diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyFrameEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyFrameEncoder.java index cc3842e9ea..61d72b4ee5 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyFrameEncoder.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyFrameEncoder.java @@ -78,7 +78,7 @@ public class SpdyFrameEncoder extends MessageToByteEncoder { } @Override - public void encode(ChannelHandlerContext ctx, Object msg, ByteBuf out) throws Exception { + protected void encode(ChannelHandlerContext ctx, Object msg, ByteBuf out) throws Exception { if (msg instanceof SpdyDataFrame) { SpdyDataFrame spdyDataFrame = (SpdyDataFrame) msg; diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHttpResponseStreamIdHandler.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHttpResponseStreamIdHandler.java index 883f8a91d8..1879daf5dd 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHttpResponseStreamIdHandler.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHttpResponseStreamIdHandler.java @@ -38,7 +38,7 @@ public class SpdyHttpResponseStreamIdHandler extends } @Override - public HttpMessage encode(ChannelHandlerContext ctx, HttpMessage msg) throws Exception { + protected HttpMessage encode(ChannelHandlerContext ctx, HttpMessage msg) throws Exception { Integer id = ids.poll(); if (id != null && id.intValue() != NO_ID && !msg.containsHeader(SpdyHttpHeaders.Names.STREAM_ID)) { SpdyHttpHeaders.setStreamId(msg, id); @@ -47,7 +47,7 @@ public class SpdyHttpResponseStreamIdHandler extends } @Override - public Object decode(ChannelHandlerContext ctx, Object msg) throws Exception { + protected Object decode(ChannelHandlerContext ctx, Object msg) throws Exception { if (msg instanceof HttpMessage) { boolean contains = ((HttpMessage) msg).containsHeader(SpdyHttpHeaders.Names.STREAM_ID); if (!contains) { diff --git a/codec/src/main/java/io/netty/handler/codec/ByteToByteCodec.java b/codec/src/main/java/io/netty/handler/codec/ByteToByteCodec.java index 0453ca3b3f..646a19b249 100644 --- a/codec/src/main/java/io/netty/handler/codec/ByteToByteCodec.java +++ b/codec/src/main/java/io/netty/handler/codec/ByteToByteCodec.java @@ -109,14 +109,14 @@ public abstract class ByteToByteCodec /** * @see {@link ByteToByteEncoder#encode(ChannelHandlerContext, ByteBuf, ByteBuf)} */ - public abstract void encode( + protected abstract void encode( ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) throws Exception; /** * @see {@link ByteToByteDecoder#decode(ChannelHandlerContext, ByteBuf, ByteBuf)} */ - public abstract void decode( + protected abstract void decode( ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) throws Exception; } diff --git a/codec/src/main/java/io/netty/handler/codec/ByteToByteDecoder.java b/codec/src/main/java/io/netty/handler/codec/ByteToByteDecoder.java index 38a12a7d45..b51e2ba29c 100644 --- a/codec/src/main/java/io/netty/handler/codec/ByteToByteDecoder.java +++ b/codec/src/main/java/io/netty/handler/codec/ByteToByteDecoder.java @@ -111,7 +111,7 @@ public abstract class ByteToByteDecoder extends ChannelInboundByteHandlerAdapter * @param out the {@link ByteBuf} to which the decoded data will be written * @throws Exception is thrown if an error accour */ - public abstract void decode(ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) throws Exception; + protected abstract void decode(ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) throws Exception; /** * Is called one last time when the {@link ChannelHandlerContext} goes in-active. Which means the @@ -120,7 +120,7 @@ public abstract class ByteToByteDecoder extends ChannelInboundByteHandlerAdapter * By default this will just call {@link #decode(ChannelHandlerContext, ByteBuf, ByteBuf)} but sub-classes may * override this for some special cleanup operation. */ - public void decodeLast(ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) throws Exception { + protected void decodeLast(ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) throws Exception { decode(ctx, in, out); } } diff --git a/codec/src/main/java/io/netty/handler/codec/ByteToByteEncoder.java b/codec/src/main/java/io/netty/handler/codec/ByteToByteEncoder.java index a98f547e54..48e569bc28 100644 --- a/codec/src/main/java/io/netty/handler/codec/ByteToByteEncoder.java +++ b/codec/src/main/java/io/netty/handler/codec/ByteToByteEncoder.java @@ -79,5 +79,5 @@ public abstract class ByteToByteEncoder extends ChannelOutboundByteHandlerAdapte * @param out the {@link ByteBuf} to which the decoded data will be written * @throws Exception is thrown if an error accour */ - public abstract void encode(ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) throws Exception; + protected abstract void encode(ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) throws Exception; } diff --git a/codec/src/main/java/io/netty/handler/codec/ByteToMessageCodec.java b/codec/src/main/java/io/netty/handler/codec/ByteToMessageCodec.java index a7420b6502..8252882a40 100644 --- a/codec/src/main/java/io/netty/handler/codec/ByteToMessageCodec.java +++ b/codec/src/main/java/io/netty/handler/codec/ByteToMessageCodec.java @@ -80,10 +80,10 @@ public abstract class ByteToMessageCodec encoder.freeOutboundBuffer(ctx, buf); } - public abstract void encode( + protected abstract void encode( ChannelHandlerContext ctx, OUTBOUND_IN msg, ByteBuf out) throws Exception; - public abstract INBOUND_OUT decode( + protected abstract INBOUND_OUT decode( ChannelHandlerContext ctx, ByteBuf in) throws Exception; } diff --git a/codec/src/main/java/io/netty/handler/codec/ByteToMessageDecoder.java b/codec/src/main/java/io/netty/handler/codec/ByteToMessageDecoder.java index fdd2b70439..8ab106efe9 100644 --- a/codec/src/main/java/io/netty/handler/codec/ByteToMessageDecoder.java +++ b/codec/src/main/java/io/netty/handler/codec/ByteToMessageDecoder.java @@ -166,7 +166,7 @@ public abstract class ByteToMessageDecoder * there was not enough data left in the {@link ByteBuf} to decode. * @throws Exception is thrown if an error accour */ - public abstract O decode(ChannelHandlerContext ctx, ByteBuf in) throws Exception; + protected abstract O decode(ChannelHandlerContext ctx, ByteBuf in) throws Exception; /** * Is called one last time when the {@link ChannelHandlerContext} goes in-active. Which means the @@ -175,7 +175,7 @@ public abstract class ByteToMessageDecoder * By default this will just call {@link #decode(ChannelHandlerContext, ByteBuf)} but sub-classes may * override this for some special cleanup operation. */ - public O decodeLast(ChannelHandlerContext ctx, ByteBuf in) throws Exception { + protected O decodeLast(ChannelHandlerContext ctx, ByteBuf in) throws Exception { return decode(ctx, in); } } diff --git a/codec/src/main/java/io/netty/handler/codec/DelimiterBasedFrameDecoder.java b/codec/src/main/java/io/netty/handler/codec/DelimiterBasedFrameDecoder.java index 0e32e6d412..374d85d7af 100644 --- a/codec/src/main/java/io/netty/handler/codec/DelimiterBasedFrameDecoder.java +++ b/codec/src/main/java/io/netty/handler/codec/DelimiterBasedFrameDecoder.java @@ -209,8 +209,9 @@ public class DelimiterBasedFrameDecoder extends ByteToMessageDecoder { private boolean isSubclass() { return getClass() != DelimiterBasedFrameDecoder.class; } + @Override - public Object decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Exception { + protected Object decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Exception { if (lineBasedDecoder != null) { return lineBasedDecoder.decode(ctx, buffer); } diff --git a/codec/src/main/java/io/netty/handler/codec/FixedLengthFrameDecoder.java b/codec/src/main/java/io/netty/handler/codec/FixedLengthFrameDecoder.java index 815377f165..35af3d0f2b 100644 --- a/codec/src/main/java/io/netty/handler/codec/FixedLengthFrameDecoder.java +++ b/codec/src/main/java/io/netty/handler/codec/FixedLengthFrameDecoder.java @@ -74,7 +74,7 @@ public class FixedLengthFrameDecoder extends ByteToMessageDecoder { } @Override - public Object decode(ChannelHandlerContext ctx, ByteBuf in) throws Exception { + protected Object decode(ChannelHandlerContext ctx, ByteBuf in) throws Exception { if (in.readableBytes() < frameLength) { return null; } else { diff --git a/codec/src/main/java/io/netty/handler/codec/LengthFieldBasedFrameDecoder.java b/codec/src/main/java/io/netty/handler/codec/LengthFieldBasedFrameDecoder.java index 90cc0cdf52..560701c9ff 100644 --- a/codec/src/main/java/io/netty/handler/codec/LengthFieldBasedFrameDecoder.java +++ b/codec/src/main/java/io/netty/handler/codec/LengthFieldBasedFrameDecoder.java @@ -307,7 +307,7 @@ public class LengthFieldBasedFrameDecoder extends ByteToMessageDecoder { } @Override - public Object decode(ChannelHandlerContext ctx, ByteBuf in) throws Exception { + protected Object decode(ChannelHandlerContext ctx, ByteBuf in) throws Exception { if (discardingTooLongFrame) { long bytesToDiscard = this.bytesToDiscard; int localBytesToDiscard = (int) Math.min(bytesToDiscard, in.readableBytes()); diff --git a/codec/src/main/java/io/netty/handler/codec/LengthFieldPrepender.java b/codec/src/main/java/io/netty/handler/codec/LengthFieldPrepender.java index a7c5d050b3..17165aa50e 100644 --- a/codec/src/main/java/io/netty/handler/codec/LengthFieldPrepender.java +++ b/codec/src/main/java/io/netty/handler/codec/LengthFieldPrepender.java @@ -95,7 +95,7 @@ public class LengthFieldPrepender extends MessageToByteEncoder { } @Override - public void encode( + protected void encode( ChannelHandlerContext ctx, ByteBuf msg, ByteBuf out) throws Exception { diff --git a/codec/src/main/java/io/netty/handler/codec/LineBasedFrameDecoder.java b/codec/src/main/java/io/netty/handler/codec/LineBasedFrameDecoder.java index 7fbee8f9b1..143f7f64e0 100644 --- a/codec/src/main/java/io/netty/handler/codec/LineBasedFrameDecoder.java +++ b/codec/src/main/java/io/netty/handler/codec/LineBasedFrameDecoder.java @@ -67,7 +67,7 @@ public class LineBasedFrameDecoder extends ByteToMessageDecoder { } @Override - public ByteBuf decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Exception { + protected ByteBuf decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Exception { final int eol = findEndOfLine(buffer); if (eol != -1) { diff --git a/codec/src/main/java/io/netty/handler/codec/MessageToByteEncoder.java b/codec/src/main/java/io/netty/handler/codec/MessageToByteEncoder.java index 5a5a8257a1..da71dadf96 100644 --- a/codec/src/main/java/io/netty/handler/codec/MessageToByteEncoder.java +++ b/codec/src/main/java/io/netty/handler/codec/MessageToByteEncoder.java @@ -104,5 +104,5 @@ public abstract class MessageToByteEncoder extends ChannelOutboundMessageHand * @param out the {@link ByteBuf} into which the encoded message will be written * @throws Exception is thrown if an error accour */ - public abstract void encode(ChannelHandlerContext ctx, I msg, ByteBuf out) throws Exception; + protected abstract void encode(ChannelHandlerContext ctx, I msg, ByteBuf out) throws Exception; } diff --git a/codec/src/main/java/io/netty/handler/codec/MessageToMessageCodec.java b/codec/src/main/java/io/netty/handler/codec/MessageToMessageCodec.java index 409397b0d4..5d2a5c791b 100644 --- a/codec/src/main/java/io/netty/handler/codec/MessageToMessageCodec.java +++ b/codec/src/main/java/io/netty/handler/codec/MessageToMessageCodec.java @@ -142,6 +142,6 @@ public abstract class MessageToMessageCodec * needs to do some kind of aggragation * @throws Exception is thrown if an error accour */ - public abstract O decode(ChannelHandlerContext ctx, I msg) throws Exception; + protected abstract O decode(ChannelHandlerContext ctx, I msg) throws Exception; } diff --git a/codec/src/main/java/io/netty/handler/codec/MessageToMessageEncoder.java b/codec/src/main/java/io/netty/handler/codec/MessageToMessageEncoder.java index c1aaf6dafa..22a06f4fd7 100644 --- a/codec/src/main/java/io/netty/handler/codec/MessageToMessageEncoder.java +++ b/codec/src/main/java/io/netty/handler/codec/MessageToMessageEncoder.java @@ -111,5 +111,5 @@ public abstract class MessageToMessageEncoder extends ChannelOutboundMessa * needs to do some kind of aggragation * @throws Exception is thrown if an error accour */ - public abstract O encode(ChannelHandlerContext ctx, I msg) throws Exception; + protected abstract O encode(ChannelHandlerContext ctx, I msg) throws Exception; } diff --git a/codec/src/main/java/io/netty/handler/codec/base64/Base64Decoder.java b/codec/src/main/java/io/netty/handler/codec/base64/Base64Decoder.java index e820483a4d..9f17f5ffbf 100644 --- a/codec/src/main/java/io/netty/handler/codec/base64/Base64Decoder.java +++ b/codec/src/main/java/io/netty/handler/codec/base64/Base64Decoder.java @@ -62,7 +62,7 @@ public class Base64Decoder extends MessageToMessageDecoder { } @Override - public ByteBuf decode(ChannelHandlerContext ctx, ByteBuf msg) throws Exception { + protected ByteBuf decode(ChannelHandlerContext ctx, ByteBuf msg) throws Exception { return Base64.decode(msg, msg.readerIndex(), msg.readableBytes(), dialect); } } diff --git a/codec/src/main/java/io/netty/handler/codec/base64/Base64Encoder.java b/codec/src/main/java/io/netty/handler/codec/base64/Base64Encoder.java index 8d95fc9fba..72cdae1030 100644 --- a/codec/src/main/java/io/netty/handler/codec/base64/Base64Encoder.java +++ b/codec/src/main/java/io/netty/handler/codec/base64/Base64Encoder.java @@ -65,7 +65,7 @@ public class Base64Encoder extends MessageToMessageEncoder { } @Override - public ByteBuf encode(ChannelHandlerContext ctx, + protected ByteBuf encode(ChannelHandlerContext ctx, ByteBuf msg) throws Exception { return Base64.encode(msg, msg.readerIndex(), msg.readableBytes(), breakLines, dialect); } diff --git a/codec/src/main/java/io/netty/handler/codec/bytes/ByteArrayDecoder.java b/codec/src/main/java/io/netty/handler/codec/bytes/ByteArrayDecoder.java index 444e0df434..aea2defc48 100644 --- a/codec/src/main/java/io/netty/handler/codec/bytes/ByteArrayDecoder.java +++ b/codec/src/main/java/io/netty/handler/codec/bytes/ByteArrayDecoder.java @@ -53,7 +53,7 @@ public class ByteArrayDecoder extends MessageToMessageDecoder { } @Override - public byte[] decode(ChannelHandlerContext ctx, ByteBuf msg) throws Exception { + protected byte[] decode(ChannelHandlerContext ctx, ByteBuf msg) throws Exception { byte[] array; if (msg.hasArray()) { if (msg.arrayOffset() == 0 && msg.readableBytes() == msg.capacity()) { diff --git a/codec/src/main/java/io/netty/handler/codec/bytes/ByteArrayEncoder.java b/codec/src/main/java/io/netty/handler/codec/bytes/ByteArrayEncoder.java index f36b9c3a27..113cde860d 100644 --- a/codec/src/main/java/io/netty/handler/codec/bytes/ByteArrayEncoder.java +++ b/codec/src/main/java/io/netty/handler/codec/bytes/ByteArrayEncoder.java @@ -60,7 +60,7 @@ public class ByteArrayEncoder extends MessageToMessageEncoder { } @Override - public ByteBuf encode(ChannelHandlerContext ctx, byte[] msg) throws Exception { + protected ByteBuf encode(ChannelHandlerContext ctx, byte[] msg) throws Exception { if (msg.length == 0) { return null; } diff --git a/codec/src/main/java/io/netty/handler/codec/compression/JZlibDecoder.java b/codec/src/main/java/io/netty/handler/codec/compression/JZlibDecoder.java index ddd12a527a..0e606a9d52 100644 --- a/codec/src/main/java/io/netty/handler/codec/compression/JZlibDecoder.java +++ b/codec/src/main/java/io/netty/handler/codec/compression/JZlibDecoder.java @@ -81,7 +81,7 @@ public class JZlibDecoder extends ZlibDecoder { } @Override - public void decode( + protected void decode( ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) throws Exception { diff --git a/codec/src/main/java/io/netty/handler/codec/compression/JZlibEncoder.java b/codec/src/main/java/io/netty/handler/codec/compression/JZlibEncoder.java index 39b2d8bf09..19b58c6de3 100644 --- a/codec/src/main/java/io/netty/handler/codec/compression/JZlibEncoder.java +++ b/codec/src/main/java/io/netty/handler/codec/compression/JZlibEncoder.java @@ -265,7 +265,7 @@ public class JZlibEncoder extends ZlibEncoder { } @Override - public void encode(ChannelHandlerContext ctx, + protected void encode(ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) throws Exception { if (finished.get()) { return; diff --git a/codec/src/main/java/io/netty/handler/codec/compression/JdkZlibEncoder.java b/codec/src/main/java/io/netty/handler/codec/compression/JdkZlibEncoder.java index 74e40494c6..cb11401df5 100644 --- a/codec/src/main/java/io/netty/handler/codec/compression/JdkZlibEncoder.java +++ b/codec/src/main/java/io/netty/handler/codec/compression/JdkZlibEncoder.java @@ -177,7 +177,7 @@ public class JdkZlibEncoder extends ZlibEncoder { } @Override - public void encode(ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) throws Exception { + protected void encode(ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) throws Exception { if (finished.get()) { out.writeBytes(in); in.discardReadBytes(); diff --git a/codec/src/main/java/io/netty/handler/codec/compression/SnappyFramedDecoder.java b/codec/src/main/java/io/netty/handler/codec/compression/SnappyFramedDecoder.java index 0d24ab10db..6060692c9c 100644 --- a/codec/src/main/java/io/netty/handler/codec/compression/SnappyFramedDecoder.java +++ b/codec/src/main/java/io/netty/handler/codec/compression/SnappyFramedDecoder.java @@ -69,7 +69,7 @@ public class SnappyFramedDecoder extends ByteToByteDecoder { } @Override - public void decode(ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) throws Exception { + protected void decode(ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) throws Exception { if (!in.readable()) { return; } diff --git a/codec/src/main/java/io/netty/handler/codec/compression/SnappyFramedEncoder.java b/codec/src/main/java/io/netty/handler/codec/compression/SnappyFramedEncoder.java index 4e6a5b1502..ea9eaea0a8 100644 --- a/codec/src/main/java/io/netty/handler/codec/compression/SnappyFramedEncoder.java +++ b/codec/src/main/java/io/netty/handler/codec/compression/SnappyFramedEncoder.java @@ -46,7 +46,7 @@ public class SnappyFramedEncoder extends ByteToByteEncoder { private boolean started; @Override - public void encode(ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) throws Exception { + protected void encode(ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) throws Exception { if (!in.readable()) { return; } diff --git a/codec/src/main/java/io/netty/handler/codec/marshalling/CompatibleMarshallingDecoder.java b/codec/src/main/java/io/netty/handler/codec/marshalling/CompatibleMarshallingDecoder.java index ace89b806b..c57f53517e 100644 --- a/codec/src/main/java/io/netty/handler/codec/marshalling/CompatibleMarshallingDecoder.java +++ b/codec/src/main/java/io/netty/handler/codec/marshalling/CompatibleMarshallingDecoder.java @@ -54,7 +54,7 @@ public class CompatibleMarshallingDecoder extends ReplayingDecoder } @Override - public Object decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Exception { + protected Object decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Exception { if (discardingTooLongFrame) { buffer.skipBytes(actualReadableBytes()); checkpoint(); @@ -82,7 +82,7 @@ public class CompatibleMarshallingDecoder extends ReplayingDecoder } @Override - public Object decodeLast(ChannelHandlerContext ctx, ByteBuf buffer) throws Exception { + protected Object decodeLast(ChannelHandlerContext ctx, ByteBuf buffer) throws Exception { switch (buffer.readableBytes()) { case 0: return null; diff --git a/codec/src/main/java/io/netty/handler/codec/marshalling/CompatibleMarshallingEncoder.java b/codec/src/main/java/io/netty/handler/codec/marshalling/CompatibleMarshallingEncoder.java index a7a53e411e..e4466e2850 100644 --- a/codec/src/main/java/io/netty/handler/codec/marshalling/CompatibleMarshallingEncoder.java +++ b/codec/src/main/java/io/netty/handler/codec/marshalling/CompatibleMarshallingEncoder.java @@ -48,7 +48,7 @@ public class CompatibleMarshallingEncoder extends MessageToByteEncoder { } @Override - public void encode(ChannelHandlerContext ctx, Object msg, ByteBuf out) throws Exception { + protected void encode(ChannelHandlerContext ctx, Object msg, ByteBuf out) throws Exception { Marshaller marshaller = provider.getMarshaller(ctx); marshaller.start(new ChannelBufferByteOutput(out)); marshaller.writeObject(msg); diff --git a/codec/src/main/java/io/netty/handler/codec/marshalling/MarshallingDecoder.java b/codec/src/main/java/io/netty/handler/codec/marshalling/MarshallingDecoder.java index 1dcb9eb773..a86e56b35b 100644 --- a/codec/src/main/java/io/netty/handler/codec/marshalling/MarshallingDecoder.java +++ b/codec/src/main/java/io/netty/handler/codec/marshalling/MarshallingDecoder.java @@ -59,7 +59,7 @@ public class MarshallingDecoder extends LengthFieldBasedFrameDecoder { } @Override - public Object decode(ChannelHandlerContext ctx, ByteBuf in) throws Exception { + protected Object decode(ChannelHandlerContext ctx, ByteBuf in) throws Exception { ByteBuf frame = (ByteBuf) super.decode(ctx, in); if (frame == null) { return null; diff --git a/codec/src/main/java/io/netty/handler/codec/marshalling/MarshallingEncoder.java b/codec/src/main/java/io/netty/handler/codec/marshalling/MarshallingEncoder.java index 6539d6556e..4068c72622 100644 --- a/codec/src/main/java/io/netty/handler/codec/marshalling/MarshallingEncoder.java +++ b/codec/src/main/java/io/netty/handler/codec/marshalling/MarshallingEncoder.java @@ -50,7 +50,7 @@ public class MarshallingEncoder extends MessageToByteEncoder { } @Override - public void encode(ChannelHandlerContext ctx, Object msg, ByteBuf out) throws Exception { + protected void encode(ChannelHandlerContext ctx, Object msg, ByteBuf out) throws Exception { Marshaller marshaller = provider.getMarshaller(ctx); int lengthPos = out.writerIndex(); out.writeBytes(LENGTH_PLACEHOLDER); diff --git a/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufDecoder.java b/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufDecoder.java index 8c42308ba5..ecc2ca6332 100644 --- a/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufDecoder.java +++ b/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufDecoder.java @@ -84,7 +84,7 @@ public class ProtobufDecoder extends MessageToMessageDecoder { } @Override - public ByteBuf encode(ChannelHandlerContext ctx, Object msg) throws Exception { + protected ByteBuf encode(ChannelHandlerContext ctx, Object msg) throws Exception { if (msg instanceof MessageLite) { return wrappedBuffer(((MessageLite) msg).toByteArray()); } diff --git a/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoder.java b/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoder.java index a71d9af88f..f3f656f119 100644 --- a/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoder.java +++ b/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoder.java @@ -43,7 +43,7 @@ public class ProtobufVarint32FrameDecoder extends ByteToMessageDecoder { // (just like LengthFieldBasedFrameDecoder) @Override - public Object decode(ChannelHandlerContext ctx, ByteBuf in) throws Exception { + protected Object decode(ChannelHandlerContext ctx, ByteBuf in) throws Exception { in.markReaderIndex(); final byte[] buf = new byte[5]; for (int i = 0; i < buf.length; i ++) { diff --git a/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrepender.java b/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrepender.java index 0a5c89f120..be984d02fc 100644 --- a/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrepender.java +++ b/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrepender.java @@ -48,7 +48,7 @@ public class ProtobufVarint32LengthFieldPrepender extends MessageToByteEncoder fragments = new HashMap(); @Override - public void messageReceived(ChannelHandlerContext ctx, SctpMessage msg) throws Exception { + protected void messageReceived(ChannelHandlerContext ctx, SctpMessage msg) throws Exception { final ByteBuf byteBuf = msg.getPayloadBuffer(); final int protocolIdentifier = msg.getProtocolIdentifier(); diff --git a/codec/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectEncoder.java b/codec/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectEncoder.java index 2871c4f240..e62787106e 100644 --- a/codec/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectEncoder.java +++ b/codec/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectEncoder.java @@ -78,7 +78,7 @@ public class CompatibleObjectEncoder extends MessageToByteEncoder { } @Override - public void encode(ChannelHandlerContext ctx, Object msg, ByteBuf out) throws Exception { + protected void encode(ChannelHandlerContext ctx, Object msg, ByteBuf out) throws Exception { Attribute oosAttr = ctx.attr(OOS); ObjectOutputStream oos = oosAttr.get(); if (oos == null) { diff --git a/codec/src/main/java/io/netty/handler/codec/serialization/ObjectDecoder.java b/codec/src/main/java/io/netty/handler/codec/serialization/ObjectDecoder.java index 8394b05ecf..28e2414a7d 100644 --- a/codec/src/main/java/io/netty/handler/codec/serialization/ObjectDecoder.java +++ b/codec/src/main/java/io/netty/handler/codec/serialization/ObjectDecoder.java @@ -66,7 +66,7 @@ public class ObjectDecoder extends LengthFieldBasedFrameDecoder { } @Override - public Object decode(ChannelHandlerContext ctx, ByteBuf in) throws Exception { + protected Object decode(ChannelHandlerContext ctx, ByteBuf in) throws Exception { ByteBuf frame = (ByteBuf) super.decode(ctx, in); if (frame == null) { return null; diff --git a/codec/src/main/java/io/netty/handler/codec/serialization/ObjectEncoder.java b/codec/src/main/java/io/netty/handler/codec/serialization/ObjectEncoder.java index 96e620d622..463db27c7d 100644 --- a/codec/src/main/java/io/netty/handler/codec/serialization/ObjectEncoder.java +++ b/codec/src/main/java/io/netty/handler/codec/serialization/ObjectEncoder.java @@ -44,7 +44,7 @@ public class ObjectEncoder extends MessageToByteEncoder { } @Override - public void encode(ChannelHandlerContext ctx, Object msg, ByteBuf out) throws Exception { + protected void encode(ChannelHandlerContext ctx, Object msg, ByteBuf out) throws Exception { int startIdx = out.writerIndex(); ByteBufOutputStream bout = new ByteBufOutputStream(out); diff --git a/codec/src/main/java/io/netty/handler/codec/string/StringDecoder.java b/codec/src/main/java/io/netty/handler/codec/string/StringDecoder.java index 45eb049607..0ae40bf437 100644 --- a/codec/src/main/java/io/netty/handler/codec/string/StringDecoder.java +++ b/codec/src/main/java/io/netty/handler/codec/string/StringDecoder.java @@ -77,7 +77,7 @@ public class StringDecoder extends MessageToMessageDecoder { } @Override - public String decode(ChannelHandlerContext ctx, ByteBuf msg) throws Exception { + protected String decode(ChannelHandlerContext ctx, ByteBuf msg) throws Exception { return msg.toString(charset); } } diff --git a/codec/src/main/java/io/netty/handler/codec/string/StringEncoder.java b/codec/src/main/java/io/netty/handler/codec/string/StringEncoder.java index 1563e37314..32f8656100 100644 --- a/codec/src/main/java/io/netty/handler/codec/string/StringEncoder.java +++ b/codec/src/main/java/io/netty/handler/codec/string/StringEncoder.java @@ -73,7 +73,7 @@ public class StringEncoder extends MessageToMessageEncoder * special handling. */ @SuppressWarnings("unused") - public boolean beginMessageReceived(ChannelHandlerContext ctx) throws Exception { + protected boolean beginMessageReceived(ChannelHandlerContext ctx) throws Exception { return true; } @@ -130,7 +130,7 @@ public abstract class ChannelInboundMessageHandlerAdapter * @param msg the message to handle * @throws Exception thrown when an error accour */ - public abstract void messageReceived(ChannelHandlerContext ctx, I msg) throws Exception; + protected abstract void messageReceived(ChannelHandlerContext ctx, I msg) throws Exception; /** * Is called after all messages of the {@link MessageBuf} was consumed. @@ -141,7 +141,7 @@ public abstract class ChannelInboundMessageHandlerAdapter * @throws Exception thrown when an error accour */ @SuppressWarnings("unused") - public void endMessageReceived(ChannelHandlerContext ctx) throws Exception { + protected void endMessageReceived(ChannelHandlerContext ctx) throws Exception { // NOOP } }