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

[#1500] Remove @deprecated methods

Browse Source
This commit is contained in:
Norman Maurer 2013-07-01 08:53:02 +02:00
parent 617ab6321b
commit 5d88c423df
8 changed files with 0 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
buffer/src/main/java/io/netty/buffer/AbstractByteBuf.java
View File

@ -116,12 +116,6 @@ public abstract class AbstractByteBuf implements ByteBuf {
return writerIndex > readerIndex;
}
@Override
@Deprecated
public final boolean readable() {
return isReadable();
}
@Override
public boolean isReadable(int numBytes) {
return writerIndex - readerIndex >= numBytes;
@ -132,12 +126,6 @@ public abstract class AbstractByteBuf implements ByteBuf {
return capacity() > writerIndex;
}
@Override
@Deprecated
public final boolean writable() {
return isWritable();
}
@Override
public boolean isWritable(int numBytes) {
return capacity() - writerIndex >= numBytes;
@ -264,12 +252,6 @@ public abstract class AbstractByteBuf implements ByteBuf {
return this;
}
@Override
@Deprecated
public final ByteBuf ensureWritableBytes(int minWritableBytes) {
return ensureWritable(minWritableBytes);
}
@Override
public int ensureWritable(int minWritableBytes, boolean force) {
if (minWritableBytes < 0) {

18
buffer/src/main/java/io/netty/buffer/ByteBuf.java
View File

@ -396,12 +396,6 @@ public interface ByteBuf extends ReferenceCounted, Comparable<ByteBuf> {
*/
boolean isReadable(int size);
/**
* @deprecated Use {@link #isReadable()} or {@link #isReadable(int)} instead.
*/
@Deprecated
boolean readable();
/**
* Returns {@code true}
* if and only if {@code (this.capacity - this.writerIndex)} is greater
@ -415,12 +409,6 @@ public interface ByteBuf extends ReferenceCounted, Comparable<ByteBuf> {
*/
boolean isWritable(int size);
/**
* @deprecated Use {@link #isWritable()} or {@link #isWritable(int)} instead.
*/
@Deprecated
boolean writable();
/**
* Sets the {@code readerIndex} and {@code writerIndex} of this buffer to
* {@code 0}.
@ -499,12 +487,6 @@ public interface ByteBuf extends ReferenceCounted, Comparable<ByteBuf> {
*/
ByteBuf ensureWritable(int minWritableBytes);
/**
* @deprecated Use {@link #ensureWritable(int)} instead.
*/
@Deprecated
ByteBuf ensureWritableBytes(int minWritableBytes);
/**
* Tries to make sure the number of {@linkplain #writableBytes() the writable bytes}
* is equal to or greater than the specified value. Unlike {@link #ensureWritable(int)},

18
buffer/src/main/java/io/netty/buffer/EmptyByteBuf.java
View File

@ -167,23 +167,11 @@ public final class EmptyByteBuf implements ByteBuf {
return false;
}
@Override
@Deprecated
public boolean readable() {
return false;
}
@Override
public boolean isWritable() {
return false;
}
@Override
@Deprecated
public boolean writable() {
return false;
}
@Override
public ByteBuf clear() {
return this;
@ -230,12 +218,6 @@ public final class EmptyByteBuf implements ByteBuf {
return this;
}
@Override
@Deprecated
public ByteBuf ensureWritableBytes(int minWritableBytes) {
return ensureWritable(minWritableBytes);
}
@Override
public int ensureWritable(int minWritableBytes, boolean force) {
if (minWritableBytes < 0) {

19
buffer/src/main/java/io/netty/buffer/SwappedByteBuf.java
View File

@ -136,12 +136,6 @@ public final class SwappedByteBuf implements ByteBuf {
return buf.isReadable();
}
@Override
@Deprecated
public boolean readable() {
return buf.isReadable();
}
@Override
public boolean isReadable(int size) {
return buf.isReadable(size);
@ -152,12 +146,6 @@ public final class SwappedByteBuf implements ByteBuf {
return buf.isWritable();
}
@Override
@Deprecated
public boolean writable() {
return buf.isWritable();
}
@Override
public boolean isWritable(int size) {
return buf.isWritable(size);
@ -211,13 +199,6 @@ public final class SwappedByteBuf implements ByteBuf {
return this;
}
@Override
@Deprecated
public ByteBuf ensureWritableBytes(int minWritableBytes) {
buf.ensureWritable(minWritableBytes);
return this;
}
@Override
public int ensureWritable(int minWritableBytes, boolean force) {
return buf.ensureWritable(minWritableBytes, force);

19
buffer/src/main/java/io/netty/buffer/UnreleasableByteBuf.java
View File

@ -152,23 +152,11 @@ final class UnreleasableByteBuf implements ByteBuf {
return buf.isReadable();
}
@Override
@Deprecated
public boolean readable() {
return buf.readable();
}
@Override
public boolean isWritable() {
return buf.isWritable();
}
@Override
@Deprecated
public boolean writable() {
return buf.writable();
}
@Override
public ByteBuf clear() {
buf.clear();
@ -217,13 +205,6 @@ final class UnreleasableByteBuf implements ByteBuf {
return this;
}
@Override
@Deprecated
public ByteBuf ensureWritableBytes(int minWritableBytes) {
buf.ensureWritableBytes(minWritableBytes);
return this;
}
@Override
public int ensureWritable(int minWritableBytes, boolean force) {
return buf.ensureWritable(minWritableBytes, force);

5
codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java
View File

@ -262,11 +262,6 @@ public abstract class WebSocketServerHandshaker {
return selectedSubprotocol;
}
@Deprecated
protected void setSelectedSubprotocol(String value) {
selectedSubprotocol = value;
}
/**
* Returns the decoder to use after handshake is complete.
*/

14
transport/src/main/java/io/netty/bootstrap/AbstractBootstrap.java
View File

@ -188,20 +188,6 @@ abstract class AbstractBootstrap<B extends AbstractBootstrap<B, C>, C extends Ch
return b;
}
/**
* @deprecated Use {@link EventLoopGroup#shutdown()} instead.
*
* Shutdown the {@link AbstractBootstrap} and the {@link EventLoopGroup} which is
* used by it. Only call this if you don't share the {@link EventLoopGroup}
* between different {@link AbstractBootstrap}'s.
*/
@Deprecated
public void shutdown() {
if (group != null) {
group.shutdown();
}
}
/**
* Validate all the parameters. Sub-classes may override this, but should
* call the super method in that case.

10
transport/src/main/java/io/netty/bootstrap/ServerBootstrap.java
View File

@ -184,16 +184,6 @@ public final class ServerBootstrap extends AbstractBootstrap<ServerBootstrap, Se
});
}
@Override
@Deprecated
@SuppressWarnings("deprecation")
public void shutdown() {
super.shutdown();
if (childGroup != null) {
childGroup.shutdown();
}
}
@Override
public ServerBootstrap validate() {
super.validate();