From 6075c50cf77ac0fdc9ba8f1f5b9af2dc7a35854c Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Tue, 17 Nov 2009 03:30:46 +0000 Subject: [PATCH] Resolved issue: NETTY-252 Remove the deprecated types and methods --- .../jboss/netty/channel/ChannelConfig.java | 31 -- .../org/jboss/netty/channel/Channels.java | 387 ------------------ .../netty/channel/DefaultChannelConfig.java | 17 - .../channel/DefaultServerChannelConfig.java | 17 - .../HttpTunnelingSocketChannelConfig.java | 10 - .../nio/DefaultNioSocketChannelConfig.java | 15 +- .../socket/nio/NioSocketChannelConfig.java | 30 -- .../xnio/DefaultXnioChannelConfig.java | 10 - 8 files changed, 1 insertion(+), 516 deletions(-) diff --git a/src/main/java/org/jboss/netty/channel/ChannelConfig.java b/src/main/java/org/jboss/netty/channel/ChannelConfig.java index c7fcc3e896..4e966875b0 100644 --- a/src/main/java/org/jboss/netty/channel/ChannelConfig.java +++ b/src/main/java/org/jboss/netty/channel/ChannelConfig.java @@ -15,7 +15,6 @@ */ package org.jboss.netty.channel; -import java.io.IOException; import java.nio.ByteOrder; import java.util.Map; @@ -24,7 +23,6 @@ import org.jboss.netty.buffer.ChannelBufferFactory; import org.jboss.netty.buffer.HeapChannelBufferFactory; import org.jboss.netty.channel.socket.SocketChannelConfig; import org.jboss.netty.channel.socket.nio.NioSocketChannelConfig; -import org.jboss.netty.handler.timeout.WriteTimeoutHandler; /** * A set of configuration properties of a {@link Channel}. @@ -151,33 +149,4 @@ public interface ChannelConfig { * {@code 0} to disable. */ void setConnectTimeoutMillis(int connectTimeoutMillis); - - /** - * @deprecated Use {@link WriteTimeoutHandler} instead. - * - * Returns the write timeout of the channel in milliseconds. If a write - * operation is not completed within the write timeout, an - * {@link IOException} will be raised. If the {@link Channel} does not - * support write operation, this property is not used at all, and therefore - * will be ignored. - * - * @return the write timeout in milliseconds. {@code 0} if disabled. - */ - @Deprecated - int getWriteTimeoutMillis(); - - /** - * @deprecated Use {@link WriteTimeoutHandler} instead. - * - * Sets the write timeout of the channel in milliseconds. If a write - * operation is not completed within the write timeout, an - * {@link IOException} will be raised. If the {@link Channel} does not - * support write operation, this property is not used at all, and therefore - * will be ignored. - * - * @param writeTimeoutMillis the write timeout in milliseconds. - * {@code 0} to disable. - */ - @Deprecated - void setWriteTimeoutMillis(int writeTimeoutMillis); } diff --git a/src/main/java/org/jboss/netty/channel/Channels.java b/src/main/java/org/jboss/netty/channel/Channels.java index e263e4bf2a..125716700e 100644 --- a/src/main/java/org/jboss/netty/channel/Channels.java +++ b/src/main/java/org/jboss/netty/channel/Channels.java @@ -134,45 +134,6 @@ public class Channels { return new FailedChannelFuture(channel, cause); } - // event factory methods - - /** - * @deprecated Instantiate {@link UpstreamMessageEvent} or {@link DownstreamMessageEvent} directly instead. - * - * Creates a new {@link MessageEvent} - * - * @param channel the channel which is associated with the event - * @param future the future which will be notified when a message is sent - * (only meaningful when the event is sent downstream) - * @param message the received or sent message object - * ('received' when the event is sent upstream, and - * 'sent' when the event is sent downstream) - */ - @Deprecated - public static MessageEvent messageEvent(Channel channel, ChannelFuture future, Object message) { - return messageEvent(channel, future, message, null); - } - - /** - * @deprecated Instantiate {@link UpstreamMessageEvent} or {@link DownstreamMessageEvent} directly instead. - * - * Creates a new {@link MessageEvent} - * - * @param channel the channel which is associated with the event - * @param future the future which will be notified when a message is sent - * (only meaningful when the event is sent downstream) - * @param message the received or sent message object - * ('received' when the event is sent upstream, and - * 'sent' when the event is sent downstream) - * @param remoteAddress the source or destination address of the message - * ('source' when the event is sent upstream, and - * 'destination' when the event is sent downstream) - */ - @Deprecated - public static MessageEvent messageEvent(Channel channel, ChannelFuture future, Object message, SocketAddress remoteAddress) { - return new DownstreamMessageEvent(channel, future, message, remoteAddress); - } - // event emission methods /** @@ -207,25 +168,6 @@ public class Channels { ctx.getChannel(), ChannelState.OPEN, Boolean.TRUE)); } - /** - * @deprecated Use {@link #fireChannelOpen(ChannelHandlerContext)} instead. - * - * Sends a {@code "channelOpen"} event to the - * {@link ChannelUpstreamHandler} which is placed in the closest upstream - * from the handler associated with the specified - * {@link ChannelHandlerContext}. - *

