diff --git a/transport-rxtx/src/main/java/io/netty/channel/rxtx/DefaultRxtxChannelConfig.java b/transport-rxtx/src/main/java/io/netty/channel/rxtx/DefaultRxtxChannelConfig.java index c9e9d3ac55..756baf892f 100644 --- a/transport-rxtx/src/main/java/io/netty/channel/rxtx/DefaultRxtxChannelConfig.java +++ b/transport-rxtx/src/main/java/io/netty/channel/rxtx/DefaultRxtxChannelConfig.java @@ -250,14 +250,12 @@ final class DefaultRxtxChannelConfig extends DefaultChannelConfig implements Rxt } @Override - @Deprecated public RxtxChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark) { super.setWriteBufferHighWaterMark(writeBufferHighWaterMark); return this; } @Override - @Deprecated public RxtxChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark) { super.setWriteBufferLowWaterMark(writeBufferLowWaterMark); return this; diff --git a/transport-rxtx/src/main/java/io/netty/channel/rxtx/RxtxChannelConfig.java b/transport-rxtx/src/main/java/io/netty/channel/rxtx/RxtxChannelConfig.java index cf07425878..ef2783eab6 100644 --- a/transport-rxtx/src/main/java/io/netty/channel/rxtx/RxtxChannelConfig.java +++ b/transport-rxtx/src/main/java/io/netty/channel/rxtx/RxtxChannelConfig.java @@ -294,11 +294,9 @@ public interface RxtxChannelConfig extends ChannelConfig { RxtxChannelConfig setAutoClose(boolean autoClose); @Override - @Deprecated RxtxChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark); @Override - @Deprecated RxtxChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark); @Override diff --git a/transport-sctp/src/main/java/io/netty/channel/sctp/DefaultSctpChannelConfig.java b/transport-sctp/src/main/java/io/netty/channel/sctp/DefaultSctpChannelConfig.java index 4ff3055b67..c5513667ac 100644 --- a/transport-sctp/src/main/java/io/netty/channel/sctp/DefaultSctpChannelConfig.java +++ b/transport-sctp/src/main/java/io/netty/channel/sctp/DefaultSctpChannelConfig.java @@ -222,14 +222,12 @@ public class DefaultSctpChannelConfig extends DefaultChannelConfig implements Sc } @Override - @Deprecated public SctpChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark) { super.setWriteBufferHighWaterMark(writeBufferHighWaterMark); return this; } @Override - @Deprecated public SctpChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark) { super.setWriteBufferLowWaterMark(writeBufferLowWaterMark); return this; diff --git a/transport-sctp/src/main/java/io/netty/channel/sctp/DefaultSctpServerChannelConfig.java b/transport-sctp/src/main/java/io/netty/channel/sctp/DefaultSctpServerChannelConfig.java index 257e016e4f..4980eb88f6 100644 --- a/transport-sctp/src/main/java/io/netty/channel/sctp/DefaultSctpServerChannelConfig.java +++ b/transport-sctp/src/main/java/io/netty/channel/sctp/DefaultSctpServerChannelConfig.java @@ -203,14 +203,12 @@ public class DefaultSctpServerChannelConfig extends DefaultChannelConfig impleme } @Override - @Deprecated public SctpServerChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark) { super.setWriteBufferLowWaterMark(writeBufferLowWaterMark); return this; } @Override - @Deprecated public SctpServerChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark) { super.setWriteBufferHighWaterMark(writeBufferHighWaterMark); return this; diff --git a/transport-sctp/src/main/java/io/netty/channel/sctp/SctpChannelConfig.java b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpChannelConfig.java index e00de64415..206d47e456 100644 --- a/transport-sctp/src/main/java/io/netty/channel/sctp/SctpChannelConfig.java +++ b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpChannelConfig.java @@ -122,11 +122,9 @@ public interface SctpChannelConfig extends ChannelConfig { SctpChannelConfig setAutoClose(boolean autoClose); @Override - @Deprecated SctpChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark); @Override - @Deprecated SctpChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark); @Override diff --git a/transport-sctp/src/main/java/io/netty/channel/sctp/SctpServerChannelConfig.java b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpServerChannelConfig.java index 7ffcfa0d7c..bb88a1f1c6 100644 --- a/transport-sctp/src/main/java/io/netty/channel/sctp/SctpServerChannelConfig.java +++ b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpServerChannelConfig.java @@ -117,11 +117,9 @@ public interface SctpServerChannelConfig extends ChannelConfig { SctpServerChannelConfig setAutoClose(boolean autoClose); @Override - @Deprecated SctpServerChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark); @Override - @Deprecated SctpServerChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark); @Override diff --git a/transport-udt/src/main/java/io/netty/channel/udt/DefaultUdtChannelConfig.java b/transport-udt/src/main/java/io/netty/channel/udt/DefaultUdtChannelConfig.java index 39dfb9a4e0..ec8918e8f9 100644 --- a/transport-udt/src/main/java/io/netty/channel/udt/DefaultUdtChannelConfig.java +++ b/transport-udt/src/main/java/io/netty/channel/udt/DefaultUdtChannelConfig.java @@ -285,14 +285,12 @@ public class DefaultUdtChannelConfig extends DefaultChannelConfig implements } @Override - @Deprecated public UdtChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark) { super.setWriteBufferLowWaterMark(writeBufferLowWaterMark); return this; } @Override - @Deprecated public UdtChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark) { super.setWriteBufferHighWaterMark(writeBufferHighWaterMark); return this; diff --git a/transport-udt/src/main/java/io/netty/channel/udt/DefaultUdtServerChannelConfig.java b/transport-udt/src/main/java/io/netty/channel/udt/DefaultUdtServerChannelConfig.java index 33632baedb..6b8cc65184 100644 --- a/transport-udt/src/main/java/io/netty/channel/udt/DefaultUdtServerChannelConfig.java +++ b/transport-udt/src/main/java/io/netty/channel/udt/DefaultUdtServerChannelConfig.java @@ -181,14 +181,12 @@ public class DefaultUdtServerChannelConfig extends DefaultUdtChannelConfig } @Override - @Deprecated public UdtServerChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark) { super.setWriteBufferLowWaterMark(writeBufferLowWaterMark); return this; } @Override - @Deprecated public UdtServerChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark) { super.setWriteBufferHighWaterMark(writeBufferHighWaterMark); return this; diff --git a/transport-udt/src/main/java/io/netty/channel/udt/UdtChannelConfig.java b/transport-udt/src/main/java/io/netty/channel/udt/UdtChannelConfig.java index 6bff3f549f..be268152b7 100644 --- a/transport-udt/src/main/java/io/netty/channel/udt/UdtChannelConfig.java +++ b/transport-udt/src/main/java/io/netty/channel/udt/UdtChannelConfig.java @@ -136,11 +136,9 @@ public interface UdtChannelConfig extends ChannelConfig { UdtChannelConfig setAutoClose(boolean autoClose); @Override - @Deprecated UdtChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark); @Override - @Deprecated UdtChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark); @Override diff --git a/transport-udt/src/main/java/io/netty/channel/udt/UdtServerChannelConfig.java b/transport-udt/src/main/java/io/netty/channel/udt/UdtServerChannelConfig.java index 788ef1bf8a..0f2be77ce8 100644 --- a/transport-udt/src/main/java/io/netty/channel/udt/UdtServerChannelConfig.java +++ b/transport-udt/src/main/java/io/netty/channel/udt/UdtServerChannelConfig.java @@ -94,11 +94,9 @@ public interface UdtServerChannelConfig extends UdtChannelConfig { UdtServerChannelConfig setSystemSendBufferSize(int size); @Override - @Deprecated UdtServerChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark); @Override - @Deprecated UdtServerChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark); @Override diff --git a/transport/src/main/java/io/netty/channel/ChannelConfig.java b/transport/src/main/java/io/netty/channel/ChannelConfig.java index 8cef199690..ec43b2ff24 100644 --- a/transport/src/main/java/io/netty/channel/ChannelConfig.java +++ b/transport/src/main/java/io/netty/channel/ChannelConfig.java @@ -220,13 +220,11 @@ public interface ChannelConfig { int getWriteBufferHighWaterMark(); /** - * @deprecated Use {@link #setWriteBufferWaterMark(WriteBufferWaterMark)} *

* Sets the high water mark of the write buffer. If the number of bytes * queued in the write buffer exceeds this value, {@link Channel#isWritable()} * will start to return {@code false}. */ - @Deprecated ChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark); /** @@ -239,7 +237,6 @@ public interface ChannelConfig { int getWriteBufferLowWaterMark(); /** - * @deprecated Use {@link #setWriteBufferWaterMark(WriteBufferWaterMark)} *

* Sets the low water mark of the write buffer. Once the number of bytes * queued in the write buffer exceeded the @@ -247,7 +244,6 @@ public interface ChannelConfig { * dropped down below this value, {@link Channel#isWritable()} will start to return * {@code true} again. */ - @Deprecated ChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark); /** diff --git a/transport/src/main/java/io/netty/channel/DefaultChannelConfig.java b/transport/src/main/java/io/netty/channel/DefaultChannelConfig.java index 755ab789e2..0602a223e6 100644 --- a/transport/src/main/java/io/netty/channel/DefaultChannelConfig.java +++ b/transport/src/main/java/io/netty/channel/DefaultChannelConfig.java @@ -359,13 +359,11 @@ public class DefaultChannelConfig implements ChannelConfig { } @Override - @Deprecated public int getWriteBufferHighWaterMark() { return writeBufferWaterMark.high(); } @Override - @Deprecated public ChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark) { if (writeBufferHighWaterMark < 0) { throw new IllegalArgumentException( @@ -387,13 +385,11 @@ public class DefaultChannelConfig implements ChannelConfig { } @Override - @Deprecated public int getWriteBufferLowWaterMark() { return writeBufferWaterMark.low(); } @Override - @Deprecated public ChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark) { if (writeBufferLowWaterMark < 0) { throw new IllegalArgumentException( diff --git a/transport/src/main/java/io/netty/channel/socket/DefaultDatagramChannelConfig.java b/transport/src/main/java/io/netty/channel/socket/DefaultDatagramChannelConfig.java index ad5c5a7526..84d348ee37 100644 --- a/transport/src/main/java/io/netty/channel/socket/DefaultDatagramChannelConfig.java +++ b/transport/src/main/java/io/netty/channel/socket/DefaultDatagramChannelConfig.java @@ -402,14 +402,12 @@ public class DefaultDatagramChannelConfig extends DefaultChannelConfig implement } @Override - @Deprecated public DatagramChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark) { super.setWriteBufferHighWaterMark(writeBufferHighWaterMark); return this; } @Override - @Deprecated public DatagramChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark) { super.setWriteBufferLowWaterMark(writeBufferLowWaterMark); return this; diff --git a/transport/src/main/java/io/netty/channel/socket/DefaultServerSocketChannelConfig.java b/transport/src/main/java/io/netty/channel/socket/DefaultServerSocketChannelConfig.java index bfe2515377..57ac53dafd 100644 --- a/transport/src/main/java/io/netty/channel/socket/DefaultServerSocketChannelConfig.java +++ b/transport/src/main/java/io/netty/channel/socket/DefaultServerSocketChannelConfig.java @@ -186,14 +186,12 @@ public class DefaultServerSocketChannelConfig extends DefaultChannelConfig } @Override - @Deprecated public ServerSocketChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark) { super.setWriteBufferHighWaterMark(writeBufferHighWaterMark); return this; } @Override - @Deprecated public ServerSocketChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark) { super.setWriteBufferLowWaterMark(writeBufferLowWaterMark); return this; diff --git a/transport/src/main/java/io/netty/channel/socket/DefaultSocketChannelConfig.java b/transport/src/main/java/io/netty/channel/socket/DefaultSocketChannelConfig.java index 69bdee187d..c154582fe5 100644 --- a/transport/src/main/java/io/netty/channel/socket/DefaultSocketChannelConfig.java +++ b/transport/src/main/java/io/netty/channel/socket/DefaultSocketChannelConfig.java @@ -324,14 +324,12 @@ public class DefaultSocketChannelConfig extends DefaultChannelConfig } @Override - @Deprecated public SocketChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark) { super.setWriteBufferHighWaterMark(writeBufferHighWaterMark); return this; } @Override - @Deprecated public SocketChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark) { super.setWriteBufferLowWaterMark(writeBufferLowWaterMark); return this; diff --git a/transport/src/main/java/io/netty/channel/socket/ServerSocketChannelConfig.java b/transport/src/main/java/io/netty/channel/socket/ServerSocketChannelConfig.java index 6ec513aa57..e259875cb6 100644 --- a/transport/src/main/java/io/netty/channel/socket/ServerSocketChannelConfig.java +++ b/transport/src/main/java/io/netty/channel/socket/ServerSocketChannelConfig.java @@ -107,18 +107,10 @@ public interface ServerSocketChannelConfig extends ChannelConfig { @Override ServerSocketChannelConfig setMessageSizeEstimator(MessageSizeEstimator estimator); - /** - * @deprecated Use {@link #setWriteBufferWaterMark(WriteBufferWaterMark)} - */ @Override - @Deprecated ServerSocketChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark); - /** - * @deprecated Use {@link #setWriteBufferWaterMark(WriteBufferWaterMark)} - */ @Override - @Deprecated ServerSocketChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark); @Override diff --git a/transport/src/main/java/io/netty/channel/socket/oio/DefaultOioServerSocketChannelConfig.java b/transport/src/main/java/io/netty/channel/socket/oio/DefaultOioServerSocketChannelConfig.java index 556ccabe0c..34e881547f 100644 --- a/transport/src/main/java/io/netty/channel/socket/oio/DefaultOioServerSocketChannelConfig.java +++ b/transport/src/main/java/io/netty/channel/socket/oio/DefaultOioServerSocketChannelConfig.java @@ -166,14 +166,12 @@ public class DefaultOioServerSocketChannelConfig extends DefaultServerSocketChan } @Override - @Deprecated public OioServerSocketChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark) { super.setWriteBufferHighWaterMark(writeBufferHighWaterMark); return this; } @Override - @Deprecated public OioServerSocketChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark) { super.setWriteBufferLowWaterMark(writeBufferLowWaterMark); return this; diff --git a/transport/src/main/java/io/netty/channel/socket/oio/DefaultOioSocketChannelConfig.java b/transport/src/main/java/io/netty/channel/socket/oio/DefaultOioSocketChannelConfig.java index ed6e7ca4b2..0eda133be0 100644 --- a/transport/src/main/java/io/netty/channel/socket/oio/DefaultOioSocketChannelConfig.java +++ b/transport/src/main/java/io/netty/channel/socket/oio/DefaultOioSocketChannelConfig.java @@ -194,14 +194,12 @@ public class DefaultOioSocketChannelConfig extends DefaultSocketChannelConfig im } @Override - @Deprecated public OioSocketChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark) { super.setWriteBufferHighWaterMark(writeBufferHighWaterMark); return this; } @Override - @Deprecated public OioSocketChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark) { super.setWriteBufferLowWaterMark(writeBufferLowWaterMark); return this; diff --git a/transport/src/main/java/io/netty/channel/socket/oio/OioServerSocketChannelConfig.java b/transport/src/main/java/io/netty/channel/socket/oio/OioServerSocketChannelConfig.java index bec12fa206..51bf6e0129 100644 --- a/transport/src/main/java/io/netty/channel/socket/oio/OioServerSocketChannelConfig.java +++ b/transport/src/main/java/io/netty/channel/socket/oio/OioServerSocketChannelConfig.java @@ -87,11 +87,9 @@ public interface OioServerSocketChannelConfig extends ServerSocketChannelConfig OioServerSocketChannelConfig setAutoClose(boolean autoClose); @Override - @Deprecated OioServerSocketChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark); @Override - @Deprecated OioServerSocketChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark); @Override diff --git a/transport/src/main/java/io/netty/channel/socket/oio/OioSocketChannelConfig.java b/transport/src/main/java/io/netty/channel/socket/oio/OioSocketChannelConfig.java index 6bc445f11a..5b56bf179b 100644 --- a/transport/src/main/java/io/netty/channel/socket/oio/OioSocketChannelConfig.java +++ b/transport/src/main/java/io/netty/channel/socket/oio/OioSocketChannelConfig.java @@ -102,11 +102,9 @@ public interface OioSocketChannelConfig extends SocketChannelConfig { OioSocketChannelConfig setAutoClose(boolean autoClose); @Override - @Deprecated OioSocketChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark); @Override - @Deprecated OioSocketChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark); @Override