diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpTransferEncoding.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpTransferEncoding.java index 5472014f3d..e523cf9c7a 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpTransferEncoding.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpTransferEncoding.java @@ -15,6 +15,8 @@ */ package io.netty.handler.codec.http; +import io.netty.buffer.ByteBuf; + /** * Represents how an HTTP request or an HTTP response is represented as an {@link HttpMessage} * and zero or more {@link HttpChunk}s. @@ -50,7 +52,7 @@ public enum HttpTransferEncoding { STREAMED(false), /** * A self-contained HTTP message which is not followed by any {@link HttpChunk}s. - * A user can set the content of the message via {@link HttpMessage#setContent(io.netty.buffer.ByteBuf)}. + * A user can set the content of the message via {@link HttpMessage#setContent(ByteBuf)}. */ SINGLE(true); diff --git a/common/src/main/java/io/netty/logging/JBossLoggerFactory.java b/common/src/main/java/io/netty/logging/JBossLoggerFactory.java index 5a61390217..d758aa9225 100644 --- a/common/src/main/java/io/netty/logging/JBossLoggerFactory.java +++ b/common/src/main/java/io/netty/logging/JBossLoggerFactory.java @@ -16,6 +16,7 @@ package io.netty.logging; +import org.jboss.logging.Logger; /** * Logger factory which creates a @@ -26,8 +27,8 @@ public class JBossLoggerFactory extends InternalLoggerFactory { @Override public InternalLogger newInstance(String name) { - final org.jboss.logging.Logger logger = - org.jboss.logging.Logger.getLogger(name); + final Logger logger = + Logger.getLogger(name); return new JBossLogger(logger); } } diff --git a/common/src/main/java/io/netty/logging/JdkLoggerFactory.java b/common/src/main/java/io/netty/logging/JdkLoggerFactory.java index aacbf25173..e98f6232bf 100644 --- a/common/src/main/java/io/netty/logging/JdkLoggerFactory.java +++ b/common/src/main/java/io/netty/logging/JdkLoggerFactory.java @@ -16,6 +16,8 @@ package io.netty.logging; +import java.util.logging.Logger; + /** * Logger factory which creates a * java.util.logging @@ -25,8 +27,8 @@ public class JdkLoggerFactory extends InternalLoggerFactory { @Override public InternalLogger newInstance(String name) { - final java.util.logging.Logger logger = - java.util.logging.Logger.getLogger(name); + final Logger logger = + Logger.getLogger(name); return new JdkLogger(logger, name); } } diff --git a/common/src/main/java/io/netty/logging/Log4JLoggerFactory.java b/common/src/main/java/io/netty/logging/Log4JLoggerFactory.java index 61c3b88b05..4b0667ee45 100644 --- a/common/src/main/java/io/netty/logging/Log4JLoggerFactory.java +++ b/common/src/main/java/io/netty/logging/Log4JLoggerFactory.java @@ -15,6 +15,8 @@ */ package io.netty.logging; +import org.apache.log4j.Logger; + /** * Logger factory which creates an * Apache Log4J @@ -24,8 +26,8 @@ public class Log4JLoggerFactory extends InternalLoggerFactory { @Override public InternalLogger newInstance(String name) { - final org.apache.log4j.Logger logger = - org.apache.log4j.Logger.getLogger(name); + final Logger logger = + Logger.getLogger(name); return new Log4JLogger(logger); } } diff --git a/common/src/main/java/io/netty/logging/Slf4JLoggerFactory.java b/common/src/main/java/io/netty/logging/Slf4JLoggerFactory.java index e0ca58cb9a..b8860591f2 100644 --- a/common/src/main/java/io/netty/logging/Slf4JLoggerFactory.java +++ b/common/src/main/java/io/netty/logging/Slf4JLoggerFactory.java @@ -16,6 +16,8 @@ package io.netty.logging; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Logger factory which creates a SLF4J @@ -25,8 +27,8 @@ public class Slf4JLoggerFactory extends InternalLoggerFactory { @Override public InternalLogger newInstance(String name) { - final org.slf4j.Logger logger = - org.slf4j.LoggerFactory.getLogger(name); + final Logger logger = + LoggerFactory.getLogger(name); return new Slf4JLogger(logger); } } diff --git a/common/src/main/java/io/netty/monitor/MonitorName.java b/common/src/main/java/io/netty/monitor/MonitorName.java index f73ce8f7f8..ad5d7e0cf5 100644 --- a/common/src/main/java/io/netty/monitor/MonitorName.java +++ b/common/src/main/java/io/netty/monitor/MonitorName.java @@ -15,6 +15,8 @@ */ package io.netty.monitor; +import java.lang.Object; + /** *
* Represents a {@code Monitor}'s unique name. This name is composed of
@@ -187,7 +189,7 @@ public final class MonitorName {
}
/**
- * @see java.lang.Object#hashCode()
+ * @see Object#hashCode()
*/
@Override
public int hashCode() {
@@ -201,7 +203,7 @@ public final class MonitorName {
}
/**
- * @see java.lang.Object#equals(java.lang.Object)
+ * @see Object#equals(Object)
*/
@Override
public boolean equals(final Object obj) {
@@ -247,7 +249,7 @@ public final class MonitorName {
}
/**
- * @see java.lang.Object#toString()
+ * @see Object#toString()
*/
@Override
public String toString() {
diff --git a/common/src/main/java/io/netty/monitor/MonitorRegistries.java b/common/src/main/java/io/netty/monitor/MonitorRegistries.java
index 19dbb33c82..dedca8beb1 100644
--- a/common/src/main/java/io/netty/monitor/MonitorRegistries.java
+++ b/common/src/main/java/io/netty/monitor/MonitorRegistries.java
@@ -18,6 +18,7 @@ package io.netty.monitor;
import io.netty.monitor.spi.MonitorProvider;
import io.netty.monitor.spi.MonitorRegistryFactory;
+import java.lang.Iterable;
import java.util.Iterator;
import java.util.ServiceLoader;
@@ -110,7 +111,7 @@ public final class MonitorRegistries implements Iterable
@@ -59,7 +61,7 @@ public final class MonitorProvider implements Serializable, Comparable
diff --git a/transport/src/main/java/io/netty/channel/socket/SctpServerChannel.java b/transport/src/main/java/io/netty/channel/socket/SctpServerChannel.java
index 6728d4a6ae..fba24c9729 100644
--- a/transport/src/main/java/io/netty/channel/socket/SctpServerChannel.java
+++ b/transport/src/main/java/io/netty/channel/socket/SctpServerChannel.java
@@ -21,7 +21,7 @@ import java.net.SocketAddress;
import java.util.Set;
/**
- * A SCTP/IP {@link io.netty.channel.ServerChannel} which accepts incoming SCTP/IP connections.
+ * A SCTP/IP {@link ServerChannel} which accepts incoming SCTP/IP connections.
*
* The {@link SctpServerChannel} provides the additional operations, available in the
* underlying JDK SCTP Server Channel like multi-homing etc.
diff --git a/transport/src/main/java/io/netty/channel/socket/SctpServerChannelConfig.java b/transport/src/main/java/io/netty/channel/socket/SctpServerChannelConfig.java
index 95a38a4642..5e76c5aaee 100644
--- a/transport/src/main/java/io/netty/channel/socket/SctpServerChannelConfig.java
+++ b/transport/src/main/java/io/netty/channel/socket/SctpServerChannelConfig.java
@@ -20,11 +20,11 @@ import io.netty.channel.ChannelConfig;
import static com.sun.nio.sctp.SctpStandardSocketOptions.InitMaxStreams;
/**
- * A {@link io.netty.channel.ChannelConfig} for a {@link SctpServerChannelConfig}.
+ * A {@link ChannelConfig} for a {@link SctpServerChannelConfig}.
*
*
Available options
*
- * In addition to the options provided by {@link io.netty.channel.ChannelConfig},
+ * In addition to the options provided by {@link ChannelConfig},
* {@link SctpServerChannelConfig} allows the following options in the
* option map:
*
diff --git a/transport/src/main/java/io/netty/channel/socket/nio/NioTask.java b/transport/src/main/java/io/netty/channel/socket/nio/NioTask.java
index e46e951389..5d3d1361e9 100644
--- a/transport/src/main/java/io/netty/channel/socket/nio/NioTask.java
+++ b/transport/src/main/java/io/netty/channel/socket/nio/NioTask.java
@@ -17,6 +17,7 @@ package io.netty.channel.socket.nio;
import java.nio.channels.SelectableChannel;
import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
/**
* An arbitrary task that can be executed by {@link NioEventLoop} when a {@link SelectableChannel} becomes ready.
@@ -25,7 +26,7 @@ import java.nio.channels.SelectionKey;
*/
public interface NioTask