From 009300fad37da001b8862bae7bb40c7f9f588d02 Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Fri, 13 Jan 2012 17:39:53 +0900 Subject: [PATCH] Overall cleanup / Add lost old jzlib headers --- .../org/jboss/netty/buffer/ChannelBuffer.java | 8 +- .../jboss/netty/channel/ChannelHandler.java | 2 +- .../org/jboss/netty/channel/ChannelLocal.java | 4 - .../channel/local/LocalServerChannelSink.java | 2 - ...HttpTunnelingClientSocketPipelineSink.java | 2 - .../socket/nio/AbstractWriteRequestQueue.java | 99 --------------- .../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 - .../netty/example/discard/DiscardClient.java | 2 - .../netty/example/discard/DiscardServer.java | 1 - .../jboss/netty/example/echo/EchoServer.java | 1 - .../example/factorial/FactorialServer.java | 1 - .../http/file/HttpStaticFileServer.java | 2 - .../file/HttpStaticFileServerHandler.java | 44 +++++++ .../HttpStaticFileServerPipelineFactory.java | 2 - .../http/snoop/HttpClientPipelineFactory.java | 2 - .../http/snoop/HttpRequestHandler.java | 2 - .../http/snoop/HttpResponseHandler.java | 2 - .../http/snoop/HttpServerPipelineFactory.java | 2 - .../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 - .../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 - .../codec/embedder/EmbeddedSocketAddress.java | 2 - .../frame/LengthFieldBasedFrameDecoder.java | 2 +- .../codec/http/CaseIgnoringComparator.java | 2 - .../handler/codec/http/CookieDateFormat.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 +- .../handler/codec/replay/ReplayError.java | 2 - .../codec/replay/ReplayingDecoderBuffer.java | 2 - .../replay/UnsafeDynamicChannelBuffer.java | 2 - .../netty/handler/codec/rtsp/RtspHeaders.java | 4 +- .../CompactObjectInputStream.java | 2 - .../CompactObjectOutputStream.java | 2 - .../CompatibleObjectDecoderState.java | 2 - .../codec/serialization/ObjectDecoder.java | 1 + .../OrderedMemoryAwareThreadPoolExecutor.java | 10 +- .../jboss/netty/handler/ssl/SslHandler.java | 8 +- .../handler/timeout/WriteTimeoutHandler.java | 2 - .../netty/logging/Log4JLoggerFactory.java | 2 - .../jboss/netty/util/UnsafeDetectUtil.java | 3 - .../util/internal/AtomicFieldUpdaterUtil.java | 2 - .../internal/LegacyLinkedTransferQueue.java | 1 + .../netty/util/internal/NonReentrantLock.java | 2 - .../netty/util/internal/QueueFactory.java | 6 +- .../netty/util/internal/ReusableIterator.java | 2 - .../util/internal/ThreadLocalBoolean.java | 2 - .../netty/util/internal/jzlib/Adler32.java | 26 ++++ .../netty/util/internal/jzlib/CRC32.java | 32 +++++ .../netty/util/internal/jzlib/Deflate.java | 27 +++- .../netty/util/internal/jzlib/InfBlocks.java | 27 +++- .../netty/util/internal/jzlib/InfCodes.java | 27 +++- .../netty/util/internal/jzlib/InfTree.java | 27 +++- .../netty/util/internal/jzlib/Inflate.java | 27 +++- .../netty/util/internal/jzlib/JZlib.java | 27 +++- .../netty/util/internal/jzlib/StaticTree.java | 27 +++- .../jboss/netty/util/internal/jzlib/Tree.java | 27 +++- .../netty/util/internal/jzlib/ZStream.java | 27 +++- .../AbstractSocketClientBootstrapTest.java | 1 + .../AbstractSocketServerBootstrapTest.java | 1 + .../bootstrap/BootstrapOrderedMapTest.java | 1 + .../jboss/netty/bootstrap/BootstrapTest.java | 1 + .../NioSocketClientBootstrapTest.java | 1 + .../NioSocketServerBootstrapTest.java | 1 + .../OioSocketClientBootstrapTest.java | 1 + .../OioSocketServerBootstrapTest.java | 1 + .../buffer/AbstractChannelBufferTest.java | 1 + .../AbstractCompositeChannelBufferTest.java | 1 + .../BigEndianCompositeChannelBufferTest.java | 1 + .../BigEndianDirectChannelBufferTest.java | 1 + .../BigEndianHeapChannelBufferTest.java | 1 + ...ByteBufferBackedHeapChannelBufferTest.java | 1 + .../buffer/ChannelBufferIndexFinderTest.java | 1 + .../netty/buffer/ChannelBufferStreamTest.java | 1 + .../netty/buffer/ChannelBuffersTest.java | 1 + .../buffer/DuplicateChannelBufferTest.java | 1 + .../buffer/DynamicChannelBufferTest.java | 1 + ...ittleEndianCompositeChannelBufferTest.java | 1 + .../LittleEndianDirectChannelBufferTest.java | 1 + .../LittleEndianHeapChannelBufferTest.java | 1 + .../buffer/ReadOnlyChannelBufferTest.java | 1 + .../netty/buffer/SlicedChannelBufferTest.java | 1 + .../buffer/TruncatedChannelBufferTest.java | 1 + .../channel/CompleteChannelFutureTest.java | 3 - .../channel/FailedChannelFutureTest.java | 3 - .../channel/StaticChannelPipelineTest.java | 2 - .../channel/SucceededChannelFutureTest.java | 3 - .../socket/AbstractSocketEchoTest.java | 3 - .../NioClientSocketShutdownTimeTest.java | 3 - .../channel/socket/NioNioSocketEchoTest.java | 2 - .../channel/socket/NioOioSocketEchoTest.java | 2 - .../NioServerSocketShutdownTimeTest.java | 3 - .../channel/socket/OioNioSocketEchoTest.java | 2 - .../channel/socket/OioOioSocketEchoTest.java | 2 - .../socket/nio/NioDatagramChannelTest.java | 118 ------------------ .../channel/socket/nio/SimpleHandler.java | 36 ------ .../netty/channel/socket/nio/UdpClient.java | 55 -------- .../AbstractSocketFixedLengthEchoTest.java | 3 - .../frame/DelimiterBasedFrameDecoderTest.java | 2 - .../LengthFieldBasedFrameDecoderTest.java | 2 - .../NioNioSocketFixedLengthEchoTest.java | 2 - .../NioOioSocketFixedLengthEchoTest.java | 2 - .../OioNioSocketFixedLengthEchoTest.java | 2 - .../OioOioSocketFixedLengthEchoTest.java | 2 - .../handler/codec/http/CookieDecoderTest.java | 2 - .../handler/codec/http/CookieEncoderTest.java | 3 - .../codec/http/DefaultHttpMessageTest.java | 2 - .../codec/http/QueryStringDecoderTest.java | 2 - .../ProtobufVarint32FrameDecoderTest.java | 2 - ...tobufVarint32LengthFieldPrependerTest.java | 2 - .../codec/replay/ReplayingDecoderTest.java | 2 - ...tSocketCompatibleObjectStreamEchoTest.java | 3 - .../AbstractSocketObjectStreamEchoTest.java | 3 - .../CompactObjectSerializationTest.java | 2 - ...oSocketCompatibleObjectStreamEchoTest.java | 2 - .../NioNioSocketObjectStreamEchoTest.java | 2 - ...oSocketCompatibleObjectStreamEchoTest.java | 2 - .../NioOioSocketObjectStreamEchoTest.java | 2 - ...oSocketCompatibleObjectStreamEchoTest.java | 2 - ...oSocketCompatibleObjectStreamEchoTest.java | 2 - .../OioOioSocketObjectStreamEchoTest.java | 2 - .../SwitchableInputStreamTest.java | 3 - .../string/AbstractSocketStringEchoTest.java | 3 - .../string/NioNioSocketStringEchoTest.java | 2 - .../string/NioOioSocketStringEchoTest.java | 2 - .../string/OioNioSocketStringEchoTest.java | 2 - .../string/OioOioSocketStringEchoTest.java | 2 - .../ssl/AbstractSocketSslEchoTest.java | 3 - .../handler/ssl/ImmediateExecutorTest.java | 3 - .../handler/ssl/NioNioSocketSslEchoTest.java | 2 - .../handler/ssl/NioOioSocketSslEchoTest.java | 2 - .../handler/ssl/OioNioSocketSslEchoTest.java | 2 - .../handler/ssl/OioOioSocketSslEchoTest.java | 2 - .../logging/CommonsLoggerFactoryTest.java | 3 - .../netty/logging/CommonsLoggerTest.java | 3 - .../logging/InternalLoggerFactoryTest.java | 3 - .../netty/logging/JBossLoggerFactoryTest.java | 3 - .../jboss/netty/logging/JBossLoggerTest.java | 3 - .../netty/logging/JdkLoggerFactoryTest.java | 3 - .../jboss/netty/logging/JdkLoggerTest.java | 3 - .../netty/logging/Log4JLoggerFactoryTest.java | 3 - .../jboss/netty/logging/Log4JLoggerTest.java | 3 - .../netty/logging/Slf4JLoggerFactoryTest.java | 3 - .../jboss/netty/logging/Slf4JLoggerTest.java | 3 - .../org/jboss/netty/util/DebugUtilTest.java | 3 - .../jboss/netty/util/MapBackedSetTest.java | 3 - .../util/ThreadRenamingRunnableTest.java | 3 - .../util/internal/ConversionUtilTest.java | 3 - .../internal/StackTraceSimplifierTest.java | 3 - .../netty/util/internal/StringUtilTest.java | 1 - 182 files changed, 381 insertions(+), 632 deletions(-) delete mode 100644 src/test/java/org/jboss/netty/channel/socket/nio/NioDatagramChannelTest.java delete mode 100644 src/test/java/org/jboss/netty/channel/socket/nio/SimpleHandler.java delete mode 100644 src/test/java/org/jboss/netty/channel/socket/nio/UdpClient.java diff --git a/src/main/java/org/jboss/netty/buffer/ChannelBuffer.java b/src/main/java/org/jboss/netty/buffer/ChannelBuffer.java index b2df67b520..a349d3895a 100644 --- a/src/main/java/org/jboss/netty/buffer/ChannelBuffer.java +++ b/src/main/java/org/jboss/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() * * +---------------------------------------------------------+ @@ -1330,7 +1334,7 @@ public interface ChannelBuffer extends Comparable { * @throws IndexOutOfBoundsException * if {@code src.readableBytes} is greater than * {@code this.writableBytes} - */ + */ void writeBytes(ChannelBuffer src); /** @@ -1584,7 +1588,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/src/main/java/org/jboss/netty/channel/ChannelHandler.java b/src/main/java/org/jboss/netty/channel/ChannelHandler.java index 633625dd9a..9c51c0d2e1 100644 --- a/src/main/java/org/jboss/netty/channel/ChannelHandler.java +++ b/src/main/java/org/jboss/netty/channel/ChannelHandler.java @@ -219,7 +219,7 @@ public interface ChannelHandler { *

* This annotation is provided for documentation purpose, just like * the JCIP annotations. - */ + */ @Inherited @Documented @Target(ElementType.TYPE) diff --git a/src/main/java/org/jboss/netty/channel/ChannelLocal.java b/src/main/java/org/jboss/netty/channel/ChannelLocal.java index cff8effe04..c8f1d80b92 100644 --- a/src/main/java/org/jboss/netty/channel/ChannelLocal.java +++ b/src/main/java/org/jboss/netty/channel/ChannelLocal.java @@ -37,10 +37,6 @@ public class ChannelLocal { private final ChannelFutureListener remover = new ChannelFutureListener() { - /* - * (non-Javadoc) - * @see org.jboss.netty.channel.ChannelFutureListener#operationComplete(org.jboss.netty.channel.ChannelFuture) - */ public void operationComplete(ChannelFuture future) throws Exception { remove(future.getChannel()); } diff --git a/src/main/java/org/jboss/netty/channel/local/LocalServerChannelSink.java b/src/main/java/org/jboss/netty/channel/local/LocalServerChannelSink.java index 5d2416fd24..61ba408af6 100644 --- a/src/main/java/org/jboss/netty/channel/local/LocalServerChannelSink.java +++ b/src/main/java/org/jboss/netty/channel/local/LocalServerChannelSink.java @@ -27,8 +27,6 @@ import org.jboss.netty.channel.ChannelState; import org.jboss.netty.channel.ChannelStateEvent; import org.jboss.netty.channel.MessageEvent; -/** - */ final class LocalServerChannelSink extends AbstractChannelSink { LocalServerChannelSink() { diff --git a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketPipelineSink.java b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketPipelineSink.java index 2aa8183ed1..2c0d629279 100644 --- a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketPipelineSink.java +++ b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketPipelineSink.java @@ -26,8 +26,6 @@ import org.jboss.netty.channel.ChannelState; import org.jboss.netty.channel.ChannelStateEvent; import org.jboss.netty.channel.MessageEvent; -/** - */ final class HttpTunnelingClientSocketPipelineSink extends AbstractChannelSink { HttpTunnelingClientSocketPipelineSink() { diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/AbstractWriteRequestQueue.java b/src/main/java/org/jboss/netty/channel/socket/nio/AbstractWriteRequestQueue.java index 80907ca67a..fd240957bb 100644 --- a/src/main/java/org/jboss/netty/channel/socket/nio/AbstractWriteRequestQueue.java +++ b/src/main/java/org/jboss/netty/channel/socket/nio/AbstractWriteRequestQueue.java @@ -23,12 +23,6 @@ import java.util.concurrent.TimeUnit; import org.jboss.netty.channel.MessageEvent; import org.jboss.netty.util.internal.QueueFactory; -/** - * - * - - - */ abstract class AbstractWriteRequestQueue implements BlockingQueue { protected final BlockingQueue queue; @@ -37,188 +31,95 @@ abstract class AbstractWriteRequestQueue implements BlockingQueue this.queue = QueueFactory.createQueue(MessageEvent.class); } - /* - * (non-Javadoc) - * @see java.util.Queue#remove() - */ public MessageEvent remove() { return queue.remove(); } - /* - * (non-Javadoc) - * @see java.util.Queue#element() - */ public MessageEvent element() { return queue.element(); } - /* - * (non-Javadoc) - * @see java.util.Queue#peek() - */ public MessageEvent peek() { return queue.peek(); } - /* - * (non-Javadoc) - * @see java.util.Collection#size() - */ public int size() { return queue.size(); } - /* - * (non-Javadoc) - * @see java.util.Collection#isEmpty() - */ public boolean isEmpty() { return queue.isEmpty(); } - /* - * (non-Javadoc) - * @see java.util.Collection#iterator() - */ public Iterator iterator() { return queue.iterator(); } - /* - * (non-Javadoc) - * @see java.util.Collection#toArray() - */ public Object[] toArray() { return queue.toArray(); } - /* - * (non-Javadoc) - * @see java.util.Collection#toArray(T[]) - */ public T[] toArray(T[] a) { return queue.toArray(a); } - /* - * (non-Javadoc) - * @see java.util.Collection#containsAll(java.util.Collection) - */ public boolean containsAll(Collection c) { return queue.containsAll(c); } - /* - * (non-Javadoc) - * @see java.util.Collection#addAll(java.util.Collection) - */ public boolean addAll(Collection c) { return queue.addAll(c); } - /* - * (non-Javadoc) - * @see java.util.Collection#removeAll(java.util.Collection) - */ public boolean removeAll(Collection c) { return queue.removeAll(c); } - /* - * (non-Javadoc) - * @see java.util.Collection#retainAll(java.util.Collection) - */ public boolean retainAll(Collection c) { return queue.retainAll(c); } - /* - * (non-Javadoc) - * @see java.util.Collection#clear() - */ public void clear() { queue.clear(); } - /* - * (non-Javadoc) - * @see java.util.concurrent.BlockingQueue#add(java.lang.Object) - */ public boolean add(MessageEvent e) { return queue.add(e); } - /* - * (non-Javadoc) - * @see java.util.concurrent.BlockingQueue#put(java.lang.Object) - */ public void put(MessageEvent e) throws InterruptedException { queue.put(e); } - /* - * (non-Javadoc) - * @see java.util.concurrent.BlockingQueue#offer(java.lang.Object, long, java.util.concurrent.TimeUnit) - */ public boolean offer(MessageEvent e, long timeout, TimeUnit unit) throws InterruptedException { return queue.offer(e, timeout, unit); } - /* - * (non-Javadoc) - * @see java.util.concurrent.BlockingQueue#take() - */ public MessageEvent take() throws InterruptedException { return queue.take(); } - /* - * (non-Javadoc) - * @see java.util.concurrent.BlockingQueue#poll(long, java.util.concurrent.TimeUnit) - */ public MessageEvent poll(long timeout, TimeUnit unit) throws InterruptedException { return queue.poll(timeout, unit); } - /* - * (non-Javadoc) - * @see java.util.concurrent.BlockingQueue#remainingCapacity() - */ public int remainingCapacity() { return queue.remainingCapacity(); } - /* - * (non-Javadoc) - * @see java.util.concurrent.BlockingQueue#remove(java.lang.Object) - */ public boolean remove(Object o) { return queue.remove(o); } - /* - * (non-Javadoc) - * @see java.util.concurrent.BlockingQueue#contains(java.lang.Object) - */ public boolean contains(Object o) { return queue.contains(o); } - /* - * (non-Javadoc) - * @see java.util.concurrent.BlockingQueue#drainTo(java.util.Collection) - */ public int drainTo(Collection c) { return queue.drainTo(c); } - /* - * (non-Javadoc) - * @see java.util.concurrent.BlockingQueue#drainTo(java.util.Collection, int) - */ public int drainTo(Collection c, int maxElements) { return queue.drainTo(c, maxElements); } - } diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioAcceptedSocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioAcceptedSocketChannel.java index 63ef259110..fbfff17867 100644 --- a/src/main/java/org/jboss/netty/channel/socket/nio/NioAcceptedSocketChannel.java +++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioAcceptedSocketChannel.java @@ -24,8 +24,6 @@ import org.jboss.netty.channel.ChannelFactory; import org.jboss.netty.channel.ChannelPipeline; import org.jboss.netty.channel.ChannelSink; -/** - */ final class NioAcceptedSocketChannel extends NioSocketChannel { final Thread bossThread; diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketChannel.java index f1d3534c50..533b24aa19 100644 --- a/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketChannel.java +++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketChannel.java @@ -28,8 +28,6 @@ import org.jboss.netty.channel.ChannelSink; import org.jboss.netty.logging.InternalLogger; import org.jboss.netty.logging.InternalLoggerFactory; -/** - */ final class NioClientSocketChannel extends NioSocketChannel { private static final InternalLogger logger = diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketPipelineSink.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketPipelineSink.java index 01e0085615..b3bdec94df 100644 --- a/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketPipelineSink.java +++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketPipelineSink.java @@ -46,8 +46,6 @@ import org.jboss.netty.util.ThreadRenamingRunnable; import org.jboss.netty.util.internal.DeadLockProofWorker; import org.jboss.netty.util.internal.QueueFactory; -/** - */ class NioClientSocketPipelineSink extends AbstractChannelSink { static final InternalLogger logger = diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannel.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannel.java index e593e6c876..0b0ee6cc7d 100644 --- a/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannel.java +++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannel.java @@ -306,7 +306,7 @@ class NioDatagramChannel extends AbstractChannel /** * WriteTask is a simple runnable performs writes by delegating the {@link NioDatagramWorker}. - */ + */ private final class WriteTask implements Runnable { WriteTask() { super(); diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramWorker.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramWorker.java index 4f144f8e8c..041defc9ef 100644 --- a/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramWorker.java +++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramWorker.java @@ -837,7 +837,7 @@ class NioDatagramWorker implements Runnable { /** * This runnable's task. Does the actual registering by calling the * underlying DatagramChannels peer DatagramSocket register method. - */ + */ public void run() { final SocketAddress localAddress = channel.getLocalAddress(); if (localAddress == null) { diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketChannel.java index 86d799c637..bb9ab80df9 100644 --- a/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketChannel.java +++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketChannel.java @@ -34,8 +34,6 @@ import org.jboss.netty.channel.socket.ServerSocketChannelConfig; import org.jboss.netty.logging.InternalLogger; import org.jboss.netty.logging.InternalLoggerFactory; -/** - */ class NioServerSocketChannel extends AbstractServerChannel implements org.jboss.netty.channel.socket.ServerSocketChannel { diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketPipelineSink.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketPipelineSink.java index 7609006bb8..3d8a235471 100644 --- a/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketPipelineSink.java +++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketPipelineSink.java @@ -42,8 +42,6 @@ import org.jboss.netty.logging.InternalLoggerFactory; import org.jboss.netty.util.ThreadRenamingRunnable; import org.jboss.netty.util.internal.DeadLockProofWorker; -/** - */ class NioServerSocketPipelineSink extends AbstractChannelSink { static final InternalLogger logger = diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannel.java index d33aced3b8..6fc4f11d80 100644 --- a/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannel.java +++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannel.java @@ -35,8 +35,6 @@ import org.jboss.netty.channel.MessageEvent; import org.jboss.netty.channel.socket.nio.SocketSendBufferPool.SendBuffer; import org.jboss.netty.util.internal.ThreadLocalBoolean; -/** - */ class NioSocketChannel extends AbstractChannel implements org.jboss.netty.channel.socket.SocketChannel { diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java index a238fda741..5554bee218 100644 --- a/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java +++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java @@ -50,8 +50,6 @@ import org.jboss.netty.util.ThreadRenamingRunnable; import org.jboss.netty.util.internal.DeadLockProofWorker; import org.jboss.netty.util.internal.QueueFactory; -/** - */ class NioWorker implements Runnable { private static final InternalLogger logger = diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/SelectorUtil.java b/src/main/java/org/jboss/netty/channel/socket/nio/SelectorUtil.java index 4437212b7d..048c68dd04 100644 --- a/src/main/java/org/jboss/netty/channel/socket/nio/SelectorUtil.java +++ b/src/main/java/org/jboss/netty/channel/socket/nio/SelectorUtil.java @@ -22,8 +22,6 @@ import java.nio.channels.Selector; import org.jboss.netty.logging.InternalLogger; import org.jboss.netty.logging.InternalLoggerFactory; -/** - */ final class SelectorUtil { private static final InternalLogger logger = InternalLoggerFactory.getInstance(SelectorUtil.class); diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/SocketReceiveBufferPool.java b/src/main/java/org/jboss/netty/channel/socket/nio/SocketReceiveBufferPool.java index 9e6785d64a..bc20ab47c9 100644 --- a/src/main/java/org/jboss/netty/channel/socket/nio/SocketReceiveBufferPool.java +++ b/src/main/java/org/jboss/netty/channel/socket/nio/SocketReceiveBufferPool.java @@ -18,8 +18,6 @@ package org.jboss.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/src/main/java/org/jboss/netty/channel/socket/nio/SocketSendBufferPool.java b/src/main/java/org/jboss/netty/channel/socket/nio/SocketSendBufferPool.java index 12d03d71a3..14f5f96c41 100644 --- a/src/main/java/org/jboss/netty/channel/socket/nio/SocketSendBufferPool.java +++ b/src/main/java/org/jboss/netty/channel/socket/nio/SocketSendBufferPool.java @@ -26,8 +26,6 @@ import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.channel.DefaultFileRegion; import org.jboss.netty.channel.FileRegion; -/** - */ final class SocketSendBufferPool { private static final SendBuffer EMPTY_BUFFER = new EmptySendBuffer(); diff --git a/src/main/java/org/jboss/netty/channel/socket/oio/OioAcceptedSocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioAcceptedSocketChannel.java index cee4c52e8f..5f91e6b97e 100644 --- a/src/main/java/org/jboss/netty/channel/socket/oio/OioAcceptedSocketChannel.java +++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioAcceptedSocketChannel.java @@ -29,8 +29,6 @@ import org.jboss.netty.channel.ChannelFactory; import org.jboss.netty.channel.ChannelPipeline; import org.jboss.netty.channel.ChannelSink; -/** - */ class OioAcceptedSocketChannel extends OioSocketChannel { private final PushbackInputStream in; diff --git a/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketChannel.java index ae9f3a9551..ea99c09112 100644 --- a/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketChannel.java +++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketChannel.java @@ -25,8 +25,6 @@ import org.jboss.netty.channel.ChannelFactory; import org.jboss.netty.channel.ChannelPipeline; import org.jboss.netty.channel.ChannelSink; -/** - */ class OioClientSocketChannel extends OioSocketChannel { volatile PushbackInputStream in; diff --git a/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketPipelineSink.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketPipelineSink.java index 459ecd10c6..209742e8aa 100644 --- a/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketPipelineSink.java +++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketPipelineSink.java @@ -32,8 +32,6 @@ import org.jboss.netty.channel.MessageEvent; import org.jboss.netty.util.ThreadRenamingRunnable; import org.jboss.netty.util.internal.DeadLockProofWorker; -/** - */ class OioClientSocketPipelineSink extends AbstractChannelSink { private final Executor workerExecutor; diff --git a/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramChannel.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramChannel.java index 0cca432b61..8206a0a89a 100644 --- a/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramChannel.java +++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramChannel.java @@ -35,8 +35,6 @@ import org.jboss.netty.channel.socket.DatagramChannel; import org.jboss.netty.channel.socket.DatagramChannelConfig; import org.jboss.netty.channel.socket.DefaultDatagramChannelConfig; -/** - */ final class OioDatagramChannel extends AbstractChannel implements DatagramChannel { diff --git a/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramPipelineSink.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramPipelineSink.java index 990c9da7c4..9da1d7c653 100644 --- a/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramPipelineSink.java +++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramPipelineSink.java @@ -31,8 +31,6 @@ import org.jboss.netty.channel.MessageEvent; import org.jboss.netty.util.ThreadRenamingRunnable; import org.jboss.netty.util.internal.DeadLockProofWorker; -/** - */ class OioDatagramPipelineSink extends AbstractChannelSink { private final Executor workerExecutor; diff --git a/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramWorker.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramWorker.java index 22276c7d46..a98acd5ded 100644 --- a/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramWorker.java +++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramWorker.java @@ -28,8 +28,6 @@ import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelFuture; import org.jboss.netty.channel.ReceiveBufferSizePredictor; -/** - */ class OioDatagramWorker implements Runnable { private final OioDatagramChannel channel; diff --git a/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketChannel.java index cf7d00d687..fe2ad5b095 100644 --- a/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketChannel.java +++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketChannel.java @@ -34,8 +34,6 @@ import org.jboss.netty.channel.socket.ServerSocketChannelConfig; import org.jboss.netty.logging.InternalLogger; import org.jboss.netty.logging.InternalLoggerFactory; -/** - */ class OioServerSocketChannel extends AbstractServerChannel implements ServerSocketChannel { diff --git a/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketPipelineSink.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketPipelineSink.java index 389d15c40a..d2bce52366 100644 --- a/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketPipelineSink.java +++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketPipelineSink.java @@ -36,8 +36,6 @@ import org.jboss.netty.logging.InternalLoggerFactory; import org.jboss.netty.util.ThreadRenamingRunnable; import org.jboss.netty.util.internal.DeadLockProofWorker; -/** - */ class OioServerSocketPipelineSink extends AbstractChannelSink { static final InternalLogger logger = diff --git a/src/main/java/org/jboss/netty/channel/socket/oio/OioSocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioSocketChannel.java index f0cc0b563b..d4996b927b 100644 --- a/src/main/java/org/jboss/netty/channel/socket/oio/OioSocketChannel.java +++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioSocketChannel.java @@ -31,8 +31,6 @@ import org.jboss.netty.channel.socket.DefaultSocketChannelConfig; import org.jboss.netty.channel.socket.SocketChannel; import org.jboss.netty.channel.socket.SocketChannelConfig; -/** - */ abstract class OioSocketChannel extends AbstractChannel implements SocketChannel { diff --git a/src/main/java/org/jboss/netty/channel/socket/oio/OioWorker.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioWorker.java index a644221f49..a3222ce14b 100644 --- a/src/main/java/org/jboss/netty/channel/socket/oio/OioWorker.java +++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioWorker.java @@ -31,8 +31,6 @@ import org.jboss.netty.channel.ChannelFuture; import org.jboss.netty.channel.DefaultFileRegion; import org.jboss.netty.channel.FileRegion; -/** - */ class OioWorker implements Runnable { private static final Pattern SOCKET_CLOSED_MESSAGE = Pattern.compile( diff --git a/src/main/java/org/jboss/netty/example/discard/DiscardClient.java b/src/main/java/org/jboss/netty/example/discard/DiscardClient.java index 30637d7bcd..c924b6a913 100644 --- a/src/main/java/org/jboss/netty/example/discard/DiscardClient.java +++ b/src/main/java/org/jboss/netty/example/discard/DiscardClient.java @@ -50,8 +50,6 @@ public class DiscardClient { } new DiscardClient(host, port, firstMessageSize).run(); - - } private final String host; diff --git a/src/main/java/org/jboss/netty/example/discard/DiscardServer.java b/src/main/java/org/jboss/netty/example/discard/DiscardServer.java index ce22eccb85..99d816c8ec 100644 --- a/src/main/java/org/jboss/netty/example/discard/DiscardServer.java +++ b/src/main/java/org/jboss/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/src/main/java/org/jboss/netty/example/echo/EchoServer.java b/src/main/java/org/jboss/netty/example/echo/EchoServer.java index ab95722ac0..cb11d22baa 100644 --- a/src/main/java/org/jboss/netty/example/echo/EchoServer.java +++ b/src/main/java/org/jboss/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/src/main/java/org/jboss/netty/example/factorial/FactorialServer.java b/src/main/java/org/jboss/netty/example/factorial/FactorialServer.java index 7a93ab2c9c..54a114cdce 100644 --- a/src/main/java/org/jboss/netty/example/factorial/FactorialServer.java +++ b/src/main/java/org/jboss/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/src/main/java/org/jboss/netty/example/http/file/HttpStaticFileServer.java b/src/main/java/org/jboss/netty/example/http/file/HttpStaticFileServer.java index 2dee1e0258..1717acc804 100644 --- a/src/main/java/org/jboss/netty/example/http/file/HttpStaticFileServer.java +++ b/src/main/java/org/jboss/netty/example/http/file/HttpStaticFileServer.java @@ -21,8 +21,6 @@ import java.util.concurrent.Executors; import org.jboss.netty.bootstrap.ServerBootstrap; import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory; -/** - */ public class HttpStaticFileServer { public static void main(String[] args) { // Configure the server. diff --git a/src/main/java/org/jboss/netty/example/http/file/HttpStaticFileServerHandler.java b/src/main/java/org/jboss/netty/example/http/file/HttpStaticFileServerHandler.java index eadf3583e9..9a1dbd19e9 100644 --- a/src/main/java/org/jboss/netty/example/http/file/HttpStaticFileServerHandler.java +++ b/src/main/java/org/jboss/netty/example/http/file/HttpStaticFileServerHandler.java @@ -48,6 +48,50 @@ import org.jboss.netty.handler.stream.ChunkedFile; import org.jboss.netty.util.CharsetUtil; /** + * A simple handler that serves incoming HTTP requests to send their respective + * HTTP responses. It also implements {@code 'If-Modified-Since'} header to + * take advantage of browser cache, as described in + * RFC 2616. + * + *

How Browser Caching Works

+ * + * Web browser caching works with HTTP headers as illustrated by the following + * sample: + *
    + *
  1. Request #1 returns the content of /file1.txt.
    2. + *
  2. Contents of /file1.txt is cached by the browser.
    3. + *
  3. Request #2 for /file1.txt does return the contents of the + * file again. Rather, a 304 Not Modified is returned. This tells the + * browser to use the contents stored in its cache.
    4. + *
  4. The server knows the file has not been modified because the + * If-Modified-Since date is the same as the file's last + * modified date.
    5. + *
+ * + * 
+ * Request #1 Headers
+ * ===================
+ * GET /file1.txt HTTP/1.1
+ *
+ * Response #1 Headers
+ * ===================
+ * HTTP/1.1 200 OK
+ * Date:               Tue, 01 Mar 2011 22:44:26 GMT
+ * Last-Modified:      Wed, 30 Jun 2010 21:36:48 GMT
+ * Expires:            Tue, 01 Mar 2012 22:44:26 GMT
+ * Cache-Control:      private, max-age=31536000
+ *
+ * Request #2 Headers
+ * ===================
+ * GET /file1.txt HTTP/1.1
+ * If-Modified-Since:  Wed, 30 Jun 2010 21:36:48 GMT
+ *
+ * Response #2 Headers
+ * ===================
+ * HTTP/1.1 304 Not Modified
+ * Date:               Tue, 01 Mar 2011 22:44:28 GMT
+ *
+ *
*/ public class HttpStaticFileServerHandler extends SimpleChannelUpstreamHandler { diff --git a/src/main/java/org/jboss/netty/example/http/file/HttpStaticFileServerPipelineFactory.java b/src/main/java/org/jboss/netty/example/http/file/HttpStaticFileServerPipelineFactory.java index 6ed62496b8..4742f0eed0 100644 --- a/src/main/java/org/jboss/netty/example/http/file/HttpStaticFileServerPipelineFactory.java +++ b/src/main/java/org/jboss/netty/example/http/file/HttpStaticFileServerPipelineFactory.java @@ -24,8 +24,6 @@ import org.jboss.netty.handler.codec.http.HttpRequestDecoder; import org.jboss.netty.handler.codec.http.HttpResponseEncoder; import org.jboss.netty.handler.stream.ChunkedWriteHandler; -/** - */ public class HttpStaticFileServerPipelineFactory implements ChannelPipelineFactory { public ChannelPipeline getPipeline() throws Exception { // Create a default pipeline implementation. diff --git a/src/main/java/org/jboss/netty/example/http/snoop/HttpClientPipelineFactory.java b/src/main/java/org/jboss/netty/example/http/snoop/HttpClientPipelineFactory.java index 021f0365d5..29a424c6b9 100644 --- a/src/main/java/org/jboss/netty/example/http/snoop/HttpClientPipelineFactory.java +++ b/src/main/java/org/jboss/netty/example/http/snoop/HttpClientPipelineFactory.java @@ -26,8 +26,6 @@ import org.jboss.netty.handler.codec.http.HttpClientCodec; import org.jboss.netty.handler.codec.http.HttpContentDecompressor; import org.jboss.netty.handler.ssl.SslHandler; -/** - */ public class HttpClientPipelineFactory implements ChannelPipelineFactory { private final boolean ssl; diff --git a/src/main/java/org/jboss/netty/example/http/snoop/HttpRequestHandler.java b/src/main/java/org/jboss/netty/example/http/snoop/HttpRequestHandler.java index 3ed0fb393e..560ce5a8ac 100644 --- a/src/main/java/org/jboss/netty/example/http/snoop/HttpRequestHandler.java +++ b/src/main/java/org/jboss/netty/example/http/snoop/HttpRequestHandler.java @@ -44,8 +44,6 @@ import org.jboss.netty.handler.codec.http.HttpResponse; import org.jboss.netty.handler.codec.http.QueryStringDecoder; import org.jboss.netty.util.CharsetUtil; -/** - */ public class HttpRequestHandler extends SimpleChannelUpstreamHandler { private HttpRequest request; diff --git a/src/main/java/org/jboss/netty/example/http/snoop/HttpResponseHandler.java b/src/main/java/org/jboss/netty/example/http/snoop/HttpResponseHandler.java index 0274188f80..2440ef3926 100644 --- a/src/main/java/org/jboss/netty/example/http/snoop/HttpResponseHandler.java +++ b/src/main/java/org/jboss/netty/example/http/snoop/HttpResponseHandler.java @@ -23,8 +23,6 @@ import org.jboss.netty.handler.codec.http.HttpChunk; import org.jboss.netty.handler.codec.http.HttpResponse; import org.jboss.netty.util.CharsetUtil; -/** - */ public class HttpResponseHandler extends SimpleChannelUpstreamHandler { private boolean readingChunks; diff --git a/src/main/java/org/jboss/netty/example/http/snoop/HttpServerPipelineFactory.java b/src/main/java/org/jboss/netty/example/http/snoop/HttpServerPipelineFactory.java index fe8bdeb50b..ace8145b1e 100644 --- a/src/main/java/org/jboss/netty/example/http/snoop/HttpServerPipelineFactory.java +++ b/src/main/java/org/jboss/netty/example/http/snoop/HttpServerPipelineFactory.java @@ -23,8 +23,6 @@ import org.jboss.netty.handler.codec.http.HttpContentCompressor; import org.jboss.netty.handler.codec.http.HttpRequestDecoder; import org.jboss.netty.handler.codec.http.HttpResponseEncoder; -/** - */ public class HttpServerPipelineFactory implements ChannelPipelineFactory { public ChannelPipeline getPipeline() throws Exception { // Create a default pipeline implementation. diff --git a/src/main/java/org/jboss/netty/example/local/LocalExample.java b/src/main/java/org/jboss/netty/example/local/LocalExample.java index 6fae72adf8..c275706fde 100644 --- a/src/main/java/org/jboss/netty/example/local/LocalExample.java +++ b/src/main/java/org/jboss/netty/example/local/LocalExample.java @@ -33,8 +33,6 @@ import org.jboss.netty.handler.codec.string.StringEncoder; import org.jboss.netty.handler.logging.LoggingHandler; import org.jboss.netty.logging.InternalLogLevel; -/** - */ public class LocalExample { public static void main(String[] args) throws Exception { // Address to bind on / connect to. diff --git a/src/main/java/org/jboss/netty/example/local/LocalExampleMultthreaded.java b/src/main/java/org/jboss/netty/example/local/LocalExampleMultthreaded.java index 3068b2cc7e..5ff008f987 100644 --- a/src/main/java/org/jboss/netty/example/local/LocalExampleMultthreaded.java +++ b/src/main/java/org/jboss/netty/example/local/LocalExampleMultthreaded.java @@ -32,8 +32,6 @@ import org.jboss.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor; import org.jboss.netty.handler.logging.LoggingHandler; import org.jboss.netty.logging.InternalLogLevel; -/** - */ public class LocalExampleMultthreaded { public static void main(String[] args) throws Exception { diff --git a/src/main/java/org/jboss/netty/example/local/LocalServerPipelineFactory.java b/src/main/java/org/jboss/netty/example/local/LocalServerPipelineFactory.java index e96c7e26e7..07d2b27de7 100644 --- a/src/main/java/org/jboss/netty/example/local/LocalServerPipelineFactory.java +++ b/src/main/java/org/jboss/netty/example/local/LocalServerPipelineFactory.java @@ -29,8 +29,6 @@ import org.jboss.netty.handler.codec.string.StringDecoder; import org.jboss.netty.handler.codec.string.StringEncoder; import org.jboss.netty.handler.execution.ExecutionHandler; -/** - */ public class LocalServerPipelineFactory implements ChannelPipelineFactory { private final ExecutionHandler executionHandler; diff --git a/src/main/java/org/jboss/netty/example/localtime/LocalTimeClientHandler.java b/src/main/java/org/jboss/netty/example/localtime/LocalTimeClientHandler.java index df390712bd..377deec0a7 100644 --- a/src/main/java/org/jboss/netty/example/localtime/LocalTimeClientHandler.java +++ b/src/main/java/org/jboss/netty/example/localtime/LocalTimeClientHandler.java @@ -37,8 +37,6 @@ import org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes; import org.jboss.netty.example.localtime.LocalTimeProtocol.Location; import org.jboss.netty.example.localtime.LocalTimeProtocol.Locations; -/** - */ public class LocalTimeClientHandler extends SimpleChannelUpstreamHandler { private static final Logger logger = Logger.getLogger( diff --git a/src/main/java/org/jboss/netty/example/localtime/LocalTimeClientPipelineFactory.java b/src/main/java/org/jboss/netty/example/localtime/LocalTimeClientPipelineFactory.java index 5a7e573e46..788f454547 100644 --- a/src/main/java/org/jboss/netty/example/localtime/LocalTimeClientPipelineFactory.java +++ b/src/main/java/org/jboss/netty/example/localtime/LocalTimeClientPipelineFactory.java @@ -24,8 +24,6 @@ import org.jboss.netty.handler.codec.protobuf.ProtobufEncoder; import org.jboss.netty.handler.codec.protobuf.ProtobufVarint32FrameDecoder; import org.jboss.netty.handler.codec.protobuf.ProtobufVarint32LengthFieldPrepender; -/** - */ public class LocalTimeClientPipelineFactory implements ChannelPipelineFactory { public ChannelPipeline getPipeline() throws Exception { diff --git a/src/main/java/org/jboss/netty/example/localtime/LocalTimeServerHandler.java b/src/main/java/org/jboss/netty/example/localtime/LocalTimeServerHandler.java index 09f689d7b5..0292acb0a8 100644 --- a/src/main/java/org/jboss/netty/example/localtime/LocalTimeServerHandler.java +++ b/src/main/java/org/jboss/netty/example/localtime/LocalTimeServerHandler.java @@ -35,8 +35,6 @@ import org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes; import org.jboss.netty.example.localtime.LocalTimeProtocol.Location; import org.jboss.netty.example.localtime.LocalTimeProtocol.Locations; -/** - */ public class LocalTimeServerHandler extends SimpleChannelUpstreamHandler { private static final Logger logger = Logger.getLogger( diff --git a/src/main/java/org/jboss/netty/example/localtime/LocalTimeServerPipelineFactory.java b/src/main/java/org/jboss/netty/example/localtime/LocalTimeServerPipelineFactory.java index f70d2649dc..f5cacf019c 100644 --- a/src/main/java/org/jboss/netty/example/localtime/LocalTimeServerPipelineFactory.java +++ b/src/main/java/org/jboss/netty/example/localtime/LocalTimeServerPipelineFactory.java @@ -24,8 +24,6 @@ import org.jboss.netty.handler.codec.protobuf.ProtobufEncoder; import org.jboss.netty.handler.codec.protobuf.ProtobufVarint32FrameDecoder; import org.jboss.netty.handler.codec.protobuf.ProtobufVarint32LengthFieldPrepender; -/** - */ public class LocalTimeServerPipelineFactory implements ChannelPipelineFactory { public ChannelPipeline getPipeline() throws Exception { diff --git a/src/main/java/org/jboss/netty/example/proxy/HexDumpProxy.java b/src/main/java/org/jboss/netty/example/proxy/HexDumpProxy.java index accc833d5a..5bfb3b96a3 100644 --- a/src/main/java/org/jboss/netty/example/proxy/HexDumpProxy.java +++ b/src/main/java/org/jboss/netty/example/proxy/HexDumpProxy.java @@ -24,8 +24,6 @@ import org.jboss.netty.channel.socket.ClientSocketChannelFactory; import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory; import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory; -/** - */ public class HexDumpProxy { public static void main(String[] args) throws Exception { diff --git a/src/main/java/org/jboss/netty/example/proxy/HexDumpProxyInboundHandler.java b/src/main/java/org/jboss/netty/example/proxy/HexDumpProxyInboundHandler.java index 446ce9940e..1f1ab284a4 100644 --- a/src/main/java/org/jboss/netty/example/proxy/HexDumpProxyInboundHandler.java +++ b/src/main/java/org/jboss/netty/example/proxy/HexDumpProxyInboundHandler.java @@ -30,8 +30,6 @@ import org.jboss.netty.channel.MessageEvent; import org.jboss.netty.channel.SimpleChannelUpstreamHandler; import org.jboss.netty.channel.socket.ClientSocketChannelFactory; -/** - */ public class HexDumpProxyInboundHandler extends SimpleChannelUpstreamHandler { private final ClientSocketChannelFactory cf; diff --git a/src/main/java/org/jboss/netty/example/proxy/HexDumpProxyPipelineFactory.java b/src/main/java/org/jboss/netty/example/proxy/HexDumpProxyPipelineFactory.java index 8d6446d3c8..6c955cfb26 100644 --- a/src/main/java/org/jboss/netty/example/proxy/HexDumpProxyPipelineFactory.java +++ b/src/main/java/org/jboss/netty/example/proxy/HexDumpProxyPipelineFactory.java @@ -21,8 +21,6 @@ import org.jboss.netty.channel.ChannelPipeline; import org.jboss.netty.channel.ChannelPipelineFactory; import org.jboss.netty.channel.socket.ClientSocketChannelFactory; -/** - */ public class HexDumpProxyPipelineFactory implements ChannelPipelineFactory { private final ClientSocketChannelFactory cf; diff --git a/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentClientHandler.java b/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentClientHandler.java index 0392dcf9c3..4950de7a08 100644 --- a/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentClientHandler.java +++ b/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentClientHandler.java @@ -20,8 +20,6 @@ import org.jboss.netty.channel.ExceptionEvent; import org.jboss.netty.channel.MessageEvent; import org.jboss.netty.channel.SimpleChannelUpstreamHandler; -/** - */ public class QuoteOfTheMomentClientHandler extends SimpleChannelUpstreamHandler { @Override diff --git a/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentServerHandler.java b/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentServerHandler.java index 33b095b503..bb65c23c81 100644 --- a/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentServerHandler.java +++ b/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentServerHandler.java @@ -22,8 +22,6 @@ import org.jboss.netty.channel.ExceptionEvent; import org.jboss.netty.channel.MessageEvent; import org.jboss.netty.channel.SimpleChannelUpstreamHandler; -/** - */ public class QuoteOfTheMomentServerHandler extends SimpleChannelUpstreamHandler { private static final Random random = new Random(); diff --git a/src/main/java/org/jboss/netty/example/securechat/SecureChatServerHandler.java b/src/main/java/org/jboss/netty/example/securechat/SecureChatServerHandler.java index 5e8da2d06b..ab7170aa9f 100644 --- a/src/main/java/org/jboss/netty/example/securechat/SecureChatServerHandler.java +++ b/src/main/java/org/jboss/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/src/main/java/org/jboss/netty/handler/codec/embedder/EmbeddedSocketAddress.java b/src/main/java/org/jboss/netty/handler/codec/embedder/EmbeddedSocketAddress.java index fdea9443ad..ff16d80bd5 100644 --- a/src/main/java/org/jboss/netty/handler/codec/embedder/EmbeddedSocketAddress.java +++ b/src/main/java/org/jboss/netty/handler/codec/embedder/EmbeddedSocketAddress.java @@ -17,8 +17,6 @@ package org.jboss.netty.handler.codec.embedder; import java.net.SocketAddress; -/** - */ class EmbeddedSocketAddress extends SocketAddress { private static final long serialVersionUID = 1400788804624980619L; diff --git a/src/main/java/org/jboss/netty/handler/codec/frame/LengthFieldBasedFrameDecoder.java b/src/main/java/org/jboss/netty/handler/codec/frame/LengthFieldBasedFrameDecoder.java index a9155fe9be..20cecaeaed 100644 --- a/src/main/java/org/jboss/netty/handler/codec/frame/LengthFieldBasedFrameDecoder.java +++ b/src/main/java/org/jboss/netty/handler/codec/frame/LengthFieldBasedFrameDecoder.java @@ -206,7 +206,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/src/main/java/org/jboss/netty/handler/codec/http/CaseIgnoringComparator.java b/src/main/java/org/jboss/netty/handler/codec/http/CaseIgnoringComparator.java index c55e2f007a..d0e4319286 100644 --- a/src/main/java/org/jboss/netty/handler/codec/http/CaseIgnoringComparator.java +++ b/src/main/java/org/jboss/netty/handler/codec/http/CaseIgnoringComparator.java @@ -18,8 +18,6 @@ package org.jboss.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/src/main/java/org/jboss/netty/handler/codec/http/CookieDateFormat.java b/src/main/java/org/jboss/netty/handler/codec/http/CookieDateFormat.java index 36fb7b23d0..0ffca10817 100644 --- a/src/main/java/org/jboss/netty/handler/codec/http/CookieDateFormat.java +++ b/src/main/java/org/jboss/netty/handler/codec/http/CookieDateFormat.java @@ -19,8 +19,6 @@ import java.text.SimpleDateFormat; import java.util.Locale; import java.util.TimeZone; -/** - */ final class CookieDateFormat extends SimpleDateFormat { private static final long serialVersionUID = 1789486337887402640L; diff --git a/src/main/java/org/jboss/netty/handler/codec/http/CookieHeaderNames.java b/src/main/java/org/jboss/netty/handler/codec/http/CookieHeaderNames.java index bdc5a88849..fd55d6e8d4 100644 --- a/src/main/java/org/jboss/netty/handler/codec/http/CookieHeaderNames.java +++ b/src/main/java/org/jboss/netty/handler/codec/http/CookieHeaderNames.java @@ -15,8 +15,6 @@ */ package org.jboss.netty.handler.codec.http; -/** - */ final class CookieHeaderNames { static final String PATH = "Path"; diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpChunkTrailer.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpChunkTrailer.java index 7612cb1b24..11df6c052c 100644 --- a/src/main/java/org/jboss/netty/handler/codec/http/HttpChunkTrailer.java +++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpChunkTrailer.java @@ -35,7 +35,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/src/main/java/org/jboss/netty/handler/codec/http/HttpCodecUtil.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpCodecUtil.java index ce05054662..08fbb1e0e7 100644 --- a/src/main/java/org/jboss/netty/handler/codec/http/HttpCodecUtil.java +++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpCodecUtil.java @@ -20,8 +20,6 @@ import java.util.List; import org.jboss.netty.util.CharsetUtil; -/** - */ final class HttpCodecUtil { //space ' ' static final byte SP = 32; diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpMessage.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpMessage.java index f574c8fe14..aeedaf0bb2 100644 --- a/src/main/java/org/jboss/netty/handler/codec/http/HttpMessage.java +++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpMessage.java @@ -38,7 +38,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/src/main/java/org/jboss/netty/handler/codec/replay/ReplayError.java b/src/main/java/org/jboss/netty/handler/codec/replay/ReplayError.java index d757c0c20e..e97d969fdc 100644 --- a/src/main/java/org/jboss/netty/handler/codec/replay/ReplayError.java +++ b/src/main/java/org/jboss/netty/handler/codec/replay/ReplayError.java @@ -16,8 +16,6 @@ package org.jboss.netty.handler.codec.replay; -/** - */ class ReplayError extends Error { private static final long serialVersionUID = 2666698631187527681L; diff --git a/src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderBuffer.java b/src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderBuffer.java index 3b4c84902a..3a127dbb72 100644 --- a/src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderBuffer.java +++ b/src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderBuffer.java @@ -29,8 +29,6 @@ import org.jboss.netty.buffer.ChannelBufferFactory; import org.jboss.netty.buffer.ChannelBufferIndexFinder; import org.jboss.netty.buffer.ChannelBuffers; -/** - */ class ReplayingDecoderBuffer implements ChannelBuffer { private static final Error REPLAY = new ReplayError(); diff --git a/src/main/java/org/jboss/netty/handler/codec/replay/UnsafeDynamicChannelBuffer.java b/src/main/java/org/jboss/netty/handler/codec/replay/UnsafeDynamicChannelBuffer.java index 6838fc8b38..8005cf0a90 100644 --- a/src/main/java/org/jboss/netty/handler/codec/replay/UnsafeDynamicChannelBuffer.java +++ b/src/main/java/org/jboss/netty/handler/codec/replay/UnsafeDynamicChannelBuffer.java @@ -18,8 +18,6 @@ package org.jboss.netty.handler.codec.replay; import org.jboss.netty.buffer.ChannelBufferFactory; import org.jboss.netty.buffer.DynamicChannelBuffer; -/** - */ class UnsafeDynamicChannelBuffer extends DynamicChannelBuffer { UnsafeDynamicChannelBuffer(ChannelBufferFactory factory) { diff --git a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspHeaders.java b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspHeaders.java index 5a0fb8f51c..904689e0aa 100644 --- a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspHeaders.java +++ b/src/main/java/org/jboss/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"} @@ -213,7 +213,7 @@ public final class RtspHeaders { /** * Standard RTSP header values. - */ + */ public static final class Values { /** * {@code "append"} diff --git a/src/main/java/org/jboss/netty/handler/codec/serialization/CompactObjectInputStream.java b/src/main/java/org/jboss/netty/handler/codec/serialization/CompactObjectInputStream.java index 8a4282f21b..4cf413538f 100644 --- a/src/main/java/org/jboss/netty/handler/codec/serialization/CompactObjectInputStream.java +++ b/src/main/java/org/jboss/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/src/main/java/org/jboss/netty/handler/codec/serialization/CompactObjectOutputStream.java b/src/main/java/org/jboss/netty/handler/codec/serialization/CompactObjectOutputStream.java index d17157b581..9e38324256 100644 --- a/src/main/java/org/jboss/netty/handler/codec/serialization/CompactObjectOutputStream.java +++ b/src/main/java/org/jboss/netty/handler/codec/serialization/CompactObjectOutputStream.java @@ -21,8 +21,6 @@ import java.io.ObjectStreamClass; import java.io.OutputStream; import java.io.Serializable; -/** - */ class CompactObjectOutputStream extends ObjectOutputStream { static final int TYPE_FAT_DESCRIPTOR = 0; diff --git a/src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectDecoderState.java b/src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectDecoderState.java index 188d09ed14..a500a5767d 100644 --- a/src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectDecoderState.java +++ b/src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectDecoderState.java @@ -15,8 +15,6 @@ */ package org.jboss.netty.handler.codec.serialization; -/** - */ enum CompatibleObjectDecoderState { READ_HEADER, READ_OBJECT, diff --git a/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectDecoder.java b/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectDecoder.java index 94c0bb56c7..eef6f056db 100644 --- a/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectDecoder.java +++ b/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectDecoder.java @@ -98,6 +98,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/src/main/java/org/jboss/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java b/src/main/java/org/jboss/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java index 1abb87ffc9..d74436b311 100644 --- a/src/main/java/org/jboss/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java +++ b/src/main/java/org/jboss/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java @@ -281,15 +281,11 @@ 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() { } - /* - * (non-Javadoc) - * @see java.util.concurrent.Executor#execute(java.lang.Runnable) - */ public void execute(Runnable command) { // TODO: What todo if the add return false ? tasks.add(command); @@ -300,10 +296,6 @@ public class OrderedMemoryAwareThreadPoolExecutor extends } } - /* - * (non-Javadoc) - * @see java.lang.Runnable#run() - */ public void run() { // check if its already running by using CAS. If so just return here. So in the worst case the thread // is executed and do nothing diff --git a/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java b/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java index 8533dd8e5d..9c28cc5b73 100644 --- a/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java +++ b/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java @@ -199,17 +199,11 @@ public class SslHandler extends FrameDecoder private volatile boolean issueHandshake; private static final ChannelFutureListener HANDSHAKE_LISTENER = new ChannelFutureListener() { - - /* - * (non-Javadoc) - * @see org.jboss.netty.channel.ChannelFutureListener#operationComplete(org.jboss.netty.channel.ChannelFuture) - */ public void operationComplete(ChannelFuture future) throws Exception { if (!future.isSuccess()) { Channels.fireExceptionCaught(future.getChannel(), future.getCause()); } } - }; /** @@ -435,7 +429,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/src/main/java/org/jboss/netty/handler/timeout/WriteTimeoutHandler.java b/src/main/java/org/jboss/netty/handler/timeout/WriteTimeoutHandler.java index a89df647b1..7823bbfb81 100644 --- a/src/main/java/org/jboss/netty/handler/timeout/WriteTimeoutHandler.java +++ b/src/main/java/org/jboss/netty/handler/timeout/WriteTimeoutHandler.java @@ -187,8 +187,6 @@ public class WriteTimeoutHandler extends SimpleChannelDownstreamHandler } } - /** - */ private static final class TimeoutCanceller implements ChannelFutureListener { private final Timeout timeout; diff --git a/src/main/java/org/jboss/netty/logging/Log4JLoggerFactory.java b/src/main/java/org/jboss/netty/logging/Log4JLoggerFactory.java index 9562f4930d..304775f7dc 100644 --- a/src/main/java/org/jboss/netty/logging/Log4JLoggerFactory.java +++ b/src/main/java/org/jboss/netty/logging/Log4JLoggerFactory.java @@ -15,8 +15,6 @@ */ package org.jboss.netty.logging; - - /** * Logger factory which creates an * Apache Log4J diff --git a/src/main/java/org/jboss/netty/util/UnsafeDetectUtil.java b/src/main/java/org/jboss/netty/util/UnsafeDetectUtil.java index fc026fc206..b3f5d5a6f9 100644 --- a/src/main/java/org/jboss/netty/util/UnsafeDetectUtil.java +++ b/src/main/java/org/jboss/netty/util/UnsafeDetectUtil.java @@ -20,9 +20,6 @@ import java.util.concurrent.atomic.AtomicInteger; /** * Utility which checks if {@value #UNSAFE} class can be found in the classpath - * - - */ public final class UnsafeDetectUtil { diff --git a/src/main/java/org/jboss/netty/util/internal/AtomicFieldUpdaterUtil.java b/src/main/java/org/jboss/netty/util/internal/AtomicFieldUpdaterUtil.java index 656e73cbcf..2bf44ae083 100644 --- a/src/main/java/org/jboss/netty/util/internal/AtomicFieldUpdaterUtil.java +++ b/src/main/java/org/jboss/netty/util/internal/AtomicFieldUpdaterUtil.java @@ -18,8 +18,6 @@ package org.jboss.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/src/main/java/org/jboss/netty/util/internal/LegacyLinkedTransferQueue.java b/src/main/java/org/jboss/netty/util/internal/LegacyLinkedTransferQueue.java index f08ae7e232..efdf2df371 100644 --- a/src/main/java/org/jboss/netty/util/internal/LegacyLinkedTransferQueue.java +++ b/src/main/java/org/jboss/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/src/main/java/org/jboss/netty/util/internal/NonReentrantLock.java b/src/main/java/org/jboss/netty/util/internal/NonReentrantLock.java index dfaf6deb32..62065be7a9 100644 --- a/src/main/java/org/jboss/netty/util/internal/NonReentrantLock.java +++ b/src/main/java/org/jboss/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/src/main/java/org/jboss/netty/util/internal/QueueFactory.java b/src/main/java/org/jboss/netty/util/internal/QueueFactory.java index e63cbc04fb..cd5ed57923 100644 --- a/src/main/java/org/jboss/netty/util/internal/QueueFactory.java +++ b/src/main/java/org/jboss/netty/util/internal/QueueFactory.java @@ -21,10 +21,8 @@ import java.util.concurrent.BlockingQueue; import org.jboss.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/src/main/java/org/jboss/netty/util/internal/ReusableIterator.java b/src/main/java/org/jboss/netty/util/internal/ReusableIterator.java index bc204c2c77..2c9d0ab10a 100644 --- a/src/main/java/org/jboss/netty/util/internal/ReusableIterator.java +++ b/src/main/java/org/jboss/netty/util/internal/ReusableIterator.java @@ -17,8 +17,6 @@ package org.jboss.netty.util.internal; import java.util.Iterator; -/** - */ public interface ReusableIterator extends Iterator { void rewind(); } diff --git a/src/main/java/org/jboss/netty/util/internal/ThreadLocalBoolean.java b/src/main/java/org/jboss/netty/util/internal/ThreadLocalBoolean.java index acfbb15ee0..0408190888 100644 --- a/src/main/java/org/jboss/netty/util/internal/ThreadLocalBoolean.java +++ b/src/main/java/org/jboss/netty/util/internal/ThreadLocalBoolean.java @@ -15,8 +15,6 @@ */ package org.jboss.netty.util.internal; -/** - */ public class ThreadLocalBoolean extends ThreadLocal { private final boolean defaultValue; diff --git a/src/main/java/org/jboss/netty/util/internal/jzlib/Adler32.java b/src/main/java/org/jboss/netty/util/internal/jzlib/Adler32.java index c09694a135..747dde2ab5 100644 --- a/src/main/java/org/jboss/netty/util/internal/jzlib/Adler32.java +++ b/src/main/java/org/jboss/netty/util/internal/jzlib/Adler32.java @@ -13,7 +13,33 @@ * 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) diff --git a/src/main/java/org/jboss/netty/util/internal/jzlib/CRC32.java b/src/main/java/org/jboss/netty/util/internal/jzlib/CRC32.java index c8a35ad77f..425075cbb0 100644 --- a/src/main/java/org/jboss/netty/util/internal/jzlib/CRC32.java +++ b/src/main/java/org/jboss/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 org.jboss.netty.util.internal.jzlib; final class CRC32 { diff --git a/src/main/java/org/jboss/netty/util/internal/jzlib/Deflate.java b/src/main/java/org/jboss/netty/util/internal/jzlib/Deflate.java index e0ae5b7fb4..e98622109c 100644 --- a/src/main/java/org/jboss/netty/util/internal/jzlib/Deflate.java +++ b/src/main/java/org/jboss/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 org.jboss.netty.util.internal.jzlib; import org.jboss.netty.util.internal.jzlib.JZlib.WrapperType; diff --git a/src/main/java/org/jboss/netty/util/internal/jzlib/InfBlocks.java b/src/main/java/org/jboss/netty/util/internal/jzlib/InfBlocks.java index da9516a970..5bd821f79e 100644 --- a/src/main/java/org/jboss/netty/util/internal/jzlib/InfBlocks.java +++ b/src/main/java/org/jboss/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 org.jboss.netty.util.internal.jzlib; final class InfBlocks { diff --git a/src/main/java/org/jboss/netty/util/internal/jzlib/InfCodes.java b/src/main/java/org/jboss/netty/util/internal/jzlib/InfCodes.java index 581cbcb611..01ffc0afb8 100644 --- a/src/main/java/org/jboss/netty/util/internal/jzlib/InfCodes.java +++ b/src/main/java/org/jboss/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 org.jboss.netty.util.internal.jzlib; final class InfCodes { diff --git a/src/main/java/org/jboss/netty/util/internal/jzlib/InfTree.java b/src/main/java/org/jboss/netty/util/internal/jzlib/InfTree.java index ba658b4c57..87db10b0f2 100644 --- a/src/main/java/org/jboss/netty/util/internal/jzlib/InfTree.java +++ b/src/main/java/org/jboss/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 org.jboss.netty.util.internal.jzlib; final class InfTree { diff --git a/src/main/java/org/jboss/netty/util/internal/jzlib/Inflate.java b/src/main/java/org/jboss/netty/util/internal/jzlib/Inflate.java index da711370d7..3961639b64 100644 --- a/src/main/java/org/jboss/netty/util/internal/jzlib/Inflate.java +++ b/src/main/java/org/jboss/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 org.jboss.netty.util.internal.jzlib; import org.jboss.netty.util.internal.jzlib.JZlib.WrapperType; diff --git a/src/main/java/org/jboss/netty/util/internal/jzlib/JZlib.java b/src/main/java/org/jboss/netty/util/internal/jzlib/JZlib.java index 1794b3843a..ea1c439541 100644 --- a/src/main/java/org/jboss/netty/util/internal/jzlib/JZlib.java +++ b/src/main/java/org/jboss/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 org.jboss.netty.util.internal.jzlib; public final class JZlib { diff --git a/src/main/java/org/jboss/netty/util/internal/jzlib/StaticTree.java b/src/main/java/org/jboss/netty/util/internal/jzlib/StaticTree.java index 6f33dcdc30..02854458f4 100644 --- a/src/main/java/org/jboss/netty/util/internal/jzlib/StaticTree.java +++ b/src/main/java/org/jboss/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 org.jboss.netty.util.internal.jzlib; final class StaticTree { diff --git a/src/main/java/org/jboss/netty/util/internal/jzlib/Tree.java b/src/main/java/org/jboss/netty/util/internal/jzlib/Tree.java index 84cd65541d..cc8ab09d86 100644 --- a/src/main/java/org/jboss/netty/util/internal/jzlib/Tree.java +++ b/src/main/java/org/jboss/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 org.jboss.netty.util.internal.jzlib; final class Tree { diff --git a/src/main/java/org/jboss/netty/util/internal/jzlib/ZStream.java b/src/main/java/org/jboss/netty/util/internal/jzlib/ZStream.java index e22d7d0b8b..b28b595080 100644 --- a/src/main/java/org/jboss/netty/util/internal/jzlib/ZStream.java +++ b/src/main/java/org/jboss/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 org.jboss.netty.util.internal.jzlib; import org.jboss.netty.util.internal.jzlib.JZlib.WrapperType; diff --git a/src/test/java/org/jboss/netty/bootstrap/AbstractSocketClientBootstrapTest.java b/src/test/java/org/jboss/netty/bootstrap/AbstractSocketClientBootstrapTest.java index 5d7c60252e..286ef5cb35 100644 --- a/src/test/java/org/jboss/netty/bootstrap/AbstractSocketClientBootstrapTest.java +++ b/src/test/java/org/jboss/netty/bootstrap/AbstractSocketClientBootstrapTest.java @@ -38,6 +38,7 @@ import org.junit.Test; /** + * An abstract test class to test socket client bootstraps */ public abstract class AbstractSocketClientBootstrapTest { diff --git a/src/test/java/org/jboss/netty/bootstrap/AbstractSocketServerBootstrapTest.java b/src/test/java/org/jboss/netty/bootstrap/AbstractSocketServerBootstrapTest.java index a377722d83..4a63bcf352 100644 --- a/src/test/java/org/jboss/netty/bootstrap/AbstractSocketServerBootstrapTest.java +++ b/src/test/java/org/jboss/netty/bootstrap/AbstractSocketServerBootstrapTest.java @@ -45,6 +45,7 @@ import org.junit.Test; /** + * An abstract test class to test server socket bootstraps */ public abstract class AbstractSocketServerBootstrapTest { diff --git a/src/test/java/org/jboss/netty/bootstrap/BootstrapOrderedMapTest.java b/src/test/java/org/jboss/netty/bootstrap/BootstrapOrderedMapTest.java index 58ac63a35c..ebc104192d 100644 --- a/src/test/java/org/jboss/netty/bootstrap/BootstrapOrderedMapTest.java +++ b/src/test/java/org/jboss/netty/bootstrap/BootstrapOrderedMapTest.java @@ -27,6 +27,7 @@ import org.junit.Test; /** + * A test to make sure that a bootstrap can recognize ordered maps */ public class BootstrapOrderedMapTest { diff --git a/src/test/java/org/jboss/netty/bootstrap/BootstrapTest.java b/src/test/java/org/jboss/netty/bootstrap/BootstrapTest.java index aa9a99a943..cf46ee5bfc 100644 --- a/src/test/java/org/jboss/netty/bootstrap/BootstrapTest.java +++ b/src/test/java/org/jboss/netty/bootstrap/BootstrapTest.java @@ -34,6 +34,7 @@ import org.junit.Test; /** + * A bootstrap test */ public class BootstrapTest { @Test(expected = IllegalStateException.class) diff --git a/src/test/java/org/jboss/netty/bootstrap/NioSocketClientBootstrapTest.java b/src/test/java/org/jboss/netty/bootstrap/NioSocketClientBootstrapTest.java index d0bfe3c8b8..c6c5f299aa 100644 --- a/src/test/java/org/jboss/netty/bootstrap/NioSocketClientBootstrapTest.java +++ b/src/test/java/org/jboss/netty/bootstrap/NioSocketClientBootstrapTest.java @@ -21,6 +21,7 @@ import org.jboss.netty.channel.ChannelFactory; import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory; /** + * A test for New I/O socket client bootstraps */ public class NioSocketClientBootstrapTest extends AbstractSocketClientBootstrapTest { diff --git a/src/test/java/org/jboss/netty/bootstrap/NioSocketServerBootstrapTest.java b/src/test/java/org/jboss/netty/bootstrap/NioSocketServerBootstrapTest.java index 42127fcb2b..3cbae02ae2 100644 --- a/src/test/java/org/jboss/netty/bootstrap/NioSocketServerBootstrapTest.java +++ b/src/test/java/org/jboss/netty/bootstrap/NioSocketServerBootstrapTest.java @@ -21,6 +21,7 @@ import org.jboss.netty.channel.ChannelFactory; import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory; /** + * A test for New I/O socket server bootstraps */ public class NioSocketServerBootstrapTest extends AbstractSocketServerBootstrapTest { diff --git a/src/test/java/org/jboss/netty/bootstrap/OioSocketClientBootstrapTest.java b/src/test/java/org/jboss/netty/bootstrap/OioSocketClientBootstrapTest.java index 3d2ac62263..40488a1e80 100644 --- a/src/test/java/org/jboss/netty/bootstrap/OioSocketClientBootstrapTest.java +++ b/src/test/java/org/jboss/netty/bootstrap/OioSocketClientBootstrapTest.java @@ -21,6 +21,7 @@ import org.jboss.netty.channel.ChannelFactory; import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory; /** + * A test for "Old" I/O socket client bootstraps */ public class OioSocketClientBootstrapTest extends AbstractSocketClientBootstrapTest { diff --git a/src/test/java/org/jboss/netty/bootstrap/OioSocketServerBootstrapTest.java b/src/test/java/org/jboss/netty/bootstrap/OioSocketServerBootstrapTest.java index 699bc613db..6a32d24679 100644 --- a/src/test/java/org/jboss/netty/bootstrap/OioSocketServerBootstrapTest.java +++ b/src/test/java/org/jboss/netty/bootstrap/OioSocketServerBootstrapTest.java @@ -21,6 +21,7 @@ import org.jboss.netty.channel.ChannelFactory; import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory; /** + * A socket server bootstrap test for "Old" I/O */ public class OioSocketServerBootstrapTest extends AbstractSocketServerBootstrapTest { diff --git a/src/test/java/org/jboss/netty/buffer/AbstractChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/AbstractChannelBufferTest.java index 795dcffa25..4ebf42719c 100644 --- a/src/test/java/org/jboss/netty/buffer/AbstractChannelBufferTest.java +++ b/src/test/java/org/jboss/netty/buffer/AbstractChannelBufferTest.java @@ -33,6 +33,7 @@ import org.junit.Before; import org.junit.Test; /** + * An abstract test class for channel buffers */ public abstract class AbstractChannelBufferTest { diff --git a/src/test/java/org/jboss/netty/buffer/AbstractCompositeChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/AbstractCompositeChannelBufferTest.java index e2ac64668c..ee0d52ba20 100644 --- a/src/test/java/org/jboss/netty/buffer/AbstractCompositeChannelBufferTest.java +++ b/src/test/java/org/jboss/netty/buffer/AbstractCompositeChannelBufferTest.java @@ -26,6 +26,7 @@ import java.util.List; import org.junit.Test; /** + * An abstract test class for composite channel buffers */ public abstract class AbstractCompositeChannelBufferTest extends AbstractChannelBufferTest { diff --git a/src/test/java/org/jboss/netty/buffer/BigEndianCompositeChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/BigEndianCompositeChannelBufferTest.java index 63dc594eb1..bfc9e36c1e 100644 --- a/src/test/java/org/jboss/netty/buffer/BigEndianCompositeChannelBufferTest.java +++ b/src/test/java/org/jboss/netty/buffer/BigEndianCompositeChannelBufferTest.java @@ -17,6 +17,7 @@ package org.jboss.netty.buffer; /** + * Tests big-endian composite channel buffers */ public class BigEndianCompositeChannelBufferTest extends AbstractCompositeChannelBufferTest { public BigEndianCompositeChannelBufferTest() { diff --git a/src/test/java/org/jboss/netty/buffer/BigEndianDirectChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/BigEndianDirectChannelBufferTest.java index 74d52b24f3..bb517f1908 100644 --- a/src/test/java/org/jboss/netty/buffer/BigEndianDirectChannelBufferTest.java +++ b/src/test/java/org/jboss/netty/buffer/BigEndianDirectChannelBufferTest.java @@ -20,6 +20,7 @@ import static org.junit.Assert.*; import java.nio.ByteOrder; /** + * Tests big-endian direct channel buffers */ public class BigEndianDirectChannelBufferTest extends AbstractChannelBufferTest { diff --git a/src/test/java/org/jboss/netty/buffer/BigEndianHeapChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/BigEndianHeapChannelBufferTest.java index bd9e9fa64f..dcd9e64f36 100644 --- a/src/test/java/org/jboss/netty/buffer/BigEndianHeapChannelBufferTest.java +++ b/src/test/java/org/jboss/netty/buffer/BigEndianHeapChannelBufferTest.java @@ -20,6 +20,7 @@ import static org.junit.Assert.*; import org.junit.Test; /** + * Tests big-endian heap channel buffers */ public class BigEndianHeapChannelBufferTest extends AbstractChannelBufferTest { diff --git a/src/test/java/org/jboss/netty/buffer/ByteBufferBackedHeapChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/ByteBufferBackedHeapChannelBufferTest.java index f14b1a786d..43aa27cfe0 100644 --- a/src/test/java/org/jboss/netty/buffer/ByteBufferBackedHeapChannelBufferTest.java +++ b/src/test/java/org/jboss/netty/buffer/ByteBufferBackedHeapChannelBufferTest.java @@ -20,6 +20,7 @@ import java.nio.ByteBuffer; import org.junit.Test; /** + * Tests ByteBuffer backed heap channel buffers */ public class ByteBufferBackedHeapChannelBufferTest extends AbstractChannelBufferTest { diff --git a/src/test/java/org/jboss/netty/buffer/ChannelBufferIndexFinderTest.java b/src/test/java/org/jboss/netty/buffer/ChannelBufferIndexFinderTest.java index 26692a2540..995211f2f5 100644 --- a/src/test/java/org/jboss/netty/buffer/ChannelBufferIndexFinderTest.java +++ b/src/test/java/org/jboss/netty/buffer/ChannelBufferIndexFinderTest.java @@ -22,6 +22,7 @@ import org.junit.Test; /** + * Tests the index-finding capabilities of channel buffers */ public class ChannelBufferIndexFinderTest { diff --git a/src/test/java/org/jboss/netty/buffer/ChannelBufferStreamTest.java b/src/test/java/org/jboss/netty/buffer/ChannelBufferStreamTest.java index f05b87d1ed..12eda52b0b 100644 --- a/src/test/java/org/jboss/netty/buffer/ChannelBufferStreamTest.java +++ b/src/test/java/org/jboss/netty/buffer/ChannelBufferStreamTest.java @@ -23,6 +23,7 @@ import org.junit.Test; /** + * Tests channel buffer streams */ public class ChannelBufferStreamTest { diff --git a/src/test/java/org/jboss/netty/buffer/ChannelBuffersTest.java b/src/test/java/org/jboss/netty/buffer/ChannelBuffersTest.java index 066d73bee2..bcf4de7db4 100644 --- a/src/test/java/org/jboss/netty/buffer/ChannelBuffersTest.java +++ b/src/test/java/org/jboss/netty/buffer/ChannelBuffersTest.java @@ -31,6 +31,7 @@ import org.easymock.classextension.EasyMock; import org.junit.Test; /** + * Tests channel buffers */ public class ChannelBuffersTest { diff --git a/src/test/java/org/jboss/netty/buffer/DuplicateChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/DuplicateChannelBufferTest.java index 6ee981a03b..f6e7f2d282 100644 --- a/src/test/java/org/jboss/netty/buffer/DuplicateChannelBufferTest.java +++ b/src/test/java/org/jboss/netty/buffer/DuplicateChannelBufferTest.java @@ -20,6 +20,7 @@ import static org.junit.Assert.*; import org.junit.Test; /** + * Tests duplicated channel buffers */ public class DuplicateChannelBufferTest extends AbstractChannelBufferTest { diff --git a/src/test/java/org/jboss/netty/buffer/DynamicChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/DynamicChannelBufferTest.java index 42e3e606c4..862c39a00e 100644 --- a/src/test/java/org/jboss/netty/buffer/DynamicChannelBufferTest.java +++ b/src/test/java/org/jboss/netty/buffer/DynamicChannelBufferTest.java @@ -22,6 +22,7 @@ import java.nio.ByteOrder; import org.junit.Test; /** + * Tests dynamic channel buffers */ public class DynamicChannelBufferTest extends AbstractChannelBufferTest { diff --git a/src/test/java/org/jboss/netty/buffer/LittleEndianCompositeChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/LittleEndianCompositeChannelBufferTest.java index 07a6d4823e..8c556575ce 100644 --- a/src/test/java/org/jboss/netty/buffer/LittleEndianCompositeChannelBufferTest.java +++ b/src/test/java/org/jboss/netty/buffer/LittleEndianCompositeChannelBufferTest.java @@ -17,6 +17,7 @@ package org.jboss.netty.buffer; /** + * Tests little-endian composite channel buffers */ public class LittleEndianCompositeChannelBufferTest extends AbstractCompositeChannelBufferTest { public LittleEndianCompositeChannelBufferTest() { diff --git a/src/test/java/org/jboss/netty/buffer/LittleEndianDirectChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/LittleEndianDirectChannelBufferTest.java index da0f898435..81b3884dbe 100644 --- a/src/test/java/org/jboss/netty/buffer/LittleEndianDirectChannelBufferTest.java +++ b/src/test/java/org/jboss/netty/buffer/LittleEndianDirectChannelBufferTest.java @@ -20,6 +20,7 @@ import static org.junit.Assert.*; import java.nio.ByteOrder; /** + * Tests little-endian direct channel buffers */ public class LittleEndianDirectChannelBufferTest extends AbstractChannelBufferTest { diff --git a/src/test/java/org/jboss/netty/buffer/LittleEndianHeapChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/LittleEndianHeapChannelBufferTest.java index 33511d1654..73a00fec58 100644 --- a/src/test/java/org/jboss/netty/buffer/LittleEndianHeapChannelBufferTest.java +++ b/src/test/java/org/jboss/netty/buffer/LittleEndianHeapChannelBufferTest.java @@ -22,6 +22,7 @@ import java.nio.ByteOrder; import org.junit.Test; /** + * Tests little-endian heap channel buffers */ public class LittleEndianHeapChannelBufferTest extends AbstractChannelBufferTest { diff --git a/src/test/java/org/jboss/netty/buffer/ReadOnlyChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/ReadOnlyChannelBufferTest.java index 814ee0da2b..ef14911cfc 100644 --- a/src/test/java/org/jboss/netty/buffer/ReadOnlyChannelBufferTest.java +++ b/src/test/java/org/jboss/netty/buffer/ReadOnlyChannelBufferTest.java @@ -29,6 +29,7 @@ import java.nio.channels.ScatteringByteChannel; import org.junit.Test; /** + * Tests read-only channel buffers */ public class ReadOnlyChannelBufferTest { diff --git a/src/test/java/org/jboss/netty/buffer/SlicedChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/SlicedChannelBufferTest.java index 119a55d6bf..fcb0ded95a 100644 --- a/src/test/java/org/jboss/netty/buffer/SlicedChannelBufferTest.java +++ b/src/test/java/org/jboss/netty/buffer/SlicedChannelBufferTest.java @@ -22,6 +22,7 @@ import java.util.Random; import org.junit.Test; /** + * Tests sliced channel buffers */ public class SlicedChannelBufferTest extends AbstractChannelBufferTest { diff --git a/src/test/java/org/jboss/netty/buffer/TruncatedChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/TruncatedChannelBufferTest.java index 17840e0193..4d10dab57a 100644 --- a/src/test/java/org/jboss/netty/buffer/TruncatedChannelBufferTest.java +++ b/src/test/java/org/jboss/netty/buffer/TruncatedChannelBufferTest.java @@ -20,6 +20,7 @@ import static org.junit.Assert.*; import org.junit.Test; /** + * Tests truncated channel buffers */ public class TruncatedChannelBufferTest extends AbstractChannelBufferTest { diff --git a/src/test/java/org/jboss/netty/channel/CompleteChannelFutureTest.java b/src/test/java/org/jboss/netty/channel/CompleteChannelFutureTest.java index 2e8ac144c0..9e2592e1bc 100644 --- a/src/test/java/org/jboss/netty/channel/CompleteChannelFutureTest.java +++ b/src/test/java/org/jboss/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/src/test/java/org/jboss/netty/channel/FailedChannelFutureTest.java b/src/test/java/org/jboss/netty/channel/FailedChannelFutureTest.java index 6579b8402d..b053252ca5 100644 --- a/src/test/java/org/jboss/netty/channel/FailedChannelFutureTest.java +++ b/src/test/java/org/jboss/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/src/test/java/org/jboss/netty/channel/StaticChannelPipelineTest.java b/src/test/java/org/jboss/netty/channel/StaticChannelPipelineTest.java index c4192e5725..0c3b8632fc 100644 --- a/src/test/java/org/jboss/netty/channel/StaticChannelPipelineTest.java +++ b/src/test/java/org/jboss/netty/channel/StaticChannelPipelineTest.java @@ -21,8 +21,6 @@ import junit.framework.Assert; import org.junit.Test; -/** - */ public class StaticChannelPipelineTest { @Test diff --git a/src/test/java/org/jboss/netty/channel/SucceededChannelFutureTest.java b/src/test/java/org/jboss/netty/channel/SucceededChannelFutureTest.java index adf0e1957b..1028e716a3 100644 --- a/src/test/java/org/jboss/netty/channel/SucceededChannelFutureTest.java +++ b/src/test/java/org/jboss/netty/channel/SucceededChannelFutureTest.java @@ -20,9 +20,6 @@ import static org.junit.Assert.*; import org.junit.Test; - -/** - */ public class SucceededChannelFutureTest { @Test public void testConstantProperties() { diff --git a/src/test/java/org/jboss/netty/channel/socket/AbstractSocketEchoTest.java b/src/test/java/org/jboss/netty/channel/socket/AbstractSocketEchoTest.java index 8696940da5..e5400a94db 100644 --- a/src/test/java/org/jboss/netty/channel/socket/AbstractSocketEchoTest.java +++ b/src/test/java/org/jboss/netty/channel/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/src/test/java/org/jboss/netty/channel/socket/NioClientSocketShutdownTimeTest.java b/src/test/java/org/jboss/netty/channel/socket/NioClientSocketShutdownTimeTest.java index f77470ce4b..aabca94e77 100644 --- a/src/test/java/org/jboss/netty/channel/socket/NioClientSocketShutdownTimeTest.java +++ b/src/test/java/org/jboss/netty/channel/socket/NioClientSocketShutdownTimeTest.java @@ -29,9 +29,6 @@ import org.jboss.netty.util.DummyHandler; import org.jboss.netty.util.TestUtil; import org.junit.Test; - -/** - */ public class NioClientSocketShutdownTimeTest { @Test diff --git a/src/test/java/org/jboss/netty/channel/socket/NioNioSocketEchoTest.java b/src/test/java/org/jboss/netty/channel/socket/NioNioSocketEchoTest.java index 700a1aa473..8600250e35 100644 --- a/src/test/java/org/jboss/netty/channel/socket/NioNioSocketEchoTest.java +++ b/src/test/java/org/jboss/netty/channel/socket/NioNioSocketEchoTest.java @@ -21,8 +21,6 @@ import org.jboss.netty.channel.ChannelFactory; import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory; import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory; -/** - */ public class NioNioSocketEchoTest extends AbstractSocketEchoTest { @Override diff --git a/src/test/java/org/jboss/netty/channel/socket/NioOioSocketEchoTest.java b/src/test/java/org/jboss/netty/channel/socket/NioOioSocketEchoTest.java index f8d790e2b9..61579cddf5 100644 --- a/src/test/java/org/jboss/netty/channel/socket/NioOioSocketEchoTest.java +++ b/src/test/java/org/jboss/netty/channel/socket/NioOioSocketEchoTest.java @@ -21,8 +21,6 @@ import org.jboss.netty.channel.ChannelFactory; import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory; import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory; -/** - */ public class NioOioSocketEchoTest extends AbstractSocketEchoTest { @Override diff --git a/src/test/java/org/jboss/netty/channel/socket/NioServerSocketShutdownTimeTest.java b/src/test/java/org/jboss/netty/channel/socket/NioServerSocketShutdownTimeTest.java index dc7fa1874d..7b5a48824f 100644 --- a/src/test/java/org/jboss/netty/channel/socket/NioServerSocketShutdownTimeTest.java +++ b/src/test/java/org/jboss/netty/channel/socket/NioServerSocketShutdownTimeTest.java @@ -31,9 +31,6 @@ import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory; import org.jboss.netty.util.TestUtil; import org.junit.Test; - -/** - */ public class NioServerSocketShutdownTimeTest { @Test(timeout = 10000) diff --git a/src/test/java/org/jboss/netty/channel/socket/OioNioSocketEchoTest.java b/src/test/java/org/jboss/netty/channel/socket/OioNioSocketEchoTest.java index 5f3d144388..af19a97f29 100644 --- a/src/test/java/org/jboss/netty/channel/socket/OioNioSocketEchoTest.java +++ b/src/test/java/org/jboss/netty/channel/socket/OioNioSocketEchoTest.java @@ -21,8 +21,6 @@ import org.jboss.netty.channel.ChannelFactory; import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory; import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory; -/** - */ public class OioNioSocketEchoTest extends AbstractSocketEchoTest { @Override diff --git a/src/test/java/org/jboss/netty/channel/socket/OioOioSocketEchoTest.java b/src/test/java/org/jboss/netty/channel/socket/OioOioSocketEchoTest.java index 4bf4cf0f9e..f8ce9d5ee0 100644 --- a/src/test/java/org/jboss/netty/channel/socket/OioOioSocketEchoTest.java +++ b/src/test/java/org/jboss/netty/channel/socket/OioOioSocketEchoTest.java @@ -21,8 +21,6 @@ import org.jboss.netty.channel.ChannelFactory; import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory; import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory; -/** - */ public class OioOioSocketEchoTest extends AbstractSocketEchoTest { @Override diff --git a/src/test/java/org/jboss/netty/channel/socket/nio/NioDatagramChannelTest.java b/src/test/java/org/jboss/netty/channel/socket/nio/NioDatagramChannelTest.java deleted file mode 100644 index fd192ae33c..0000000000 --- a/src/test/java/org/jboss/netty/channel/socket/nio/NioDatagramChannelTest.java +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Copyright 2011 The Netty Project - * - * The Netty Project licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package org.jboss.netty.channel.socket.nio; - -import static org.junit.Assert.*; - -import java.io.IOException; -import java.net.DatagramPacket; -import java.net.InetSocketAddress; -import java.util.concurrent.Executors; - -import org.jboss.netty.bootstrap.ConnectionlessBootstrap; -import org.jboss.netty.buffer.ChannelBuffers; -import org.jboss.netty.channel.Channel; -import org.jboss.netty.channel.ChannelFuture; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - */ -public class NioDatagramChannelTest { - private static Channel sc; - - private static InetSocketAddress inetSocketAddress; - - @BeforeClass - public static void setupChannel() { - final NioDatagramChannelFactory channelFactory = new NioDatagramChannelFactory( - Executors.newCachedThreadPool()); - final ConnectionlessBootstrap sb = new ConnectionlessBootstrap(channelFactory); - inetSocketAddress = new InetSocketAddress("localhost", 9999); - sc = sb.bind(inetSocketAddress); - final SimpleHandler handler = new SimpleHandler(); - sc.getPipeline().addFirst("handler", handler); - } - - @Test - public void checkBoundPort() throws Throwable { - final InetSocketAddress socketAddress = (InetSocketAddress) sc - .getLocalAddress(); - assertEquals(9999, socketAddress.getPort()); - } - - @Test - public void sendReciveOne() throws Throwable { - final String expectedPayload = "some payload"; - sendRecive(expectedPayload); - } - - @Test - public void sendReciveMultiple() throws Throwable { - final String expectedPayload = "some payload"; - for (int i = 0; i < 1000; i ++) { - sendRecive(expectedPayload); - } - } - - public void clientBootstrap() { - final NioDatagramChannelFactory channelFactory = new NioDatagramChannelFactory( - Executors.newCachedThreadPool()); - final ConnectionlessBootstrap bootstrap = new ConnectionlessBootstrap(channelFactory); - bootstrap.getPipeline().addLast("test", new SimpleHandler()); - bootstrap.setOption("tcpNoDelay", true); - bootstrap.setOption("keepAlive", true); - InetSocketAddress clientAddress = new InetSocketAddress("localhost", - 8888); - bootstrap.setOption("localAddress", clientAddress); - - ChannelFuture ccf = bootstrap.connect(inetSocketAddress); - ccf.awaitUninterruptibly(); - - Channel cc = ccf.getChannel(); - final String payload = "client payload"; - ChannelFuture write = cc.write(ChannelBuffers.wrappedBuffer(payload - .getBytes(), 0, payload.length())); - write.awaitUninterruptibly(); - } - - @AfterClass - public static void closeChannel() { - if (sc != null) { - final ChannelFuture future = sc.close(); - if (future != null) { - future.awaitUninterruptibly(); - } - } - } - - private void sendRecive(final String expectedPayload) throws IOException { - final UdpClient udpClient = new UdpClient(inetSocketAddress - .getAddress(), inetSocketAddress.getPort()); - final DatagramPacket dp = udpClient.send(expectedPayload.getBytes()); - - dp.setData(new byte[expectedPayload.length()]); - assertFalse("The payload should have been cleared", expectedPayload - .equals(new String(dp.getData()))); - - udpClient.receive(dp, 4000); - - assertEquals(expectedPayload, new String(dp.getData())); - udpClient.close(); - } - -} diff --git a/src/test/java/org/jboss/netty/channel/socket/nio/SimpleHandler.java b/src/test/java/org/jboss/netty/channel/socket/nio/SimpleHandler.java deleted file mode 100644 index a6f22485b2..0000000000 --- a/src/test/java/org/jboss/netty/channel/socket/nio/SimpleHandler.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2011 The Netty Project - * - * The Netty Project licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package org.jboss.netty.channel.socket.nio; - -import org.jboss.netty.buffer.ChannelBuffer; -import org.jboss.netty.channel.ChannelHandlerContext; -import org.jboss.netty.channel.MessageEvent; -import org.jboss.netty.channel.SimpleChannelHandler; - -/** - */ -public class SimpleHandler extends SimpleChannelHandler { - - @Override - public void messageReceived(final ChannelHandlerContext ctx, - final MessageEvent e) throws Exception { - final ChannelBuffer cb = (ChannelBuffer) e.getMessage(); - final byte[] actual = new byte[cb.readableBytes()]; - cb.getBytes(0, actual); - //System.out.println("TestHandler payload : " + new String(actual)); - ctx.sendDownstream(e); - } -} diff --git a/src/test/java/org/jboss/netty/channel/socket/nio/UdpClient.java b/src/test/java/org/jboss/netty/channel/socket/nio/UdpClient.java deleted file mode 100644 index 3591bb5f6e..0000000000 --- a/src/test/java/org/jboss/netty/channel/socket/nio/UdpClient.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2011 The Netty Project - * - * The Netty Project licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package org.jboss.netty.channel.socket.nio; - -import java.io.IOException; -import java.net.DatagramPacket; -import java.net.DatagramSocket; -import java.net.InetAddress; -import java.net.SocketException; - -/** - */ -public class UdpClient { - - private final InetAddress address; - private final DatagramSocket clientSocket; - private final int port; - - public UdpClient(final InetAddress address, final int port) - throws SocketException { - this.address = address; - this.port = port; - clientSocket = new DatagramSocket(); - clientSocket.setReuseAddress(true); - } - - public DatagramPacket send(final byte[] payload) throws IOException { - final DatagramPacket dp = - new DatagramPacket(payload, payload.length, address, port); - clientSocket.send(dp); - return dp; - } - - public void receive(final DatagramPacket dp, final int timeout) throws IOException { - clientSocket.setSoTimeout(timeout); - clientSocket.receive(dp); - } - - public void close() { - clientSocket.close(); - } -} diff --git a/src/test/java/org/jboss/netty/handler/codec/frame/AbstractSocketFixedLengthEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/frame/AbstractSocketFixedLengthEchoTest.java index a1c516eaf2..90e5637414 100644 --- a/src/test/java/org/jboss/netty/handler/codec/frame/AbstractSocketFixedLengthEchoTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/frame/AbstractSocketFixedLengthEchoTest.java @@ -43,9 +43,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/src/test/java/org/jboss/netty/handler/codec/frame/DelimiterBasedFrameDecoderTest.java b/src/test/java/org/jboss/netty/handler/codec/frame/DelimiterBasedFrameDecoderTest.java index bc764c35aa..787a94a126 100644 --- a/src/test/java/org/jboss/netty/handler/codec/frame/DelimiterBasedFrameDecoderTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/frame/DelimiterBasedFrameDecoderTest.java @@ -23,8 +23,6 @@ import org.jboss.netty.util.CharsetUtil; import org.junit.Assert; import org.junit.Test; -/** - */ public class DelimiterBasedFrameDecoderTest { @Test public void testFailSlowTooLongFrameRecovery() throws Exception { diff --git a/src/test/java/org/jboss/netty/handler/codec/frame/LengthFieldBasedFrameDecoderTest.java b/src/test/java/org/jboss/netty/handler/codec/frame/LengthFieldBasedFrameDecoderTest.java index e34105f5af..1aefa34799 100644 --- a/src/test/java/org/jboss/netty/handler/codec/frame/LengthFieldBasedFrameDecoderTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/frame/LengthFieldBasedFrameDecoderTest.java @@ -23,8 +23,6 @@ import org.jboss.netty.util.CharsetUtil; import org.junit.Assert; import org.junit.Test; -/** - */ public class LengthFieldBasedFrameDecoderTest { @Test public void testFailSlowTooLongFrameRecovery() throws Exception { diff --git a/src/test/java/org/jboss/netty/handler/codec/frame/NioNioSocketFixedLengthEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/frame/NioNioSocketFixedLengthEchoTest.java index c279367fcc..79c334134c 100644 --- a/src/test/java/org/jboss/netty/handler/codec/frame/NioNioSocketFixedLengthEchoTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/frame/NioNioSocketFixedLengthEchoTest.java @@ -21,8 +21,6 @@ import org.jboss.netty.channel.ChannelFactory; import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory; import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory; -/** - */ public class NioNioSocketFixedLengthEchoTest extends AbstractSocketFixedLengthEchoTest { @Override diff --git a/src/test/java/org/jboss/netty/handler/codec/frame/NioOioSocketFixedLengthEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/frame/NioOioSocketFixedLengthEchoTest.java index 15c3b7f38a..d89330293b 100644 --- a/src/test/java/org/jboss/netty/handler/codec/frame/NioOioSocketFixedLengthEchoTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/frame/NioOioSocketFixedLengthEchoTest.java @@ -21,8 +21,6 @@ import org.jboss.netty.channel.ChannelFactory; import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory; import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory; -/** - */ public class NioOioSocketFixedLengthEchoTest extends AbstractSocketFixedLengthEchoTest { @Override diff --git a/src/test/java/org/jboss/netty/handler/codec/frame/OioNioSocketFixedLengthEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/frame/OioNioSocketFixedLengthEchoTest.java index bdfc9d19a8..63419ac7a7 100644 --- a/src/test/java/org/jboss/netty/handler/codec/frame/OioNioSocketFixedLengthEchoTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/frame/OioNioSocketFixedLengthEchoTest.java @@ -21,8 +21,6 @@ import org.jboss.netty.channel.ChannelFactory; import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory; import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory; -/** - */ public class OioNioSocketFixedLengthEchoTest extends AbstractSocketFixedLengthEchoTest { @Override diff --git a/src/test/java/org/jboss/netty/handler/codec/frame/OioOioSocketFixedLengthEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/frame/OioOioSocketFixedLengthEchoTest.java index 1f1bc3a9c2..737543defd 100644 --- a/src/test/java/org/jboss/netty/handler/codec/frame/OioOioSocketFixedLengthEchoTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/frame/OioOioSocketFixedLengthEchoTest.java @@ -21,8 +21,6 @@ import org.jboss.netty.channel.ChannelFactory; import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory; import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory; -/** - */ public class OioOioSocketFixedLengthEchoTest extends AbstractSocketFixedLengthEchoTest { @Override diff --git a/src/test/java/org/jboss/netty/handler/codec/http/CookieDecoderTest.java b/src/test/java/org/jboss/netty/handler/codec/http/CookieDecoderTest.java index 9fd442d367..a5470a4ecc 100644 --- a/src/test/java/org/jboss/netty/handler/codec/http/CookieDecoderTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/http/CookieDecoderTest.java @@ -23,8 +23,6 @@ import java.util.Set; import org.junit.Test; -/** - */ public class CookieDecoderTest { @Test public void testDecodingSingleCookieV0() { diff --git a/src/test/java/org/jboss/netty/handler/codec/http/CookieEncoderTest.java b/src/test/java/org/jboss/netty/handler/codec/http/CookieEncoderTest.java index b208e5acfd..8e4944b23d 100644 --- a/src/test/java/org/jboss/netty/handler/codec/http/CookieEncoderTest.java +++ b/src/test/java/org/jboss/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/src/test/java/org/jboss/netty/handler/codec/http/DefaultHttpMessageTest.java b/src/test/java/org/jboss/netty/handler/codec/http/DefaultHttpMessageTest.java index 608c0dabe8..6436423697 100644 --- a/src/test/java/org/jboss/netty/handler/codec/http/DefaultHttpMessageTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/http/DefaultHttpMessageTest.java @@ -18,8 +18,6 @@ package org.jboss.netty.handler.codec.http; import org.junit.Assert; import org.junit.Test; -/** - */ public class DefaultHttpMessageTest { @Test diff --git a/src/test/java/org/jboss/netty/handler/codec/http/QueryStringDecoderTest.java b/src/test/java/org/jboss/netty/handler/codec/http/QueryStringDecoderTest.java index 77536a4d2f..42e40586ee 100644 --- a/src/test/java/org/jboss/netty/handler/codec/http/QueryStringDecoderTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/http/QueryStringDecoderTest.java @@ -22,8 +22,6 @@ import org.jboss.netty.util.CharsetUtil; import org.junit.Assert; import org.junit.Test; -/** - */ public class QueryStringDecoderTest { @Test diff --git a/src/test/java/org/jboss/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoderTest.java b/src/test/java/org/jboss/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoderTest.java index 6feaf354af..009bf85335 100644 --- a/src/test/java/org/jboss/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoderTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoderTest.java @@ -25,8 +25,6 @@ import org.jboss.netty.handler.codec.embedder.DecoderEmbedder; import org.junit.Before; import org.junit.Test; -/** - */ public class ProtobufVarint32FrameDecoderTest { private DecoderEmbedder embedder; diff --git a/src/test/java/org/jboss/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrependerTest.java b/src/test/java/org/jboss/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrependerTest.java index 4b361b8abe..2e1d97469c 100644 --- a/src/test/java/org/jboss/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrependerTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrependerTest.java @@ -24,8 +24,6 @@ import org.jboss.netty.handler.codec.embedder.EncoderEmbedder; import org.junit.Before; import org.junit.Test; -/** - */ public class ProtobufVarint32LengthFieldPrependerTest { private EncoderEmbedder embedder; diff --git a/src/test/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderTest.java b/src/test/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderTest.java index a2c045a467..f94a4724e9 100644 --- a/src/test/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderTest.java @@ -25,8 +25,6 @@ import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.handler.codec.embedder.DecoderEmbedder; import org.junit.Test; -/** - */ public class ReplayingDecoderTest { @Test diff --git a/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketCompatibleObjectStreamEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketCompatibleObjectStreamEchoTest.java index babccaeb88..c9336a6af9 100644 --- a/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketCompatibleObjectStreamEchoTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketCompatibleObjectStreamEchoTest.java @@ -41,9 +41,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/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketObjectStreamEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketObjectStreamEchoTest.java index 677cabbd10..da24cd6920 100644 --- a/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketObjectStreamEchoTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketObjectStreamEchoTest.java @@ -41,9 +41,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/src/test/java/org/jboss/netty/handler/codec/serialization/CompactObjectSerializationTest.java b/src/test/java/org/jboss/netty/handler/codec/serialization/CompactObjectSerializationTest.java index 84e0517430..163e58138d 100644 --- a/src/test/java/org/jboss/netty/handler/codec/serialization/CompactObjectSerializationTest.java +++ b/src/test/java/org/jboss/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/src/test/java/org/jboss/netty/handler/codec/serialization/NioNioSocketCompatibleObjectStreamEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/serialization/NioNioSocketCompatibleObjectStreamEchoTest.java index 8af5edc73c..15ed1b3d01 100644 --- a/src/test/java/org/jboss/netty/handler/codec/serialization/NioNioSocketCompatibleObjectStreamEchoTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/serialization/NioNioSocketCompatibleObjectStreamEchoTest.java @@ -21,8 +21,6 @@ import org.jboss.netty.channel.ChannelFactory; import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory; import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory; -/** - */ public class NioNioSocketCompatibleObjectStreamEchoTest extends AbstractSocketCompatibleObjectStreamEchoTest { @Override diff --git a/src/test/java/org/jboss/netty/handler/codec/serialization/NioNioSocketObjectStreamEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/serialization/NioNioSocketObjectStreamEchoTest.java index 13d247036c..80391ad0b5 100644 --- a/src/test/java/org/jboss/netty/handler/codec/serialization/NioNioSocketObjectStreamEchoTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/serialization/NioNioSocketObjectStreamEchoTest.java @@ -21,8 +21,6 @@ import org.jboss.netty.channel.ChannelFactory; import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory; import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory; -/** - */ public class NioNioSocketObjectStreamEchoTest extends AbstractSocketObjectStreamEchoTest { @Override diff --git a/src/test/java/org/jboss/netty/handler/codec/serialization/NioOioSocketCompatibleObjectStreamEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/serialization/NioOioSocketCompatibleObjectStreamEchoTest.java index d5bfe1b29e..361c17ee16 100644 --- a/src/test/java/org/jboss/netty/handler/codec/serialization/NioOioSocketCompatibleObjectStreamEchoTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/serialization/NioOioSocketCompatibleObjectStreamEchoTest.java @@ -21,8 +21,6 @@ import org.jboss.netty.channel.ChannelFactory; import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory; import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory; -/** - */ public class NioOioSocketCompatibleObjectStreamEchoTest extends AbstractSocketCompatibleObjectStreamEchoTest { @Override diff --git a/src/test/java/org/jboss/netty/handler/codec/serialization/NioOioSocketObjectStreamEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/serialization/NioOioSocketObjectStreamEchoTest.java index f51d75e56e..63cea8d27f 100644 --- a/src/test/java/org/jboss/netty/handler/codec/serialization/NioOioSocketObjectStreamEchoTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/serialization/NioOioSocketObjectStreamEchoTest.java @@ -21,8 +21,6 @@ import org.jboss.netty.channel.ChannelFactory; import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory; import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory; -/** - */ public class NioOioSocketObjectStreamEchoTest extends AbstractSocketObjectStreamEchoTest { @Override diff --git a/src/test/java/org/jboss/netty/handler/codec/serialization/OioNioSocketCompatibleObjectStreamEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/serialization/OioNioSocketCompatibleObjectStreamEchoTest.java index dc4ce21ee2..6126e8400d 100644 --- a/src/test/java/org/jboss/netty/handler/codec/serialization/OioNioSocketCompatibleObjectStreamEchoTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/serialization/OioNioSocketCompatibleObjectStreamEchoTest.java @@ -21,8 +21,6 @@ import org.jboss.netty.channel.ChannelFactory; import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory; import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory; -/** - */ public class OioNioSocketCompatibleObjectStreamEchoTest extends AbstractSocketCompatibleObjectStreamEchoTest { @Override diff --git a/src/test/java/org/jboss/netty/handler/codec/serialization/OioOioSocketCompatibleObjectStreamEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/serialization/OioOioSocketCompatibleObjectStreamEchoTest.java index 935b6c51a0..6a0684c3cb 100644 --- a/src/test/java/org/jboss/netty/handler/codec/serialization/OioOioSocketCompatibleObjectStreamEchoTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/serialization/OioOioSocketCompatibleObjectStreamEchoTest.java @@ -21,8 +21,6 @@ import org.jboss.netty.channel.ChannelFactory; import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory; import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory; -/** - */ public class OioOioSocketCompatibleObjectStreamEchoTest extends AbstractSocketCompatibleObjectStreamEchoTest { @Override diff --git a/src/test/java/org/jboss/netty/handler/codec/serialization/OioOioSocketObjectStreamEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/serialization/OioOioSocketObjectStreamEchoTest.java index 89c5cb52e5..41f1b718b6 100644 --- a/src/test/java/org/jboss/netty/handler/codec/serialization/OioOioSocketObjectStreamEchoTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/serialization/OioOioSocketObjectStreamEchoTest.java @@ -21,8 +21,6 @@ import org.jboss.netty.channel.ChannelFactory; import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory; import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory; -/** - */ public class OioOioSocketObjectStreamEchoTest extends AbstractSocketObjectStreamEchoTest { @Override diff --git a/src/test/java/org/jboss/netty/handler/codec/serialization/SwitchableInputStreamTest.java b/src/test/java/org/jboss/netty/handler/codec/serialization/SwitchableInputStreamTest.java index b5bb50e1d7..f59f5f7691 100644 --- a/src/test/java/org/jboss/netty/handler/codec/serialization/SwitchableInputStreamTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/serialization/SwitchableInputStreamTest.java @@ -23,9 +23,6 @@ import java.io.InputStream; import org.junit.Test; - -/** - */ public class SwitchableInputStreamTest { @Test diff --git a/src/test/java/org/jboss/netty/handler/codec/string/AbstractSocketStringEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/string/AbstractSocketStringEchoTest.java index 6447aa4f1d..3c40da6807 100644 --- a/src/test/java/org/jboss/netty/handler/codec/string/AbstractSocketStringEchoTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/string/AbstractSocketStringEchoTest.java @@ -44,9 +44,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/src/test/java/org/jboss/netty/handler/codec/string/NioNioSocketStringEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/string/NioNioSocketStringEchoTest.java index 91273035c7..789b0932b4 100644 --- a/src/test/java/org/jboss/netty/handler/codec/string/NioNioSocketStringEchoTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/string/NioNioSocketStringEchoTest.java @@ -21,8 +21,6 @@ import org.jboss.netty.channel.ChannelFactory; import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory; import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory; -/** - */ public class NioNioSocketStringEchoTest extends AbstractSocketStringEchoTest { @Override diff --git a/src/test/java/org/jboss/netty/handler/codec/string/NioOioSocketStringEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/string/NioOioSocketStringEchoTest.java index 618794886f..c51fdbfc6d 100644 --- a/src/test/java/org/jboss/netty/handler/codec/string/NioOioSocketStringEchoTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/string/NioOioSocketStringEchoTest.java @@ -21,8 +21,6 @@ import org.jboss.netty.channel.ChannelFactory; import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory; import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory; -/** - */ public class NioOioSocketStringEchoTest extends AbstractSocketStringEchoTest { @Override diff --git a/src/test/java/org/jboss/netty/handler/codec/string/OioNioSocketStringEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/string/OioNioSocketStringEchoTest.java index 1376921a9d..b18b6c2974 100644 --- a/src/test/java/org/jboss/netty/handler/codec/string/OioNioSocketStringEchoTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/string/OioNioSocketStringEchoTest.java @@ -21,8 +21,6 @@ import org.jboss.netty.channel.ChannelFactory; import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory; import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory; -/** - */ public class OioNioSocketStringEchoTest extends AbstractSocketStringEchoTest { @Override diff --git a/src/test/java/org/jboss/netty/handler/codec/string/OioOioSocketStringEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/string/OioOioSocketStringEchoTest.java index 80fda61f7b..2671f7a20f 100644 --- a/src/test/java/org/jboss/netty/handler/codec/string/OioOioSocketStringEchoTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/string/OioOioSocketStringEchoTest.java @@ -21,8 +21,6 @@ import org.jboss.netty.channel.ChannelFactory; import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory; import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory; -/** - */ public class OioOioSocketStringEchoTest extends AbstractSocketStringEchoTest { @Override diff --git a/src/test/java/org/jboss/netty/handler/ssl/AbstractSocketSslEchoTest.java b/src/test/java/org/jboss/netty/handler/ssl/AbstractSocketSslEchoTest.java index 9692f08967..f4419bc57a 100644 --- a/src/test/java/org/jboss/netty/handler/ssl/AbstractSocketSslEchoTest.java +++ b/src/test/java/org/jboss/netty/handler/ssl/AbstractSocketSslEchoTest.java @@ -50,9 +50,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/src/test/java/org/jboss/netty/handler/ssl/ImmediateExecutorTest.java b/src/test/java/org/jboss/netty/handler/ssl/ImmediateExecutorTest.java index c2b397f69b..cb4b465bca 100644 --- a/src/test/java/org/jboss/netty/handler/ssl/ImmediateExecutorTest.java +++ b/src/test/java/org/jboss/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/src/test/java/org/jboss/netty/handler/ssl/NioNioSocketSslEchoTest.java b/src/test/java/org/jboss/netty/handler/ssl/NioNioSocketSslEchoTest.java index e5afbfeebd..572b0c137f 100644 --- a/src/test/java/org/jboss/netty/handler/ssl/NioNioSocketSslEchoTest.java +++ b/src/test/java/org/jboss/netty/handler/ssl/NioNioSocketSslEchoTest.java @@ -21,8 +21,6 @@ import org.jboss.netty.channel.ChannelFactory; import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory; import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory; -/** - */ public class NioNioSocketSslEchoTest extends AbstractSocketSslEchoTest { @Override diff --git a/src/test/java/org/jboss/netty/handler/ssl/NioOioSocketSslEchoTest.java b/src/test/java/org/jboss/netty/handler/ssl/NioOioSocketSslEchoTest.java index 7ed130e074..657a63403b 100644 --- a/src/test/java/org/jboss/netty/handler/ssl/NioOioSocketSslEchoTest.java +++ b/src/test/java/org/jboss/netty/handler/ssl/NioOioSocketSslEchoTest.java @@ -21,8 +21,6 @@ import org.jboss.netty.channel.ChannelFactory; import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory; import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory; -/** - */ public class NioOioSocketSslEchoTest extends AbstractSocketSslEchoTest { @Override diff --git a/src/test/java/org/jboss/netty/handler/ssl/OioNioSocketSslEchoTest.java b/src/test/java/org/jboss/netty/handler/ssl/OioNioSocketSslEchoTest.java index f8abfe06c3..ba46562dac 100644 --- a/src/test/java/org/jboss/netty/handler/ssl/OioNioSocketSslEchoTest.java +++ b/src/test/java/org/jboss/netty/handler/ssl/OioNioSocketSslEchoTest.java @@ -21,8 +21,6 @@ import org.jboss.netty.channel.ChannelFactory; import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory; import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory; -/** - */ public class OioNioSocketSslEchoTest extends AbstractSocketSslEchoTest { @Override diff --git a/src/test/java/org/jboss/netty/handler/ssl/OioOioSocketSslEchoTest.java b/src/test/java/org/jboss/netty/handler/ssl/OioOioSocketSslEchoTest.java index 59697600f7..33e0db3229 100644 --- a/src/test/java/org/jboss/netty/handler/ssl/OioOioSocketSslEchoTest.java +++ b/src/test/java/org/jboss/netty/handler/ssl/OioOioSocketSslEchoTest.java @@ -21,8 +21,6 @@ import org.jboss.netty.channel.ChannelFactory; import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory; import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory; -/** - */ public class OioOioSocketSslEchoTest extends AbstractSocketSslEchoTest { @Override diff --git a/src/test/java/org/jboss/netty/logging/CommonsLoggerFactoryTest.java b/src/test/java/org/jboss/netty/logging/CommonsLoggerFactoryTest.java index be97d1e356..c5fbe8f083 100644 --- a/src/test/java/org/jboss/netty/logging/CommonsLoggerFactoryTest.java +++ b/src/test/java/org/jboss/netty/logging/CommonsLoggerFactoryTest.java @@ -19,9 +19,6 @@ import static org.junit.Assert.*; import org.junit.Test; - -/** - */ public class CommonsLoggerFactoryTest { @Test diff --git a/src/test/java/org/jboss/netty/logging/CommonsLoggerTest.java b/src/test/java/org/jboss/netty/logging/CommonsLoggerTest.java index 10c22a39d1..fb44e66df2 100644 --- a/src/test/java/org/jboss/netty/logging/CommonsLoggerTest.java +++ b/src/test/java/org/jboss/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/src/test/java/org/jboss/netty/logging/InternalLoggerFactoryTest.java b/src/test/java/org/jboss/netty/logging/InternalLoggerFactoryTest.java index ee3c61b017..71b69b4931 100644 --- a/src/test/java/org/jboss/netty/logging/InternalLoggerFactoryTest.java +++ b/src/test/java/org/jboss/netty/logging/InternalLoggerFactoryTest.java @@ -23,9 +23,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/src/test/java/org/jboss/netty/logging/JBossLoggerFactoryTest.java b/src/test/java/org/jboss/netty/logging/JBossLoggerFactoryTest.java index 9a55e59343..3347a58cd1 100644 --- a/src/test/java/org/jboss/netty/logging/JBossLoggerFactoryTest.java +++ b/src/test/java/org/jboss/netty/logging/JBossLoggerFactoryTest.java @@ -19,9 +19,6 @@ import static org.junit.Assert.*; import org.junit.Test; - -/** - */ public class JBossLoggerFactoryTest { @Test diff --git a/src/test/java/org/jboss/netty/logging/JBossLoggerTest.java b/src/test/java/org/jboss/netty/logging/JBossLoggerTest.java index 206529f2e6..f68f3847a2 100644 --- a/src/test/java/org/jboss/netty/logging/JBossLoggerTest.java +++ b/src/test/java/org/jboss/netty/logging/JBossLoggerTest.java @@ -21,9 +21,6 @@ import static org.junit.Assert.*; import org.junit.Test; - -/** - */ public class JBossLoggerTest { private static final Exception e = new Exception(); diff --git a/src/test/java/org/jboss/netty/logging/JdkLoggerFactoryTest.java b/src/test/java/org/jboss/netty/logging/JdkLoggerFactoryTest.java index 0904416d3e..1aa40f9f20 100644 --- a/src/test/java/org/jboss/netty/logging/JdkLoggerFactoryTest.java +++ b/src/test/java/org/jboss/netty/logging/JdkLoggerFactoryTest.java @@ -19,9 +19,6 @@ import static org.junit.Assert.*; import org.junit.Test; - -/** - */ public class JdkLoggerFactoryTest { @Test diff --git a/src/test/java/org/jboss/netty/logging/JdkLoggerTest.java b/src/test/java/org/jboss/netty/logging/JdkLoggerTest.java index eaf22daa9a..1ef0b804fe 100644 --- a/src/test/java/org/jboss/netty/logging/JdkLoggerTest.java +++ b/src/test/java/org/jboss/netty/logging/JdkLoggerTest.java @@ -23,9 +23,6 @@ import java.util.logging.Level; import org.junit.Test; - -/** - */ public class JdkLoggerTest { private static final Exception e = new Exception(); diff --git a/src/test/java/org/jboss/netty/logging/Log4JLoggerFactoryTest.java b/src/test/java/org/jboss/netty/logging/Log4JLoggerFactoryTest.java index b9182a8760..2d9e422e93 100644 --- a/src/test/java/org/jboss/netty/logging/Log4JLoggerFactoryTest.java +++ b/src/test/java/org/jboss/netty/logging/Log4JLoggerFactoryTest.java @@ -19,9 +19,6 @@ import static org.junit.Assert.*; import org.junit.Test; - -/** - */ public class Log4JLoggerFactoryTest { @Test diff --git a/src/test/java/org/jboss/netty/logging/Log4JLoggerTest.java b/src/test/java/org/jboss/netty/logging/Log4JLoggerTest.java index 00d3dd6204..3166deb2cf 100644 --- a/src/test/java/org/jboss/netty/logging/Log4JLoggerTest.java +++ b/src/test/java/org/jboss/netty/logging/Log4JLoggerTest.java @@ -21,9 +21,6 @@ import static org.junit.Assert.*; import org.junit.Test; - -/** - */ public class Log4JLoggerTest { private static final Exception e = new Exception(); diff --git a/src/test/java/org/jboss/netty/logging/Slf4JLoggerFactoryTest.java b/src/test/java/org/jboss/netty/logging/Slf4JLoggerFactoryTest.java index 409585fc48..d9eda92c38 100644 --- a/src/test/java/org/jboss/netty/logging/Slf4JLoggerFactoryTest.java +++ b/src/test/java/org/jboss/netty/logging/Slf4JLoggerFactoryTest.java @@ -19,9 +19,6 @@ import static org.junit.Assert.*; import org.junit.Test; - -/** - */ public class Slf4JLoggerFactoryTest { @Test diff --git a/src/test/java/org/jboss/netty/logging/Slf4JLoggerTest.java b/src/test/java/org/jboss/netty/logging/Slf4JLoggerTest.java index e6195b9ac7..202b871abe 100644 --- a/src/test/java/org/jboss/netty/logging/Slf4JLoggerTest.java +++ b/src/test/java/org/jboss/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/src/test/java/org/jboss/netty/util/DebugUtilTest.java b/src/test/java/org/jboss/netty/util/DebugUtilTest.java index 6258565bc0..c0e77e2229 100644 --- a/src/test/java/org/jboss/netty/util/DebugUtilTest.java +++ b/src/test/java/org/jboss/netty/util/DebugUtilTest.java @@ -23,9 +23,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; - -/** - */ public class DebugUtilTest { public void shouldReturnFalseIfPropertyIsNotSet() { diff --git a/src/test/java/org/jboss/netty/util/MapBackedSetTest.java b/src/test/java/org/jboss/netty/util/MapBackedSetTest.java index 10daa7bd49..91bb842977 100644 --- a/src/test/java/org/jboss/netty/util/MapBackedSetTest.java +++ b/src/test/java/org/jboss/netty/util/MapBackedSetTest.java @@ -24,9 +24,6 @@ import java.util.Set; import org.junit.Test; - -/** - */ public class MapBackedSetTest { @Test diff --git a/src/test/java/org/jboss/netty/util/ThreadRenamingRunnableTest.java b/src/test/java/org/jboss/netty/util/ThreadRenamingRunnableTest.java index 5189cb915a..5b70f19f82 100644 --- a/src/test/java/org/jboss/netty/util/ThreadRenamingRunnableTest.java +++ b/src/test/java/org/jboss/netty/util/ThreadRenamingRunnableTest.java @@ -23,9 +23,6 @@ import java.util.concurrent.Executor; import org.junit.Test; - -/** - */ public class ThreadRenamingRunnableTest { @Test(expected = NullPointerException.class) diff --git a/src/test/java/org/jboss/netty/util/internal/ConversionUtilTest.java b/src/test/java/org/jboss/netty/util/internal/ConversionUtilTest.java index 507f400bf5..59de1e3fb7 100644 --- a/src/test/java/org/jboss/netty/util/internal/ConversionUtilTest.java +++ b/src/test/java/org/jboss/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/src/test/java/org/jboss/netty/util/internal/StackTraceSimplifierTest.java b/src/test/java/org/jboss/netty/util/internal/StackTraceSimplifierTest.java index 48ca30d2e1..948770f085 100644 --- a/src/test/java/org/jboss/netty/util/internal/StackTraceSimplifierTest.java +++ b/src/test/java/org/jboss/netty/util/internal/StackTraceSimplifierTest.java @@ -26,9 +26,6 @@ import org.jboss.netty.channel.SimpleChannelHandler; import org.jboss.netty.util.ThreadRenamingRunnable; import org.junit.Test; - -/** - */ public class StackTraceSimplifierTest { @Test diff --git a/src/test/java/org/jboss/netty/util/internal/StringUtilTest.java b/src/test/java/org/jboss/netty/util/internal/StringUtilTest.java index 4e3da7d578..0c6eeaee64 100644 --- a/src/test/java/org/jboss/netty/util/internal/StringUtilTest.java +++ b/src/test/java/org/jboss/netty/util/internal/StringUtilTest.java @@ -21,7 +21,6 @@ import org.junit.Test; /** * Unit test for {@link StringUtil}. - *

*/ public class StringUtilTest {