From 1011227b88bae1d30c4ff63e0c779d192a0c06af Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Thu, 14 Feb 2013 12:09:16 -0800 Subject: [PATCH] Remove apiviz tags - we are focusing on user guide instead and putting diagrams there --- buffer/src/main/java/io/netty/buffer/ByteBuf.java | 2 -- .../java/io/netty/buffer/ByteBufAllocator.java | 3 --- .../java/io/netty/buffer/ByteBufIndexFinder.java | 1 - .../java/io/netty/buffer/ByteBufInputStream.java | 2 +- .../java/io/netty/buffer/ByteBufOutputStream.java | 2 +- .../src/main/java/io/netty/buffer/MessageBuf.java | 2 -- buffer/src/main/java/io/netty/buffer/Unpooled.java | 2 -- .../main/java/io/netty/buffer/package-info.java | 9 --------- .../handler/codec/http/ClientCookieEncoder.java | 3 --- .../io/netty/handler/codec/http/CookieDecoder.java | 3 --- .../netty/handler/codec/http/HttpClientCodec.java | 3 --- .../io/netty/handler/codec/http/HttpContent.java | 1 - .../io/netty/handler/codec/http/HttpHeaders.java | 9 +-------- .../io/netty/handler/codec/http/HttpMessage.java | 4 +--- .../io/netty/handler/codec/http/HttpMethod.java | 1 - .../handler/codec/http/HttpObjectAggregator.java | 2 -- .../handler/codec/http/HttpObjectDecoder.java | 4 +--- .../handler/codec/http/HttpObjectEncoder.java | 1 - .../handler/codec/http/HttpResponseStatus.java | 1 - .../netty/handler/codec/http/HttpServerCodec.java | 4 +--- .../io/netty/handler/codec/http/HttpVersion.java | 1 - .../handler/codec/http/QueryStringDecoder.java | 3 --- .../handler/codec/http/QueryStringEncoder.java | 3 --- .../handler/codec/http/ServerCookieEncoder.java | 3 --- .../io/netty/handler/codec/http/package-info.java | 8 -------- .../WebSocketClientHandshakerFactory.java | 3 --- .../WebSocketServerHandshakerFactory.java | 3 --- .../codec/http/websocketx/package-info.java | 4 ---- .../io/netty/handler/codec/rtsp/RtspHeaders.java | 2 -- .../io/netty/handler/codec/rtsp/RtspMethods.java | 1 - .../handler/codec/rtsp/RtspObjectDecoder.java | 1 - .../handler/codec/rtsp/RtspObjectEncoder.java | 3 --- .../handler/codec/rtsp/RtspResponseStatuses.java | 1 - .../io/netty/handler/codec/rtsp/RtspVersions.java | 1 - .../io/netty/handler/codec/rtsp/package-info.java | 2 -- .../netty/handler/codec/spdy/SpdyFrameCodec.java | 3 --- .../io/netty/handler/codec/spdy/SpdyHeaders.java | 3 --- .../io/netty/handler/codec/spdy/SpdyHttpCodec.java | 2 -- .../netty/handler/codec/spdy/SpdyHttpHeaders.java | 2 -- .../handler/codec/spdy/SpdyProtocolException.java | 1 - .../handler/codec/spdy/SpdySessionStatus.java | 1 - .../netty/handler/codec/spdy/SpdyStreamStatus.java | 1 - .../io/netty/handler/codec/spdy/package-info.java | 8 -------- .../io/netty/handler/codec/socks/package-info.java | 2 -- .../io/netty/handler/codec/CodecException.java | 2 -- .../handler/codec/CorruptedFrameException.java | 2 -- .../io/netty/handler/codec/DecoderException.java | 2 -- .../handler/codec/DelimiterBasedFrameDecoder.java | 1 - .../io/netty/handler/codec/EncoderException.java | 2 -- .../io/netty/handler/codec/ReplayingDecoder.java | 3 --- .../netty/handler/codec/TooLongFrameException.java | 2 -- .../java/io/netty/handler/codec/base64/Base64.java | 3 --- .../netty/handler/codec/base64/Base64Decoder.java | 2 -- .../netty/handler/codec/base64/Base64Encoder.java | 2 -- .../netty/handler/codec/base64/package-info.java | 2 -- .../io/netty/handler/codec/bytes/package-info.java | 2 -- .../handler/codec/compression/JZlibEncoder.java | 2 -- .../handler/codec/compression/JdkZlibEncoder.java | 2 -- .../handler/codec/compression/ZlibDecoder.java | 2 -- .../handler/codec/compression/ZlibEncoder.java | 2 -- .../handler/codec/compression/package-info.java | 5 ----- .../java/io/netty/handler/codec/package-info.java | 5 ----- .../handler/codec/protobuf/ProtobufDecoder.java | 1 - .../handler/codec/protobuf/ProtobufEncoder.java | 1 - .../netty/handler/codec/protobuf/package-info.java | 3 --- .../codec/serialization/ClassResolvers.java | 4 ---- .../handler/codec/serialization/ObjectDecoder.java | 2 -- .../handler/codec/serialization/ObjectEncoder.java | 2 -- .../handler/codec/serialization/package-info.java | 3 --- .../netty/handler/codec/string/StringDecoder.java | 1 - .../netty/handler/codec/string/StringEncoder.java | 1 - .../netty/handler/codec/string/package-info.java | 2 -- .../src/main/java/io/netty/util/AttributeMap.java | 2 -- .../java/io/netty/util/ResourceLeakDetector.java | 3 --- common/src/main/java/io/netty/util/Timer.java | 3 --- .../netty/util/internal/InternalLoggerFactory.java | 2 -- .../src/main/java/io/netty/util/package-info.java | 6 ------ .../io/netty/handler/logging/LoggingHandler.java | 2 -- .../io/netty/handler/logging/package-info.java | 3 --- .../main/java/io/netty/handler/ssl/SslHandler.java | 2 -- .../java/io/netty/handler/ssl/package-info.java | 2 -- .../java/io/netty/handler/stream/ChunkedInput.java | 1 - .../netty/handler/stream/ChunkedWriteHandler.java | 2 -- .../java/io/netty/handler/stream/package-info.java | 2 -- .../io/netty/handler/timeout/IdleStateEvent.java | 3 --- .../io/netty/handler/timeout/IdleStateHandler.java | 4 ---- .../netty/handler/timeout/ReadTimeoutHandler.java | 3 --- .../netty/handler/timeout/WriteTimeoutHandler.java | 3 --- .../io/netty/handler/timeout/package-info.java | 4 ---- .../io/netty/handler/traffic/package-info.java | 2 -- .../java/io/netty/channel/sctp/package-info.java | 4 ---- .../java/io/netty/bootstrap/AbstractBootstrap.java | 2 -- .../java/io/netty/bootstrap/ChannelFactory.java | 2 -- .../main/java/io/netty/bootstrap/package-info.java | 3 --- .../src/main/java/io/netty/channel/Channel.java | 6 ------ .../main/java/io/netty/channel/ChannelConfig.java | 2 -- .../java/io/netty/channel/ChannelException.java | 2 -- .../main/java/io/netty/channel/ChannelFuture.java | 6 ++---- .../main/java/io/netty/channel/ChannelHandler.java | 2 -- .../io/netty/channel/ChannelHandlerContext.java | 1 - .../java/io/netty/channel/ChannelPipeline.java | 4 ---- .../io/netty/channel/ChannelPipelineException.java | 2 -- .../java/io/netty/channel/group/ChannelGroup.java | 2 -- .../io/netty/channel/group/ChannelGroupFuture.java | 2 -- .../netty/channel/group/DefaultChannelGroup.java | 1 - .../java/io/netty/channel/group/package-info.java | 3 --- .../java/io/netty/channel/local/LocalAddress.java | 2 -- .../java/io/netty/channel/local/package-info.java | 3 --- .../main/java/io/netty/channel/package-info.java | 14 -------------- .../io/netty/channel/socket/DatagramChannel.java | 2 -- .../netty/channel/socket/ServerSocketChannel.java | 2 -- .../io/netty/channel/socket/SocketChannel.java | 3 --- .../java/io/netty/channel/socket/package-info.java | 4 ---- 113 files changed, 8 insertions(+), 299 deletions(-) diff --git a/buffer/src/main/java/io/netty/buffer/ByteBuf.java b/buffer/src/main/java/io/netty/buffer/ByteBuf.java index 5e7636ce14..39c2d21772 100644 --- a/buffer/src/main/java/io/netty/buffer/ByteBuf.java +++ b/buffer/src/main/java/io/netty/buffer/ByteBuf.java @@ -226,8 +226,6 @@ import java.nio.charset.UnsupportedCharsetException; * * Please refer to {@link ByteBufInputStream} and * {@link ByteBufOutputStream}. - * - * @apiviz.landmark */ public interface ByteBuf extends Buf, Comparable { diff --git a/buffer/src/main/java/io/netty/buffer/ByteBufAllocator.java b/buffer/src/main/java/io/netty/buffer/ByteBufAllocator.java index 0d15bf495f..786bbb18f9 100644 --- a/buffer/src/main/java/io/netty/buffer/ByteBufAllocator.java +++ b/buffer/src/main/java/io/netty/buffer/ByteBufAllocator.java @@ -15,9 +15,6 @@ */ package io.netty.buffer; -/** - * @apiviz.has io.netty.buffer.ByteBuf oneway - - creates - */ public interface ByteBufAllocator { ByteBuf buffer(); diff --git a/buffer/src/main/java/io/netty/buffer/ByteBufIndexFinder.java b/buffer/src/main/java/io/netty/buffer/ByteBufIndexFinder.java index e512c7733a..10a29d8885 100644 --- a/buffer/src/main/java/io/netty/buffer/ByteBufIndexFinder.java +++ b/buffer/src/main/java/io/netty/buffer/ByteBufIndexFinder.java @@ -24,7 +24,6 @@ package io.netty.buffer; * refer to {@link ByteBuf#indexOf(int, int, ByteBufIndexFinder)} and * {@link ByteBuf#bytesBefore(int, int, ByteBufIndexFinder)} * for more explanation. - * @apiviz.uses io.netty.buffer.ByteBuf */ public interface ByteBufIndexFinder { diff --git a/buffer/src/main/java/io/netty/buffer/ByteBufInputStream.java b/buffer/src/main/java/io/netty/buffer/ByteBufInputStream.java index 5b04f348b4..f99e4c6444 100644 --- a/buffer/src/main/java/io/netty/buffer/ByteBufInputStream.java +++ b/buffer/src/main/java/io/netty/buffer/ByteBufInputStream.java @@ -34,8 +34,8 @@ import java.io.InputStream; * This stream implements {@link DataInput} for your convenience. * The endianness of the stream is not always big endian but depends on * the endianness of the underlying buffer. + * * @see ByteBufOutputStream - * @apiviz.uses io.netty.buffer.ByteBuf */ public class ByteBufInputStream extends InputStream implements DataInput { diff --git a/buffer/src/main/java/io/netty/buffer/ByteBufOutputStream.java b/buffer/src/main/java/io/netty/buffer/ByteBufOutputStream.java index a067132b29..489472591a 100644 --- a/buffer/src/main/java/io/netty/buffer/ByteBufOutputStream.java +++ b/buffer/src/main/java/io/netty/buffer/ByteBufOutputStream.java @@ -30,8 +30,8 @@ import java.io.OutputStream; * This stream implements {@link DataOutput} for your convenience. * The endianness of the stream is not always big endian but depends on * the endianness of the underlying buffer. + * * @see ByteBufInputStream - * @apiviz.uses io.netty.buffer.ByteBuf */ public class ByteBufOutputStream extends OutputStream implements DataOutput { diff --git a/buffer/src/main/java/io/netty/buffer/MessageBuf.java b/buffer/src/main/java/io/netty/buffer/MessageBuf.java index e571d7befb..00d45c5156 100644 --- a/buffer/src/main/java/io/netty/buffer/MessageBuf.java +++ b/buffer/src/main/java/io/netty/buffer/MessageBuf.java @@ -22,8 +22,6 @@ import java.util.Queue; * Buf which operates on messages. * * @param the type of the messages that are hold by this {@link MessageBuf} - * - * @apiviz.landmark */ public interface MessageBuf extends Buf, Queue { diff --git a/buffer/src/main/java/io/netty/buffer/Unpooled.java b/buffer/src/main/java/io/netty/buffer/Unpooled.java index 12daf8710c..3b1f5b70ce 100644 --- a/buffer/src/main/java/io/netty/buffer/Unpooled.java +++ b/buffer/src/main/java/io/netty/buffer/Unpooled.java @@ -72,8 +72,6 @@ import java.util.Queue; * This class also provides various utility methods to help implementation * of a new buffer type, generation of hex dump and swapping an integer's * byte order. - * @apiviz.landmark - * @apiviz.has io.netty.buffer.Buf oneway - - creates */ public final class Unpooled { diff --git a/buffer/src/main/java/io/netty/buffer/package-info.java b/buffer/src/main/java/io/netty/buffer/package-info.java index 36bac15ccd..e4ac574952 100644 --- a/buffer/src/main/java/io/netty/buffer/package-info.java +++ b/buffer/src/main/java/io/netty/buffer/package-info.java @@ -126,14 +126,5 @@ * easier for a JVM to optimize the buffer access. More complicated buffer * implementation is used only for sliced or composite buffers, and it performs * as well as {@link java.nio.ByteBuffer}. - * - * @apiviz.landmark - * @apiviz.exclude ^java\.lang\. - * @apiviz.exclude netty\.((?!buffer).)+$ - * @apiviz.exclude (In|Out)putStream$ - * @apiviz.exclude \.(Abstract|Default)((?!ByteBufAllocator).)*$ - * @apiviz.exclude \.(BufType|BufUtil)$ - * @apiviz.exclude \.[^\.]+Exception$ - * @apiviz.exclude \.(Empty|Swapped|Default|Sliced|Duplicated|ReadOnly)[^\.]*ByteBuf$ */ package io.netty.buffer; diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/ClientCookieEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/ClientCookieEncoder.java index b21cf174e7..178dbdb64f 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/ClientCookieEncoder.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/ClientCookieEncoder.java @@ -27,9 +27,6 @@ import static io.netty.handler.codec.http.CookieEncoderUtil.*; * * * @see CookieDecoder - * - * @apiviz.stereotype utility - * @apiviz.has io.netty.handler.codec.http.Cookie oneway - - encodes */ public final class ClientCookieEncoder { diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/CookieDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/CookieDecoder.java index 82eec65ed5..2086688157 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/CookieDecoder.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/CookieDecoder.java @@ -36,9 +36,6 @@ import java.util.TreeSet; * * @see ClientCookieEncoder * @see ServerCookieEncoder - * - * @apiviz.stereotype utility - * @apiviz.has io.netty.handler.codec.http.Cookie oneway - - decodes */ public final class CookieDecoder { diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpClientCodec.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpClientCodec.java index 2b8e1af0e9..faaf232d4d 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpClientCodec.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpClientCodec.java @@ -41,9 +41,6 @@ import java.util.concurrent.atomic.AtomicLong; * a {@link PrematureChannelClosureException} is thrown. * * @see HttpServerCodec - * - * @apiviz.has io.netty.handler.codec.http.HttpResponseDecoder - * @apiviz.has io.netty.handler.codec.http.HttpRequestEncoder */ public final class HttpClientCodec extends CombinedChannelDuplexHandler diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpContent.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContent.java index c7c868cba3..e0e969f5b3 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpContent.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContent.java @@ -25,7 +25,6 @@ import io.netty.channel.ChannelPipeline; * is 'chunked. If you prefer not to receive {@link HttpContent} in your handler, * place {@link HttpObjectAggregator} after {@link HttpObjectDecoder} in the * {@link ChannelPipeline}. - * @apiviz.landmark */ public interface HttpContent extends HttpObject, ByteBufHolder { @Override diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpHeaders.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpHeaders.java index 1cd127ff62..d7dae975f7 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpHeaders.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpHeaders.java @@ -29,8 +29,6 @@ import java.util.Set; /** * Provides the constants for the standard HTTP header names and values and * commonly used utility methods that accesses an {@link HttpMessage}. - * @apiviz.landmark - * @apiviz.stereotype static */ public abstract class HttpHeaders implements Iterable> { @@ -102,11 +100,7 @@ public abstract class HttpHeaders implements Iterable> }; /** - * Standard and CORS HTTP header names. - * For CORS headers, see - * https://developer.mozilla.org/en-US/docs/HTTP_access_control - * - * @apiviz.stereotype static + * Standard HTTP header names. */ public static final class Names { /** @@ -408,7 +402,6 @@ public abstract class HttpHeaders implements Iterable> /** * Standard HTTP header values. - * @apiviz.stereotype static */ public static final class Values { /** diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpMessage.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpMessage.java index dda91356df..7faabd2f60 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpMessage.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpMessage.java @@ -19,12 +19,10 @@ package io.netty.handler.codec.http; /** * An interface that defines a HTTP message, providing common properties for * {@link HttpRequest} and {@link HttpResponse}. + * * @see HttpResponse * @see HttpRequest * @see HttpHeaders - * - * @apiviz.landmark - * @apiviz.has io.netty.handler.codec.http.HttpContent oneway - - is followed by */ public interface HttpMessage extends HttpObject { diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpMethod.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpMethod.java index 0dc480985c..908abe11a7 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpMethod.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpMethod.java @@ -22,7 +22,6 @@ import java.util.Map; * The request getMethod of HTTP or its derived protocols, such as * RTSP and * ICAP. - * @apiviz.exclude */ public class HttpMethod implements Comparable { /** diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpObjectAggregator.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpObjectAggregator.java index 70d08c9d0f..0abe602efb 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpObjectAggregator.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpObjectAggregator.java @@ -44,8 +44,6 @@ import static io.netty.handler.codec.http.HttpHeaders.*; * p.addLast("encoder", new {@link HttpResponseEncoder}()); * p.addLast("handler", new HttpRequestHandler()); * - * @apiviz.landmark - * @apiviz.has io.netty.handler.codec.http.HttpContent oneway - - filters out */ public class HttpObjectAggregator extends MessageToMessageDecoder { public static final int DEFAULT_MAX_COMPOSITEBUFFER_COMPONENTS = 1024; diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpObjectDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpObjectDecoder.java index 8491d07981..5b9b02cd37 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpObjectDecoder.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpObjectDecoder.java @@ -95,7 +95,6 @@ import java.util.List; * ICAP. * To implement the decoder of such a derived protocol, extend this class and * implement all abstract methods properly. - * @apiviz.landmark */ public abstract class HttpObjectDecoder extends ReplayingDecoder { @@ -112,9 +111,8 @@ public abstract class HttpObjectDecoder extends ReplayingDecoderInternal use only. - * @apiviz.exclude */ - protected enum State { + enum State { SKIP_CONTROL_CHARS, READ_INITIAL, READ_HEADER, diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpObjectEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpObjectEncoder.java index 87cff6d88a..6b31245e43 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpObjectEncoder.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpObjectEncoder.java @@ -37,7 +37,6 @@ import static io.netty.handler.codec.http.HttpConstants.*; * ICAP. * To implement the encoder of such a derived protocol, extend this class and * implement all abstract methods properly. - * @apiviz.landmark */ public abstract class HttpObjectEncoder extends MessageToByteEncoder { diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpResponseStatus.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpResponseStatus.java index efa80ff32c..4f57c9e050 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpResponseStatus.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpResponseStatus.java @@ -19,7 +19,6 @@ package io.netty.handler.codec.http; * The response code and its description of HTTP or its derived protocols, such as * RTSP and * ICAP. - * @apiviz.exclude */ public class HttpResponseStatus implements Comparable { diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpServerCodec.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpServerCodec.java index dfd5328759..a724f0a4d9 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpServerCodec.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpServerCodec.java @@ -26,10 +26,8 @@ import io.netty.channel.CombinedChannelDuplexHandler; /** * A combination of {@link HttpRequestDecoder} and {@link HttpResponseEncoder} * which enables easier server side HTTP implementation. - * @see HttpClientCodec * - * @apiviz.has io.netty.handler.codec.http.HttpRequestDecoder - * @apiviz.has io.netty.handler.codec.http.HttpResponseEncoder + * @see HttpClientCodec */ public final class HttpServerCodec extends CombinedChannelDuplexHandler diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpVersion.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpVersion.java index 05df9f4b3a..06cfce6526 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpVersion.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpVersion.java @@ -22,7 +22,6 @@ import java.util.regex.Pattern; * The version of HTTP or its derived protocols, such as * RTSP and * ICAP. - * @apiviz.exclude */ public class HttpVersion implements Comparable { diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/QueryStringDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/QueryStringDecoder.java index 841a6ca9c4..792452f44e 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/QueryStringDecoder.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/QueryStringDecoder.java @@ -52,9 +52,6 @@ import java.util.Map; * integer parameter. * * @see QueryStringEncoder - * - * @apiviz.stereotype utility - * @apiviz.has io.netty.handler.codec.http.HttpRequest oneway - - decodes URI */ public class QueryStringDecoder { diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/QueryStringEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/QueryStringEncoder.java index 6997c6cdc5..eb40646f24 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/QueryStringEncoder.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/QueryStringEncoder.java @@ -34,9 +34,6 @@ import java.util.List; * assert encoder.toString().equals("/hello?recipient=world"); * * @see QueryStringDecoder - * - * @apiviz.stereotype utility - * @apiviz.has io.netty.handler.codec.http.HttpRequest oneway - - encodes URI */ public class QueryStringEncoder { diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/ServerCookieEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/ServerCookieEncoder.java index ad60371dd3..b1575e4703 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/ServerCookieEncoder.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/ServerCookieEncoder.java @@ -32,9 +32,6 @@ import static io.netty.handler.codec.http.CookieEncoderUtil.*; * * * @see CookieDecoder - * - * @apiviz.stereotype utility - * @apiviz.has io.netty.handler.codec.http.Cookie oneway - - encodes */ public final class ServerCookieEncoder { diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/package-info.java b/codec-http/src/main/java/io/netty/handler/codec/http/package-info.java index 831b2b9a45..ae65eb7b4b 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/package-info.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/package-info.java @@ -16,13 +16,5 @@ /** * Encoder, decoder and their related message types for HTTP. - * - * @apiviz.exclude ^java\.lang\. - * @apiviz.exclude \.HttpHeaders\. - * @apiviz.exclude \.codec\.replay\. - * @apiviz.exclude \.(Simple)?Channel[A-Za-z]*Handler$ - * @apiviz.exclude \.Rtsp - * @apiviz.exclude \.Default - * @apiviz.exclude \.Http(Client|Server)Codec$ */ package io.netty.handler.codec.http; diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshakerFactory.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshakerFactory.java index 5159a43e39..231f1cbdc2 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshakerFactory.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshakerFactory.java @@ -23,9 +23,6 @@ import static io.netty.handler.codec.http.websocketx.WebSocketVersion.*; /** * Creates a new {@link WebSocketClientHandshaker} of desired protocol version. - * - * @apiviz.landmark - * @apiviz.has io.netty.handler.codec.http.websocketx.WebSocketClientHandshaker oneway - - creates */ public final class WebSocketClientHandshakerFactory { diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshakerFactory.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshakerFactory.java index cc467f4200..47299f39e8 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshakerFactory.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshakerFactory.java @@ -26,9 +26,6 @@ import io.netty.handler.codec.http.HttpVersion; /** * Auto-detects the version of the Web Socket protocol in use and creates a new proper * {@link WebSocketServerHandshaker}. - * - * @apiviz.landmark - * @apiviz.has io.netty.handler.codec.http.websocketx.WebSocketServerHandshaker oneway - - creates */ public class WebSocketServerHandshakerFactory { diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/package-info.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/package-info.java index 755b25de9d..f913bcf0eb 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/package-info.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/package-info.java @@ -32,10 +32,6 @@ * server, take a look into the WebSocketServerX example located in the * {@code io.netty.example.http.websocket} package. *

- * - * @apiviz.exclude [0-9][0-9] - * @apiviz.exclude Exception$ - * @apiviz.exclude Version$ */ package io.netty.handler.codec.http.websocketx; diff --git a/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspHeaders.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspHeaders.java index 313342be13..82b5682146 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspHeaders.java +++ b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspHeaders.java @@ -20,8 +20,6 @@ import io.netty.handler.codec.http.HttpHeaders; /** * Standard RTSP header names and values. - * @apiviz.exclude - * @apiviz.stereotype static */ public final class RtspHeaders { diff --git a/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspMethods.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspMethods.java index 970546ba19..3e62928012 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspMethods.java +++ b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspMethods.java @@ -22,7 +22,6 @@ import java.util.Map; /** * The request getMethod of RTSP. - * @apiviz.exclude */ public final class RtspMethods { diff --git a/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspObjectDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspObjectDecoder.java index 17fcaa7b30..441017f272 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspObjectDecoder.java +++ b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspObjectDecoder.java @@ -47,7 +47,6 @@ import io.netty.handler.codec.http.HttpObjectDecoder; * value, a {@link TooLongFrameException} will be raised. * * - * @apiviz.landmark */ public abstract class RtspObjectDecoder extends HttpObjectDecoder { diff --git a/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspObjectEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspObjectEncoder.java index 9bcc9cc118..0dba3f0b71 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspObjectEncoder.java +++ b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspObjectEncoder.java @@ -24,9 +24,6 @@ import io.netty.handler.codec.http.HttpObjectEncoder; /** * Encodes an RTSP message represented in {@link FullHttpMessage} into * a {@link ByteBuf}. - - * - * @apiviz.landmark */ @Sharable public abstract class RtspObjectEncoder extends HttpObjectEncoder { diff --git a/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspResponseStatuses.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspResponseStatuses.java index 4b159b15ce..b428d996e0 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspResponseStatuses.java +++ b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspResponseStatuses.java @@ -19,7 +19,6 @@ import io.netty.handler.codec.http.HttpResponseStatus; /** * The getStatus code and its description of a RTSP response. - * @apiviz.exclude */ public final class RtspResponseStatuses { diff --git a/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspVersions.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspVersions.java index f5d03f0591..94d0368654 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspVersions.java +++ b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspVersions.java @@ -19,7 +19,6 @@ import io.netty.handler.codec.http.HttpVersion; /** * The version of RTSP. - * @apiviz.exclude */ public final class RtspVersions { diff --git a/codec-http/src/main/java/io/netty/handler/codec/rtsp/package-info.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/package-info.java index 7add739127..b26411b2e5 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/rtsp/package-info.java +++ b/codec-http/src/main/java/io/netty/handler/codec/rtsp/package-info.java @@ -17,7 +17,5 @@ /** * An RTSP * extension based on the HTTP codec. - * - * @apiviz.exclude \.RtspHeaders\. */ package io.netty.handler.codec.rtsp; diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyFrameCodec.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyFrameCodec.java index 8f5af728f8..d60698cd62 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyFrameCodec.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyFrameCodec.java @@ -25,9 +25,6 @@ import io.netty.channel.CombinedChannelDuplexHandler; /** * A combination of {@link SpdyFrameDecoder} and {@link SpdyFrameEncoder}. - * - * @apiviz.has io.netty.handler.codec.spdy.SpdyFrameDecoder - * @apiviz.has io.netty.handler.codec.spdy.SpdyFrameEncoder */ public final class SpdyFrameCodec extends CombinedChannelDuplexHandler diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHeaders.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHeaders.java index 8346e60747..7afa155590 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHeaders.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHeaders.java @@ -28,7 +28,6 @@ import java.util.Set; /** * Provides the constants for the standard SPDY HTTP header names and commonly * used utility methods that access a {@link SpdyHeaderBlock}. - * @apiviz.stereotype static */ public abstract class SpdyHeaders implements Iterable> { @@ -102,7 +101,6 @@ public abstract class SpdyHeaders implements Iterable> /** * SPDY HTTP header names - * @apiviz.stereotype static */ public static final class HttpNames { /** @@ -135,7 +133,6 @@ public abstract class SpdyHeaders implements Iterable> /** * SPDY/2 HTTP header names - * @apiviz.stereotype static */ public static final class Spdy2HttpNames { /** diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHttpCodec.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHttpCodec.java index d994a8b8b3..311e7edf8c 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHttpCodec.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHttpCodec.java @@ -25,8 +25,6 @@ import io.netty.handler.codec.http.HttpObject; /** * A combination of {@link SpdyHttpDecoder} and {@link SpdyHttpEncoder} - * @apiviz.has io.netty.handler.codec.sdpy.SpdyHttpDecoder - * @apiviz.has io.netty.handler.codec.spdy.SpdyHttpEncoder */ public final class SpdyHttpCodec extends CombinedChannelDuplexHandler diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHttpHeaders.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHttpHeaders.java index efcde4d149..0aa0de913d 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHttpHeaders.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHttpHeaders.java @@ -21,13 +21,11 @@ import io.netty.handler.codec.http.HttpMessage; /** * Provides the constants for the header names and the utility methods * used by the {@link SpdyHttpDecoder} and {@link SpdyHttpEncoder}. - * @apiviz.stereotype static */ public final class SpdyHttpHeaders { /** * SPDY HTTP header names - * @apiviz.stereotype static */ public static final class Names { /** diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyProtocolException.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyProtocolException.java index cadd9dabcb..0500058b11 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyProtocolException.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyProtocolException.java @@ -18,7 +18,6 @@ package io.netty.handler.codec.spdy; /** * An {@link Exception} which is thrown when the received frame cannot * be decoded by the {@link SpdyFrameDecoder}. - * @apiviz.exclude */ public class SpdyProtocolException extends Exception { diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdySessionStatus.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdySessionStatus.java index 0ea1f5c34d..120b509eeb 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdySessionStatus.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdySessionStatus.java @@ -17,7 +17,6 @@ package io.netty.handler.codec.spdy; /** * The SPDY session getStatus code and its description. - * @apiviz.exclude */ public class SpdySessionStatus implements Comparable { diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyStreamStatus.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyStreamStatus.java index 9cfaf0c03c..4487fa8c52 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyStreamStatus.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyStreamStatus.java @@ -17,7 +17,6 @@ package io.netty.handler.codec.spdy; /** * The SPDY stream getStatus code and its description. - * @apiviz.exclude */ public class SpdyStreamStatus implements Comparable { diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/package-info.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/package-info.java index df459086a6..30b4299d5d 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/package-info.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/package-info.java @@ -15,13 +15,5 @@ */ /** * Encoder, decoder, session handler and their related message types for the SPDY protocol. - * - * @apiviz.exclude ^java\.lang\. - * @apiviz.exclude OneToOne(Encoder|Decoder)$ - * @apiviz.exclude \.SpdyHeaders\. - * @apiviz.exclude \.codec\.frame\. - * @apiviz.exclude \.(Simple)?Channel[A-Za-z]*Handler$ - * @apiviz.exclude \.Default - * @apiviz.exclude \.SpdyFrameCodec$ */ package io.netty.handler.codec.spdy; diff --git a/codec-socks/src/main/java/io/netty/handler/codec/socks/package-info.java b/codec-socks/src/main/java/io/netty/handler/codec/socks/package-info.java index 374795b7bb..bf76bf924d 100644 --- a/codec-socks/src/main/java/io/netty/handler/codec/socks/package-info.java +++ b/codec-socks/src/main/java/io/netty/handler/codec/socks/package-info.java @@ -16,8 +16,6 @@ /** * Encoder, decoder and their related message types for Socks. - * - * @apiviz.exclude \.Socks.*(Type|Version|Status|Scheme)$ */ package io.netty.handler.codec.socks; // TODO: Combine decoders into one. diff --git a/codec/src/main/java/io/netty/handler/codec/CodecException.java b/codec/src/main/java/io/netty/handler/codec/CodecException.java index 55fb7279b9..8c29a7fc53 100644 --- a/codec/src/main/java/io/netty/handler/codec/CodecException.java +++ b/codec/src/main/java/io/netty/handler/codec/CodecException.java @@ -17,8 +17,6 @@ package io.netty.handler.codec; /** * An {@link Exception} which is thrown by a codec. - * - * @apiviz.exclude */ public class CodecException extends RuntimeException { diff --git a/codec/src/main/java/io/netty/handler/codec/CorruptedFrameException.java b/codec/src/main/java/io/netty/handler/codec/CorruptedFrameException.java index 2d7779f57e..36d8ddc188 100644 --- a/codec/src/main/java/io/netty/handler/codec/CorruptedFrameException.java +++ b/codec/src/main/java/io/netty/handler/codec/CorruptedFrameException.java @@ -18,8 +18,6 @@ package io.netty.handler.codec; /** * An {@link DecoderException} which is thrown when the received frame data could not be decoded by * an inbound handler. - * - * @apiviz.exclude */ public class CorruptedFrameException extends DecoderException { diff --git a/codec/src/main/java/io/netty/handler/codec/DecoderException.java b/codec/src/main/java/io/netty/handler/codec/DecoderException.java index 94298a4715..02caa198a2 100644 --- a/codec/src/main/java/io/netty/handler/codec/DecoderException.java +++ b/codec/src/main/java/io/netty/handler/codec/DecoderException.java @@ -17,8 +17,6 @@ package io.netty.handler.codec; /** * An {@link CodecException} which is thrown by a dencoder. - * - * @apiviz.exclude */ public class DecoderException extends CodecException { diff --git a/codec/src/main/java/io/netty/handler/codec/DelimiterBasedFrameDecoder.java b/codec/src/main/java/io/netty/handler/codec/DelimiterBasedFrameDecoder.java index c81e78527d..438a984d02 100644 --- a/codec/src/main/java/io/netty/handler/codec/DelimiterBasedFrameDecoder.java +++ b/codec/src/main/java/io/netty/handler/codec/DelimiterBasedFrameDecoder.java @@ -52,7 +52,6 @@ import io.netty.channel.ChannelHandlerContext; * | ABC\nDEF | * +----------+ * - * @apiviz.uses io.netty.handler.codec.Delimiters - - useful */ public class DelimiterBasedFrameDecoder extends ByteToMessageDecoder { diff --git a/codec/src/main/java/io/netty/handler/codec/EncoderException.java b/codec/src/main/java/io/netty/handler/codec/EncoderException.java index 83ce03e623..9140994b4e 100644 --- a/codec/src/main/java/io/netty/handler/codec/EncoderException.java +++ b/codec/src/main/java/io/netty/handler/codec/EncoderException.java @@ -17,8 +17,6 @@ package io.netty.handler.codec; /** * An {@link CodecException} which is thrown by an encoder. - * - * @apiviz.exclude */ public class EncoderException extends CodecException { diff --git a/codec/src/main/java/io/netty/handler/codec/ReplayingDecoder.java b/codec/src/main/java/io/netty/handler/codec/ReplayingDecoder.java index 37f6a96966..9fa7603d33 100644 --- a/codec/src/main/java/io/netty/handler/codec/ReplayingDecoder.java +++ b/codec/src/main/java/io/netty/handler/codec/ReplayingDecoder.java @@ -260,9 +260,6 @@ import io.netty.util.Signal; * @param * the state type which is usually an {@link Enum}; use {@link Void} if state management is * unused - * - * @apiviz.landmark - * @apiviz.has io.netty.handler.codec.UnreplayableOperationException oneway - - throws */ public abstract class ReplayingDecoder extends ByteToMessageDecoder { diff --git a/codec/src/main/java/io/netty/handler/codec/TooLongFrameException.java b/codec/src/main/java/io/netty/handler/codec/TooLongFrameException.java index 74e4732486..d1551f82c4 100644 --- a/codec/src/main/java/io/netty/handler/codec/TooLongFrameException.java +++ b/codec/src/main/java/io/netty/handler/codec/TooLongFrameException.java @@ -18,8 +18,6 @@ package io.netty.handler.codec; /** * An {@link DecoderException} which is thrown when the length of the frame * decoded is greater than the allowed maximum. - * - * @apiviz.exclude */ public class TooLongFrameException extends DecoderException { diff --git a/codec/src/main/java/io/netty/handler/codec/base64/Base64.java b/codec/src/main/java/io/netty/handler/codec/base64/Base64.java index c12a765e71..7cf4d567ff 100644 --- a/codec/src/main/java/io/netty/handler/codec/base64/Base64.java +++ b/codec/src/main/java/io/netty/handler/codec/base64/Base64.java @@ -29,9 +29,6 @@ import io.netty.buffer.Unpooled; * The encoding and decoding algorithm in this class has been derived from * Robert Harder's Public Domain * Base64 Encoder/Decoder. - * - * @apiviz.landmark - * @apiviz.uses io.netty.handler.codec.base64.Base64Dialect */ public final class Base64 { diff --git a/codec/src/main/java/io/netty/handler/codec/base64/Base64Decoder.java b/codec/src/main/java/io/netty/handler/codec/base64/Base64Decoder.java index 6b33120606..bd8bb840ee 100644 --- a/codec/src/main/java/io/netty/handler/codec/base64/Base64Decoder.java +++ b/codec/src/main/java/io/netty/handler/codec/base64/Base64Decoder.java @@ -40,8 +40,6 @@ import io.netty.handler.codec.MessageToMessageDecoder; * // Encoder * pipeline.addLast("base64Encoder", new {@link Base64Encoder}()); * - * @apiviz.landmark - * @apiviz.uses io.netty.handler.codec.base64.Base64 */ @Sharable public class Base64Decoder extends MessageToMessageDecoder { diff --git a/codec/src/main/java/io/netty/handler/codec/base64/Base64Encoder.java b/codec/src/main/java/io/netty/handler/codec/base64/Base64Encoder.java index 6932f7aceb..31c420a8d0 100644 --- a/codec/src/main/java/io/netty/handler/codec/base64/Base64Encoder.java +++ b/codec/src/main/java/io/netty/handler/codec/base64/Base64Encoder.java @@ -36,8 +36,6 @@ import io.netty.handler.codec.MessageToMessageEncoder; * // Encoder * pipeline.addLast("base64Encoder", new {@link Base64Encoder}()); * - * @apiviz.landmark - * @apiviz.uses io.netty.handler.codec.base64.Base64 */ @Sharable public class Base64Encoder extends MessageToMessageEncoder { diff --git a/codec/src/main/java/io/netty/handler/codec/base64/package-info.java b/codec/src/main/java/io/netty/handler/codec/base64/package-info.java index 792b2d66a4..9b0e66e974 100644 --- a/codec/src/main/java/io/netty/handler/codec/base64/package-info.java +++ b/codec/src/main/java/io/netty/handler/codec/base64/package-info.java @@ -19,7 +19,5 @@ * Base64-encoded * {@link java.lang.String} or {@link io.netty.buffer.ByteBuf} * into a decoded {@link io.netty.buffer.ByteBuf} and vice versa. - * - * @apiviz.exclude OneToOne(Encoder|Decoder)$ */ package io.netty.handler.codec.base64; diff --git a/codec/src/main/java/io/netty/handler/codec/bytes/package-info.java b/codec/src/main/java/io/netty/handler/codec/bytes/package-info.java index 694d52ad4b..ab01f9486e 100644 --- a/codec/src/main/java/io/netty/handler/codec/bytes/package-info.java +++ b/codec/src/main/java/io/netty/handler/codec/bytes/package-info.java @@ -17,7 +17,5 @@ /** * Encoder and decoder which transform an array of bytes into a * {@link io.netty.buffer.ByteBuf} and vice versa. - * - * @apiviz.exclude \.oneone\. */ package io.netty.handler.codec.bytes; diff --git a/codec/src/main/java/io/netty/handler/codec/compression/JZlibEncoder.java b/codec/src/main/java/io/netty/handler/codec/compression/JZlibEncoder.java index 7395b911a7..8085134718 100644 --- a/codec/src/main/java/io/netty/handler/codec/compression/JZlibEncoder.java +++ b/codec/src/main/java/io/netty/handler/codec/compression/JZlibEncoder.java @@ -30,8 +30,6 @@ import java.util.concurrent.atomic.AtomicBoolean; /** * Compresses a {@link ByteBuf} using the deflate algorithm. - * @apiviz.landmark - * @apiviz.has io.netty.handler.codec.compression.ZlibWrapper */ public class JZlibEncoder extends ZlibEncoder { diff --git a/codec/src/main/java/io/netty/handler/codec/compression/JdkZlibEncoder.java b/codec/src/main/java/io/netty/handler/codec/compression/JdkZlibEncoder.java index 445f2dda1f..83c999a2e4 100644 --- a/codec/src/main/java/io/netty/handler/codec/compression/JdkZlibEncoder.java +++ b/codec/src/main/java/io/netty/handler/codec/compression/JdkZlibEncoder.java @@ -30,8 +30,6 @@ import java.util.zip.Deflater; /** * Compresses a {@link ByteBuf} using the deflate algorithm. - * @apiviz.landmark - * @apiviz.has org.jboss.netty.handler.codec.compression.ZlibWrapper */ public class JdkZlibEncoder extends ZlibEncoder { diff --git a/codec/src/main/java/io/netty/handler/codec/compression/ZlibDecoder.java b/codec/src/main/java/io/netty/handler/codec/compression/ZlibDecoder.java index a44f9b95a9..550de06609 100644 --- a/codec/src/main/java/io/netty/handler/codec/compression/ZlibDecoder.java +++ b/codec/src/main/java/io/netty/handler/codec/compression/ZlibDecoder.java @@ -20,8 +20,6 @@ import io.netty.handler.codec.ByteToByteDecoder; /** * Decompresses a {@link ByteBuf} using the deflate algorithm. - * - * @apiviz.landmark */ public abstract class ZlibDecoder extends ByteToByteDecoder { diff --git a/codec/src/main/java/io/netty/handler/codec/compression/ZlibEncoder.java b/codec/src/main/java/io/netty/handler/codec/compression/ZlibEncoder.java index 6122416889..90c1b7ff45 100644 --- a/codec/src/main/java/io/netty/handler/codec/compression/ZlibEncoder.java +++ b/codec/src/main/java/io/netty/handler/codec/compression/ZlibEncoder.java @@ -22,8 +22,6 @@ import io.netty.handler.codec.ByteToByteEncoder; /** * Compresses a {@link ByteBuf} using the deflate algorithm. - * - * @apiviz.landmark */ public abstract class ZlibEncoder extends ByteToByteEncoder { diff --git a/codec/src/main/java/io/netty/handler/codec/compression/package-info.java b/codec/src/main/java/io/netty/handler/codec/compression/package-info.java index a0f3d8576c..0b709ec90f 100644 --- a/codec/src/main/java/io/netty/handler/codec/compression/package-info.java +++ b/codec/src/main/java/io/netty/handler/codec/compression/package-info.java @@ -19,11 +19,6 @@ * in a compression format such as zlib, * gzip, and * Snappy. - * - * @apiviz.exclude \.codec\.(?!compression)[a-z0-9]+\. - * @apiviz.exclude ^java\.lang\. - * @apiviz.exclude \.channel\. - * @apiviz.exclude Exception$ */ package io.netty.handler.codec.compression; // TODO Implement bzip2 and lzma handlers diff --git a/codec/src/main/java/io/netty/handler/codec/package-info.java b/codec/src/main/java/io/netty/handler/codec/package-info.java index 4673dfa1a3..473ac1cbde 100644 --- a/codec/src/main/java/io/netty/handler/codec/package-info.java +++ b/codec/src/main/java/io/netty/handler/codec/package-info.java @@ -18,10 +18,5 @@ * Extensible decoder and its common implementations which deal with the * packet fragmentation and reassembly issue found in a stream-based transport * such as TCP/IP. - * - * @apiviz.exclude OneToOne(Encoder|Decoder)$ - * @apiviz.exclude \.(Simple)?Channel[A-Za-z]*Handler$ - * @apiviz.exclude \.codec\.[a-eg-z][a-z0-9]*\. - * @apiviz.exclude \.ssl\. */ package io.netty.handler.codec; diff --git a/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufDecoder.java b/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufDecoder.java index 4af92e8636..9cf8c49c03 100644 --- a/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufDecoder.java +++ b/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufDecoder.java @@ -57,7 +57,6 @@ import io.netty.handler.codec.MessageToMessageDecoder; * ch.write(res); * } * - * @apiviz.landmark */ @Sharable public class ProtobufDecoder extends MessageToMessageDecoder { diff --git a/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufEncoder.java b/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufEncoder.java index 6d943a8146..70d8a8719e 100644 --- a/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufEncoder.java +++ b/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufEncoder.java @@ -54,7 +54,6 @@ import static io.netty.buffer.Unpooled.*; * ch.write(res); * } * - * @apiviz.landmark */ @Sharable public class ProtobufEncoder extends MessageToMessageEncoder { diff --git a/codec/src/main/java/io/netty/handler/codec/protobuf/package-info.java b/codec/src/main/java/io/netty/handler/codec/protobuf/package-info.java index 6e93d7fdd6..6d781c5be3 100644 --- a/codec/src/main/java/io/netty/handler/codec/protobuf/package-info.java +++ b/codec/src/main/java/io/netty/handler/codec/protobuf/package-info.java @@ -19,8 +19,5 @@ * Google Protocol Buffers * {@link com.google.protobuf.Message} into a {@link io.netty.buffer.ByteBuf} * and vice versa. - * - * @apiviz.exclude \.oneone\. - * @apiviz.exclude \.frame\. */ package io.netty.handler.codec.protobuf; diff --git a/codec/src/main/java/io/netty/handler/codec/serialization/ClassResolvers.java b/codec/src/main/java/io/netty/handler/codec/serialization/ClassResolvers.java index b3a2fcb092..9d0a669074 100644 --- a/codec/src/main/java/io/netty/handler/codec/serialization/ClassResolvers.java +++ b/codec/src/main/java/io/netty/handler/codec/serialization/ClassResolvers.java @@ -19,10 +19,6 @@ import java.lang.ref.Reference; import java.util.HashMap; import java.util.concurrent.ConcurrentHashMap; -/** - * - * @apiviz.has io.netty.handler.codec.serialization.ClassResolver oneway - - creates - */ public final class ClassResolvers { /** diff --git a/codec/src/main/java/io/netty/handler/codec/serialization/ObjectDecoder.java b/codec/src/main/java/io/netty/handler/codec/serialization/ObjectDecoder.java index 28e2414a7d..d762ff3180 100644 --- a/codec/src/main/java/io/netty/handler/codec/serialization/ObjectDecoder.java +++ b/codec/src/main/java/io/netty/handler/codec/serialization/ObjectDecoder.java @@ -31,8 +31,6 @@ import java.io.StreamCorruptedException; * compatible with the standard {@link ObjectOutputStream}. Please use * {@link ObjectEncoder} or {@link ObjectEncoderOutputStream} to ensure the * interoperability with this decoder. - * @apiviz.landmark - * @apiviz.has io.netty.handler.codec.serialization.ObjectDecoderInputStream - - - compatible with */ public class ObjectDecoder extends LengthFieldBasedFrameDecoder { diff --git a/codec/src/main/java/io/netty/handler/codec/serialization/ObjectEncoder.java b/codec/src/main/java/io/netty/handler/codec/serialization/ObjectEncoder.java index 766186f69b..c3bbf2a347 100644 --- a/codec/src/main/java/io/netty/handler/codec/serialization/ObjectEncoder.java +++ b/codec/src/main/java/io/netty/handler/codec/serialization/ObjectEncoder.java @@ -32,8 +32,6 @@ import java.io.Serializable; * compatible with the standard {@link ObjectInputStream}. Please use * {@link ObjectDecoder} or {@link ObjectDecoderInputStream} to ensure the * interoperability with this encoder. - * @apiviz.landmark - * @apiviz.has io.netty.handler.codec.serialization.ObjectEncoderOutputStream - - - compatible with */ @Sharable public class ObjectEncoder extends MessageToByteEncoder { diff --git a/codec/src/main/java/io/netty/handler/codec/serialization/package-info.java b/codec/src/main/java/io/netty/handler/codec/serialization/package-info.java index 25a4f2d0a5..74e8579d91 100644 --- a/codec/src/main/java/io/netty/handler/codec/serialization/package-info.java +++ b/codec/src/main/java/io/netty/handler/codec/serialization/package-info.java @@ -18,8 +18,5 @@ * Encoder, decoder and their compatibility stream implementations which * transform a {@link java.io.Serializable} object into a byte buffer and * vice versa. - * - * @apiviz.exclude ^java\.io\. - * @apiviz.exclude \.codec\.(?!serialization)[a-z0-9]+\. */ package io.netty.handler.codec.serialization; diff --git a/codec/src/main/java/io/netty/handler/codec/string/StringDecoder.java b/codec/src/main/java/io/netty/handler/codec/string/StringDecoder.java index 6bb0f33925..26c8004707 100644 --- a/codec/src/main/java/io/netty/handler/codec/string/StringDecoder.java +++ b/codec/src/main/java/io/netty/handler/codec/string/StringDecoder.java @@ -49,7 +49,6 @@ import java.nio.charset.Charset; * ch.write("Did you say '" + msg + "'?\n"); * } * - * @apiviz.landmark */ @Sharable public class StringDecoder extends MessageToMessageDecoder { diff --git a/codec/src/main/java/io/netty/handler/codec/string/StringEncoder.java b/codec/src/main/java/io/netty/handler/codec/string/StringEncoder.java index 81bb50b3ba..fd4d12f391 100644 --- a/codec/src/main/java/io/netty/handler/codec/string/StringEncoder.java +++ b/codec/src/main/java/io/netty/handler/codec/string/StringEncoder.java @@ -46,7 +46,6 @@ import java.nio.charset.Charset; * ch.write("Did you say '" + msg + "'?\n"); * } * - * @apiviz.landmark */ @Sharable public class StringEncoder extends ChannelOutboundMessageHandlerAdapter { diff --git a/codec/src/main/java/io/netty/handler/codec/string/package-info.java b/codec/src/main/java/io/netty/handler/codec/string/package-info.java index ca26fd2df4..f9773fdc9f 100644 --- a/codec/src/main/java/io/netty/handler/codec/string/package-info.java +++ b/codec/src/main/java/io/netty/handler/codec/string/package-info.java @@ -17,7 +17,5 @@ /** * Encoder and decoder which transform a {@link java.lang.String} into a * {@link io.netty.buffer.ByteBuf} and vice versa. - * - * @apiviz.exclude \.oneone\. */ package io.netty.handler.codec.string; diff --git a/common/src/main/java/io/netty/util/AttributeMap.java b/common/src/main/java/io/netty/util/AttributeMap.java index 224baeb6d2..baa06a5a31 100644 --- a/common/src/main/java/io/netty/util/AttributeMap.java +++ b/common/src/main/java/io/netty/util/AttributeMap.java @@ -19,8 +19,6 @@ package io.netty.util; * Holds {@link Attribute}s which can be accessed via {@link AttributeKey}. * * Implementations must be Thread-safe. - * - * @apiviz.composedOf io.netty.util.Attribute oneway - - creates */ public interface AttributeMap { /** diff --git a/common/src/main/java/io/netty/util/ResourceLeakDetector.java b/common/src/main/java/io/netty/util/ResourceLeakDetector.java index beb30f3c9f..72c07367eb 100644 --- a/common/src/main/java/io/netty/util/ResourceLeakDetector.java +++ b/common/src/main/java/io/netty/util/ResourceLeakDetector.java @@ -26,9 +26,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicBoolean; -/** - * @apiviz.has io.netty.util.ResourceLeak oneway - - creates - */ public final class ResourceLeakDetector { private static final boolean ENABLED = SystemPropertyUtil.getBoolean("io.netty.resourceLeakDetection", false); diff --git a/common/src/main/java/io/netty/util/Timer.java b/common/src/main/java/io/netty/util/Timer.java index 421b06267e..6fadce075e 100644 --- a/common/src/main/java/io/netty/util/Timer.java +++ b/common/src/main/java/io/netty/util/Timer.java @@ -21,9 +21,6 @@ import java.util.concurrent.TimeUnit; /** * Schedules {@link TimerTask}s for one-time future execution in a background * thread. - * @apiviz.landmark - * @apiviz.has io.netty.util.TimerTask oneway - - executes - * @apiviz.has io.netty.util.Timeout oneway - - creates */ public interface Timer { diff --git a/common/src/main/java/io/netty/util/internal/InternalLoggerFactory.java b/common/src/main/java/io/netty/util/internal/InternalLoggerFactory.java index c570df61eb..4412f483d2 100644 --- a/common/src/main/java/io/netty/util/internal/InternalLoggerFactory.java +++ b/common/src/main/java/io/netty/util/internal/InternalLoggerFactory.java @@ -28,8 +28,6 @@ package io.netty.util.internal; * which were loaded after the default factory is changed. Therefore, * {@link #setDefaultFactory(InternalLoggerFactory)} should be called as early * as possible and shouldn't be called more than once. - * @apiviz.landmark - * @apiviz.has io.netty.util.internal.InternalLogger oneway - - creates */ public abstract class InternalLoggerFactory { private static volatile InternalLoggerFactory defaultFactory; diff --git a/common/src/main/java/io/netty/util/package-info.java b/common/src/main/java/io/netty/util/package-info.java index c5be16798a..5a42c8d044 100644 --- a/common/src/main/java/io/netty/util/package-info.java +++ b/common/src/main/java/io/netty/util/package-info.java @@ -16,11 +16,5 @@ /** * Utility classes used across multiple packages. - * - * @apiviz.exclude - * @apiviz.exclude ^java\.(lang|util)\. - * @apiviz.exclude \.netty\.(?!util)[a-z0-9]+\. - * @apiviz.exclude Util$ - * @apiviz.exclude Exception$ */ package io.netty.util; diff --git a/handler/src/main/java/io/netty/handler/logging/LoggingHandler.java b/handler/src/main/java/io/netty/handler/logging/LoggingHandler.java index 25e937679c..59d66891db 100644 --- a/handler/src/main/java/io/netty/handler/logging/LoggingHandler.java +++ b/handler/src/main/java/io/netty/handler/logging/LoggingHandler.java @@ -29,8 +29,6 @@ import java.net.SocketAddress; /** * A {@link ChannelHandler} that logs all events using a logging framework. * By default, all events are logged at DEBUG level. - * - * @apiviz.landmark */ @Sharable public class LoggingHandler extends ChannelDuplexHandler { diff --git a/handler/src/main/java/io/netty/handler/logging/package-info.java b/handler/src/main/java/io/netty/handler/logging/package-info.java index f744492edf..3ce2be45cc 100644 --- a/handler/src/main/java/io/netty/handler/logging/package-info.java +++ b/handler/src/main/java/io/netty/handler/logging/package-info.java @@ -16,8 +16,5 @@ /** * Logs a {@link io.netty.channel.ChannelEvent} for debugging purpose. - * - * @apiviz.hidden - * @apiviz.exclude \.channel\. */ package io.netty.handler.logging; diff --git a/handler/src/main/java/io/netty/handler/ssl/SslHandler.java b/handler/src/main/java/io/netty/handler/ssl/SslHandler.java index 32fcc7a81d..547e62b312 100644 --- a/handler/src/main/java/io/netty/handler/ssl/SslHandler.java +++ b/handler/src/main/java/io/netty/handler/ssl/SslHandler.java @@ -138,8 +138,6 @@ import java.util.regex.Pattern; * based on monitoring and debugging of it. * For more details see * #832 in our issue tracker. - * @apiviz.landmark - * @apiviz.uses io.netty.handler.ssl.SslBufferPool */ public class SslHandler extends ChannelDuplexHandler diff --git a/handler/src/main/java/io/netty/handler/ssl/package-info.java b/handler/src/main/java/io/netty/handler/ssl/package-info.java index de8e1e7ffb..a38c152aef 100644 --- a/handler/src/main/java/io/netty/handler/ssl/package-info.java +++ b/handler/src/main/java/io/netty/handler/ssl/package-info.java @@ -17,7 +17,5 @@ /** * SSL · * TLS implementation based on {@link javax.net.ssl.SSLEngine} - * - * @apiviz.exclude \.(channel|codec)\. */ package io.netty.handler.ssl; diff --git a/handler/src/main/java/io/netty/handler/stream/ChunkedInput.java b/handler/src/main/java/io/netty/handler/stream/ChunkedInput.java index ffc5b213d8..075bfc5338 100644 --- a/handler/src/main/java/io/netty/handler/stream/ChunkedInput.java +++ b/handler/src/main/java/io/netty/handler/stream/ChunkedInput.java @@ -18,7 +18,6 @@ package io.netty.handler.stream; /** * A data stream of indefinite length which is consumed by {@link ChunkedWriteHandler}. - * @apiviz.landmark */ public interface ChunkedInput { diff --git a/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java b/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java index 37d95a0187..b1439a3bb4 100644 --- a/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java +++ b/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java @@ -63,8 +63,6 @@ import java.util.concurrent.atomic.AtomicInteger; * {@link ChunkedInput#readChunk(Object)}, resulting in the indefinitely suspended * transfer. To resume the transfer when a new chunk is available, you have to * call {@link #resumeTransfer()}. - * @apiviz.landmark - * @apiviz.has io.netty.handler.stream.ChunkedInput oneway - - reads from */ public class ChunkedWriteHandler extends ChannelDuplexHandler implements ChannelOutboundMessageHandler { diff --git a/handler/src/main/java/io/netty/handler/stream/package-info.java b/handler/src/main/java/io/netty/handler/stream/package-info.java index 7b874664d4..526786c264 100644 --- a/handler/src/main/java/io/netty/handler/stream/package-info.java +++ b/handler/src/main/java/io/netty/handler/stream/package-info.java @@ -18,7 +18,5 @@ * Writes very large data stream asynchronously neither spending a lot of * memory nor getting {@link java.lang.OutOfMemoryError}. For a detailed * example, please refer to {@code io.netty.example.http.file}. - * - * @apiviz.exclude \.channel\. */ package io.netty.handler.stream; diff --git a/handler/src/main/java/io/netty/handler/timeout/IdleStateEvent.java b/handler/src/main/java/io/netty/handler/timeout/IdleStateEvent.java index dfcc0cf1fd..eddd1719e3 100644 --- a/handler/src/main/java/io/netty/handler/timeout/IdleStateEvent.java +++ b/handler/src/main/java/io/netty/handler/timeout/IdleStateEvent.java @@ -19,9 +19,6 @@ import io.netty.channel.Channel; /** * A user event triggered by {@link IdleStateHandler} when a {@link Channel} is idle. - * - * @apiviz.landmark - * @apiviz.has io.netty.handler.timeout.IdleState oneway - - */ public final class IdleStateEvent { public static final IdleStateEvent FIRST_READER_IDLE_STATE_EVENT = new IdleStateEvent(IdleState.READER_IDLE, true); diff --git a/handler/src/main/java/io/netty/handler/timeout/IdleStateHandler.java b/handler/src/main/java/io/netty/handler/timeout/IdleStateHandler.java index 5a3ecb5d54..d974c213c1 100644 --- a/handler/src/main/java/io/netty/handler/timeout/IdleStateHandler.java +++ b/handler/src/main/java/io/netty/handler/timeout/IdleStateHandler.java @@ -97,10 +97,6 @@ import java.util.concurrent.TimeUnit; * * @see ReadTimeoutHandler * @see WriteTimeoutHandler - * - * @apiviz.landmark - * @apiviz.uses io.netty.util.HashedWheelTimer - * @apiviz.has io.netty.handler.timeout.IdleStateEvent oneway - - triggers */ public class IdleStateHandler extends ChannelStateHandlerAdapter implements ChannelOperationHandler { diff --git a/handler/src/main/java/io/netty/handler/timeout/ReadTimeoutHandler.java b/handler/src/main/java/io/netty/handler/timeout/ReadTimeoutHandler.java index 52aea5e69d..1ae7f12e17 100644 --- a/handler/src/main/java/io/netty/handler/timeout/ReadTimeoutHandler.java +++ b/handler/src/main/java/io/netty/handler/timeout/ReadTimeoutHandler.java @@ -60,9 +60,6 @@ import java.util.concurrent.TimeUnit; * * @see WriteTimeoutHandler * @see IdleStateHandler - * - * @apiviz.landmark - * @apiviz.has io.netty.handler.timeout.TimeoutException oneway - - raises */ public class ReadTimeoutHandler extends ChannelStateHandlerAdapter { diff --git a/handler/src/main/java/io/netty/handler/timeout/WriteTimeoutHandler.java b/handler/src/main/java/io/netty/handler/timeout/WriteTimeoutHandler.java index 0be2d2522e..a43d12feae 100644 --- a/handler/src/main/java/io/netty/handler/timeout/WriteTimeoutHandler.java +++ b/handler/src/main/java/io/netty/handler/timeout/WriteTimeoutHandler.java @@ -64,9 +64,6 @@ import java.util.concurrent.TimeUnit; * * @see ReadTimeoutHandler * @see IdleStateHandler - * - * @apiviz.landmark - * @apiviz.has io.netty.handler.timeout.TimeoutException oneway - - raises */ public class WriteTimeoutHandler extends ChannelOperationHandlerAdapter { diff --git a/handler/src/main/java/io/netty/handler/timeout/package-info.java b/handler/src/main/java/io/netty/handler/timeout/package-info.java index bdb0401cac..c544788360 100644 --- a/handler/src/main/java/io/netty/handler/timeout/package-info.java +++ b/handler/src/main/java/io/netty/handler/timeout/package-info.java @@ -17,9 +17,5 @@ /** * Adds support for read and write timeout and idle connection notification * using a {@link io.netty.util.Timer}. - * - * @apiviz.exclude \.channel\. - * @apiviz.exclude \.DefaultIdleStateEvent$ - * @apiviz.exclude \.ExternalResourceReleasable$ */ package io.netty.handler.timeout; diff --git a/handler/src/main/java/io/netty/handler/traffic/package-info.java b/handler/src/main/java/io/netty/handler/traffic/package-info.java index 44123fbb1d..f682a7051d 100644 --- a/handler/src/main/java/io/netty/handler/traffic/package-info.java +++ b/handler/src/main/java/io/netty/handler/traffic/package-info.java @@ -52,8 +52,6 @@ * *

Note also that you can create different GlobalTrafficShapingHandler if you want to separate classes of * channels (for instance either from business point of view or from bind address point of view).

- * - * @apiviz.exclude ^java\.lang\. */ package io.netty.handler.traffic; diff --git a/transport-sctp/src/main/java/io/netty/channel/sctp/package-info.java b/transport-sctp/src/main/java/io/netty/channel/sctp/package-info.java index 0b086e921e..e8553e64f9 100644 --- a/transport-sctp/src/main/java/io/netty/channel/sctp/package-info.java +++ b/transport-sctp/src/main/java/io/netty/channel/sctp/package-info.java @@ -16,9 +16,5 @@ /** * Abstract SCTP socket interfaces which extend the core channel API. - * - * @apiviz.exclude \.(Abstract|Default).*$ - * @apiviz.exclude \.socket\.[a-z]+\. - * @apiviz.exclude \.channel\.[A-Z] */ package io.netty.channel.sctp; diff --git a/transport/src/main/java/io/netty/bootstrap/AbstractBootstrap.java b/transport/src/main/java/io/netty/bootstrap/AbstractBootstrap.java index ca8b99290f..79d9716684 100644 --- a/transport/src/main/java/io/netty/bootstrap/AbstractBootstrap.java +++ b/transport/src/main/java/io/netty/bootstrap/AbstractBootstrap.java @@ -33,8 +33,6 @@ import java.util.Map; /** * {@link AbstractBootstrap} is a helper class that makes it easy to bootstrap a {@link Channel}. It support * method-chaining to provide an easy way to configure the {@link AbstractBootstrap}. - * - * @apiviz.exclude */ abstract class AbstractBootstrap, C extends Channel> implements Cloneable { diff --git a/transport/src/main/java/io/netty/bootstrap/ChannelFactory.java b/transport/src/main/java/io/netty/bootstrap/ChannelFactory.java index dd2f0647c1..292eb6efa6 100644 --- a/transport/src/main/java/io/netty/bootstrap/ChannelFactory.java +++ b/transport/src/main/java/io/netty/bootstrap/ChannelFactory.java @@ -20,8 +20,6 @@ import io.netty.channel.Channel; /** * Factory that creates a new {@link Channel} on {@link Bootstrap#bind()}, {@link Bootstrap#connect()}, and * {@link ServerBootstrap#bind()}. - * - * @apiviz.exclude */ public interface ChannelFactory { /** diff --git a/transport/src/main/java/io/netty/bootstrap/package-info.java b/transport/src/main/java/io/netty/bootstrap/package-info.java index b1df0bb37e..123e074de3 100644 --- a/transport/src/main/java/io/netty/bootstrap/package-info.java +++ b/transport/src/main/java/io/netty/bootstrap/package-info.java @@ -17,8 +17,5 @@ /** * The helper classes with fluent API which enable an easy implementation of * typical client side and server side channel initialization. - * - * @apiviz.landmark - * @apiviz.exclude ^io\.netty\.util\. */ package io.netty.bootstrap; diff --git a/transport/src/main/java/io/netty/channel/Channel.java b/transport/src/main/java/io/netty/channel/Channel.java index 238d37ddd3..4f22560a06 100755 --- a/transport/src/main/java/io/netty/channel/Channel.java +++ b/transport/src/main/java/io/netty/channel/Channel.java @@ -67,12 +67,6 @@ import java.net.SocketAddress; * transport. Down-cast the {@link Channel} to sub-type to invoke such * operations. For example, with the old I/O datagram transport, multicast * join / leave operations are provided by {@link DatagramChannel}. - * - * @apiviz.landmark - * @apiviz.composedOf io.netty.channel.ChannelConfig - * @apiviz.composedOf io.netty.channel.ChannelPipeline - * - * @apiviz.exclude ^io\.netty\.channel\.([a-z]+\.)+[^\.]+Channel$ */ public interface Channel extends AttributeMap, ChannelOutboundInvoker, ChannelPropertyAccess, Comparable { diff --git a/transport/src/main/java/io/netty/channel/ChannelConfig.java b/transport/src/main/java/io/netty/channel/ChannelConfig.java index 496f7ecd72..9e3869bd7d 100644 --- a/transport/src/main/java/io/netty/channel/ChannelConfig.java +++ b/transport/src/main/java/io/netty/channel/ChannelConfig.java @@ -59,8 +59,6 @@ import java.util.Map; * More options are available in the sub-types of {@link ChannelConfig}. For * example, you can configure the parameters which are specific to a TCP/IP * socket as explained in {@link SocketChannelConfig}. - * - * @apiviz.excludeSubtypes */ public interface ChannelConfig { diff --git a/transport/src/main/java/io/netty/channel/ChannelException.java b/transport/src/main/java/io/netty/channel/ChannelException.java index 8c4dcaf43f..3aa89ff723 100644 --- a/transport/src/main/java/io/netty/channel/ChannelException.java +++ b/transport/src/main/java/io/netty/channel/ChannelException.java @@ -17,8 +17,6 @@ package io.netty.channel; /** * A {@link RuntimeException} which is thrown when an I/O operation fails. - * - * @apiviz.exclude */ public class ChannelException extends RuntimeException { diff --git a/transport/src/main/java/io/netty/channel/ChannelFuture.java b/transport/src/main/java/io/netty/channel/ChannelFuture.java index 049d6b7b69..87af1ff81c 100644 --- a/transport/src/main/java/io/netty/channel/ChannelFuture.java +++ b/transport/src/main/java/io/netty/channel/ChannelFuture.java @@ -15,10 +15,10 @@ */ package io.netty.channel; -import java.util.concurrent.TimeUnit; - import io.netty.bootstrap.Bootstrap; +import java.util.concurrent.TimeUnit; + /** * The result of an asynchronous {@link Channel} I/O operation. @@ -158,8 +158,6 @@ import io.netty.bootstrap.Bootstrap; * // Connection established successfully * } * - * @apiviz.landmark - * @apiviz.owns io.netty.channel.ChannelFutureListener - - notifies */ public interface ChannelFuture { diff --git a/transport/src/main/java/io/netty/channel/ChannelHandler.java b/transport/src/main/java/io/netty/channel/ChannelHandler.java index a0b3fbc7cb..b08136519f 100644 --- a/transport/src/main/java/io/netty/channel/ChannelHandler.java +++ b/transport/src/main/java/io/netty/channel/ChannelHandler.java @@ -186,8 +186,6 @@ import java.lang.annotation.Target; * {@link ChannelPipeline} to find out more about inbound and outbound operations, * what fundamental differences they have, how they flow in a pipeline, and how to handle * the operation in your application. - * @apiviz.landmark - * @apiviz.exclude ^io\.netty\.handler\..*$ */ public interface ChannelHandler { diff --git a/transport/src/main/java/io/netty/channel/ChannelHandlerContext.java b/transport/src/main/java/io/netty/channel/ChannelHandlerContext.java index 32e70e5578..d9a42f4a3d 100755 --- a/transport/src/main/java/io/netty/channel/ChannelHandlerContext.java +++ b/transport/src/main/java/io/netty/channel/ChannelHandlerContext.java @@ -123,7 +123,6 @@ import java.util.Set; * {@link ChannelPipeline} to find out more about inbound and outbound operations, * what fundamental differences they have, how they flow in a pipeline, and how to handle * the operation in your application. - * @apiviz.owns io.netty.channel.ChannelHandler */ public interface ChannelHandlerContext extends AttributeMap, ChannelPropertyAccess, diff --git a/transport/src/main/java/io/netty/channel/ChannelPipeline.java b/transport/src/main/java/io/netty/channel/ChannelPipeline.java index 5e7f3dcdf5..d036c57458 100644 --- a/transport/src/main/java/io/netty/channel/ChannelPipeline.java +++ b/transport/src/main/java/io/netty/channel/ChannelPipeline.java @@ -173,10 +173,6 @@ import java.util.NoSuchElementException; * {@link ChannelPipeline} is thread safe. For example, you can insert an * encryption handler when sensitive information is about to be exchanged, * and remove it after the exchange. - * - * @apiviz.landmark - * @apiviz.composedOf io.netty.channel.ChannelHandlerContext - * @apiviz.owns io.netty.channel.ChannelHandler */ public interface ChannelPipeline extends ChannelInboundInvoker, ChannelOutboundInvoker, Iterable> { diff --git a/transport/src/main/java/io/netty/channel/ChannelPipelineException.java b/transport/src/main/java/io/netty/channel/ChannelPipelineException.java index 80e0308439..89ce1da723 100644 --- a/transport/src/main/java/io/netty/channel/ChannelPipelineException.java +++ b/transport/src/main/java/io/netty/channel/ChannelPipelineException.java @@ -18,8 +18,6 @@ package io.netty.channel; /** * A {@link ChannelException} which is thrown when a {@link ChannelPipeline} * failed to execute an operation. - * - * @apiviz.exclude */ public class ChannelPipelineException extends ChannelException { diff --git a/transport/src/main/java/io/netty/channel/group/ChannelGroup.java b/transport/src/main/java/io/netty/channel/group/ChannelGroup.java index 78a8088c66..a8230de2aa 100644 --- a/transport/src/main/java/io/netty/channel/group/ChannelGroup.java +++ b/transport/src/main/java/io/netty/channel/group/ChannelGroup.java @@ -87,8 +87,6 @@ import java.util.Set; * } * } * - * @apiviz.landmark - * @apiviz.has io.netty.channel.group.ChannelGroupFuture oneway - - returns */ public interface ChannelGroup extends Set, Comparable { diff --git a/transport/src/main/java/io/netty/channel/group/ChannelGroupFuture.java b/transport/src/main/java/io/netty/channel/group/ChannelGroupFuture.java index e807b563e3..c3232dab5c 100644 --- a/transport/src/main/java/io/netty/channel/group/ChannelGroupFuture.java +++ b/transport/src/main/java/io/netty/channel/group/ChannelGroupFuture.java @@ -100,8 +100,6 @@ import java.util.concurrent.TimeUnit; * where it is more convenient to call {@link #await()}. In such a case, please * make sure you do not call {@link #await()} in an I/O thread. Otherwise, * {@link IllegalStateException} will be raised to prevent a dead lock. - * - * @apiviz.owns io.netty.channel.group.ChannelGroupFutureListener - - notifies */ public interface ChannelGroupFuture extends Iterable { diff --git a/transport/src/main/java/io/netty/channel/group/DefaultChannelGroup.java b/transport/src/main/java/io/netty/channel/group/DefaultChannelGroup.java index 31e8d8e993..2dd88d263e 100644 --- a/transport/src/main/java/io/netty/channel/group/DefaultChannelGroup.java +++ b/transport/src/main/java/io/netty/channel/group/DefaultChannelGroup.java @@ -34,7 +34,6 @@ import java.util.concurrent.atomic.AtomicInteger; /** * The default {@link ChannelGroup} implementation. - * @apiviz.landmark */ public class DefaultChannelGroup extends AbstractSet implements ChannelGroup { diff --git a/transport/src/main/java/io/netty/channel/group/package-info.java b/transport/src/main/java/io/netty/channel/group/package-info.java index 5e147c7060..2afbec7b77 100644 --- a/transport/src/main/java/io/netty/channel/group/package-info.java +++ b/transport/src/main/java/io/netty/channel/group/package-info.java @@ -17,8 +17,5 @@ /** * A channel registry which helps a user maintain the list of open * {@link io.netty.channel.Channel}s and perform bulk operations on them. - * - * @apiviz.exclude ^java - * @apiviz.exclude \.DefaultChannelGroupFuture$ */ package io.netty.channel.group; diff --git a/transport/src/main/java/io/netty/channel/local/LocalAddress.java b/transport/src/main/java/io/netty/channel/local/LocalAddress.java index d523d6462b..901e16f066 100644 --- a/transport/src/main/java/io/netty/channel/local/LocalAddress.java +++ b/transport/src/main/java/io/netty/channel/local/LocalAddress.java @@ -22,8 +22,6 @@ import java.net.SocketAddress; /** * An endpoint in the local transport. Each endpoint is identified by a unique * case-insensitive string. - * - * @apiviz.landmark */ public final class LocalAddress extends SocketAddress implements Comparable { diff --git a/transport/src/main/java/io/netty/channel/local/package-info.java b/transport/src/main/java/io/netty/channel/local/package-info.java index ca683f491d..5d4c742ff1 100644 --- a/transport/src/main/java/io/netty/channel/local/package-info.java +++ b/transport/src/main/java/io/netty/channel/local/package-info.java @@ -17,8 +17,5 @@ /** * A virtual transport that enables the communication between the two * parties in the same virtual machine. - * - * @apiviz.exclude ^java\.lang\. - * @apiviz.exclude Channel$ */ package io.netty.channel.local; diff --git a/transport/src/main/java/io/netty/channel/package-info.java b/transport/src/main/java/io/netty/channel/package-info.java index 5f23f29bc0..c625625a8e 100644 --- a/transport/src/main/java/io/netty/channel/package-info.java +++ b/transport/src/main/java/io/netty/channel/package-info.java @@ -18,19 +18,5 @@ * The core channel API which is asynchronous and event-driven abstraction of * various transports such as a * NIO Channel. - * - * @apiviz.landmark - * @apiviz.exclude ^java - * @apiviz.exclude ^io\.netty\.channel\.[^\.]+\. - * @apiviz.exclude ^io\.netty\.(bootstrap|handler|util)\. - * @apiviz.exclude \.(Abstract|Default|Static).*$ - * @apiviz.exclude \.(Downstream|Upstream).*Event$ - * @apiviz.exclude \.[A-Za-z]+ChannelFuture$ - * @apiviz.exclude \.ChannelPipelineFactory$ - * @apiviz.exclude \.ChannelHandlerContext$ - * @apiviz.exclude \.ChannelSink$ - * @apiviz.exclude \.ChannelLocal$ - * @apiviz.exclude \.[^\.]+ReceiveBufferSizePredictor(Factory)?$ - * @apiviz.exclude \.FileRegion$ */ package io.netty.channel; diff --git a/transport/src/main/java/io/netty/channel/socket/DatagramChannel.java b/transport/src/main/java/io/netty/channel/socket/DatagramChannel.java index 6f575abd67..be21487e4d 100644 --- a/transport/src/main/java/io/netty/channel/socket/DatagramChannel.java +++ b/transport/src/main/java/io/netty/channel/socket/DatagramChannel.java @@ -25,8 +25,6 @@ import java.net.NetworkInterface; /** * A UDP/IP {@link Channel}}. - * @apiviz.landmark - * @apiviz.composedOf io.netty.channel.socket.DatagramChannelConfig */ public interface DatagramChannel extends Channel { @Override diff --git a/transport/src/main/java/io/netty/channel/socket/ServerSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/ServerSocketChannel.java index 3e726396b1..5160c9f2f1 100644 --- a/transport/src/main/java/io/netty/channel/socket/ServerSocketChannel.java +++ b/transport/src/main/java/io/netty/channel/socket/ServerSocketChannel.java @@ -21,8 +21,6 @@ import java.net.InetSocketAddress; /** * A TCP/IP {@link ServerChannel} which accepts incoming TCP/IP connections. - * @apiviz.landmark - * @apiviz.composedOf io.netty.channel.socket.ServerSocketChannelConfig */ public interface ServerSocketChannel extends ServerChannel { @Override diff --git a/transport/src/main/java/io/netty/channel/socket/SocketChannel.java b/transport/src/main/java/io/netty/channel/socket/SocketChannel.java index 4e84615665..ba0962c9fd 100644 --- a/transport/src/main/java/io/netty/channel/socket/SocketChannel.java +++ b/transport/src/main/java/io/netty/channel/socket/SocketChannel.java @@ -24,9 +24,6 @@ import java.net.Socket; /** * A TCP/IP socket {@link Channel}. - * - * @apiviz.landmark - * @apiviz.composedOf io.netty.channel.socket.SocketChannelConfig */ public interface SocketChannel extends Channel { @Override diff --git a/transport/src/main/java/io/netty/channel/socket/package-info.java b/transport/src/main/java/io/netty/channel/socket/package-info.java index 6ad71a2221..571b49367d 100644 --- a/transport/src/main/java/io/netty/channel/socket/package-info.java +++ b/transport/src/main/java/io/netty/channel/socket/package-info.java @@ -16,9 +16,5 @@ /** * Abstract TCP and UDP socket interfaces which extend the core channel API. - * - * @apiviz.exclude \.(Abstract|Default).*$ - * @apiviz.exclude \.socket\.[a-z]+\. - * @apiviz.exclude \.channel\.[A-Z] */ package io.netty.channel.socket;