andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tighten access modifier of encode/decode()

Browse Source
This commit is contained in:
Trustin Lee 2013-02-08 17:37:16 +09:00
parent 646cd455ea
commit 82c46180c9
17 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codec-http/src/main/java/io/netty/handler/codec/http/HttpContentEncoder.java
View File

@ -67,7 +67,7 @@ public abstract class HttpContentEncoder extends MessageToMessageCodec<HttpMessa
}
@Override
public Object encode(ChannelHandlerContext ctx, HttpObject msg)
protected Object encode(ChannelHandlerContext ctx, HttpObject msg)
throws Exception {
if (msg instanceof HttpResponse && ((HttpResponse) msg).getStatus().code() == 100) {

2
codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket00FrameDecoder.java
View File

@ -52,7 +52,7 @@ public class WebSocket00FrameDecoder extends ReplayingDecoder<Void> {
}
@Override
public Object decode(ChannelHandlerContext ctx, ByteBuf in) throws Exception {
protected Object decode(ChannelHandlerContext ctx, ByteBuf in) throws Exception {
// Discard all data received if closing handshake was received before.
if (receivedClosingHandshake) {
in.skipBytes(actualReadableBytes());

2
codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket00FrameEncoder.java
View File

@ -33,7 +33,7 @@ import io.netty.handler.codec.MessageToByteEncoder;
public class WebSocket00FrameEncoder extends MessageToByteEncoder<WebSocketFrame> {
@Override
public void encode(ChannelHandlerContext ctx, WebSocketFrame msg, ByteBuf out) throws Exception {
protected void encode(ChannelHandlerContext ctx, WebSocketFrame msg, ByteBuf out) throws Exception {
if (msg instanceof TextWebSocketFrame) {
// Text frame
ByteBuf data = msg.data();

3
codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java
View File

@ -117,8 +117,7 @@ public class WebSocket08FrameDecoder extends ReplayingDecoder<WebSocket08FrameDe
}
@Override
public Object decode(
ChannelHandlerContext ctx, ByteBuf in) throws Exception {
protected Object decode(ChannelHandlerContext ctx, ByteBuf in) throws Exception {
// Discard all data received if closing handshake was received before.
if (receivedClosingHandshake) {

2
codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHttpDecoder.java
View File

@ -70,7 +70,7 @@ public class SpdyHttpDecoder extends MessageToMessageDecoder<Object> {
}
@Override
public Object decode(ChannelHandlerContext ctx, Object msg) throws Exception {
protected Object decode(ChannelHandlerContext ctx, Object msg) throws Exception {
if (msg instanceof SpdySynStreamFrame) {
// HTTP requests/responses are mapped one-to-one to SPDY streams.

2
codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHttpEncoder.java
View File

@ -139,7 +139,7 @@ public class SpdyHttpEncoder extends MessageToMessageEncoder<HttpObject> {
}
@Override
public Object encode(ChannelHandlerContext ctx, HttpObject msg) throws Exception {
protected Object encode(ChannelHandlerContext ctx, HttpObject msg) throws Exception {
List<Object> out = new ArrayList<Object>();
if (msg instanceof HttpRequest) {

2
codec-socks/src/main/java/io/netty/handler/codec/socks/SocksAuthRequestDecoder.java
View File

@ -42,7 +42,7 @@ public class SocksAuthRequestDecoder extends ReplayingDecoder<SocksAuthRequestDe
}
@Override
public Object decode(ChannelHandlerContext ctx, ByteBuf byteBuf) throws Exception {
protected Object decode(ChannelHandlerContext ctx, ByteBuf byteBuf) throws Exception {
switch (state()) {
case CHECK_PROTOCOL_VERSION: {
version = SocksMessage.SubnegotiationVersion.fromByte(byteBuf.readByte());

2
codec-socks/src/main/java/io/netty/handler/codec/socks/SocksAuthResponseDecoder.java
View File

@ -39,7 +39,7 @@ public class SocksAuthResponseDecoder extends ReplayingDecoder<SocksAuthResponse
}
@Override
public Object decode(ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf) throws Exception {
protected Object decode(ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf) throws Exception {
switch (state()) {
case CHECK_PROTOCOL_VERSION: {
version = SocksMessage.SubnegotiationVersion.fromByte(byteBuf.readByte());

2
codec-socks/src/main/java/io/netty/handler/codec/socks/SocksCmdRequestDecoder.java
View File

@ -45,7 +45,7 @@ public class SocksCmdRequestDecoder extends ReplayingDecoder<SocksCmdRequestDeco
}
@Override
public Object decode(ChannelHandlerContext ctx, ByteBuf byteBuf) throws Exception {
protected Object decode(ChannelHandlerContext ctx, ByteBuf byteBuf) throws Exception {
switch (state()) {
case CHECK_PROTOCOL_VERSION: {
version = SocksMessage.ProtocolVersion.fromByte(byteBuf.readByte());

3
codec-socks/src/main/java/io/netty/handler/codec/socks/SocksCmdResponseDecoder.java
View File

@ -45,8 +45,7 @@ public class SocksCmdResponseDecoder extends ReplayingDecoder<SocksCmdResponseDe
}
@Override
public Object decode(ChannelHandlerContext ctx, ByteBuf byteBuf) throws Exception {
protected Object decode(ChannelHandlerContext ctx, ByteBuf byteBuf) throws Exception {
switch (state()) {
case CHECK_PROTOCOL_VERSION: {
version = SocksMessage.ProtocolVersion.fromByte(byteBuf.readByte());

2
codec-socks/src/main/java/io/netty/handler/codec/socks/SocksInitRequestDecoder.java
View File

@ -43,7 +43,7 @@ public class SocksInitRequestDecoder extends ReplayingDecoder<SocksInitRequestDe
}
@Override
public Object decode(ChannelHandlerContext ctx, ByteBuf byteBuf) throws Exception {
protected Object decode(ChannelHandlerContext ctx, ByteBuf byteBuf) throws Exception {
switch (state()) {
case CHECK_PROTOCOL_VERSION: {
version = SocksMessage.ProtocolVersion.fromByte(byteBuf.readByte());

2
codec-socks/src/main/java/io/netty/handler/codec/socks/SocksInitResponseDecoder.java
View File

@ -40,7 +40,7 @@ public class SocksInitResponseDecoder extends ReplayingDecoder<SocksInitResponse
}
@Override
public SocksResponse decode(ChannelHandlerContext ctx, ByteBuf byteBuf) throws Exception {
protected SocksResponse decode(ChannelHandlerContext ctx, ByteBuf byteBuf) throws Exception {
switch (state()) {
case CHECK_PROTOCOL_VERSION: {
version = SocksMessage.ProtocolVersion.fromByte(byteBuf.readByte());

4
codec/src/main/java/io/netty/handler/codec/ByteToByteCodec.java
View File

@ -58,7 +58,7 @@ public abstract class ByteToByteCodec
private final ByteToByteEncoder encoder = new ByteToByteEncoder() {
@Override
public void encode(
protected void encode(
ChannelHandlerContext ctx,
ByteBuf in, ByteBuf out) throws Exception {
ByteToByteCodec.this.encode(ctx, in, out);
@ -67,7 +67,7 @@ public abstract class ByteToByteCodec
private final ByteToByteDecoder decoder = new ByteToByteDecoder() {
@Override
public void decode(ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) throws Exception {
protected void decode(ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) throws Exception {
ByteToByteCodec.this.decode(ctx, in, out);
}

4
codec/src/main/java/io/netty/handler/codec/MessageToMessageCodec.java
View File

@ -65,7 +65,7 @@ public abstract class MessageToMessageCodec<INBOUND_IN, OUTBOUND_IN>
@Override
@SuppressWarnings("unchecked")
public Object encode(ChannelHandlerContext ctx, Object msg) throws Exception {
protected Object encode(ChannelHandlerContext ctx, Object msg) throws Exception {
return MessageToMessageCodec.this.encode(ctx, (OUTBOUND_IN) msg);
}
@ -86,7 +86,7 @@ public abstract class MessageToMessageCodec<INBOUND_IN, OUTBOUND_IN>
@Override
@SuppressWarnings("unchecked")
public Object decode(ChannelHandlerContext ctx, Object msg) throws Exception {
protected Object decode(ChannelHandlerContext ctx, Object msg) throws Exception {
return MessageToMessageCodec.this.decode(ctx, (INBOUND_IN) msg);
}

6
codec/src/test/java/io/netty/handler/codec/ReplayingDecoderTest.java
View File

@ -15,15 +15,15 @@
*/
package io.netty.handler.codec;
import static org.junit.Assert.*;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufIndexFinder;
import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.embedded.EmbeddedByteChannel;
import org.junit.Test;
import static org.junit.Assert.*;
public class ReplayingDecoderTest {
@Test
@ -53,7 +53,7 @@ public class ReplayingDecoderTest {
}
@Override
public ByteBuf decode(ChannelHandlerContext ctx, ByteBuf in) {
protected ByteBuf decode(ChannelHandlerContext ctx, ByteBuf in) {
ByteBuf msg = in.readBytes(in.bytesBefore(ByteBufIndexFinder.LF));
in.skipBytes(1);
return msg;

2
example/src/main/java/io/netty/example/factorial/BigIntegerDecoder.java
View File

@ -31,7 +31,7 @@ import java.math.BigInteger;
public class BigIntegerDecoder extends ByteToMessageDecoder {
@Override
public BigInteger decode(ChannelHandlerContext ctx, ByteBuf in) {
protected BigInteger decode(ChannelHandlerContext ctx, ByteBuf in) {
// Wait until the length prefix is available.
if (in.readableBytes() < 5) {
return null;

2
example/src/main/java/io/netty/example/factorial/NumberEncoder.java
View File

@ -29,7 +29,7 @@ import java.math.BigInteger;
public class NumberEncoder extends MessageToByteEncoder<Number> {
@Override
public void encode(ChannelHandlerContext ctx, Number msg, ByteBuf out) throws Exception {
protected void encode(ChannelHandlerContext ctx, Number msg, ByteBuf out) throws Exception {
// Convert to a BigInteger first for easier implementation.
BigInteger v;
if (msg instanceof BigInteger) {