From 303c1b5f79c5cd335a4f90535d42c56b107c0261 Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Fri, 13 Jan 2012 17:41:18 +0900 Subject: [PATCH] Overall cleanup / Add lost old jzlib headers --- .../java/io/netty/buffer/ChannelBuffer.java | 8 +++-- .../codec/http/CaseIgnoringComparator.java | 2 -- .../handler/codec/http/CookieHeaderNames.java | 2 -- .../handler/codec/http/HttpChunkTrailer.java | 2 +- .../handler/codec/http/HttpCodecUtil.java | 2 -- .../netty/handler/codec/http/HttpMessage.java | 2 +- .../netty/handler/codec/rtsp/RtspHeaders.java | 4 +-- .../handler/codec/http/CookieDecoderTest.java | 2 -- .../handler/codec/http/CookieEncoderTest.java | 3 -- .../codec/http/DefaultHttpMessageTest.java | 2 -- .../codec/http/QueryStringDecoderTest.java | 2 -- .../codec/embedder/EmbeddedSocketAddress.java | 2 -- .../frame/LengthFieldBasedFrameDecoder.java | 2 +- .../handler/codec/replay/ReplayError.java | 2 -- .../codec/replay/ReplayingDecoderBuffer.java | 2 -- .../replay/UnsafeDynamicChannelBuffer.java | 2 -- .../CompactObjectInputStream.java | 2 -- .../CompactObjectOutputStream.java | 2 -- .../CompatibleObjectDecoderState.java | 2 -- .../codec/serialization/ObjectDecoder.java | 1 + .../frame/DelimiterBasedFrameDecoderTest.java | 2 -- .../LengthFieldBasedFrameDecoderTest.java | 2 -- .../ProtobufVarint32FrameDecoderTest.java | 2 -- ...tobufVarint32LengthFieldPrependerTest.java | 2 -- .../codec/replay/ReplayingDecoderTest.java | 2 -- .../CompactObjectSerializationTest.java | 2 -- .../SwitchableInputStreamTest.java | 3 -- .../io/netty/logging/Log4JLoggerFactory.java | 2 -- .../util/internal/AtomicFieldUpdaterUtil.java | 2 -- .../internal/LegacyLinkedTransferQueue.java | 1 + .../netty/util/internal/NonReentrantLock.java | 2 -- .../io/netty/util/internal/QueueFactory.java | 6 ++-- .../netty/util/internal/ReusableIterator.java | 2 -- .../util/internal/ThreadLocalBoolean.java | 2 -- .../io/netty/util/internal/jzlib/Adler32.java | 27 +++++++++++++++- .../io/netty/util/internal/jzlib/CRC32.java | 32 +++++++++++++++++++ .../io/netty/util/internal/jzlib/Deflate.java | 27 +++++++++++++++- .../netty/util/internal/jzlib/InfBlocks.java | 27 +++++++++++++++- .../netty/util/internal/jzlib/InfCodes.java | 27 +++++++++++++++- .../io/netty/util/internal/jzlib/InfTree.java | 27 +++++++++++++++- .../io/netty/util/internal/jzlib/Inflate.java | 27 +++++++++++++++- .../io/netty/util/internal/jzlib/JZlib.java | 27 +++++++++++++++- .../netty/util/internal/jzlib/StaticTree.java | 27 +++++++++++++++- .../io/netty/util/internal/jzlib/Tree.java | 27 +++++++++++++++- .../io/netty/util/internal/jzlib/ZStream.java | 27 +++++++++++++++- .../logging/CommonsLoggerFactoryTest.java | 3 -- .../io/netty/logging/CommonsLoggerTest.java | 3 -- .../logging/InternalLoggerFactoryTest.java | 3 -- .../netty/logging/JBossLoggerFactoryTest.java | 3 -- .../io/netty/logging/JBossLoggerTest.java | 3 -- .../netty/logging/JdkLoggerFactoryTest.java | 3 -- .../java/io/netty/logging/JdkLoggerTest.java | 3 -- .../netty/logging/Log4JLoggerFactoryTest.java | 3 -- .../io/netty/logging/Log4JLoggerTest.java | 3 -- .../netty/logging/Slf4JLoggerFactoryTest.java | 3 -- .../io/netty/logging/Slf4JLoggerTest.java | 3 -- .../java/io/netty/util/MapBackedSetTest.java | 3 -- .../util/internal/ConversionUtilTest.java | 3 -- .../netty/example/discard/DiscardServer.java | 1 - .../io/netty/example/echo/EchoServer.java | 1 - .../example/factorial/FactorialServer.java | 1 - .../http/file/HttpStaticFileServer.java | 2 -- .../HttpStaticFileServerPipelineFactory.java | 2 -- .../http/snoop/HttpClientPipelineFactory.java | 2 -- .../http/snoop/HttpRequestHandler.java | 2 -- .../http/snoop/HttpResponseHandler.java | 2 -- .../http/snoop/HttpServerPipelineFactory.java | 2 -- .../upload/HttpClientPipelineFactory.java | 2 -- .../http/upload/HttpRequestHandler.java | 2 -- .../http/upload/HttpResponseHandler.java | 2 -- .../upload/HttpServerPipelineFactory.java | 2 -- .../io/netty/example/local/LocalExample.java | 2 -- .../local/LocalExampleMultthreaded.java | 2 -- .../local/LocalServerPipelineFactory.java | 2 -- .../localtime/LocalTimeClientHandler.java | 2 -- .../LocalTimeClientPipelineFactory.java | 2 -- .../localtime/LocalTimeServerHandler.java | 2 -- .../LocalTimeServerPipelineFactory.java | 2 -- .../io/netty/example/proxy/HexDumpProxy.java | 2 -- .../proxy/HexDumpProxyInboundHandler.java | 2 -- .../proxy/HexDumpProxyPipelineFactory.java | 2 -- .../qotm/QuoteOfTheMomentClientHandler.java | 2 -- .../qotm/QuoteOfTheMomentServerHandler.java | 2 -- .../securechat/SecureChatServerHandler.java | 2 -- .../OrderedMemoryAwareThreadPoolExecutor.java | 2 +- .../java/io/netty/handler/ssl/SslHandler.java | 2 +- .../handler/timeout/WriteTimeoutHandler.java | 2 -- .../handler/ssl/ImmediateExecutorTest.java | 3 -- ...tSocketCompatibleObjectStreamEchoTest.java | 3 -- .../socket/AbstractSocketEchoTest.java | 3 -- .../AbstractSocketFixedLengthEchoTest.java | 3 -- .../AbstractSocketObjectStreamEchoTest.java | 3 -- .../socket/AbstractSocketSslEchoTest.java | 3 -- .../socket/AbstractSocketStringEchoTest.java | 3 -- ...oSocketCompatibleObjectStreamEchoTest.java | 2 -- .../NioNioSocketFixedLengthEchoTest.java | 2 -- .../NioNioSocketObjectStreamEchoTest.java | 2 -- .../socket/NioNioSocketStringEchoTest.java | 2 -- ...oSocketCompatibleObjectStreamEchoTest.java | 2 -- .../NioOioSocketFixedLengthEchoTest.java | 2 -- .../NioOioSocketObjectStreamEchoTest.java | 2 -- .../socket/NioOioSocketStringEchoTest.java | 2 -- ...oSocketCompatibleObjectStreamEchoTest.java | 2 -- .../OioNioSocketFixedLengthEchoTest.java | 2 -- .../socket/OioNioSocketStringEchoTest.java | 2 -- ...oSocketCompatibleObjectStreamEchoTest.java | 2 -- .../OioOioSocketFixedLengthEchoTest.java | 2 -- .../OioOioSocketObjectStreamEchoTest.java | 2 -- .../socket/OioOioSocketStringEchoTest.java | 2 -- .../nio/NioClientSocketShutdownTimeTest.java | 2 -- .../nio/NioServerSocketShutdownTimeTest.java | 3 -- .../socket/nio/nio/NioNioSocketEchoTest.java | 2 -- .../nio/nio/NioNioSocketSslEchoTest.java | 2 -- .../socket/nio/oio/NioOioSocketEchoTest.java | 2 -- .../nio/oio/NioOioSocketSslEchoTest.java | 2 -- .../socket/oio/nio/OioNioSocketEchoTest.java | 2 -- .../oio/nio/OioNioSocketSslEchoTest.java | 2 -- .../socket/oio/oio/OioOioSocketEchoTest.java | 2 -- .../oio/oio/OioOioSocketSslEchoTest.java | 2 -- .../channel/sctp/SctpReceiveBufferPool.java | 2 -- .../channel/sctp/SctpSendBufferPool.java | 2 -- .../io/netty/channel/sctp/SelectorUtil.java | 2 -- .../java/io/netty/channel/ChannelHandler.java | 2 +- .../channel/local/LocalServerChannelSink.java | 2 -- .../socket/nio/AbstractWriteRequestQueue.java | 6 ---- .../socket/nio/NioAcceptedSocketChannel.java | 2 -- .../socket/nio/NioClientSocketChannel.java | 2 -- .../nio/NioClientSocketPipelineSink.java | 2 -- .../socket/nio/NioDatagramChannel.java | 2 +- .../channel/socket/nio/NioDatagramWorker.java | 2 +- .../socket/nio/NioServerSocketChannel.java | 2 -- .../nio/NioServerSocketPipelineSink.java | 2 -- .../channel/socket/nio/NioSocketChannel.java | 2 -- .../netty/channel/socket/nio/NioWorker.java | 2 -- .../channel/socket/nio/SelectorUtil.java | 2 -- .../socket/nio/SocketReceiveBufferPool.java | 2 -- .../socket/nio/SocketSendBufferPool.java | 2 -- .../socket/oio/OioAcceptedSocketChannel.java | 2 -- .../socket/oio/OioClientSocketChannel.java | 2 -- .../oio/OioClientSocketPipelineSink.java | 2 -- .../socket/oio/OioDatagramChannel.java | 2 -- .../socket/oio/OioDatagramPipelineSink.java | 2 -- .../channel/socket/oio/OioDatagramWorker.java | 2 -- .../socket/oio/OioServerSocketChannel.java | 2 -- .../oio/OioServerSocketPipelineSink.java | 2 -- .../channel/socket/oio/OioSocketChannel.java | 2 -- .../netty/channel/socket/oio/OioWorker.java | 2 -- .../channel/CompleteChannelFutureTest.java | 3 -- .../channel/FailedChannelFutureTest.java | 3 -- .../channel/StaticChannelPipelineTest.java | 2 -- .../channel/SucceededChannelFutureTest.java | 3 -- 151 files changed, 312 insertions(+), 307 deletions(-) diff --git a/buffer/src/main/java/io/netty/buffer/ChannelBuffer.java b/buffer/src/main/java/io/netty/buffer/ChannelBuffer.java index bda2401971..0d43b6107d 100644 --- a/buffer/src/main/java/io/netty/buffer/ChannelBuffer.java +++ b/buffer/src/main/java/io/netty/buffer/ChannelBuffer.java @@ -130,6 +130,8 @@ import java.nio.charset.UnsupportedCharsetException; * +-------------------+------------------+------------------+ * | | | | * 0 <= readerIndex <= writerIndex <= capacity + * + * * AFTER discardReadBytes() * * +------------------+--------------------------------------+ @@ -160,6 +162,8 @@ import java.nio.charset.UnsupportedCharsetException; * +-------------------+------------------+------------------+ * | | | | * 0 <= readerIndex <= writerIndex <= capacity + * + * * AFTER clear() * * +---------------------------------------------------------+ @@ -1352,7 +1356,7 @@ public interface ChannelBuffer extends Comparable { * @throws IndexOutOfBoundsException * if {@code src.readableBytes} is greater than * {@code this.writableBytes} - */ + */ void writeBytes(ChannelBuffer src); /** @@ -1606,7 +1610,7 @@ public interface ChannelBuffer extends Comparable { * This method is identical to {@code buf.copy(buf.readerIndex(), buf.readableBytes())}. * This method does not modify {@code readerIndex} or {@code writerIndex} of * this buffer. - */ + */ ChannelBuffer copy(); /** diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/CaseIgnoringComparator.java b/codec-http/src/main/java/io/netty/handler/codec/http/CaseIgnoringComparator.java index 5235891dba..4fd2b4370f 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/CaseIgnoringComparator.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/CaseIgnoringComparator.java @@ -18,8 +18,6 @@ package io.netty.handler.codec.http; import java.io.Serializable; import java.util.Comparator; -/** - */ final class CaseIgnoringComparator implements Comparator, Serializable { private static final long serialVersionUID = 4582133183775373862L; diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/CookieHeaderNames.java b/codec-http/src/main/java/io/netty/handler/codec/http/CookieHeaderNames.java index ab5ed057a9..2c0b7bfd1d 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/CookieHeaderNames.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/CookieHeaderNames.java @@ -15,8 +15,6 @@ */ package io.netty.handler.codec.http; -/** - */ final class CookieHeaderNames { static final String PATH = "Path"; diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpChunkTrailer.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpChunkTrailer.java index e02e76d9f6..50ded221bb 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpChunkTrailer.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpChunkTrailer.java @@ -36,7 +36,7 @@ public interface HttpChunkTrailer extends HttpChunk { * header name, the first value is returned. * * @return the header value or {@code null} if there is no such header - */ + */ String getHeader(String name); /** diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpCodecUtil.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpCodecUtil.java index 065f8579ab..0f9c3834cf 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpCodecUtil.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpCodecUtil.java @@ -20,8 +20,6 @@ import java.util.List; import io.netty.util.CharsetUtil; -/** - */ final class HttpCodecUtil { //space ' ' static final byte SP = 32; diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpMessage.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpMessage.java index e129f7a59c..aaa1213f7c 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpMessage.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpMessage.java @@ -40,7 +40,7 @@ public interface HttpMessage { * value is returned. * * @return the header value or {@code null} if there is no such header - */ + */ String getHeader(String name); /** diff --git a/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspHeaders.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspHeaders.java index 7e0e7e9159..77ae287deb 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspHeaders.java +++ b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspHeaders.java @@ -27,7 +27,7 @@ public final class RtspHeaders { /** * Standard RTSP header names. - */ + */ public static final class Names { /** * {@code "Accept"} @@ -212,7 +212,7 @@ public final class RtspHeaders { /** * Standard RTSP header values. - */ + */ public static final class Values { /** * {@code "append"} diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/CookieDecoderTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/CookieDecoderTest.java index b9499381d0..b853328e70 100644 --- a/codec-http/src/test/java/io/netty/handler/codec/http/CookieDecoderTest.java +++ b/codec-http/src/test/java/io/netty/handler/codec/http/CookieDecoderTest.java @@ -28,8 +28,6 @@ import java.util.Set; import org.junit.Test; -/** - */ public class CookieDecoderTest { @Test public void testDecodingSingleCookieV0() { diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/CookieEncoderTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/CookieEncoderTest.java index a924ac0d06..b274e44e35 100644 --- a/codec-http/src/test/java/io/netty/handler/codec/http/CookieEncoderTest.java +++ b/codec-http/src/test/java/io/netty/handler/codec/http/CookieEncoderTest.java @@ -24,9 +24,6 @@ import java.util.Date; import org.junit.Test; - -/** - */ public class CookieEncoderTest { @Test public void testEncodingSingleCookieV0() { diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/DefaultHttpMessageTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/DefaultHttpMessageTest.java index cb3945a1d6..a2d75940cf 100644 --- a/codec-http/src/test/java/io/netty/handler/codec/http/DefaultHttpMessageTest.java +++ b/codec-http/src/test/java/io/netty/handler/codec/http/DefaultHttpMessageTest.java @@ -18,8 +18,6 @@ package io.netty.handler.codec.http; import org.junit.Assert; import org.junit.Test; -/** - */ public class DefaultHttpMessageTest { @Test diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/QueryStringDecoderTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/QueryStringDecoderTest.java index 74962be61e..14f93c73c0 100644 --- a/codec-http/src/test/java/io/netty/handler/codec/http/QueryStringDecoderTest.java +++ b/codec-http/src/test/java/io/netty/handler/codec/http/QueryStringDecoderTest.java @@ -22,8 +22,6 @@ import io.netty.util.CharsetUtil; import org.junit.Assert; import org.junit.Test; -/** - */ public class QueryStringDecoderTest { @Test diff --git a/codec/src/main/java/io/netty/handler/codec/embedder/EmbeddedSocketAddress.java b/codec/src/main/java/io/netty/handler/codec/embedder/EmbeddedSocketAddress.java index 0147ba5b47..2ae835b9b3 100644 --- a/codec/src/main/java/io/netty/handler/codec/embedder/EmbeddedSocketAddress.java +++ b/codec/src/main/java/io/netty/handler/codec/embedder/EmbeddedSocketAddress.java @@ -17,8 +17,6 @@ package io.netty.handler.codec.embedder; import java.net.SocketAddress; -/** - */ class EmbeddedSocketAddress extends SocketAddress { private static final long serialVersionUID = 1400788804624980619L; } diff --git a/codec/src/main/java/io/netty/handler/codec/frame/LengthFieldBasedFrameDecoder.java b/codec/src/main/java/io/netty/handler/codec/frame/LengthFieldBasedFrameDecoder.java index 472184bdf1..a935f89605 100644 --- a/codec/src/main/java/io/netty/handler/codec/frame/LengthFieldBasedFrameDecoder.java +++ b/codec/src/main/java/io/netty/handler/codec/frame/LengthFieldBasedFrameDecoder.java @@ -205,7 +205,7 @@ public class LengthFieldBasedFrameDecoder extends FrameDecoder { * the offset of the length field * @param lengthFieldLength * the length of the length field - */ + */ public LengthFieldBasedFrameDecoder( int maxFrameLength, int lengthFieldOffset, int lengthFieldLength) { diff --git a/codec/src/main/java/io/netty/handler/codec/replay/ReplayError.java b/codec/src/main/java/io/netty/handler/codec/replay/ReplayError.java index a2d98abfee..42aabe8548 100644 --- a/codec/src/main/java/io/netty/handler/codec/replay/ReplayError.java +++ b/codec/src/main/java/io/netty/handler/codec/replay/ReplayError.java @@ -16,8 +16,6 @@ package io.netty.handler.codec.replay; -/** - */ class ReplayError extends Error { private static final long serialVersionUID = 2666698631187527681L; diff --git a/codec/src/main/java/io/netty/handler/codec/replay/ReplayingDecoderBuffer.java b/codec/src/main/java/io/netty/handler/codec/replay/ReplayingDecoderBuffer.java index 1a28dfa8f1..b258af7185 100644 --- a/codec/src/main/java/io/netty/handler/codec/replay/ReplayingDecoderBuffer.java +++ b/codec/src/main/java/io/netty/handler/codec/replay/ReplayingDecoderBuffer.java @@ -29,8 +29,6 @@ import io.netty.buffer.ChannelBufferFactory; import io.netty.buffer.ChannelBufferIndexFinder; import io.netty.buffer.ChannelBuffers; -/** - */ class ReplayingDecoderBuffer implements ChannelBuffer { private static final Error REPLAY = new ReplayError(); diff --git a/codec/src/main/java/io/netty/handler/codec/replay/UnsafeDynamicChannelBuffer.java b/codec/src/main/java/io/netty/handler/codec/replay/UnsafeDynamicChannelBuffer.java index 820fe0f187..57b5be4fc7 100644 --- a/codec/src/main/java/io/netty/handler/codec/replay/UnsafeDynamicChannelBuffer.java +++ b/codec/src/main/java/io/netty/handler/codec/replay/UnsafeDynamicChannelBuffer.java @@ -18,8 +18,6 @@ package io.netty.handler.codec.replay; import io.netty.buffer.ChannelBufferFactory; import io.netty.buffer.DynamicChannelBuffer; -/** - */ class UnsafeDynamicChannelBuffer extends DynamicChannelBuffer { UnsafeDynamicChannelBuffer(ChannelBufferFactory factory) { diff --git a/codec/src/main/java/io/netty/handler/codec/serialization/CompactObjectInputStream.java b/codec/src/main/java/io/netty/handler/codec/serialization/CompactObjectInputStream.java index 7bfc0bfa7c..9e7e766b38 100644 --- a/codec/src/main/java/io/netty/handler/codec/serialization/CompactObjectInputStream.java +++ b/codec/src/main/java/io/netty/handler/codec/serialization/CompactObjectInputStream.java @@ -22,8 +22,6 @@ import java.io.ObjectInputStream; import java.io.ObjectStreamClass; import java.io.StreamCorruptedException; -/** - */ class CompactObjectInputStream extends ObjectInputStream { private final ClassResolver classResolver; diff --git a/codec/src/main/java/io/netty/handler/codec/serialization/CompactObjectOutputStream.java b/codec/src/main/java/io/netty/handler/codec/serialization/CompactObjectOutputStream.java index 2e88e7cc13..4a17d80487 100644 --- a/codec/src/main/java/io/netty/handler/codec/serialization/CompactObjectOutputStream.java +++ b/codec/src/main/java/io/netty/handler/codec/serialization/CompactObjectOutputStream.java @@ -20,8 +20,6 @@ import java.io.ObjectOutputStream; import java.io.ObjectStreamClass; import java.io.OutputStream; -/** - */ class CompactObjectOutputStream extends ObjectOutputStream { static final int TYPE_FAT_DESCRIPTOR = 0; diff --git a/codec/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectDecoderState.java b/codec/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectDecoderState.java index 9ed1109b9a..a98fbc99cc 100644 --- a/codec/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectDecoderState.java +++ b/codec/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectDecoderState.java @@ -15,8 +15,6 @@ */ package io.netty.handler.codec.serialization; -/** - */ enum CompatibleObjectDecoderState { READ_HEADER, READ_OBJECT, diff --git a/codec/src/main/java/io/netty/handler/codec/serialization/ObjectDecoder.java b/codec/src/main/java/io/netty/handler/codec/serialization/ObjectDecoder.java index 7a0a642f95..64a2f9049b 100644 --- a/codec/src/main/java/io/netty/handler/codec/serialization/ObjectDecoder.java +++ b/codec/src/main/java/io/netty/handler/codec/serialization/ObjectDecoder.java @@ -97,6 +97,7 @@ public class ObjectDecoder extends LengthFieldBasedFrameDecoder { /** * Create a new decoder with the specified maximum object size and the {@link ClassLoader} wrapped in {@link ClassResolvers#weakCachingResolver(ClassLoader)} + * * @param maxObjectSize the maximum byte length of the serialized object. * if the length of the received object is greater * than this value, {@link StreamCorruptedException} diff --git a/codec/src/test/java/io/netty/handler/codec/frame/DelimiterBasedFrameDecoderTest.java b/codec/src/test/java/io/netty/handler/codec/frame/DelimiterBasedFrameDecoderTest.java index 7d1728de7a..d183af4ae9 100644 --- a/codec/src/test/java/io/netty/handler/codec/frame/DelimiterBasedFrameDecoderTest.java +++ b/codec/src/test/java/io/netty/handler/codec/frame/DelimiterBasedFrameDecoderTest.java @@ -23,8 +23,6 @@ import io.netty.util.CharsetUtil; import org.junit.Assert; import org.junit.Test; -/** - */ public class DelimiterBasedFrameDecoderTest { @Test public void testFailSlowTooLongFrameRecovery() throws Exception { diff --git a/codec/src/test/java/io/netty/handler/codec/frame/LengthFieldBasedFrameDecoderTest.java b/codec/src/test/java/io/netty/handler/codec/frame/LengthFieldBasedFrameDecoderTest.java index 7e24821b34..5d756bc232 100644 --- a/codec/src/test/java/io/netty/handler/codec/frame/LengthFieldBasedFrameDecoderTest.java +++ b/codec/src/test/java/io/netty/handler/codec/frame/LengthFieldBasedFrameDecoderTest.java @@ -23,8 +23,6 @@ import io.netty.util.CharsetUtil; import org.junit.Assert; import org.junit.Test; -/** - */ public class LengthFieldBasedFrameDecoderTest { @Test public void testFailSlowTooLongFrameRecovery() throws Exception { diff --git a/codec/src/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoderTest.java b/codec/src/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoderTest.java index 29259fae9d..9c32400375 100644 --- a/codec/src/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoderTest.java +++ b/codec/src/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoderTest.java @@ -25,8 +25,6 @@ import io.netty.handler.codec.embedder.DecoderEmbedder; import org.junit.Before; import org.junit.Test; -/** - */ public class ProtobufVarint32FrameDecoderTest { private DecoderEmbedder embedder; diff --git a/codec/src/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrependerTest.java b/codec/src/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrependerTest.java index d650942628..93ae7b2ba1 100644 --- a/codec/src/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrependerTest.java +++ b/codec/src/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrependerTest.java @@ -24,8 +24,6 @@ import io.netty.handler.codec.embedder.EncoderEmbedder; import org.junit.Before; import org.junit.Test; -/** - */ public class ProtobufVarint32LengthFieldPrependerTest { private EncoderEmbedder embedder; diff --git a/codec/src/test/java/io/netty/handler/codec/replay/ReplayingDecoderTest.java b/codec/src/test/java/io/netty/handler/codec/replay/ReplayingDecoderTest.java index a96b0c6ff7..1b8af565b8 100644 --- a/codec/src/test/java/io/netty/handler/codec/replay/ReplayingDecoderTest.java +++ b/codec/src/test/java/io/netty/handler/codec/replay/ReplayingDecoderTest.java @@ -25,8 +25,6 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.embedder.DecoderEmbedder; import org.junit.Test; -/** - */ public class ReplayingDecoderTest { @Test diff --git a/codec/src/test/java/io/netty/handler/codec/serialization/CompactObjectSerializationTest.java b/codec/src/test/java/io/netty/handler/codec/serialization/CompactObjectSerializationTest.java index 23953ec468..ceb77f0468 100644 --- a/codec/src/test/java/io/netty/handler/codec/serialization/CompactObjectSerializationTest.java +++ b/codec/src/test/java/io/netty/handler/codec/serialization/CompactObjectSerializationTest.java @@ -22,8 +22,6 @@ import java.util.List; import org.junit.Assert; import org.junit.Test; -/** - */ public class CompactObjectSerializationTest { @Test diff --git a/codec/src/test/java/io/netty/handler/codec/serialization/SwitchableInputStreamTest.java b/codec/src/test/java/io/netty/handler/codec/serialization/SwitchableInputStreamTest.java index 195da53a37..2ec1f782f7 100644 --- a/codec/src/test/java/io/netty/handler/codec/serialization/SwitchableInputStreamTest.java +++ b/codec/src/test/java/io/netty/handler/codec/serialization/SwitchableInputStreamTest.java @@ -22,9 +22,6 @@ import java.io.InputStream; import org.junit.Test; - -/** - */ public class SwitchableInputStreamTest { @Test diff --git a/common/src/main/java/io/netty/logging/Log4JLoggerFactory.java b/common/src/main/java/io/netty/logging/Log4JLoggerFactory.java index 45812f29cf..17b52c1074 100644 --- a/common/src/main/java/io/netty/logging/Log4JLoggerFactory.java +++ b/common/src/main/java/io/netty/logging/Log4JLoggerFactory.java @@ -15,8 +15,6 @@ */ package io.netty.logging; - - /** * Logger factory which creates an * Apache Log4J diff --git a/common/src/main/java/io/netty/util/internal/AtomicFieldUpdaterUtil.java b/common/src/main/java/io/netty/util/internal/AtomicFieldUpdaterUtil.java index 7338e4cf71..9399a18192 100644 --- a/common/src/main/java/io/netty/util/internal/AtomicFieldUpdaterUtil.java +++ b/common/src/main/java/io/netty/util/internal/AtomicFieldUpdaterUtil.java @@ -18,8 +18,6 @@ package io.netty.util.internal; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; -/** - */ final class AtomicFieldUpdaterUtil { private static final boolean AVAILABLE; diff --git a/common/src/main/java/io/netty/util/internal/LegacyLinkedTransferQueue.java b/common/src/main/java/io/netty/util/internal/LegacyLinkedTransferQueue.java index 3fa4bdf9bd..f0168ea637 100644 --- a/common/src/main/java/io/netty/util/internal/LegacyLinkedTransferQueue.java +++ b/common/src/main/java/io/netty/util/internal/LegacyLinkedTransferQueue.java @@ -32,6 +32,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; import java.util.concurrent.locks.LockSupport; + /** * * This version does work even if sun.misc.Unsafe is not found in the classpath. So this is kept for compatibility reasons. diff --git a/common/src/main/java/io/netty/util/internal/NonReentrantLock.java b/common/src/main/java/io/netty/util/internal/NonReentrantLock.java index 3cc3163548..129e792e8e 100644 --- a/common/src/main/java/io/netty/util/internal/NonReentrantLock.java +++ b/common/src/main/java/io/netty/util/internal/NonReentrantLock.java @@ -20,8 +20,6 @@ import java.util.concurrent.locks.AbstractQueuedSynchronizer; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; -/** - */ public final class NonReentrantLock extends AbstractQueuedSynchronizer implements Lock { diff --git a/common/src/main/java/io/netty/util/internal/QueueFactory.java b/common/src/main/java/io/netty/util/internal/QueueFactory.java index 78795f3df0..29b53acfd5 100644 --- a/common/src/main/java/io/netty/util/internal/QueueFactory.java +++ b/common/src/main/java/io/netty/util/internal/QueueFactory.java @@ -21,10 +21,8 @@ import java.util.concurrent.BlockingQueue; import io.netty.util.UnsafeDetectUtil; /** - * This factory should be used to create the "optimal" {@link BlockingQueue} instance for the running JVM. - * - - + * This factory should be used to create the "optimal" {@link BlockingQueue} + * instance for the running JVM. */ public final class QueueFactory { diff --git a/common/src/main/java/io/netty/util/internal/ReusableIterator.java b/common/src/main/java/io/netty/util/internal/ReusableIterator.java index 019e24bed7..f821ef9670 100644 --- a/common/src/main/java/io/netty/util/internal/ReusableIterator.java +++ b/common/src/main/java/io/netty/util/internal/ReusableIterator.java @@ -17,8 +17,6 @@ package io.netty.util.internal; import java.util.Iterator; -/** - */ public interface ReusableIterator extends Iterator { void rewind(); } diff --git a/common/src/main/java/io/netty/util/internal/ThreadLocalBoolean.java b/common/src/main/java/io/netty/util/internal/ThreadLocalBoolean.java index be60001439..af526cddfe 100644 --- a/common/src/main/java/io/netty/util/internal/ThreadLocalBoolean.java +++ b/common/src/main/java/io/netty/util/internal/ThreadLocalBoolean.java @@ -15,8 +15,6 @@ */ package io.netty.util.internal; -/** - */ public class ThreadLocalBoolean extends ThreadLocal { private final boolean defaultValue; diff --git a/common/src/main/java/io/netty/util/internal/jzlib/Adler32.java b/common/src/main/java/io/netty/util/internal/jzlib/Adler32.java index 13a8cefaa8..8e5f00c834 100644 --- a/common/src/main/java/io/netty/util/internal/jzlib/Adler32.java +++ b/common/src/main/java/io/netty/util/internal/jzlib/Adler32.java @@ -13,13 +13,38 @@ * License for the specific language governing permissions and limitations * under the License. */ +/* +Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the distribution. + + 3. The names of the authors may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, +INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, +OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ /* * This program is based on zlib-1.1.3, so all credit should go authors * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu) * and contributors of zlib. */ - package io.netty.util.internal.jzlib; final class Adler32 { diff --git a/common/src/main/java/io/netty/util/internal/jzlib/CRC32.java b/common/src/main/java/io/netty/util/internal/jzlib/CRC32.java index e65f32e51c..c6b17f0876 100644 --- a/common/src/main/java/io/netty/util/internal/jzlib/CRC32.java +++ b/common/src/main/java/io/netty/util/internal/jzlib/CRC32.java @@ -13,6 +13,38 @@ * License for the specific language governing permissions and limitations * under the License. */ +/* +Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the distribution. + + 3. The names of the authors may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, +INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, +OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +/* + * This program is based on zlib-1.1.3, so all credit should go authors + * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu) + * and contributors of zlib. + */ package io.netty.util.internal.jzlib; final class CRC32 { diff --git a/common/src/main/java/io/netty/util/internal/jzlib/Deflate.java b/common/src/main/java/io/netty/util/internal/jzlib/Deflate.java index a0fb3812d0..17890055ee 100644 --- a/common/src/main/java/io/netty/util/internal/jzlib/Deflate.java +++ b/common/src/main/java/io/netty/util/internal/jzlib/Deflate.java @@ -13,13 +13,38 @@ * License for the specific language governing permissions and limitations * under the License. */ +/* +Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the distribution. + + 3. The names of the authors may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, +INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, +OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ /* * This program is based on zlib-1.1.3, so all credit should go authors * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu) * and contributors of zlib. */ - package io.netty.util.internal.jzlib; import io.netty.util.internal.jzlib.JZlib.WrapperType; diff --git a/common/src/main/java/io/netty/util/internal/jzlib/InfBlocks.java b/common/src/main/java/io/netty/util/internal/jzlib/InfBlocks.java index 2af281e50e..b387ffbb1c 100644 --- a/common/src/main/java/io/netty/util/internal/jzlib/InfBlocks.java +++ b/common/src/main/java/io/netty/util/internal/jzlib/InfBlocks.java @@ -13,13 +13,38 @@ * License for the specific language governing permissions and limitations * under the License. */ +/* +Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the distribution. + + 3. The names of the authors may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, +INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, +OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ /* * This program is based on zlib-1.1.3, so all credit should go authors * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu) * and contributors of zlib. */ - package io.netty.util.internal.jzlib; final class InfBlocks { diff --git a/common/src/main/java/io/netty/util/internal/jzlib/InfCodes.java b/common/src/main/java/io/netty/util/internal/jzlib/InfCodes.java index ae23c56cc6..ef979b57a3 100644 --- a/common/src/main/java/io/netty/util/internal/jzlib/InfCodes.java +++ b/common/src/main/java/io/netty/util/internal/jzlib/InfCodes.java @@ -13,13 +13,38 @@ * License for the specific language governing permissions and limitations * under the License. */ +/* +Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the distribution. + + 3. The names of the authors may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, +INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, +OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ /* * This program is based on zlib-1.1.3, so all credit should go authors * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu) * and contributors of zlib. */ - package io.netty.util.internal.jzlib; final class InfCodes { diff --git a/common/src/main/java/io/netty/util/internal/jzlib/InfTree.java b/common/src/main/java/io/netty/util/internal/jzlib/InfTree.java index 64ab9554cd..313c1789f6 100644 --- a/common/src/main/java/io/netty/util/internal/jzlib/InfTree.java +++ b/common/src/main/java/io/netty/util/internal/jzlib/InfTree.java @@ -13,13 +13,38 @@ * License for the specific language governing permissions and limitations * under the License. */ +/* +Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the distribution. + + 3. The names of the authors may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, +INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, +OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ /* * This program is based on zlib-1.1.3, so all credit should go authors * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu) * and contributors of zlib. */ - package io.netty.util.internal.jzlib; final class InfTree { diff --git a/common/src/main/java/io/netty/util/internal/jzlib/Inflate.java b/common/src/main/java/io/netty/util/internal/jzlib/Inflate.java index a7898f9d45..c496533203 100644 --- a/common/src/main/java/io/netty/util/internal/jzlib/Inflate.java +++ b/common/src/main/java/io/netty/util/internal/jzlib/Inflate.java @@ -13,13 +13,38 @@ * License for the specific language governing permissions and limitations * under the License. */ +/* +Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the distribution. + + 3. The names of the authors may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, +INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, +OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ /* * This program is based on zlib-1.1.3, so all credit should go authors * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu) * and contributors of zlib. */ - package io.netty.util.internal.jzlib; import io.netty.util.internal.jzlib.JZlib.WrapperType; diff --git a/common/src/main/java/io/netty/util/internal/jzlib/JZlib.java b/common/src/main/java/io/netty/util/internal/jzlib/JZlib.java index aa46e37da2..b97f96a878 100644 --- a/common/src/main/java/io/netty/util/internal/jzlib/JZlib.java +++ b/common/src/main/java/io/netty/util/internal/jzlib/JZlib.java @@ -13,13 +13,38 @@ * License for the specific language governing permissions and limitations * under the License. */ +/* +Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the distribution. + + 3. The names of the authors may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, +INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, +OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ /* * This program is based on zlib-1.1.3, so all credit should go authors * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu) * and contributors of zlib. */ - package io.netty.util.internal.jzlib; public final class JZlib { diff --git a/common/src/main/java/io/netty/util/internal/jzlib/StaticTree.java b/common/src/main/java/io/netty/util/internal/jzlib/StaticTree.java index ce6e6ea455..8ccb3bd314 100644 --- a/common/src/main/java/io/netty/util/internal/jzlib/StaticTree.java +++ b/common/src/main/java/io/netty/util/internal/jzlib/StaticTree.java @@ -13,13 +13,38 @@ * License for the specific language governing permissions and limitations * under the License. */ +/* +Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the distribution. + + 3. The names of the authors may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, +INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, +OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ /* * This program is based on zlib-1.1.3, so all credit should go authors * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu) * and contributors of zlib. */ - package io.netty.util.internal.jzlib; final class StaticTree { diff --git a/common/src/main/java/io/netty/util/internal/jzlib/Tree.java b/common/src/main/java/io/netty/util/internal/jzlib/Tree.java index e90ee3056e..96b22af6e7 100644 --- a/common/src/main/java/io/netty/util/internal/jzlib/Tree.java +++ b/common/src/main/java/io/netty/util/internal/jzlib/Tree.java @@ -13,13 +13,38 @@ * License for the specific language governing permissions and limitations * under the License. */ +/* +Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the distribution. + + 3. The names of the authors may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, +INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, +OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ /* * This program is based on zlib-1.1.3, so all credit should go authors * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu) * and contributors of zlib. */ - package io.netty.util.internal.jzlib; final class Tree { diff --git a/common/src/main/java/io/netty/util/internal/jzlib/ZStream.java b/common/src/main/java/io/netty/util/internal/jzlib/ZStream.java index 9bc28c205f..2598165faa 100644 --- a/common/src/main/java/io/netty/util/internal/jzlib/ZStream.java +++ b/common/src/main/java/io/netty/util/internal/jzlib/ZStream.java @@ -13,13 +13,38 @@ * License for the specific language governing permissions and limitations * under the License. */ +/* +Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the distribution. + + 3. The names of the authors may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, +INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, +OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ /* * This program is based on zlib-1.1.3, so all credit should go authors * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu) * and contributors of zlib. */ - package io.netty.util.internal.jzlib; import io.netty.util.internal.jzlib.JZlib.WrapperType; diff --git a/common/src/test/java/io/netty/logging/CommonsLoggerFactoryTest.java b/common/src/test/java/io/netty/logging/CommonsLoggerFactoryTest.java index 90f4509abc..85caa03ee1 100644 --- a/common/src/test/java/io/netty/logging/CommonsLoggerFactoryTest.java +++ b/common/src/test/java/io/netty/logging/CommonsLoggerFactoryTest.java @@ -19,9 +19,6 @@ import static org.junit.Assert.*; import org.junit.Test; - -/** - */ public class CommonsLoggerFactoryTest { @Test diff --git a/common/src/test/java/io/netty/logging/CommonsLoggerTest.java b/common/src/test/java/io/netty/logging/CommonsLoggerTest.java index 0bdb7327c5..85c10cda53 100644 --- a/common/src/test/java/io/netty/logging/CommonsLoggerTest.java +++ b/common/src/test/java/io/netty/logging/CommonsLoggerTest.java @@ -20,9 +20,6 @@ import static org.junit.Assert.*; import org.junit.Test; - -/** - */ public class CommonsLoggerTest { private static final Exception e = new Exception(); diff --git a/common/src/test/java/io/netty/logging/InternalLoggerFactoryTest.java b/common/src/test/java/io/netty/logging/InternalLoggerFactoryTest.java index b3a898d725..3dd15881f2 100644 --- a/common/src/test/java/io/netty/logging/InternalLoggerFactoryTest.java +++ b/common/src/test/java/io/netty/logging/InternalLoggerFactoryTest.java @@ -22,9 +22,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; - -/** - */ public class InternalLoggerFactoryTest { private static final Exception e = new Exception(); private InternalLoggerFactory oldLoggerFactory; diff --git a/common/src/test/java/io/netty/logging/JBossLoggerFactoryTest.java b/common/src/test/java/io/netty/logging/JBossLoggerFactoryTest.java index 2ef952c366..865d723d78 100644 --- a/common/src/test/java/io/netty/logging/JBossLoggerFactoryTest.java +++ b/common/src/test/java/io/netty/logging/JBossLoggerFactoryTest.java @@ -19,9 +19,6 @@ import static org.junit.Assert.*; import org.junit.Test; - -/** - */ public class JBossLoggerFactoryTest { @Test diff --git a/common/src/test/java/io/netty/logging/JBossLoggerTest.java b/common/src/test/java/io/netty/logging/JBossLoggerTest.java index 7c3c8d48f7..f9ac13e463 100644 --- a/common/src/test/java/io/netty/logging/JBossLoggerTest.java +++ b/common/src/test/java/io/netty/logging/JBossLoggerTest.java @@ -20,9 +20,6 @@ import static org.junit.Assert.*; import org.junit.Test; - -/** - */ public class JBossLoggerTest { private static final Exception e = new Exception(); diff --git a/common/src/test/java/io/netty/logging/JdkLoggerFactoryTest.java b/common/src/test/java/io/netty/logging/JdkLoggerFactoryTest.java index 93c2a5fee6..b6fbcf6fb2 100644 --- a/common/src/test/java/io/netty/logging/JdkLoggerFactoryTest.java +++ b/common/src/test/java/io/netty/logging/JdkLoggerFactoryTest.java @@ -19,9 +19,6 @@ import static org.junit.Assert.*; import org.junit.Test; - -/** - */ public class JdkLoggerFactoryTest { @Test diff --git a/common/src/test/java/io/netty/logging/JdkLoggerTest.java b/common/src/test/java/io/netty/logging/JdkLoggerTest.java index e742700935..4aac0664f1 100644 --- a/common/src/test/java/io/netty/logging/JdkLoggerTest.java +++ b/common/src/test/java/io/netty/logging/JdkLoggerTest.java @@ -22,9 +22,6 @@ import java.util.logging.Level; import org.junit.Test; - -/** - */ public class JdkLoggerTest { private static final Exception e = new Exception(); diff --git a/common/src/test/java/io/netty/logging/Log4JLoggerFactoryTest.java b/common/src/test/java/io/netty/logging/Log4JLoggerFactoryTest.java index 6265bfe895..66c8532305 100644 --- a/common/src/test/java/io/netty/logging/Log4JLoggerFactoryTest.java +++ b/common/src/test/java/io/netty/logging/Log4JLoggerFactoryTest.java @@ -19,9 +19,6 @@ import static org.junit.Assert.*; import org.junit.Test; - -/** - */ public class Log4JLoggerFactoryTest { @Test diff --git a/common/src/test/java/io/netty/logging/Log4JLoggerTest.java b/common/src/test/java/io/netty/logging/Log4JLoggerTest.java index 4ee31ff454..81debf68a5 100644 --- a/common/src/test/java/io/netty/logging/Log4JLoggerTest.java +++ b/common/src/test/java/io/netty/logging/Log4JLoggerTest.java @@ -20,9 +20,6 @@ import static org.junit.Assert.*; import org.junit.Test; - -/** - */ public class Log4JLoggerTest { private static final Exception e = new Exception(); diff --git a/common/src/test/java/io/netty/logging/Slf4JLoggerFactoryTest.java b/common/src/test/java/io/netty/logging/Slf4JLoggerFactoryTest.java index 6b4ec9da51..c365570baa 100644 --- a/common/src/test/java/io/netty/logging/Slf4JLoggerFactoryTest.java +++ b/common/src/test/java/io/netty/logging/Slf4JLoggerFactoryTest.java @@ -19,9 +19,6 @@ import static org.junit.Assert.*; import org.junit.Test; - -/** - */ public class Slf4JLoggerFactoryTest { @Test diff --git a/common/src/test/java/io/netty/logging/Slf4JLoggerTest.java b/common/src/test/java/io/netty/logging/Slf4JLoggerTest.java index 467623b9bd..2c5d95163e 100644 --- a/common/src/test/java/io/netty/logging/Slf4JLoggerTest.java +++ b/common/src/test/java/io/netty/logging/Slf4JLoggerTest.java @@ -20,9 +20,6 @@ import static org.junit.Assert.*; import org.junit.Test; - -/** - */ public class Slf4JLoggerTest { private static final Exception e = new Exception(); diff --git a/common/src/test/java/io/netty/util/MapBackedSetTest.java b/common/src/test/java/io/netty/util/MapBackedSetTest.java index 3f35bf97c6..5500063e9f 100644 --- a/common/src/test/java/io/netty/util/MapBackedSetTest.java +++ b/common/src/test/java/io/netty/util/MapBackedSetTest.java @@ -24,9 +24,6 @@ import java.util.Set; import org.junit.Test; - -/** - */ public class MapBackedSetTest { @Test diff --git a/common/src/test/java/io/netty/util/internal/ConversionUtilTest.java b/common/src/test/java/io/netty/util/internal/ConversionUtilTest.java index ca2b20faf7..1d393c128a 100644 --- a/common/src/test/java/io/netty/util/internal/ConversionUtilTest.java +++ b/common/src/test/java/io/netty/util/internal/ConversionUtilTest.java @@ -19,9 +19,6 @@ import static org.junit.Assert.*; import org.junit.Test; - -/** - */ public class ConversionUtilTest { @Test diff --git a/example/src/main/java/io/netty/example/discard/DiscardServer.java b/example/src/main/java/io/netty/example/discard/DiscardServer.java index 933579416c..48369e2505 100644 --- a/example/src/main/java/io/netty/example/discard/DiscardServer.java +++ b/example/src/main/java/io/netty/example/discard/DiscardServer.java @@ -31,7 +31,6 @@ public class DiscardServer { public static void main(String[] args) throws Exception { new DiscardServer().run(); - } public void run() { diff --git a/example/src/main/java/io/netty/example/echo/EchoServer.java b/example/src/main/java/io/netty/example/echo/EchoServer.java index bf02e7b3cb..d16352c1a6 100644 --- a/example/src/main/java/io/netty/example/echo/EchoServer.java +++ b/example/src/main/java/io/netty/example/echo/EchoServer.java @@ -31,7 +31,6 @@ public class EchoServer { public static void main(String[] args) throws Exception { new EchoServer().run(); - } public void run() { diff --git a/example/src/main/java/io/netty/example/factorial/FactorialServer.java b/example/src/main/java/io/netty/example/factorial/FactorialServer.java index 94607a8355..c7e0a4ba7d 100644 --- a/example/src/main/java/io/netty/example/factorial/FactorialServer.java +++ b/example/src/main/java/io/netty/example/factorial/FactorialServer.java @@ -29,7 +29,6 @@ public class FactorialServer { public static void main(String[] args) throws Exception { new FactorialServer().run(); - } public void run() { diff --git a/example/src/main/java/io/netty/example/http/file/HttpStaticFileServer.java b/example/src/main/java/io/netty/example/http/file/HttpStaticFileServer.java index 78cf58523a..d408c36601 100644 --- a/example/src/main/java/io/netty/example/http/file/HttpStaticFileServer.java +++ b/example/src/main/java/io/netty/example/http/file/HttpStaticFileServer.java @@ -21,8 +21,6 @@ import java.util.concurrent.Executors; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.socket.nio.NioServerSocketChannelFactory; -/** - */ public class HttpStaticFileServer { public static void main(String[] args) { // Configure the server. diff --git a/example/src/main/java/io/netty/example/http/file/HttpStaticFileServerPipelineFactory.java b/example/src/main/java/io/netty/example/http/file/HttpStaticFileServerPipelineFactory.java index 566e622ff9..71791005b5 100644 --- a/example/src/main/java/io/netty/example/http/file/HttpStaticFileServerPipelineFactory.java +++ b/example/src/main/java/io/netty/example/http/file/HttpStaticFileServerPipelineFactory.java @@ -24,8 +24,6 @@ import io.netty.handler.codec.http.HttpRequestDecoder; import io.netty.handler.codec.http.HttpResponseEncoder; import io.netty.handler.stream.ChunkedWriteHandler; -/** - */ public class HttpStaticFileServerPipelineFactory implements ChannelPipelineFactory { @Override public ChannelPipeline getPipeline() throws Exception { diff --git a/example/src/main/java/io/netty/example/http/snoop/HttpClientPipelineFactory.java b/example/src/main/java/io/netty/example/http/snoop/HttpClientPipelineFactory.java index eb98ed5f53..af732408a0 100644 --- a/example/src/main/java/io/netty/example/http/snoop/HttpClientPipelineFactory.java +++ b/example/src/main/java/io/netty/example/http/snoop/HttpClientPipelineFactory.java @@ -28,8 +28,6 @@ import io.netty.handler.logging.LoggingHandler; import io.netty.handler.ssl.SslHandler; import io.netty.logging.InternalLogLevel; -/** - */ public class HttpClientPipelineFactory implements ChannelPipelineFactory { private final boolean ssl; diff --git a/example/src/main/java/io/netty/example/http/snoop/HttpRequestHandler.java b/example/src/main/java/io/netty/example/http/snoop/HttpRequestHandler.java index 8c405e499d..5f91856eff 100644 --- a/example/src/main/java/io/netty/example/http/snoop/HttpRequestHandler.java +++ b/example/src/main/java/io/netty/example/http/snoop/HttpRequestHandler.java @@ -44,8 +44,6 @@ import io.netty.handler.codec.http.HttpResponse; import io.netty.handler.codec.http.QueryStringDecoder; import io.netty.util.CharsetUtil; -/** - */ public class HttpRequestHandler extends SimpleChannelUpstreamHandler { private HttpRequest request; diff --git a/example/src/main/java/io/netty/example/http/snoop/HttpResponseHandler.java b/example/src/main/java/io/netty/example/http/snoop/HttpResponseHandler.java index 1feef4fa0f..0dadf14215 100644 --- a/example/src/main/java/io/netty/example/http/snoop/HttpResponseHandler.java +++ b/example/src/main/java/io/netty/example/http/snoop/HttpResponseHandler.java @@ -23,8 +23,6 @@ import io.netty.handler.codec.http.HttpChunk; import io.netty.handler.codec.http.HttpResponse; import io.netty.util.CharsetUtil; -/** - */ public class HttpResponseHandler extends SimpleChannelUpstreamHandler { private boolean readingChunks; diff --git a/example/src/main/java/io/netty/example/http/snoop/HttpServerPipelineFactory.java b/example/src/main/java/io/netty/example/http/snoop/HttpServerPipelineFactory.java index bbeb1424a2..c06294f282 100644 --- a/example/src/main/java/io/netty/example/http/snoop/HttpServerPipelineFactory.java +++ b/example/src/main/java/io/netty/example/http/snoop/HttpServerPipelineFactory.java @@ -25,8 +25,6 @@ import io.netty.handler.codec.http.HttpResponseEncoder; import io.netty.handler.logging.LoggingHandler; import io.netty.logging.InternalLogLevel; -/** - */ public class HttpServerPipelineFactory implements ChannelPipelineFactory { @Override public ChannelPipeline getPipeline() throws Exception { diff --git a/example/src/main/java/io/netty/example/http/upload/HttpClientPipelineFactory.java b/example/src/main/java/io/netty/example/http/upload/HttpClientPipelineFactory.java index b7db7f8334..8029134836 100644 --- a/example/src/main/java/io/netty/example/http/upload/HttpClientPipelineFactory.java +++ b/example/src/main/java/io/netty/example/http/upload/HttpClientPipelineFactory.java @@ -27,8 +27,6 @@ import io.netty.handler.codec.http.HttpContentDecompressor; import io.netty.handler.ssl.SslHandler; import io.netty.handler.stream.ChunkedWriteHandler; -/** - */ public class HttpClientPipelineFactory implements ChannelPipelineFactory { private final boolean ssl; diff --git a/example/src/main/java/io/netty/example/http/upload/HttpRequestHandler.java b/example/src/main/java/io/netty/example/http/upload/HttpRequestHandler.java index abcdbe72b1..8f2c8da94b 100644 --- a/example/src/main/java/io/netty/example/http/upload/HttpRequestHandler.java +++ b/example/src/main/java/io/netty/example/http/upload/HttpRequestHandler.java @@ -60,8 +60,6 @@ import io.netty.handler.codec.http.InterfaceHttpData.HttpDataType; import io.netty.handler.codec.http.QueryStringDecoder; import io.netty.util.CharsetUtil; -/** - */ public class HttpRequestHandler extends SimpleChannelUpstreamHandler { private volatile HttpRequest request; diff --git a/example/src/main/java/io/netty/example/http/upload/HttpResponseHandler.java b/example/src/main/java/io/netty/example/http/upload/HttpResponseHandler.java index aecfa869ab..35336963b1 100644 --- a/example/src/main/java/io/netty/example/http/upload/HttpResponseHandler.java +++ b/example/src/main/java/io/netty/example/http/upload/HttpResponseHandler.java @@ -24,8 +24,6 @@ import io.netty.handler.codec.http.HttpChunk; import io.netty.handler.codec.http.HttpResponse; import io.netty.util.CharsetUtil; -/** - */ public class HttpResponseHandler extends SimpleChannelUpstreamHandler { private volatile boolean readingChunks; diff --git a/example/src/main/java/io/netty/example/http/upload/HttpServerPipelineFactory.java b/example/src/main/java/io/netty/example/http/upload/HttpServerPipelineFactory.java index b330298636..03e7131452 100644 --- a/example/src/main/java/io/netty/example/http/upload/HttpServerPipelineFactory.java +++ b/example/src/main/java/io/netty/example/http/upload/HttpServerPipelineFactory.java @@ -23,8 +23,6 @@ import io.netty.handler.codec.http.HttpContentCompressor; import io.netty.handler.codec.http.HttpRequestDecoder; import io.netty.handler.codec.http.HttpResponseEncoder; -/** - */ public class HttpServerPipelineFactory implements ChannelPipelineFactory { @Override public ChannelPipeline getPipeline() throws Exception { diff --git a/example/src/main/java/io/netty/example/local/LocalExample.java b/example/src/main/java/io/netty/example/local/LocalExample.java index 48358eaf55..d853f6094b 100644 --- a/example/src/main/java/io/netty/example/local/LocalExample.java +++ b/example/src/main/java/io/netty/example/local/LocalExample.java @@ -33,8 +33,6 @@ import io.netty.handler.codec.string.StringEncoder; import io.netty.handler.logging.LoggingHandler; import io.netty.logging.InternalLogLevel; -/** - */ public class LocalExample { public static void main(String[] args) throws Exception { // Address to bind on / connect to. diff --git a/example/src/main/java/io/netty/example/local/LocalExampleMultthreaded.java b/example/src/main/java/io/netty/example/local/LocalExampleMultthreaded.java index 4b1ebadb8e..f05219abc1 100644 --- a/example/src/main/java/io/netty/example/local/LocalExampleMultthreaded.java +++ b/example/src/main/java/io/netty/example/local/LocalExampleMultthreaded.java @@ -32,8 +32,6 @@ import io.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor; import io.netty.handler.logging.LoggingHandler; import io.netty.logging.InternalLogLevel; -/** - */ public class LocalExampleMultthreaded { public static void main(String[] args) throws Exception { diff --git a/example/src/main/java/io/netty/example/local/LocalServerPipelineFactory.java b/example/src/main/java/io/netty/example/local/LocalServerPipelineFactory.java index 14c0e21ebc..3c28c5d764 100644 --- a/example/src/main/java/io/netty/example/local/LocalServerPipelineFactory.java +++ b/example/src/main/java/io/netty/example/local/LocalServerPipelineFactory.java @@ -29,8 +29,6 @@ import io.netty.handler.codec.string.StringDecoder; import io.netty.handler.codec.string.StringEncoder; import io.netty.handler.execution.ExecutionHandler; -/** - */ public class LocalServerPipelineFactory implements ChannelPipelineFactory { private final ExecutionHandler executionHandler; diff --git a/example/src/main/java/io/netty/example/localtime/LocalTimeClientHandler.java b/example/src/main/java/io/netty/example/localtime/LocalTimeClientHandler.java index 018b7394bb..141f750789 100644 --- a/example/src/main/java/io/netty/example/localtime/LocalTimeClientHandler.java +++ b/example/src/main/java/io/netty/example/localtime/LocalTimeClientHandler.java @@ -37,8 +37,6 @@ import io.netty.example.localtime.LocalTimeProtocol.LocalTimes; import io.netty.example.localtime.LocalTimeProtocol.Location; import io.netty.example.localtime.LocalTimeProtocol.Locations; -/** - */ public class LocalTimeClientHandler extends SimpleChannelUpstreamHandler { private static final Logger logger = Logger.getLogger( diff --git a/example/src/main/java/io/netty/example/localtime/LocalTimeClientPipelineFactory.java b/example/src/main/java/io/netty/example/localtime/LocalTimeClientPipelineFactory.java index 33d442a26a..b2b407b853 100644 --- a/example/src/main/java/io/netty/example/localtime/LocalTimeClientPipelineFactory.java +++ b/example/src/main/java/io/netty/example/localtime/LocalTimeClientPipelineFactory.java @@ -24,8 +24,6 @@ import io.netty.handler.codec.protobuf.ProtobufEncoder; import io.netty.handler.codec.protobuf.ProtobufVarint32FrameDecoder; import io.netty.handler.codec.protobuf.ProtobufVarint32LengthFieldPrepender; -/** - */ public class LocalTimeClientPipelineFactory implements ChannelPipelineFactory { @Override diff --git a/example/src/main/java/io/netty/example/localtime/LocalTimeServerHandler.java b/example/src/main/java/io/netty/example/localtime/LocalTimeServerHandler.java index 7bb8a4a246..eabb15c569 100644 --- a/example/src/main/java/io/netty/example/localtime/LocalTimeServerHandler.java +++ b/example/src/main/java/io/netty/example/localtime/LocalTimeServerHandler.java @@ -35,8 +35,6 @@ import io.netty.example.localtime.LocalTimeProtocol.LocalTimes; import io.netty.example.localtime.LocalTimeProtocol.Location; import io.netty.example.localtime.LocalTimeProtocol.Locations; -/** - */ public class LocalTimeServerHandler extends SimpleChannelUpstreamHandler { private static final Logger logger = Logger.getLogger( diff --git a/example/src/main/java/io/netty/example/localtime/LocalTimeServerPipelineFactory.java b/example/src/main/java/io/netty/example/localtime/LocalTimeServerPipelineFactory.java index 62bbb2dacc..8328500b3b 100644 --- a/example/src/main/java/io/netty/example/localtime/LocalTimeServerPipelineFactory.java +++ b/example/src/main/java/io/netty/example/localtime/LocalTimeServerPipelineFactory.java @@ -24,8 +24,6 @@ import io.netty.handler.codec.protobuf.ProtobufEncoder; import io.netty.handler.codec.protobuf.ProtobufVarint32FrameDecoder; import io.netty.handler.codec.protobuf.ProtobufVarint32LengthFieldPrepender; -/** - */ public class LocalTimeServerPipelineFactory implements ChannelPipelineFactory { @Override diff --git a/example/src/main/java/io/netty/example/proxy/HexDumpProxy.java b/example/src/main/java/io/netty/example/proxy/HexDumpProxy.java index 855bbc4d36..7bf2138e7e 100644 --- a/example/src/main/java/io/netty/example/proxy/HexDumpProxy.java +++ b/example/src/main/java/io/netty/example/proxy/HexDumpProxy.java @@ -24,8 +24,6 @@ import io.netty.channel.socket.ClientSocketChannelFactory; import io.netty.channel.socket.nio.NioClientSocketChannelFactory; import io.netty.channel.socket.nio.NioServerSocketChannelFactory; -/** - */ public class HexDumpProxy { public static void main(String[] args) throws Exception { diff --git a/example/src/main/java/io/netty/example/proxy/HexDumpProxyInboundHandler.java b/example/src/main/java/io/netty/example/proxy/HexDumpProxyInboundHandler.java index d934ca98e7..839a7d8d6a 100644 --- a/example/src/main/java/io/netty/example/proxy/HexDumpProxyInboundHandler.java +++ b/example/src/main/java/io/netty/example/proxy/HexDumpProxyInboundHandler.java @@ -30,8 +30,6 @@ import io.netty.channel.MessageEvent; import io.netty.channel.SimpleChannelUpstreamHandler; import io.netty.channel.socket.ClientSocketChannelFactory; -/** - */ public class HexDumpProxyInboundHandler extends SimpleChannelUpstreamHandler { private final ClientSocketChannelFactory cf; diff --git a/example/src/main/java/io/netty/example/proxy/HexDumpProxyPipelineFactory.java b/example/src/main/java/io/netty/example/proxy/HexDumpProxyPipelineFactory.java index 935f02cd64..456110a516 100644 --- a/example/src/main/java/io/netty/example/proxy/HexDumpProxyPipelineFactory.java +++ b/example/src/main/java/io/netty/example/proxy/HexDumpProxyPipelineFactory.java @@ -21,8 +21,6 @@ import io.netty.channel.ChannelPipeline; import io.netty.channel.ChannelPipelineFactory; import io.netty.channel.socket.ClientSocketChannelFactory; -/** - */ public class HexDumpProxyPipelineFactory implements ChannelPipelineFactory { private final ClientSocketChannelFactory cf; diff --git a/example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentClientHandler.java b/example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentClientHandler.java index a2f8a41036..163272616b 100644 --- a/example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentClientHandler.java +++ b/example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentClientHandler.java @@ -20,8 +20,6 @@ import io.netty.channel.ExceptionEvent; import io.netty.channel.MessageEvent; import io.netty.channel.SimpleChannelUpstreamHandler; -/** - */ public class QuoteOfTheMomentClientHandler extends SimpleChannelUpstreamHandler { @Override diff --git a/example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentServerHandler.java b/example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentServerHandler.java index 9bd734b5a4..6866a47de5 100644 --- a/example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentServerHandler.java +++ b/example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentServerHandler.java @@ -22,8 +22,6 @@ import io.netty.channel.ExceptionEvent; import io.netty.channel.MessageEvent; import io.netty.channel.SimpleChannelUpstreamHandler; -/** - */ public class QuoteOfTheMomentServerHandler extends SimpleChannelUpstreamHandler { private static final Random random = new Random(); diff --git a/example/src/main/java/io/netty/example/securechat/SecureChatServerHandler.java b/example/src/main/java/io/netty/example/securechat/SecureChatServerHandler.java index a99b7db617..98bed94908 100644 --- a/example/src/main/java/io/netty/example/securechat/SecureChatServerHandler.java +++ b/example/src/main/java/io/netty/example/securechat/SecureChatServerHandler.java @@ -105,8 +105,6 @@ public class SecureChatServerHandler extends SimpleChannelUpstreamHandler { e.getChannel().close(); } - /** - */ private static final class Greeter implements ChannelFutureListener { private final SslHandler sslHandler; diff --git a/handler/src/main/java/io/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java b/handler/src/main/java/io/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java index c2c6da494f..9158dc6157 100644 --- a/handler/src/main/java/io/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java +++ b/handler/src/main/java/io/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java @@ -279,7 +279,7 @@ public class OrderedMemoryAwareThreadPoolExecutor extends private final class ChildExecutor implements Executor, Runnable { private final Queue tasks = QueueFactory.createQueue(Runnable.class); - private final AtomicBoolean isRunning = new AtomicBoolean(false); + private final AtomicBoolean isRunning = new AtomicBoolean(); ChildExecutor() { } diff --git a/handler/src/main/java/io/netty/handler/ssl/SslHandler.java b/handler/src/main/java/io/netty/handler/ssl/SslHandler.java index a69ec06286..059d524c0d 100644 --- a/handler/src/main/java/io/netty/handler/ssl/SslHandler.java +++ b/handler/src/main/java/io/netty/handler/ssl/SslHandler.java @@ -414,7 +414,7 @@ public class SslHandler extends FrameDecoder /** * Enables or disables the automatic handshake once the {@link Channel} is connected. The value will only have affect if its set before the * {@link Channel} is connected. - */ + */ public void setIssueHandshake(boolean issueHandshake) { this.issueHandshake = issueHandshake; } diff --git a/handler/src/main/java/io/netty/handler/timeout/WriteTimeoutHandler.java b/handler/src/main/java/io/netty/handler/timeout/WriteTimeoutHandler.java index f00a177024..b5af55d670 100644 --- a/handler/src/main/java/io/netty/handler/timeout/WriteTimeoutHandler.java +++ b/handler/src/main/java/io/netty/handler/timeout/WriteTimeoutHandler.java @@ -189,8 +189,6 @@ public class WriteTimeoutHandler extends SimpleChannelDownstreamHandler } } - /** - */ private static final class TimeoutCanceller implements ChannelFutureListener { private final Timeout timeout; diff --git a/handler/src/test/java/io/netty/handler/ssl/ImmediateExecutorTest.java b/handler/src/test/java/io/netty/handler/ssl/ImmediateExecutorTest.java index a8538ad3ee..1b8111fa9c 100644 --- a/handler/src/test/java/io/netty/handler/ssl/ImmediateExecutorTest.java +++ b/handler/src/test/java/io/netty/handler/ssl/ImmediateExecutorTest.java @@ -19,9 +19,6 @@ import static org.junit.Assert.*; import org.junit.Test; - -/** - */ public class ImmediateExecutorTest { @Test diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketCompatibleObjectStreamEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketCompatibleObjectStreamEchoTest.java index c0ea5bda83..b9fa6ee223 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketCompatibleObjectStreamEchoTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketCompatibleObjectStreamEchoTest.java @@ -43,9 +43,6 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; - -/** - */ public abstract class AbstractSocketCompatibleObjectStreamEchoTest { static final Random random = new Random(); diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketEchoTest.java index 2259805802..0540016456 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketEchoTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketEchoTest.java @@ -43,9 +43,6 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; - -/** - */ public abstract class AbstractSocketEchoTest { private static final Random random = new Random(); diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketFixedLengthEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketFixedLengthEchoTest.java index 2c93c10f2d..f9e81e98a6 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketFixedLengthEchoTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketFixedLengthEchoTest.java @@ -44,9 +44,6 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; - -/** - */ public abstract class AbstractSocketFixedLengthEchoTest { private static final Random random = new Random(); diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketObjectStreamEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketObjectStreamEchoTest.java index 8d665b0524..4e324c6c16 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketObjectStreamEchoTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketObjectStreamEchoTest.java @@ -43,9 +43,6 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; - -/** - */ public abstract class AbstractSocketObjectStreamEchoTest { static final Random random = new Random(); diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketSslEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketSslEchoTest.java index cd0803730d..ef9b6819fe 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketSslEchoTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketSslEchoTest.java @@ -64,9 +64,6 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; - -/** - */ public abstract class AbstractSocketSslEchoTest { static final InternalLogger logger = InternalLoggerFactory.getInstance(AbstractSocketSslEchoTest.class); diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketStringEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketStringEchoTest.java index 4c49379aa3..df1a1860c4 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketStringEchoTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketStringEchoTest.java @@ -46,9 +46,6 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; - -/** - */ public abstract class AbstractSocketStringEchoTest { static final Random random = new Random(); diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioNioSocketCompatibleObjectStreamEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioNioSocketCompatibleObjectStreamEchoTest.java index ddfa9ac798..9c096383d9 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioNioSocketCompatibleObjectStreamEchoTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioNioSocketCompatibleObjectStreamEchoTest.java @@ -21,8 +21,6 @@ import io.netty.channel.ChannelFactory; import io.netty.channel.socket.nio.NioClientSocketChannelFactory; import io.netty.channel.socket.nio.NioServerSocketChannelFactory; -/** - */ public class NioNioSocketCompatibleObjectStreamEchoTest extends AbstractSocketCompatibleObjectStreamEchoTest { @Override diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioNioSocketFixedLengthEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioNioSocketFixedLengthEchoTest.java index ab6c35d016..75556cd940 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioNioSocketFixedLengthEchoTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioNioSocketFixedLengthEchoTest.java @@ -21,8 +21,6 @@ import io.netty.channel.ChannelFactory; import io.netty.channel.socket.nio.NioClientSocketChannelFactory; import io.netty.channel.socket.nio.NioServerSocketChannelFactory; -/** - */ public class NioNioSocketFixedLengthEchoTest extends AbstractSocketFixedLengthEchoTest { @Override diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioNioSocketObjectStreamEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioNioSocketObjectStreamEchoTest.java index 37dd041aac..e966726f6d 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioNioSocketObjectStreamEchoTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioNioSocketObjectStreamEchoTest.java @@ -21,8 +21,6 @@ import io.netty.channel.ChannelFactory; import io.netty.channel.socket.nio.NioClientSocketChannelFactory; import io.netty.channel.socket.nio.NioServerSocketChannelFactory; -/** - */ public class NioNioSocketObjectStreamEchoTest extends AbstractSocketObjectStreamEchoTest { @Override diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioNioSocketStringEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioNioSocketStringEchoTest.java index 3ffcaaf9ff..d0ade4650e 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioNioSocketStringEchoTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioNioSocketStringEchoTest.java @@ -21,8 +21,6 @@ import io.netty.channel.ChannelFactory; import io.netty.channel.socket.nio.NioClientSocketChannelFactory; import io.netty.channel.socket.nio.NioServerSocketChannelFactory; -/** - */ public class NioNioSocketStringEchoTest extends AbstractSocketStringEchoTest { @Override diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioOioSocketCompatibleObjectStreamEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioOioSocketCompatibleObjectStreamEchoTest.java index 5fa5ea84af..6e7486b673 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioOioSocketCompatibleObjectStreamEchoTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioOioSocketCompatibleObjectStreamEchoTest.java @@ -21,8 +21,6 @@ import io.netty.channel.ChannelFactory; import io.netty.channel.socket.nio.NioClientSocketChannelFactory; import io.netty.channel.socket.oio.OioServerSocketChannelFactory; -/** - */ public class NioOioSocketCompatibleObjectStreamEchoTest extends AbstractSocketCompatibleObjectStreamEchoTest { @Override diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioOioSocketFixedLengthEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioOioSocketFixedLengthEchoTest.java index 5606117fc0..b21b2c6701 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioOioSocketFixedLengthEchoTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioOioSocketFixedLengthEchoTest.java @@ -21,8 +21,6 @@ import io.netty.channel.ChannelFactory; import io.netty.channel.socket.nio.NioClientSocketChannelFactory; import io.netty.channel.socket.oio.OioServerSocketChannelFactory; -/** - */ public class NioOioSocketFixedLengthEchoTest extends AbstractSocketFixedLengthEchoTest { @Override diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioOioSocketObjectStreamEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioOioSocketObjectStreamEchoTest.java index 376cebc1c2..d847c6a68f 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioOioSocketObjectStreamEchoTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioOioSocketObjectStreamEchoTest.java @@ -21,8 +21,6 @@ import io.netty.channel.ChannelFactory; import io.netty.channel.socket.nio.NioClientSocketChannelFactory; import io.netty.channel.socket.oio.OioServerSocketChannelFactory; -/** - */ public class NioOioSocketObjectStreamEchoTest extends AbstractSocketObjectStreamEchoTest { @Override diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioOioSocketStringEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioOioSocketStringEchoTest.java index de39c167d3..659071386e 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioOioSocketStringEchoTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioOioSocketStringEchoTest.java @@ -21,8 +21,6 @@ import io.netty.channel.ChannelFactory; import io.netty.channel.socket.nio.NioClientSocketChannelFactory; import io.netty.channel.socket.oio.OioServerSocketChannelFactory; -/** - */ public class NioOioSocketStringEchoTest extends AbstractSocketStringEchoTest { @Override diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioNioSocketCompatibleObjectStreamEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioNioSocketCompatibleObjectStreamEchoTest.java index 1705d25be2..d1b4af3825 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioNioSocketCompatibleObjectStreamEchoTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioNioSocketCompatibleObjectStreamEchoTest.java @@ -21,8 +21,6 @@ import io.netty.channel.ChannelFactory; import io.netty.channel.socket.nio.NioServerSocketChannelFactory; import io.netty.channel.socket.oio.OioClientSocketChannelFactory; -/** - */ public class OioNioSocketCompatibleObjectStreamEchoTest extends AbstractSocketCompatibleObjectStreamEchoTest { @Override diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioNioSocketFixedLengthEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioNioSocketFixedLengthEchoTest.java index 59f0930143..fc1810b549 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioNioSocketFixedLengthEchoTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioNioSocketFixedLengthEchoTest.java @@ -21,8 +21,6 @@ import io.netty.channel.ChannelFactory; import io.netty.channel.socket.nio.NioServerSocketChannelFactory; import io.netty.channel.socket.oio.OioClientSocketChannelFactory; -/** - */ public class OioNioSocketFixedLengthEchoTest extends AbstractSocketFixedLengthEchoTest { @Override diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioNioSocketStringEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioNioSocketStringEchoTest.java index dab455dac5..fbbc847240 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioNioSocketStringEchoTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioNioSocketStringEchoTest.java @@ -21,8 +21,6 @@ import io.netty.channel.ChannelFactory; import io.netty.channel.socket.nio.NioServerSocketChannelFactory; import io.netty.channel.socket.oio.OioClientSocketChannelFactory; -/** - */ public class OioNioSocketStringEchoTest extends AbstractSocketStringEchoTest { @Override diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioOioSocketCompatibleObjectStreamEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioOioSocketCompatibleObjectStreamEchoTest.java index f9c04c8be8..2b0203d52e 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioOioSocketCompatibleObjectStreamEchoTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioOioSocketCompatibleObjectStreamEchoTest.java @@ -21,8 +21,6 @@ import io.netty.channel.ChannelFactory; import io.netty.channel.socket.oio.OioClientSocketChannelFactory; import io.netty.channel.socket.oio.OioServerSocketChannelFactory; -/** - */ public class OioOioSocketCompatibleObjectStreamEchoTest extends AbstractSocketCompatibleObjectStreamEchoTest { @Override diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioOioSocketFixedLengthEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioOioSocketFixedLengthEchoTest.java index 603bf4c3e4..fc664d124e 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioOioSocketFixedLengthEchoTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioOioSocketFixedLengthEchoTest.java @@ -21,8 +21,6 @@ import io.netty.channel.ChannelFactory; import io.netty.channel.socket.oio.OioClientSocketChannelFactory; import io.netty.channel.socket.oio.OioServerSocketChannelFactory; -/** - */ public class OioOioSocketFixedLengthEchoTest extends AbstractSocketFixedLengthEchoTest { @Override diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioOioSocketObjectStreamEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioOioSocketObjectStreamEchoTest.java index ea3c1d38dd..c6318ca98f 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioOioSocketObjectStreamEchoTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioOioSocketObjectStreamEchoTest.java @@ -21,8 +21,6 @@ import io.netty.channel.ChannelFactory; import io.netty.channel.socket.oio.OioClientSocketChannelFactory; import io.netty.channel.socket.oio.OioServerSocketChannelFactory; -/** - */ public class OioOioSocketObjectStreamEchoTest extends AbstractSocketObjectStreamEchoTest { @Override diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioOioSocketStringEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioOioSocketStringEchoTest.java index 20b547b8fa..50e785388c 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioOioSocketStringEchoTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioOioSocketStringEchoTest.java @@ -21,8 +21,6 @@ import io.netty.channel.ChannelFactory; import io.netty.channel.socket.oio.OioClientSocketChannelFactory; import io.netty.channel.socket.oio.OioServerSocketChannelFactory; -/** - */ public class OioOioSocketStringEchoTest extends AbstractSocketStringEchoTest { @Override diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/NioClientSocketShutdownTimeTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/NioClientSocketShutdownTimeTest.java index 7d488ddebc..abf56948f6 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/NioClientSocketShutdownTimeTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/NioClientSocketShutdownTimeTest.java @@ -30,8 +30,6 @@ import io.netty.channel.socket.nio.NioClientSocketChannelFactory; import io.netty.testsuite.util.DummyHandler; import io.netty.util.SocketAddresses; -/** - */ public class NioClientSocketShutdownTimeTest { @Test diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/NioServerSocketShutdownTimeTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/NioServerSocketShutdownTimeTest.java index 2c063ee6ae..f67795d4b8 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/NioServerSocketShutdownTimeTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/NioServerSocketShutdownTimeTest.java @@ -31,9 +31,6 @@ import io.netty.channel.socket.nio.NioServerSocketChannelFactory; import io.netty.util.SocketAddresses; import org.junit.Test; - -/** - */ public class NioServerSocketShutdownTimeTest { @Test(timeout = 10000) diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/nio/NioNioSocketEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/nio/NioNioSocketEchoTest.java index b2c1687832..84d895fa76 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/nio/NioNioSocketEchoTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/nio/NioNioSocketEchoTest.java @@ -22,8 +22,6 @@ import io.netty.channel.socket.nio.NioClientSocketChannelFactory; import io.netty.channel.socket.nio.NioServerSocketChannelFactory; import io.netty.testsuite.transport.socket.AbstractSocketEchoTest; -/** - */ public class NioNioSocketEchoTest extends AbstractSocketEchoTest { @Override diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/nio/NioNioSocketSslEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/nio/NioNioSocketSslEchoTest.java index 93bf5fddd7..6942f34c12 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/nio/NioNioSocketSslEchoTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/nio/NioNioSocketSslEchoTest.java @@ -22,8 +22,6 @@ import io.netty.channel.socket.nio.NioClientSocketChannelFactory; import io.netty.channel.socket.nio.NioServerSocketChannelFactory; import io.netty.testsuite.transport.socket.AbstractSocketSslEchoTest; -/** - */ public class NioNioSocketSslEchoTest extends AbstractSocketSslEchoTest { @Override diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/oio/NioOioSocketEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/oio/NioOioSocketEchoTest.java index 4a3c80141f..3ab69b2fbd 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/oio/NioOioSocketEchoTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/oio/NioOioSocketEchoTest.java @@ -22,8 +22,6 @@ import io.netty.channel.socket.nio.NioClientSocketChannelFactory; import io.netty.channel.socket.oio.OioServerSocketChannelFactory; import io.netty.testsuite.transport.socket.AbstractSocketEchoTest; -/** - */ public class NioOioSocketEchoTest extends AbstractSocketEchoTest { @Override diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/oio/NioOioSocketSslEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/oio/NioOioSocketSslEchoTest.java index cfe662e544..909165ac58 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/oio/NioOioSocketSslEchoTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/oio/NioOioSocketSslEchoTest.java @@ -22,8 +22,6 @@ import io.netty.channel.socket.nio.NioClientSocketChannelFactory; import io.netty.channel.socket.oio.OioServerSocketChannelFactory; import io.netty.testsuite.transport.socket.AbstractSocketSslEchoTest; -/** - */ public class NioOioSocketSslEchoTest extends AbstractSocketSslEchoTest { @Override diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/nio/OioNioSocketEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/nio/OioNioSocketEchoTest.java index c78028496c..09ba826cb0 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/nio/OioNioSocketEchoTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/nio/OioNioSocketEchoTest.java @@ -22,8 +22,6 @@ import io.netty.channel.socket.nio.NioServerSocketChannelFactory; import io.netty.channel.socket.oio.OioClientSocketChannelFactory; import io.netty.testsuite.transport.socket.AbstractSocketEchoTest; -/** - */ public class OioNioSocketEchoTest extends AbstractSocketEchoTest { @Override diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/nio/OioNioSocketSslEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/nio/OioNioSocketSslEchoTest.java index d14effe29a..65aa78ab65 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/nio/OioNioSocketSslEchoTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/nio/OioNioSocketSslEchoTest.java @@ -22,8 +22,6 @@ import io.netty.channel.socket.nio.NioServerSocketChannelFactory; import io.netty.channel.socket.oio.OioClientSocketChannelFactory; import io.netty.testsuite.transport.socket.AbstractSocketSslEchoTest; -/** - */ public class OioNioSocketSslEchoTest extends AbstractSocketSslEchoTest { @Override diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/oio/OioOioSocketEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/oio/OioOioSocketEchoTest.java index 19c543a4e6..32cc3550e4 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/oio/OioOioSocketEchoTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/oio/OioOioSocketEchoTest.java @@ -22,8 +22,6 @@ import io.netty.channel.socket.oio.OioClientSocketChannelFactory; import io.netty.channel.socket.oio.OioServerSocketChannelFactory; import io.netty.testsuite.transport.socket.AbstractSocketEchoTest; -/** - */ public class OioOioSocketEchoTest extends AbstractSocketEchoTest { @Override diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/oio/OioOioSocketSslEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/oio/OioOioSocketSslEchoTest.java index 65b7dec947..087352f0f0 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/oio/OioOioSocketSslEchoTest.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/oio/OioOioSocketSslEchoTest.java @@ -22,8 +22,6 @@ import io.netty.channel.socket.oio.OioClientSocketChannelFactory; import io.netty.channel.socket.oio.OioServerSocketChannelFactory; import io.netty.testsuite.transport.socket.AbstractSocketSslEchoTest; -/** - */ public class OioOioSocketSslEchoTest extends AbstractSocketSslEchoTest { @Override diff --git a/transport-sctp/src/main/java/io/netty/channel/sctp/SctpReceiveBufferPool.java b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpReceiveBufferPool.java index 358ccd41a1..b664a794bc 100644 --- a/transport-sctp/src/main/java/io/netty/channel/sctp/SctpReceiveBufferPool.java +++ b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpReceiveBufferPool.java @@ -18,8 +18,6 @@ package io.netty.channel.sctp; import java.lang.ref.SoftReference; import java.nio.ByteBuffer; -/** - */ final class SctpReceiveBufferPool { private static final int POOL_SIZE = 8; diff --git a/transport-sctp/src/main/java/io/netty/channel/sctp/SctpSendBufferPool.java b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpSendBufferPool.java index fc64a1219a..07d5adc8fd 100644 --- a/transport-sctp/src/main/java/io/netty/channel/sctp/SctpSendBufferPool.java +++ b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpSendBufferPool.java @@ -23,8 +23,6 @@ import java.io.IOException; import java.lang.ref.SoftReference; import java.nio.ByteBuffer; -/** - */ final class SctpSendBufferPool { private static final SendBuffer EMPTY_BUFFER = new EmptySendBuffer(); diff --git a/transport-sctp/src/main/java/io/netty/channel/sctp/SelectorUtil.java b/transport-sctp/src/main/java/io/netty/channel/sctp/SelectorUtil.java index 99fbf1d4cb..500b5473e1 100644 --- a/transport-sctp/src/main/java/io/netty/channel/sctp/SelectorUtil.java +++ b/transport-sctp/src/main/java/io/netty/channel/sctp/SelectorUtil.java @@ -22,8 +22,6 @@ import java.io.IOException; import java.nio.channels.CancelledKeyException; import java.nio.channels.Selector; -/** - */ final class SelectorUtil { private static final InternalLogger logger = InternalLoggerFactory.getInstance(SelectorUtil.class); diff --git a/transport/src/main/java/io/netty/channel/ChannelHandler.java b/transport/src/main/java/io/netty/channel/ChannelHandler.java index a0f3849920..4bd6bfd4f4 100644 --- a/transport/src/main/java/io/netty/channel/ChannelHandler.java +++ b/transport/src/main/java/io/netty/channel/ChannelHandler.java @@ -218,7 +218,7 @@ public interface ChannelHandler { *

* This annotation is provided for documentation purpose, just like * the JCIP annotations. - */ + */ @Inherited @Documented @Target(ElementType.TYPE) diff --git a/transport/src/main/java/io/netty/channel/local/LocalServerChannelSink.java b/transport/src/main/java/io/netty/channel/local/LocalServerChannelSink.java index 8918f315c7..6bfa780f28 100644 --- a/transport/src/main/java/io/netty/channel/local/LocalServerChannelSink.java +++ b/transport/src/main/java/io/netty/channel/local/LocalServerChannelSink.java @@ -27,8 +27,6 @@ import io.netty.channel.ChannelState; import io.netty.channel.ChannelStateEvent; import io.netty.channel.MessageEvent; -/** - */ final class LocalServerChannelSink extends AbstractChannelSink { LocalServerChannelSink() { diff --git a/transport/src/main/java/io/netty/channel/socket/nio/AbstractWriteRequestQueue.java b/transport/src/main/java/io/netty/channel/socket/nio/AbstractWriteRequestQueue.java index 070c336eb0..b9a848ead1 100644 --- a/transport/src/main/java/io/netty/channel/socket/nio/AbstractWriteRequestQueue.java +++ b/transport/src/main/java/io/netty/channel/socket/nio/AbstractWriteRequestQueue.java @@ -23,12 +23,6 @@ import java.util.concurrent.TimeUnit; import io.netty.channel.MessageEvent; import io.netty.util.internal.QueueFactory; -/** - * - * - - - */ abstract class AbstractWriteRequestQueue implements BlockingQueue { protected final BlockingQueue queue; diff --git a/transport/src/main/java/io/netty/channel/socket/nio/NioAcceptedSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/nio/NioAcceptedSocketChannel.java index 56d3fe8cc7..a4b7803cfe 100644 --- a/transport/src/main/java/io/netty/channel/socket/nio/NioAcceptedSocketChannel.java +++ b/transport/src/main/java/io/netty/channel/socket/nio/NioAcceptedSocketChannel.java @@ -24,8 +24,6 @@ import io.netty.channel.ChannelFactory; import io.netty.channel.ChannelPipeline; import io.netty.channel.ChannelSink; -/** - */ final class NioAcceptedSocketChannel extends NioSocketChannel { final Thread bossThread; diff --git a/transport/src/main/java/io/netty/channel/socket/nio/NioClientSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/nio/NioClientSocketChannel.java index c1a1af47d7..571a832e29 100644 --- a/transport/src/main/java/io/netty/channel/socket/nio/NioClientSocketChannel.java +++ b/transport/src/main/java/io/netty/channel/socket/nio/NioClientSocketChannel.java @@ -28,8 +28,6 @@ import io.netty.channel.ChannelSink; import io.netty.logging.InternalLogger; import io.netty.logging.InternalLoggerFactory; -/** - */ final class NioClientSocketChannel extends NioSocketChannel { private static final InternalLogger logger = diff --git a/transport/src/main/java/io/netty/channel/socket/nio/NioClientSocketPipelineSink.java b/transport/src/main/java/io/netty/channel/socket/nio/NioClientSocketPipelineSink.java index 7d4531bd56..0b269857e7 100644 --- a/transport/src/main/java/io/netty/channel/socket/nio/NioClientSocketPipelineSink.java +++ b/transport/src/main/java/io/netty/channel/socket/nio/NioClientSocketPipelineSink.java @@ -45,8 +45,6 @@ import io.netty.logging.InternalLoggerFactory; import io.netty.util.internal.DeadLockProofWorker; import io.netty.util.internal.QueueFactory; -/** - */ class NioClientSocketPipelineSink extends AbstractChannelSink { static final InternalLogger logger = diff --git a/transport/src/main/java/io/netty/channel/socket/nio/NioDatagramChannel.java b/transport/src/main/java/io/netty/channel/socket/nio/NioDatagramChannel.java index d3feb3289c..89d54527cc 100644 --- a/transport/src/main/java/io/netty/channel/socket/nio/NioDatagramChannel.java +++ b/transport/src/main/java/io/netty/channel/socket/nio/NioDatagramChannel.java @@ -315,7 +315,7 @@ final class NioDatagramChannel extends AbstractChannel /** * WriteTask is a simple runnable performs writes by delegating the {@link NioDatagramWorker}. - */ + */ private final class WriteTask implements Runnable { WriteTask() { } diff --git a/transport/src/main/java/io/netty/channel/socket/nio/NioDatagramWorker.java b/transport/src/main/java/io/netty/channel/socket/nio/NioDatagramWorker.java index 4eb550cbb5..eff53e3433 100644 --- a/transport/src/main/java/io/netty/channel/socket/nio/NioDatagramWorker.java +++ b/transport/src/main/java/io/netty/channel/socket/nio/NioDatagramWorker.java @@ -822,7 +822,7 @@ class NioDatagramWorker implements Runnable { /** * This runnable's task. Does the actual registering by calling the * underlying DatagramChannels peer DatagramSocket register method. - */ + */ @Override public void run() { final SocketAddress localAddress = channel.getLocalAddress(); diff --git a/transport/src/main/java/io/netty/channel/socket/nio/NioServerSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/nio/NioServerSocketChannel.java index 9185dc1e07..91b6ca0cb2 100644 --- a/transport/src/main/java/io/netty/channel/socket/nio/NioServerSocketChannel.java +++ b/transport/src/main/java/io/netty/channel/socket/nio/NioServerSocketChannel.java @@ -34,8 +34,6 @@ import io.netty.channel.socket.ServerSocketChannelConfig; import io.netty.logging.InternalLogger; import io.netty.logging.InternalLoggerFactory; -/** - */ final class NioServerSocketChannel extends AbstractServerChannel implements io.netty.channel.socket.ServerSocketChannel { diff --git a/transport/src/main/java/io/netty/channel/socket/nio/NioServerSocketPipelineSink.java b/transport/src/main/java/io/netty/channel/socket/nio/NioServerSocketPipelineSink.java index 37767fe999..7663886d52 100644 --- a/transport/src/main/java/io/netty/channel/socket/nio/NioServerSocketPipelineSink.java +++ b/transport/src/main/java/io/netty/channel/socket/nio/NioServerSocketPipelineSink.java @@ -41,8 +41,6 @@ import io.netty.logging.InternalLogger; import io.netty.logging.InternalLoggerFactory; import io.netty.util.internal.DeadLockProofWorker; -/** - */ class NioServerSocketPipelineSink extends AbstractChannelSink { static final InternalLogger logger = diff --git a/transport/src/main/java/io/netty/channel/socket/nio/NioSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/nio/NioSocketChannel.java index 57c534b0f7..e73d133d2b 100644 --- a/transport/src/main/java/io/netty/channel/socket/nio/NioSocketChannel.java +++ b/transport/src/main/java/io/netty/channel/socket/nio/NioSocketChannel.java @@ -35,8 +35,6 @@ import io.netty.channel.MessageEvent; import io.netty.channel.socket.nio.SocketSendBufferPool.SendBuffer; import io.netty.util.internal.ThreadLocalBoolean; -/** - */ class NioSocketChannel extends AbstractChannel implements io.netty.channel.socket.SocketChannel { diff --git a/transport/src/main/java/io/netty/channel/socket/nio/NioWorker.java b/transport/src/main/java/io/netty/channel/socket/nio/NioWorker.java index 33caf4cb3f..3a80e11c90 100644 --- a/transport/src/main/java/io/netty/channel/socket/nio/NioWorker.java +++ b/transport/src/main/java/io/netty/channel/socket/nio/NioWorker.java @@ -49,8 +49,6 @@ import io.netty.logging.InternalLoggerFactory; import io.netty.util.internal.DeadLockProofWorker; import io.netty.util.internal.QueueFactory; -/** - */ class NioWorker implements Runnable { private static final InternalLogger logger = diff --git a/transport/src/main/java/io/netty/channel/socket/nio/SelectorUtil.java b/transport/src/main/java/io/netty/channel/socket/nio/SelectorUtil.java index fd62de37a5..79ade13920 100644 --- a/transport/src/main/java/io/netty/channel/socket/nio/SelectorUtil.java +++ b/transport/src/main/java/io/netty/channel/socket/nio/SelectorUtil.java @@ -22,8 +22,6 @@ import java.nio.channels.Selector; import io.netty.logging.InternalLogger; import io.netty.logging.InternalLoggerFactory; -/** - */ final class SelectorUtil { private static final InternalLogger logger = InternalLoggerFactory.getInstance(SelectorUtil.class); diff --git a/transport/src/main/java/io/netty/channel/socket/nio/SocketReceiveBufferPool.java b/transport/src/main/java/io/netty/channel/socket/nio/SocketReceiveBufferPool.java index 21384322aa..cff543aaca 100644 --- a/transport/src/main/java/io/netty/channel/socket/nio/SocketReceiveBufferPool.java +++ b/transport/src/main/java/io/netty/channel/socket/nio/SocketReceiveBufferPool.java @@ -18,8 +18,6 @@ package io.netty.channel.socket.nio; import java.lang.ref.SoftReference; import java.nio.ByteBuffer; -/** - */ final class SocketReceiveBufferPool { private static final int POOL_SIZE = 8; diff --git a/transport/src/main/java/io/netty/channel/socket/nio/SocketSendBufferPool.java b/transport/src/main/java/io/netty/channel/socket/nio/SocketSendBufferPool.java index a775ed0441..bd0ebbd3f5 100644 --- a/transport/src/main/java/io/netty/channel/socket/nio/SocketSendBufferPool.java +++ b/transport/src/main/java/io/netty/channel/socket/nio/SocketSendBufferPool.java @@ -25,8 +25,6 @@ import java.nio.channels.WritableByteChannel; import io.netty.buffer.ChannelBuffer; import io.netty.channel.FileRegion; -/** - */ final class SocketSendBufferPool { private static final SendBuffer EMPTY_BUFFER = new EmptySendBuffer(); diff --git a/transport/src/main/java/io/netty/channel/socket/oio/OioAcceptedSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/oio/OioAcceptedSocketChannel.java index 629cb5c2f6..58af115aba 100644 --- a/transport/src/main/java/io/netty/channel/socket/oio/OioAcceptedSocketChannel.java +++ b/transport/src/main/java/io/netty/channel/socket/oio/OioAcceptedSocketChannel.java @@ -28,8 +28,6 @@ import io.netty.channel.ChannelFactory; import io.netty.channel.ChannelPipeline; import io.netty.channel.ChannelSink; -/** - */ final class OioAcceptedSocketChannel extends OioSocketChannel { private final PushbackInputStream in; diff --git a/transport/src/main/java/io/netty/channel/socket/oio/OioClientSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/oio/OioClientSocketChannel.java index b4610098f6..57219543ee 100644 --- a/transport/src/main/java/io/netty/channel/socket/oio/OioClientSocketChannel.java +++ b/transport/src/main/java/io/netty/channel/socket/oio/OioClientSocketChannel.java @@ -25,8 +25,6 @@ import io.netty.channel.ChannelFactory; import io.netty.channel.ChannelPipeline; import io.netty.channel.ChannelSink; -/** - */ final class OioClientSocketChannel extends OioSocketChannel { volatile PushbackInputStream in; diff --git a/transport/src/main/java/io/netty/channel/socket/oio/OioClientSocketPipelineSink.java b/transport/src/main/java/io/netty/channel/socket/oio/OioClientSocketPipelineSink.java index 43851b3a8c..e5cf415a02 100644 --- a/transport/src/main/java/io/netty/channel/socket/oio/OioClientSocketPipelineSink.java +++ b/transport/src/main/java/io/netty/channel/socket/oio/OioClientSocketPipelineSink.java @@ -31,8 +31,6 @@ import io.netty.channel.ChannelStateEvent; import io.netty.channel.MessageEvent; import io.netty.util.internal.DeadLockProofWorker; -/** - */ class OioClientSocketPipelineSink extends AbstractChannelSink { private final Executor workerExecutor; diff --git a/transport/src/main/java/io/netty/channel/socket/oio/OioDatagramChannel.java b/transport/src/main/java/io/netty/channel/socket/oio/OioDatagramChannel.java index 140e5fa15c..841fd1b316 100644 --- a/transport/src/main/java/io/netty/channel/socket/oio/OioDatagramChannel.java +++ b/transport/src/main/java/io/netty/channel/socket/oio/OioDatagramChannel.java @@ -35,8 +35,6 @@ import io.netty.channel.socket.DatagramChannel; import io.netty.channel.socket.DatagramChannelConfig; import io.netty.channel.socket.DefaultDatagramChannelConfig; -/** - */ final class OioDatagramChannel extends AbstractChannel implements DatagramChannel { diff --git a/transport/src/main/java/io/netty/channel/socket/oio/OioDatagramPipelineSink.java b/transport/src/main/java/io/netty/channel/socket/oio/OioDatagramPipelineSink.java index 5c2a9e4aae..3cf3e6baf6 100644 --- a/transport/src/main/java/io/netty/channel/socket/oio/OioDatagramPipelineSink.java +++ b/transport/src/main/java/io/netty/channel/socket/oio/OioDatagramPipelineSink.java @@ -30,8 +30,6 @@ import io.netty.channel.ChannelStateEvent; import io.netty.channel.MessageEvent; import io.netty.util.internal.DeadLockProofWorker; -/** - */ class OioDatagramPipelineSink extends AbstractChannelSink { private final Executor workerExecutor; diff --git a/transport/src/main/java/io/netty/channel/socket/oio/OioDatagramWorker.java b/transport/src/main/java/io/netty/channel/socket/oio/OioDatagramWorker.java index 78f25b474a..ab6ffbd277 100644 --- a/transport/src/main/java/io/netty/channel/socket/oio/OioDatagramWorker.java +++ b/transport/src/main/java/io/netty/channel/socket/oio/OioDatagramWorker.java @@ -28,8 +28,6 @@ import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; import io.netty.channel.ReceiveBufferSizePredictor; -/** - */ class OioDatagramWorker implements Runnable { private final OioDatagramChannel channel; diff --git a/transport/src/main/java/io/netty/channel/socket/oio/OioServerSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/oio/OioServerSocketChannel.java index dfd5300d03..87b256f4a2 100644 --- a/transport/src/main/java/io/netty/channel/socket/oio/OioServerSocketChannel.java +++ b/transport/src/main/java/io/netty/channel/socket/oio/OioServerSocketChannel.java @@ -34,8 +34,6 @@ import io.netty.channel.socket.ServerSocketChannelConfig; import io.netty.logging.InternalLogger; import io.netty.logging.InternalLoggerFactory; -/** - */ final class OioServerSocketChannel extends AbstractServerChannel implements ServerSocketChannel { diff --git a/transport/src/main/java/io/netty/channel/socket/oio/OioServerSocketPipelineSink.java b/transport/src/main/java/io/netty/channel/socket/oio/OioServerSocketPipelineSink.java index be1d567266..1e594ace15 100644 --- a/transport/src/main/java/io/netty/channel/socket/oio/OioServerSocketPipelineSink.java +++ b/transport/src/main/java/io/netty/channel/socket/oio/OioServerSocketPipelineSink.java @@ -36,8 +36,6 @@ import io.netty.logging.InternalLogger; import io.netty.logging.InternalLoggerFactory; import io.netty.util.internal.DeadLockProofWorker; -/** - */ class OioServerSocketPipelineSink extends AbstractChannelSink { static final InternalLogger logger = diff --git a/transport/src/main/java/io/netty/channel/socket/oio/OioSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/oio/OioSocketChannel.java index 29d7178ebb..bd1ccdb588 100644 --- a/transport/src/main/java/io/netty/channel/socket/oio/OioSocketChannel.java +++ b/transport/src/main/java/io/netty/channel/socket/oio/OioSocketChannel.java @@ -31,8 +31,6 @@ import io.netty.channel.socket.DefaultSocketChannelConfig; import io.netty.channel.socket.SocketChannel; import io.netty.channel.socket.SocketChannelConfig; -/** - */ abstract class OioSocketChannel extends AbstractChannel implements SocketChannel { diff --git a/transport/src/main/java/io/netty/channel/socket/oio/OioWorker.java b/transport/src/main/java/io/netty/channel/socket/oio/OioWorker.java index 8135f3e1ab..9afe62ba62 100644 --- a/transport/src/main/java/io/netty/channel/socket/oio/OioWorker.java +++ b/transport/src/main/java/io/netty/channel/socket/oio/OioWorker.java @@ -30,8 +30,6 @@ import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; import io.netty.channel.FileRegion; -/** - */ class OioWorker implements Runnable { private static final Pattern SOCKET_CLOSED_MESSAGE = Pattern.compile( diff --git a/transport/src/test/java/io/netty/channel/CompleteChannelFutureTest.java b/transport/src/test/java/io/netty/channel/CompleteChannelFutureTest.java index 29a5fedb50..6b27051315 100644 --- a/transport/src/test/java/io/netty/channel/CompleteChannelFutureTest.java +++ b/transport/src/test/java/io/netty/channel/CompleteChannelFutureTest.java @@ -23,9 +23,6 @@ import java.util.concurrent.TimeUnit; import org.junit.Before; import org.junit.Test; - -/** - */ public class CompleteChannelFutureTest { private final Channel channel = createMock(Channel.class); diff --git a/transport/src/test/java/io/netty/channel/FailedChannelFutureTest.java b/transport/src/test/java/io/netty/channel/FailedChannelFutureTest.java index bf43e07fdc..a6d697a2ea 100644 --- a/transport/src/test/java/io/netty/channel/FailedChannelFutureTest.java +++ b/transport/src/test/java/io/netty/channel/FailedChannelFutureTest.java @@ -20,9 +20,6 @@ import static org.junit.Assert.*; import org.junit.Test; - -/** - */ public class FailedChannelFutureTest { @Test public void testConstantProperties() { diff --git a/transport/src/test/java/io/netty/channel/StaticChannelPipelineTest.java b/transport/src/test/java/io/netty/channel/StaticChannelPipelineTest.java index 04d596ab83..2fce4a6f2f 100644 --- a/transport/src/test/java/io/netty/channel/StaticChannelPipelineTest.java +++ b/transport/src/test/java/io/netty/channel/StaticChannelPipelineTest.java @@ -21,8 +21,6 @@ import junit.framework.Assert; import org.junit.Test; -/** - */ public class StaticChannelPipelineTest { @Test diff --git a/transport/src/test/java/io/netty/channel/SucceededChannelFutureTest.java b/transport/src/test/java/io/netty/channel/SucceededChannelFutureTest.java index a29d022e94..f1ae135f72 100644 --- a/transport/src/test/java/io/netty/channel/SucceededChannelFutureTest.java +++ b/transport/src/test/java/io/netty/channel/SucceededChannelFutureTest.java @@ -20,9 +20,6 @@ import static org.junit.Assert.*; import org.junit.Test; - -/** - */ public class SucceededChannelFutureTest { @Test public void testConstantProperties() {