- * Please note that this method does not trigger a - * {@code "childChannelOpen"} event unlike {@link #fireChannelOpen(Channel)} - * method. - */ - @Deprecated - public static void fireChannelOpen( - ChannelHandlerContext ctx, - @SuppressWarnings("unused") Channel channel) { - fireChannelOpen(ctx); - } - /** * Sends a {@code "channelBound"} event to the first * {@link ChannelUpstreamHandler} in the {@link ChannelPipeline} of @@ -254,25 +196,6 @@ public class Channels { ctx.getChannel(), ChannelState.BOUND, localAddress)); } - /** - * @deprecated Use {@link #fireChannelBound(ChannelHandlerContext, SocketAddress)} instead. - * - * Sends a {@code "channelBound"} event to the - * {@link ChannelUpstreamHandler} which is placed in the closest upstream - * from the handler associated with the specified - * {@link ChannelHandlerContext}. - * - * @param localAddress - * the local address where the specified channel is bound - */ - @Deprecated - public static void fireChannelBound( - ChannelHandlerContext ctx, - @SuppressWarnings("unused") Channel channel, - SocketAddress localAddress) { - fireChannelBound(ctx, localAddress); - } - /** * Sends a {@code "channelConnected"} event to the first * {@link ChannelUpstreamHandler} in the {@link ChannelPipeline} of @@ -302,25 +225,6 @@ public class Channels { ctx.getChannel(), ChannelState.CONNECTED, remoteAddress)); } - /** - * @deprecated Use {@link #fireChannelConnected(ChannelHandlerContext, SocketAddress)} instead. - * - * Sends a {@code "channelConnected"} event to the - * {@link ChannelUpstreamHandler} which is placed in the closest upstream - * from the handler associated with the specified - * {@link ChannelHandlerContext}. - * - * @param remoteAddress - * the remote address where the specified channel is connected - */ - @Deprecated - public static void fireChannelConnected( - ChannelHandlerContext ctx, - @SuppressWarnings("unused") Channel channel, - SocketAddress remoteAddress) { - fireChannelConnected(ctx, remoteAddress); - } - /** * Sends a {@code "messageReceived"} event to the first * {@link ChannelUpstreamHandler} in the {@link ChannelPipeline} of @@ -358,24 +262,6 @@ public class Channels { ctx.sendUpstream(new UpstreamMessageEvent(ctx.getChannel(), message, null)); } - /** - * @deprecated Use {@link #fireMessageReceived(ChannelHandlerContext, Object)} instead. - * - * Sends a {@code "messageReceived"} event to the - * {@link ChannelUpstreamHandler} which is placed in the closest upstream - * from the handler associated with the specified - * {@link ChannelHandlerContext}. - * - * @param message the received message - */ - @Deprecated - public static void fireMessageReceived( - ChannelHandlerContext ctx, - @SuppressWarnings("unused") Channel channel, - Object message) { - fireMessageReceived(ctx, message); - } - /** * Sends a {@code "messageReceived"} event to the * {@link ChannelUpstreamHandler} which is placed in the closest upstream @@ -392,26 +278,6 @@ public class Channels { ctx.getChannel(), message, remoteAddress)); } - /** - * @deprecated Use {@link #fireMessageReceived(ChannelHandlerContext, Object, SocketAddress)} instead. - * - * Sends a {@code "messageReceived"} event to the - * {@link ChannelUpstreamHandler} which is placed in the closest upstream - * from the handler associated with the specified - * {@link ChannelHandlerContext}. - * - * @param message the received message - * @param remoteAddress the remote address where the received message - * came from - */ - @Deprecated - public static void fireMessageReceived( - ChannelHandlerContext ctx, - @SuppressWarnings("unused") Channel channel, - Object message, SocketAddress remoteAddress) { - fireMessageReceived(ctx, message, remoteAddress); - } - /** * Sends a {@code "writeComplete"} event to the first * {@link ChannelUpstreamHandler} in the {@link ChannelPipeline} of @@ -447,20 +313,6 @@ public class Channels { channel, ChannelState.INTEREST_OPS, Channel.OP_READ)); } - /** - * @deprecated Use {@link #fireChannelInterestChanged(Channel)} instead. - * - * Sends a {@code "channelInterestChanged"} event to the first - * {@link ChannelUpstreamHandler} in the {@link ChannelPipeline} of - * the specified {@link Channel}. - * - * @param interestOps the new interestOps - */ - @Deprecated - public static void fireChannelInterestChanged(Channel channel, int interestOps) { - fireChannelInterestChanged(channel); - } - /** * Sends a {@code "channelInterestChanged"} event to the * {@link ChannelUpstreamHandler} which is placed in the closest upstream @@ -475,24 +327,6 @@ public class Channels { ctx.getChannel(), ChannelState.INTEREST_OPS, Channel.OP_READ)); } - /** - * @deprecated Use {@link #fireChannelInterestChanged(ChannelHandlerContext)} instead. - * - * Sends a {@code "channelInterestChanged"} event to the - * {@link ChannelUpstreamHandler} which is placed in the closest upstream - * from the handler associated with the specified - * {@link ChannelHandlerContext}. - * - * @param channel the {@link Channel} - * @param interestOps the new interestOps - */ - @Deprecated - public static void fireChannelInterestChanged( - ChannelHandlerContext ctx, Channel channel, int interestOps) { - - fireChannelInterestChanged(ctx); - } - /** * Sends a {@code "channelDisconnected"} event to the first * {@link ChannelUpstreamHandler} in the {@link ChannelPipeline} of @@ -515,21 +349,6 @@ public class Channels { ctx.getChannel(), ChannelState.CONNECTED, null)); } - /** - * @deprecated Use {@link #fireChannelDisconnected(ChannelHandlerContext)} instead. - * - * Sends a {@code "channelDisconnected"} event to the - * {@link ChannelUpstreamHandler} which is placed in the closest upstream - * from the handler associated with the specified - * {@link ChannelHandlerContext}. - */ - @Deprecated - public static void fireChannelDisconnected( - ChannelHandlerContext ctx, - @SuppressWarnings("unused") Channel channel) { - fireChannelDisconnected(ctx); - } - /** * Sends a {@code "channelUnbound"} event to the first * {@link ChannelUpstreamHandler} in the {@link ChannelPipeline} of @@ -552,21 +371,6 @@ public class Channels { ctx.getChannel(), ChannelState.BOUND, null)); } - /** - * @deprecated Use {@link #fireChannelUnbound(ChannelHandlerContext)} instead. - * - * Sends a {@code "channelUnbound"} event to the - * {@link ChannelUpstreamHandler} which is placed in the closest upstream - * from the handler associated with the specified - * {@link ChannelHandlerContext}. - */ - @Deprecated - public static void fireChannelUnbound( - ChannelHandlerContext ctx, - @SuppressWarnings("unused") Channel channel) { - fireChannelUnbound(ctx); - } - /** * Sends a {@code "channelClosed"} event to the first * {@link ChannelUpstreamHandler} in the {@link ChannelPipeline} of @@ -595,21 +399,6 @@ public class Channels { ctx.getChannel(), ChannelState.OPEN, Boolean.FALSE)); } - /** - * @deprecated Use {@link #fireChannelClosed(ChannelHandlerContext)}. - * - * Sends a {@code "channelClosed"} event to the - * {@link ChannelUpstreamHandler} which is placed in the closest upstream - * from the handler associated with the specified - * {@link ChannelHandlerContext}. - */ - @Deprecated - public static void fireChannelClosed( - ChannelHandlerContext ctx, - @SuppressWarnings("unused") Channel channel) { - fireChannelClosed(ctx); - } - /** * Sends a {@code "exceptionCaught"} event to the first * {@link ChannelUpstreamHandler} in the {@link ChannelPipeline} of @@ -630,22 +419,6 @@ public class Channels { ctx.sendUpstream(new DefaultExceptionEvent(ctx.getChannel(), cause)); } - /** - * @deprecated Use {@link #fireExceptionCaught(ChannelHandlerContext, Throwable)} instead. - * - * Sends a {@code "exceptionCaught"} event to the - * {@link ChannelUpstreamHandler} which is placed in the closest upstream - * from the handler associated with the specified - * {@link ChannelHandlerContext}. - */ - @Deprecated - public static void fireExceptionCaught( - ChannelHandlerContext ctx, - @SuppressWarnings("unused") Channel channel, - Throwable cause) { - fireExceptionCaught(ctx, cause); - } - private static void fireChildChannelStateChanged( Channel channel, Channel childChannel) { channel.getPipeline().sendUpstream( @@ -693,27 +466,6 @@ public class Channels { ctx.getChannel(), future, ChannelState.BOUND, localAddress)); } - /** - * @deprecated Use {@link #bind(ChannelHandlerContext, ChannelFuture, SocketAddress)} instead. - * - * Sends a {@code "bind"} request to the - * {@link ChannelDownstreamHandler} which is placed in the closest - * downstream from the handler associated with the specified - * {@link ChannelHandlerContext}. - * - * @param ctx the context - * @param channel the channel to bind - * @param future the future which will be notified when the bind - * operation is done - * @param localAddress the local address to bind to - */ - @Deprecated - public static void bind( - ChannelHandlerContext ctx, Channel channel, - ChannelFuture future, SocketAddress localAddress) { - bind(ctx, future, localAddress); - } - /** * Sends a {@code "unbind"} request to the * {@link ChannelDownstreamHandler} which is placed in the closest @@ -729,25 +481,6 @@ public class Channels { ctx.getChannel(), future, ChannelState.BOUND, null)); } - /** - * @deprecated Use {@link #unbind(ChannelHandlerContext, ChannelFuture)} instead. - * - * Sends a {@code "unbind"} request to the - * {@link ChannelDownstreamHandler} which is placed in the closest - * downstream from the handler associated with the specified - * {@link ChannelHandlerContext}. - * - * @param ctx the context - * @param channel the channel to unbind - * @param future the future which will be notified when the unbind - * operation is done - */ - @Deprecated - public static void unbind( - ChannelHandlerContext ctx, Channel channel, ChannelFuture future) { - unbind(ctx, future); - } - /** * Sends a {@code "unbind"} request to the last * {@link ChannelDownstreamHandler} in the {@link ChannelPipeline} of @@ -806,27 +539,6 @@ public class Channels { ctx.getChannel(), future, ChannelState.CONNECTED, remoteAddress)); } - /** - * @deprecated Use {@link #connect(ChannelHandlerContext, ChannelFuture, SocketAddress)} instead. - * - * Sends a {@code "connect"} request to the - * {@link ChannelDownstreamHandler} which is placed in the closest - * downstream from the handler associated with the specified - * {@link ChannelHandlerContext}. - * - * @param ctx the context - * @param channel the channel to attempt a connection - * @param future the future which will be notified when the connection - * attempt is done - * @param remoteAddress the remote address to connect to - */ - @Deprecated - public static void connect( - ChannelHandlerContext ctx, Channel channel, - ChannelFuture future, SocketAddress remoteAddress) { - connect(ctx, future, remoteAddress); - } - /** * Sends a {@code "write"} request to the last * {@link ChannelDownstreamHandler} in the {@link ChannelPipeline} of @@ -857,26 +569,6 @@ public class Channels { write(ctx, future, message, null); } - /** - * @deprecated Use {@link #write(ChannelHandlerContext, ChannelFuture, Object)} instead. - * - * Sends a {@code "write"} request to the - * {@link ChannelDownstreamHandler} which is placed in the closest - * downstream from the handler associated with the specified - * {@link ChannelHandlerContext}. - * - * @param ctx the context - * @param channel the channel to write a message - * @param future the future which will be notified when the write - * operation is done - */ - @Deprecated - public static void write( - ChannelHandlerContext ctx, Channel channel, - ChannelFuture future, Object message) { - write(ctx, future, message, null); - } - /** * Sends a {@code "write"} request to the last * {@link ChannelDownstreamHandler} in the {@link ChannelPipeline} of @@ -917,29 +609,6 @@ public class Channels { new DownstreamMessageEvent(ctx.getChannel(), future, message, remoteAddress)); } - /** - * @deprecated Use {@link #write(ChannelHandlerContext, ChannelFuture, Object, SocketAddress)} instead. - * - * Sends a {@code "write"} request to the - * {@link ChannelDownstreamHandler} which is placed in the closest - * downstream from the handler associated with the specified - * {@link ChannelHandlerContext}. - * - * @param ctx the context - * @param channel the channel to write a message - * @param future the future which will be notified when the write - * operation is done - * @param message the message to write to the channel - * @param remoteAddress the destination of the message. - * {@code null} to use the default remote address. - */ - @Deprecated - public static void write( - ChannelHandlerContext ctx, Channel channel, - ChannelFuture future, Object message, SocketAddress remoteAddress) { - write(ctx, future, message, remoteAddress); - } - /** * Sends a {@code "setInterestOps"} request to the last * {@link ChannelDownstreamHandler} in the {@link ChannelPipeline} of @@ -982,26 +651,6 @@ public class Channels { Integer.valueOf(interestOps))); } - /** - * @deprecated Use {@link #setInterestOps(ChannelHandlerContext, ChannelFuture, int)} instead. - * - * Sends a {@code "setInterestOps"} request to the - * {@link ChannelDownstreamHandler} which is placed in the closest - * downstream from the handler associated with the specified - * {@link ChannelHandlerContext}. - * - * @param ctx the context - * @param channel the channel to change the interestOps - * @param future the future which will be notified when the interestOps is - * changed. - */ - @Deprecated - public static void setInterestOps( - ChannelHandlerContext ctx, Channel channel, - ChannelFuture future, int interestOps) { - setInterestOps(ctx, future, interestOps); - } - /** * Sends a {@code "disconnect"} request to the last * {@link ChannelDownstreamHandler} in the {@link ChannelPipeline} of @@ -1033,24 +682,6 @@ public class Channels { ctx.getChannel(), future, ChannelState.CONNECTED, null)); } - /** - * @deprecated Use {@link #disconnect(ChannelHandlerContext, ChannelFuture)} instead. - * - * Sends a {@code "disconnect"} request to the - * {@link ChannelDownstreamHandler} which is placed in the closest - * downstream from the handler associated with the specified - * {@link ChannelHandlerContext}. - * - * @param ctx the context - * @param channel the channel to disconnect - * @param future the future which will be notified on disconnection - */ - @Deprecated - public static void disconnect( - ChannelHandlerContext ctx, Channel channel, ChannelFuture future) { - disconnect(ctx, future); - } - /** * Sends a {@code "close"} request to the last * {@link ChannelDownstreamHandler} in the {@link ChannelPipeline} of @@ -1082,24 +713,6 @@ public class Channels { ctx.getChannel(), future, ChannelState.OPEN, Boolean.FALSE)); } - /** - * @deprecated Use {@link #close(ChannelHandlerContext, ChannelFuture)} instead. - * - * Sends a {@code "close"} request to the - * {@link ChannelDownstreamHandler} which is placed in the closest - * downstream from the handler associated with the specified - * {@link ChannelHandlerContext}. - * - * @param ctx the context - * @param channel the channel to close - * @param future the future which will be notified on closure - */ - @Deprecated - public static void close( - ChannelHandlerContext ctx, Channel channel, ChannelFuture future) { - close(ctx, future); - } - private static void validateInterestOps(int interestOps) { switch (interestOps) { case Channel.OP_NONE: diff --git a/src/main/java/org/jboss/netty/channel/DefaultChannelConfig.java b/src/main/java/org/jboss/netty/channel/DefaultChannelConfig.java index 2856c47e0f..ccc72ddb87 100644 --- a/src/main/java/org/jboss/netty/channel/DefaultChannelConfig.java +++ b/src/main/java/org/jboss/netty/channel/DefaultChannelConfig.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import org.jboss.netty.buffer.ChannelBufferFactory; import org.jboss.netty.buffer.HeapChannelBufferFactory; import org.jboss.netty.channel.socket.SocketChannelConfig; -import org.jboss.netty.handler.timeout.WriteTimeoutHandler; import org.jboss.netty.util.internal.ConversionUtil; /** @@ -83,14 +82,6 @@ public class DefaultChannelConfig implements ChannelConfig { return null; } - /** - * @deprecated Use {@link WriteTimeoutHandler} instead. - */ - @Deprecated - public int getWriteTimeoutMillis() { - return 0; - } - public void setConnectTimeoutMillis(int connectTimeoutMillis) { if (connectTimeoutMillis < 0) { throw new IllegalArgumentException("connectTimeoutMillis: " + connectTimeoutMillis); @@ -101,12 +92,4 @@ public class DefaultChannelConfig implements ChannelConfig { public void setPipelineFactory(ChannelPipelineFactory pipelineFactory) { // Unused } - - /** - * @deprecated Use {@link WriteTimeoutHandler} instead. - */ - @Deprecated - public void setWriteTimeoutMillis(int writeTimeoutMillis) { - // Unused - } } diff --git a/src/main/java/org/jboss/netty/channel/DefaultServerChannelConfig.java b/src/main/java/org/jboss/netty/channel/DefaultServerChannelConfig.java index 047b0a909b..b342215c14 100644 --- a/src/main/java/org/jboss/netty/channel/DefaultServerChannelConfig.java +++ b/src/main/java/org/jboss/netty/channel/DefaultServerChannelConfig.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import org.jboss.netty.buffer.ChannelBufferFactory; import org.jboss.netty.buffer.HeapChannelBufferFactory; import org.jboss.netty.channel.socket.ServerSocketChannelConfig; -import org.jboss.netty.handler.timeout.WriteTimeoutHandler; /** * The default {@link ServerSocketChannelConfig} implementation. @@ -94,20 +93,4 @@ public class DefaultServerChannelConfig implements ChannelConfig { public void setConnectTimeoutMillis(int connectTimeoutMillis) { // Unused } - - /** - * @deprecated Use {@link WriteTimeoutHandler} instead. - */ - @Deprecated - public int getWriteTimeoutMillis() { - return 0; - } - - /** - * @deprecated Use {@link WriteTimeoutHandler} instead. - */ - @Deprecated - public void setWriteTimeoutMillis(int writeTimeoutMillis) { - // Unused - } } diff --git a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingSocketChannelConfig.java b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingSocketChannelConfig.java index e7d37851b1..b66682df5d 100644 --- a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingSocketChannelConfig.java +++ b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingSocketChannelConfig.java @@ -310,11 +310,6 @@ public final class HttpTunnelingSocketChannelConfig implements SocketChannelConf return channel.realChannel.getConfig().getPipelineFactory(); } - @Deprecated - public int getWriteTimeoutMillis() { - return channel.realChannel.getConfig().getWriteTimeoutMillis(); - } - public void setBufferFactory(ChannelBufferFactory bufferFactory) { channel.realChannel.getConfig().setBufferFactory(bufferFactory); } @@ -326,9 +321,4 @@ public final class HttpTunnelingSocketChannelConfig implements SocketChannelConf public void setPipelineFactory(ChannelPipelineFactory pipelineFactory) { channel.realChannel.getConfig().setPipelineFactory(pipelineFactory); } - - @Deprecated - public void setWriteTimeoutMillis(int writeTimeoutMillis) { - channel.realChannel.getConfig().setWriteTimeoutMillis(writeTimeoutMillis); - } } diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java b/src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java index 1447ae792d..f8900fb680 100644 --- a/src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java +++ b/src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java @@ -75,9 +75,7 @@ class DefaultNioSocketChannelConfig extends DefaultSocketChannelConfig return true; } - if (key.equals("readWriteFair")) { - setReadWriteFair(true); // Deprecated - } else if (key.equals("writeBufferHighWaterMark")) { + if (key.equals("writeBufferHighWaterMark")) { setWriteBufferHighWaterMark0(ConversionUtil.toInt(value)); } else if (key.equals("writeBufferLowWaterMark")) { setWriteBufferLowWaterMark0(ConversionUtil.toInt(value)); @@ -180,15 +178,4 @@ class DefaultNioSocketChannelConfig extends DefaultSocketChannelConfig } this.predictorFactory = predictorFactory; } - - public boolean isReadWriteFair() { - logger.warn( - "Detected an access to a deprecated configuration parameter: " + - "readWriteFair"); - return true; - } - - public void setReadWriteFair(boolean readWriteFair) { - isReadWriteFair(); - } } diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannelConfig.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannelConfig.java index 07f715ae44..57ab8c540a 100644 --- a/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannelConfig.java +++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannelConfig.java @@ -49,8 +49,6 @@ import org.jboss.netty.channel.socket.SocketChannelConfig; * {@code "receiveBufferSizePredictor"}{@link #setReceiveBufferSizePredictor(ReceiveBufferSizePredictor)} * * {@code "receiveBufferSizePredictorFactory"}{@link #setReceiveBufferSizePredictorFactory(ReceiveBufferSizePredictorFactory)} - * - * {@code "readWriteFair"}{@link #setReadWriteFair(boolean)} * * * @@ -147,32 +145,4 @@ public interface NioSocketChannelConfig extends SocketChannelConfig { * {@link AdaptiveReceiveBufferSizePredictorFactory}(64, 1024, 65536). */ void setReceiveBufferSizePredictorFactory(ReceiveBufferSizePredictorFactory predictorFactory); - - /** - * @deprecated This property has been replaced by the - * {@code writeBufferHighWaterMark} and {@code writeBufferLowWaterMark}. - * - * Returns {@code true} if and only if an I/O thread should do its effort - * to balance the ratio of read and write operations. Assuring - * the read-write fairness is sometimes necessary in a high speed network - * because a certain channel can spend too much time on flushing the - * large number of write requests not giving enough time for other channels - * to perform I/O. The default value is {@code false}. - */ - @Deprecated - boolean isReadWriteFair(); - - /** - * @deprecated This property has been replaced by the - * {@code writeBufferHighWaterMark} and {@code writeBufferLowWaterMark}. - * - * Sets if an I/O thread should balance the ratio of read and write - * operations. Assuring the read-write fairness is sometimes necessary - * in a high speed network because a certain channel can spend too much - * time on flushing the large number of write requests not giving enough - * time for other channels to perform I/O. The default value is - * {@code false}. - */ - @Deprecated - void setReadWriteFair(boolean fair); } diff --git a/src/main/java/org/jboss/netty/channel/xnio/DefaultXnioChannelConfig.java b/src/main/java/org/jboss/netty/channel/xnio/DefaultXnioChannelConfig.java index 083f740ce6..113e9afa4d 100644 --- a/src/main/java/org/jboss/netty/channel/xnio/DefaultXnioChannelConfig.java +++ b/src/main/java/org/jboss/netty/channel/xnio/DefaultXnioChannelConfig.java @@ -213,14 +213,4 @@ final class DefaultXnioChannelConfig implements XnioChannelConfig { public void setConnectTimeoutMillis(int connectTimeoutMillis) { // Preconfigured by XNIO. } - - @Deprecated - public int getWriteTimeoutMillis() { - return 0; - } - - @Deprecated - public void setWriteTimeoutMillis(int writeTimeoutMillis) { - // Unused. - } }