From 4e0f455e69152a3b25acd8bfa6be660c98784142 Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Sat, 10 Nov 2012 07:10:30 +0900 Subject: [PATCH] Remove methods overridden but identical with the super implementation / Make constructors of abstract classes protected rather than non-sense public AbstractWrappedByteBuf.capacity(int) should raise a UnsupportedOperationException rather than ReadOnlyBufferException. --- .../main/java/io/netty/buffer/AbstractWrappedByteBuf.java | 2 +- buffer/src/main/java/io/netty/buffer/DuplicatedByteBuf.java | 5 ----- .../handler/codec/http/multipart/AbstractDiskHttpData.java | 2 +- .../netty/handler/codec/http/multipart/AbstractHttpData.java | 2 +- .../handler/codec/http/multipart/AbstractMemoryHttpData.java | 2 +- .../codec/http/websocketx/WebSocketClientHandshaker.java | 4 ++-- .../java/io/netty/handler/codec/spdy/SpdyOrHttpChooser.java | 2 +- 7 files changed, 7 insertions(+), 12 deletions(-) diff --git a/buffer/src/main/java/io/netty/buffer/AbstractWrappedByteBuf.java b/buffer/src/main/java/io/netty/buffer/AbstractWrappedByteBuf.java index e40c1d14f0..912a46d018 100644 --- a/buffer/src/main/java/io/netty/buffer/AbstractWrappedByteBuf.java +++ b/buffer/src/main/java/io/netty/buffer/AbstractWrappedByteBuf.java @@ -32,7 +32,7 @@ public abstract class AbstractWrappedByteBuf extends AbstractByteBuf implements @Override public WrappedByteBuf capacity(int newCapacity) { - throw new ReadOnlyBufferException(); + throw new UnsupportedOperationException(); } @Override diff --git a/buffer/src/main/java/io/netty/buffer/DuplicatedByteBuf.java b/buffer/src/main/java/io/netty/buffer/DuplicatedByteBuf.java index 809a02865d..9118e42f25 100644 --- a/buffer/src/main/java/io/netty/buffer/DuplicatedByteBuf.java +++ b/buffer/src/main/java/io/netty/buffer/DuplicatedByteBuf.java @@ -108,11 +108,6 @@ public class DuplicatedByteBuf extends AbstractWrappedByteBuf { return buffer.getLong(index); } - @Override - public ByteBuf duplicate() { - return new DuplicatedByteBuf(this); - } - @Override public ByteBuf copy(int index, int length) { return buffer.copy(index, length); diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/AbstractDiskHttpData.java b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/AbstractDiskHttpData.java index 0e018131c5..47b98a4a87 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/AbstractDiskHttpData.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/AbstractDiskHttpData.java @@ -37,7 +37,7 @@ public abstract class AbstractDiskHttpData extends AbstractHttpData { private boolean isRenamed; private FileChannel fileChannel; - public AbstractDiskHttpData(String name, Charset charset, long size) { + protected AbstractDiskHttpData(String name, Charset charset, long size) { super(name, charset, size); } diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/AbstractHttpData.java b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/AbstractHttpData.java index 262a764366..4a86534f7f 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/AbstractHttpData.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/AbstractHttpData.java @@ -30,7 +30,7 @@ public abstract class AbstractHttpData implements HttpData { protected Charset charset = HttpConstants.DEFAULT_CHARSET; protected boolean completed; - public AbstractHttpData(String name, Charset charset, long size) { + protected AbstractHttpData(String name, Charset charset, long size) { if (name == null) { throw new NullPointerException("name"); } diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/AbstractMemoryHttpData.java b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/AbstractMemoryHttpData.java index 6ff0cb941e..671c0406a8 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/AbstractMemoryHttpData.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/AbstractMemoryHttpData.java @@ -39,7 +39,7 @@ public abstract class AbstractMemoryHttpData extends AbstractHttpData { private int chunkPosition; protected boolean isRenamed; - public AbstractMemoryHttpData(String name, Charset charset, long size) { + protected AbstractMemoryHttpData(String name, Charset charset, long size) { super(name, charset, size); } diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java index f078865660..78ee6bf650 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java @@ -56,8 +56,8 @@ public abstract class WebSocketClientHandshaker { * @param maxFramePayloadLength * Maximum length of a frame's payload */ - public WebSocketClientHandshaker(URI webSocketUrl, WebSocketVersion version, String subprotocol, - Map customHeaders, int maxFramePayloadLength) { + protected WebSocketClientHandshaker(URI webSocketUrl, WebSocketVersion version, String subprotocol, + Map customHeaders, int maxFramePayloadLength) { this.webSocketUrl = webSocketUrl; this.version = version; expectedSubprotocol = subprotocol; diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyOrHttpChooser.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyOrHttpChooser.java index c6d090f2fa..4d7002a02e 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyOrHttpChooser.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyOrHttpChooser.java @@ -50,7 +50,7 @@ public abstract class SpdyOrHttpChooser extends ChannelHandlerAdapter implements private final int maxSpdyContentLength; private final int maxHttpContentLength; - public SpdyOrHttpChooser(int maxSpdyContentLength, int maxHttpContentLength) { + protected SpdyOrHttpChooser(int maxSpdyContentLength, int maxHttpContentLength) { this.maxSpdyContentLength = maxSpdyContentLength; this.maxHttpContentLength = maxHttpContentLength; }