andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove unnecessary qualifiers

Browse Source
This commit is contained in:
Trustin Lee 2012-11-12 09:11:48 +09:00
parent 61d872d6e2
commit 91a61d7f43
25 changed files with 232 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
codec-http/src/main/java/io/netty/handler/codec/http/HttpTransferEncoding.java
View File

@ -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);

5
common/src/main/java/io/netty/logging/JBossLoggerFactory.java
View File

@ -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);
}
}

6
common/src/main/java/io/netty/logging/JdkLoggerFactory.java
View File

@ -16,6 +16,8 @@
package io.netty.logging;
import java.util.logging.Logger;
/**
* Logger factory which creates a
* <a href="http://docs.oracle.com/javase/7/docs/technotes/guides/logging/">java.util.logging</a>
@ -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);
}
}

6
common/src/main/java/io/netty/logging/Log4JLoggerFactory.java
View File

@ -15,6 +15,8 @@
*/
package io.netty.logging;
import org.apache.log4j.Logger;
/**
* Logger factory which creates an
* <a href="http://logging.apache.org/log4j/1.2/index.html">Apache Log4J</a>
@ -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);
}
}

6
common/src/main/java/io/netty/logging/Slf4JLoggerFactory.java
View File

@ -16,6 +16,8 @@
package io.netty.logging;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Logger factory which creates a <a href="http://www.slf4j.org/">SLF4J</a>
@ -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);
}
}

8
common/src/main/java/io/netty/monitor/MonitorName.java
View File

@ -15,6 +15,8 @@
*/
package io.netty.monitor;
import java.lang.Object;
/**
* <p>
* 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() {

3
common/src/main/java/io/netty/monitor/MonitorRegistries.java
View File

@ -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<MonitorRegistry> {
}
/**
* @see java.lang.Iterable#iterator()
* @see Iterable#iterator()
*/
@Override
public Iterator<MonitorRegistry> iterator() {

12
common/src/main/java/io/netty/monitor/NoopMonitorRegistry.java
View File

@ -28,7 +28,7 @@ final class NoopMonitorRegistry implements MonitorRegistry {
static final NoopMonitorRegistry INSTANCE = new NoopMonitorRegistry();
/**
* @see io.netty.monitor.MonitorRegistry#newValueDistributionMonitor(io.netty.monitor.MonitorName)
* @see MonitorRegistry#newValueDistributionMonitor(MonitorName)
*/
@Override
public ValueDistributionMonitor newValueDistributionMonitor(final MonitorName monitorName) {
@ -36,8 +36,8 @@ final class NoopMonitorRegistry implements MonitorRegistry {
}
/**
* @see io.netty.monitor.MonitorRegistry#newEventRateMonitor(io.netty.monitor.MonitorName,
* java.util.concurrent.TimeUnit)
* @see MonitorRegistry#newEventRateMonitor(MonitorName,
* TimeUnit)
*/
@Override
public EventRateMonitor newEventRateMonitor(final MonitorName monitorName, final TimeUnit rateUnit) {
@ -45,8 +45,8 @@ final class NoopMonitorRegistry implements MonitorRegistry {
}
/**
* @see io.netty.monitor.MonitorRegistry#registerValueMonitor(io.netty.monitor.MonitorName,
* io.netty.monitor.ValueMonitor)
* @see MonitorRegistry#registerValueMonitor(MonitorName,
* ValueMonitor)
*/
@Override
public <T> ValueMonitor<T> registerValueMonitor(final MonitorName monitorName, final ValueMonitor<T> valueMonitor) {
@ -54,7 +54,7 @@ final class NoopMonitorRegistry implements MonitorRegistry {
}
/**
* @see io.netty.monitor.MonitorRegistry#newCounterMonitor(io.netty.monitor.MonitorName)
* @see MonitorRegistry#newCounterMonitor(MonitorName)
*/
@Override
public CounterMonitor newCounterMonitor(final MonitorName monitorName) {

10
common/src/main/java/io/netty/monitor/spi/MonitorProvider.java
View File

@ -16,6 +16,8 @@
package io.netty.monitor.spi;
import java.io.Serializable;
import java.lang.Comparable;
import java.lang.Object;
/**
* <p>
@ -59,7 +61,7 @@ public final class MonitorProvider implements Serializable, Comparable<MonitorPr
}
/**
* @see java.lang.Comparable#compareTo(java.lang.Object)
* @see Comparable#compareTo(Object)
*/
@Override
public int compareTo(final MonitorProvider o) {
@ -67,7 +69,7 @@ public final class MonitorProvider implements Serializable, Comparable<MonitorPr
}
/**
* @see java.lang.Object#hashCode()
* @see Object#hashCode()
*/
@Override
public int hashCode() {
@ -78,7 +80,7 @@ public final class MonitorProvider implements Serializable, Comparable<MonitorPr
}
/**
* @see java.lang.Object#equals(java.lang.Object)
* @see Object#equals(Object)
*/
@Override
public boolean equals(final Object obj) {
@ -103,7 +105,7 @@ public final class MonitorProvider implements Serializable, Comparable<MonitorPr
}
/**
* @see java.lang.Object#toString()
* @see Object#toString()
*/
@Override
public String toString() {

61
common/src/test/java/io/netty/logging/CommonsLoggerTest.java
View File

@ -18,6 +18,7 @@ package io.netty.logging;
import static org.easymock.EasyMock.*;
import static org.junit.Assert.*;
import org.apache.commons.logging.Log;
import org.junit.Test;
public class CommonsLoggerTest {
@ -25,8 +26,8 @@ public class CommonsLoggerTest {
@Test
public void testIsTraceEnabled() {
org.apache.commons.logging.Log mock =
createStrictMock(org.apache.commons.logging.Log.class);
Log mock =
createStrictMock(Log.class);
expect(mock.isTraceEnabled()).andReturn(true);
replay(mock);
@ -38,8 +39,8 @@ public class CommonsLoggerTest {
@Test
public void testIsDebugEnabled() {
org.apache.commons.logging.Log mock =
createStrictMock(org.apache.commons.logging.Log.class);
Log mock =
createStrictMock(Log.class);
expect(mock.isDebugEnabled()).andReturn(true);
replay(mock);
@ -51,8 +52,8 @@ public class CommonsLoggerTest {
@Test
public void testIsInfoEnabled() {
org.apache.commons.logging.Log mock =
createStrictMock(org.apache.commons.logging.Log.class);
Log mock =
createStrictMock(Log.class);
expect(mock.isInfoEnabled()).andReturn(true);
replay(mock);
@ -64,8 +65,8 @@ public class CommonsLoggerTest {
@Test
public void testIsWarnEnabled() {
org.apache.commons.logging.Log mock =
createStrictMock(org.apache.commons.logging.Log.class);
Log mock =
createStrictMock(Log.class);
expect(mock.isWarnEnabled()).andReturn(true);
replay(mock);
@ -77,8 +78,8 @@ public class CommonsLoggerTest {
@Test
public void testIsErrorEnabled() {
org.apache.commons.logging.Log mock =
createStrictMock(org.apache.commons.logging.Log.class);
Log mock =
createStrictMock(Log.class);
expect(mock.isErrorEnabled()).andReturn(true);
replay(mock);
@ -90,8 +91,8 @@ public class CommonsLoggerTest {
@Test
public void testTrace() {
org.apache.commons.logging.Log mock =
createStrictMock(org.apache.commons.logging.Log.class);
Log mock =
createStrictMock(Log.class);
mock.trace("a");
replay(mock);
@ -103,8 +104,8 @@ public class CommonsLoggerTest {
@Test
public void testTraceWithException() {
org.apache.commons.logging.Log mock =
createStrictMock(org.apache.commons.logging.Log.class);
Log mock =
createStrictMock(Log.class);
mock.trace("a", e);
replay(mock);
@ -116,8 +117,8 @@ public class CommonsLoggerTest {
@Test
public void testDebug() {
org.apache.commons.logging.Log mock =
createStrictMock(org.apache.commons.logging.Log.class);
Log mock =
createStrictMock(Log.class);
mock.debug("a");
replay(mock);
@ -129,8 +130,8 @@ public class CommonsLoggerTest {
@Test
public void testDebugWithException() {
org.apache.commons.logging.Log mock =
createStrictMock(org.apache.commons.logging.Log.class);
Log mock =
createStrictMock(Log.class);
mock.debug("a", e);
replay(mock);
@ -142,8 +143,8 @@ public class CommonsLoggerTest {
@Test
public void testInfo() {
org.apache.commons.logging.Log mock =
createStrictMock(org.apache.commons.logging.Log.class);
Log mock =
createStrictMock(Log.class);
mock.info("a");
replay(mock);
@ -155,8 +156,8 @@ public class CommonsLoggerTest {
@Test
public void testInfoWithException() {
org.apache.commons.logging.Log mock =
createStrictMock(org.apache.commons.logging.Log.class);
Log mock =
createStrictMock(Log.class);
mock.info("a", e);
replay(mock);
@ -168,8 +169,8 @@ public class CommonsLoggerTest {
@Test
public void testWarn() {
org.apache.commons.logging.Log mock =
createStrictMock(org.apache.commons.logging.Log.class);
Log mock =
createStrictMock(Log.class);
mock.warn("a");
replay(mock);
@ -181,8 +182,8 @@ public class CommonsLoggerTest {
@Test
public void testWarnWithException() {
org.apache.commons.logging.Log mock =
createStrictMock(org.apache.commons.logging.Log.class);
Log mock =
createStrictMock(Log.class);
mock.warn("a", e);
replay(mock);
@ -194,8 +195,8 @@ public class CommonsLoggerTest {
@Test
public void testError() {
org.apache.commons.logging.Log mock =
createStrictMock(org.apache.commons.logging.Log.class);
Log mock =
createStrictMock(Log.class);
mock.error("a");
replay(mock);
@ -207,8 +208,8 @@ public class CommonsLoggerTest {
@Test
public void testErrorWithException() {
org.apache.commons.logging.Log mock =
createStrictMock(org.apache.commons.logging.Log.class);
Log mock =
createStrictMock(Log.class);
mock.error("a", e);
replay(mock);

61
common/src/test/java/io/netty/logging/JBossLoggerTest.java
View File

@ -18,6 +18,7 @@ package io.netty.logging;
import static org.easymock.EasyMock.*;
import static org.junit.Assert.*;
import org.jboss.logging.Logger;
import org.junit.Test;
public class JBossLoggerTest {
@ -25,8 +26,8 @@ public class JBossLoggerTest {
@Test
public void testIsTraceEnabled() {
org.jboss.logging.Logger mock =
createStrictMock(org.jboss.logging.Logger.class);
Logger mock =
createStrictMock(Logger.class);
expect(mock.isTraceEnabled()).andReturn(true);
replay(mock);
@ -39,8 +40,8 @@ public class JBossLoggerTest {
@Test
@SuppressWarnings("deprecation")
public void testIsDebugEnabled() {
org.jboss.logging.Logger mock =
createStrictMock(org.jboss.logging.Logger.class);
Logger mock =
createStrictMock(Logger.class);
expect(mock.isDebugEnabled()).andReturn(true);
replay(mock);
@ -53,8 +54,8 @@ public class JBossLoggerTest {
@Test
@SuppressWarnings("deprecation")
public void testIsInfoEnabled() {
org.jboss.logging.Logger mock =
createStrictMock(org.jboss.logging.Logger.class);
Logger mock =
createStrictMock(Logger.class);
expect(mock.isInfoEnabled()).andReturn(true);
replay(mock);
@ -66,8 +67,8 @@ public class JBossLoggerTest {
@Test
public void testIsWarnEnabled() {
org.jboss.logging.Logger mock =
createStrictMock(org.jboss.logging.Logger.class);
Logger mock =
createStrictMock(Logger.class);
replay(mock);
InternalLogger logger = new JBossLogger(mock);
@ -77,8 +78,8 @@ public class JBossLoggerTest {
@Test
public void testIsErrorEnabled() {
org.jboss.logging.Logger mock =
createStrictMock(org.jboss.logging.Logger.class);
Logger mock =
createStrictMock(Logger.class);
replay(mock);
InternalLogger logger = new JBossLogger(mock);
@ -88,8 +89,8 @@ public class JBossLoggerTest {
@Test
public void testTrace() {
org.jboss.logging.Logger mock =
createStrictMock(org.jboss.logging.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.trace("a");
replay(mock);
@ -101,8 +102,8 @@ public class JBossLoggerTest {
@Test
public void testTraceWithException() {
org.jboss.logging.Logger mock =
createStrictMock(org.jboss.logging.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.trace("a", e);
replay(mock);
@ -114,8 +115,8 @@ public class JBossLoggerTest {
@Test
public void testDebug() {
org.jboss.logging.Logger mock =
createStrictMock(org.jboss.logging.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.debug("a");
replay(mock);
@ -127,8 +128,8 @@ public class JBossLoggerTest {
@Test
public void testDebugWithException() {
org.jboss.logging.Logger mock =
createStrictMock(org.jboss.logging.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.debug("a", e);
replay(mock);
@ -140,8 +141,8 @@ public class JBossLoggerTest {
@Test
public void testInfo() {
org.jboss.logging.Logger mock =
createStrictMock(org.jboss.logging.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.info("a");
replay(mock);
@ -153,8 +154,8 @@ public class JBossLoggerTest {
@Test
public void testInfoWithException() {
org.jboss.logging.Logger mock =
createStrictMock(org.jboss.logging.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.info("a", e);
replay(mock);
@ -166,8 +167,8 @@ public class JBossLoggerTest {
@Test
public void testWarn() {
org.jboss.logging.Logger mock =
createStrictMock(org.jboss.logging.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.warn("a");
replay(mock);
@ -179,8 +180,8 @@ public class JBossLoggerTest {
@Test
public void testWarnWithException() {
org.jboss.logging.Logger mock =
createStrictMock(org.jboss.logging.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.warn("a", e);
replay(mock);
@ -192,8 +193,8 @@ public class JBossLoggerTest {
@Test
public void testError() {
org.jboss.logging.Logger mock =
createStrictMock(org.jboss.logging.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.error("a");
replay(mock);
@ -205,8 +206,8 @@ public class JBossLoggerTest {
@Test
public void testErrorWithException() {
org.jboss.logging.Logger mock =
createStrictMock(org.jboss.logging.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.error("a", e);
replay(mock);

61
common/src/test/java/io/netty/logging/JdkLoggerTest.java
View File

@ -19,6 +19,7 @@ import static org.easymock.EasyMock.*;
import static org.junit.Assert.*;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.junit.Test;
@ -28,8 +29,8 @@ public class JdkLoggerTest {
@Test
public void testIsTraceEnabled() {
java.util.logging.Logger mock =
createStrictMock(java.util.logging.Logger.class);
Logger mock =
createStrictMock(Logger.class);
expect(mock.isLoggable(Level.FINEST)).andReturn(true);
replay(mock);
@ -42,8 +43,8 @@ public class JdkLoggerTest {
@Test
public void testIsDebugEnabled() {
java.util.logging.Logger mock =
createStrictMock(java.util.logging.Logger.class);
Logger mock =
createStrictMock(Logger.class);
expect(mock.isLoggable(Level.FINE)).andReturn(true);
replay(mock);
@ -55,8 +56,8 @@ public class JdkLoggerTest {
@Test
public void testIsInfoEnabled() {
java.util.logging.Logger mock =
createStrictMock(java.util.logging.Logger.class);
Logger mock =
createStrictMock(Logger.class);
expect(mock.isLoggable(Level.INFO)).andReturn(true);
replay(mock);
@ -68,8 +69,8 @@ public class JdkLoggerTest {
@Test
public void testIsWarnEnabled() {
java.util.logging.Logger mock =
createStrictMock(java.util.logging.Logger.class);
Logger mock =
createStrictMock(Logger.class);
expect(mock.isLoggable(Level.WARNING)).andReturn(true);
replay(mock);
@ -81,8 +82,8 @@ public class JdkLoggerTest {
@Test
public void testIsErrorEnabled() {
java.util.logging.Logger mock =
createStrictMock(java.util.logging.Logger.class);
Logger mock =
createStrictMock(Logger.class);
expect(mock.isLoggable(Level.SEVERE)).andReturn(true);
replay(mock);
@ -94,8 +95,8 @@ public class JdkLoggerTest {
@Test
public void testTrace() {
java.util.logging.Logger mock =
createStrictMock(java.util.logging.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.logp(Level.FINEST, "foo", null, "a");
replay(mock);
@ -107,8 +108,8 @@ public class JdkLoggerTest {
@Test
public void testTraceWithException() {
java.util.logging.Logger mock =
createStrictMock(java.util.logging.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.logp(Level.FINEST, "foo", null, "a", e);
replay(mock);
@ -120,8 +121,8 @@ public class JdkLoggerTest {
@Test
public void testDebug() {
java.util.logging.Logger mock =
createStrictMock(java.util.logging.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.logp(Level.FINE, "foo", null, "a");
replay(mock);
@ -133,8 +134,8 @@ public class JdkLoggerTest {
@Test
public void testDebugWithException() {
java.util.logging.Logger mock =
createStrictMock(java.util.logging.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.logp(Level.FINE, "foo", null, "a", e);
replay(mock);
@ -146,8 +147,8 @@ public class JdkLoggerTest {
@Test
public void testInfo() {
java.util.logging.Logger mock =
createStrictMock(java.util.logging.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.logp(Level.INFO, "foo", null, "a");
replay(mock);
@ -159,8 +160,8 @@ public class JdkLoggerTest {
@Test
public void testInfoWithException() {
java.util.logging.Logger mock =
createStrictMock(java.util.logging.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.logp(Level.INFO, "foo", null, "a", e);
replay(mock);
@ -172,8 +173,8 @@ public class JdkLoggerTest {
@Test
public void testWarn() {
java.util.logging.Logger mock =
createStrictMock(java.util.logging.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.logp(Level.WARNING, "foo", null, "a");
replay(mock);
@ -185,8 +186,8 @@ public class JdkLoggerTest {
@Test
public void testWarnWithException() {
java.util.logging.Logger mock =
createStrictMock(java.util.logging.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.logp(Level.WARNING, "foo", null, "a", e);
replay(mock);
@ -198,8 +199,8 @@ public class JdkLoggerTest {
@Test
public void testError() {
java.util.logging.Logger mock =
createStrictMock(java.util.logging.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.logp(Level.SEVERE, "foo", null, "a");
replay(mock);
@ -211,8 +212,8 @@ public class JdkLoggerTest {
@Test
public void testErrorWithException() {
java.util.logging.Logger mock =
createStrictMock(java.util.logging.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.logp(Level.SEVERE, "foo", null, "a", e);
replay(mock);

61
common/src/test/java/io/netty/logging/Log4JLoggerTest.java
View File

@ -18,6 +18,7 @@ package io.netty.logging;
import static org.easymock.EasyMock.*;
import static org.junit.Assert.*;
import org.apache.log4j.Logger;
import org.junit.Test;
public class Log4JLoggerTest {
@ -26,8 +27,8 @@ public class Log4JLoggerTest {
@Test
public void testIsTraceEnabled() {
org.apache.log4j.Logger mock =
createStrictMock(org.apache.log4j.Logger.class);
Logger mock =
createStrictMock(Logger.class);
expect(mock.isTraceEnabled()).andReturn(true);
replay(mock);
@ -40,8 +41,8 @@ public class Log4JLoggerTest {
@Test
public void testIsDebugEnabled() {
org.apache.log4j.Logger mock =
createStrictMock(org.apache.log4j.Logger.class);
Logger mock =
createStrictMock(Logger.class);
expect(mock.isDebugEnabled()).andReturn(true);
replay(mock);
@ -53,8 +54,8 @@ public class Log4JLoggerTest {
@Test
public void testIsInfoEnabled() {
org.apache.log4j.Logger mock =
createStrictMock(org.apache.log4j.Logger.class);
Logger mock =
createStrictMock(Logger.class);
expect(mock.isInfoEnabled()).andReturn(true);
replay(mock);
@ -66,8 +67,8 @@ public class Log4JLoggerTest {
@Test
public void testIsWarnEnabled() {
org.apache.log4j.Logger mock =
createStrictMock(org.apache.log4j.Logger.class);
Logger mock =
createStrictMock(Logger.class);
replay(mock);
@ -78,8 +79,8 @@ public class Log4JLoggerTest {
@Test
public void testIsErrorEnabled() {
org.apache.log4j.Logger mock =
createStrictMock(org.apache.log4j.Logger.class);
Logger mock =
createStrictMock(Logger.class);
replay(mock);
InternalLogger logger = new Log4JLogger(mock);
@ -89,8 +90,8 @@ public class Log4JLoggerTest {
@Test
public void testTrace() {
org.apache.log4j.Logger mock =
createStrictMock(org.apache.log4j.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.trace("a");
replay(mock);
@ -102,8 +103,8 @@ public class Log4JLoggerTest {
@Test
public void testTraceWithException() {
org.apache.log4j.Logger mock =
createStrictMock(org.apache.log4j.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.trace("a", e);
replay(mock);
@ -115,8 +116,8 @@ public class Log4JLoggerTest {
@Test
public void testDebug() {
org.apache.log4j.Logger mock =
createStrictMock(org.apache.log4j.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.debug("a");
replay(mock);
@ -128,8 +129,8 @@ public class Log4JLoggerTest {
@Test
public void testDebugWithException() {
org.apache.log4j.Logger mock =
createStrictMock(org.apache.log4j.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.debug("a", e);
replay(mock);
@ -141,8 +142,8 @@ public class Log4JLoggerTest {
@Test
public void testInfo() {
org.apache.log4j.Logger mock =
createStrictMock(org.apache.log4j.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.info("a");
replay(mock);
@ -154,8 +155,8 @@ public class Log4JLoggerTest {
@Test
public void testInfoWithException() {
org.apache.log4j.Logger mock =
createStrictMock(org.apache.log4j.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.info("a", e);
replay(mock);
@ -167,8 +168,8 @@ public class Log4JLoggerTest {
@Test
public void testWarn() {
org.apache.log4j.Logger mock =
createStrictMock(org.apache.log4j.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.warn("a");
replay(mock);
@ -180,8 +181,8 @@ public class Log4JLoggerTest {
@Test
public void testWarnWithException() {
org.apache.log4j.Logger mock =
createStrictMock(org.apache.log4j.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.warn("a", e);
replay(mock);
@ -193,8 +194,8 @@ public class Log4JLoggerTest {
@Test
public void testError() {
org.apache.log4j.Logger mock =
createStrictMock(org.apache.log4j.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.error("a");
replay(mock);
@ -206,8 +207,8 @@ public class Log4JLoggerTest {
@Test
public void testErrorWithException() {
org.apache.log4j.Logger mock =
createStrictMock(org.apache.log4j.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.error("a", e);
replay(mock);

61
common/src/test/java/io/netty/logging/Slf4JLoggerTest.java
View File

@ -19,14 +19,15 @@ import static org.easymock.EasyMock.*;
import static org.junit.Assert.*;
import org.junit.Test;
import org.slf4j.Logger;
public class Slf4JLoggerTest {
private static final Exception e = new Exception();
@Test
public void testIsTraceEnabled() {
org.slf4j.Logger mock =
createStrictMock(org.slf4j.Logger.class);
Logger mock =
createStrictMock(Logger.class);
expect(mock.isTraceEnabled()).andReturn(true);
replay(mock);
@ -38,8 +39,8 @@ public class Slf4JLoggerTest {
@Test
public void testIsDebugEnabled() {
org.slf4j.Logger mock =
createStrictMock(org.slf4j.Logger.class);
Logger mock =
createStrictMock(Logger.class);
expect(mock.isDebugEnabled()).andReturn(true);
replay(mock);
@ -51,8 +52,8 @@ public class Slf4JLoggerTest {
@Test
public void testIsInfoEnabled() {
org.slf4j.Logger mock =
createStrictMock(org.slf4j.Logger.class);
Logger mock =
createStrictMock(Logger.class);
expect(mock.isInfoEnabled()).andReturn(true);
replay(mock);
@ -64,8 +65,8 @@ public class Slf4JLoggerTest {
@Test
public void testIsWarnEnabled() {
org.slf4j.Logger mock =
createStrictMock(org.slf4j.Logger.class);
Logger mock =
createStrictMock(Logger.class);
expect(mock.isWarnEnabled()).andReturn(true);
replay(mock);
@ -77,8 +78,8 @@ public class Slf4JLoggerTest {
@Test
public void testIsErrorEnabled() {
org.slf4j.Logger mock =
createStrictMock(org.slf4j.Logger.class);
Logger mock =
createStrictMock(Logger.class);
expect(mock.isErrorEnabled()).andReturn(true);
replay(mock);
@ -90,8 +91,8 @@ public class Slf4JLoggerTest {
@Test
public void testTrace() {
org.slf4j.Logger mock =
createStrictMock(org.slf4j.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.trace("a");
replay(mock);
@ -103,8 +104,8 @@ public class Slf4JLoggerTest {
@Test
public void testTraceWithException() {
org.slf4j.Logger mock =
createStrictMock(org.slf4j.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.trace("a", e);
replay(mock);
@ -116,8 +117,8 @@ public class Slf4JLoggerTest {
@Test
public void testDebug() {
org.slf4j.Logger mock =
createStrictMock(org.slf4j.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.debug("a");
replay(mock);
@ -129,8 +130,8 @@ public class Slf4JLoggerTest {
@Test
public void testDebugWithException() {
org.slf4j.Logger mock =
createStrictMock(org.slf4j.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.debug("a", e);
replay(mock);
@ -142,8 +143,8 @@ public class Slf4JLoggerTest {
@Test
public void testInfo() {
org.slf4j.Logger mock =
createStrictMock(org.slf4j.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.info("a");
replay(mock);
@ -155,8 +156,8 @@ public class Slf4JLoggerTest {
@Test
public void testInfoWithException() {
org.slf4j.Logger mock =
createStrictMock(org.slf4j.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.info("a", e);
replay(mock);
@ -168,8 +169,8 @@ public class Slf4JLoggerTest {
@Test
public void testWarn() {
org.slf4j.Logger mock =
createStrictMock(org.slf4j.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.warn("a");
replay(mock);
@ -181,8 +182,8 @@ public class Slf4JLoggerTest {
@Test
public void testWarnWithException() {
org.slf4j.Logger mock =
createStrictMock(org.slf4j.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.warn("a", e);
replay(mock);
@ -194,8 +195,8 @@ public class Slf4JLoggerTest {
@Test
public void testError() {
org.slf4j.Logger mock =
createStrictMock(org.slf4j.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.error("a");
replay(mock);
@ -207,8 +208,8 @@ public class Slf4JLoggerTest {
@Test
public void testErrorWithException() {
org.slf4j.Logger mock =
createStrictMock(org.slf4j.Logger.class);
Logger mock =
createStrictMock(Logger.class);
mock.error("a", e);
replay(mock);

14
metrics-yammer/src/main/java/io/netty/monitor/yammer/YammerCounterMonitor.java
View File

@ -19,6 +19,8 @@ import io.netty.monitor.CounterMonitor;
import com.yammer.metrics.core.Counter;
import java.lang.Object;
/**
* <p>
* An {@link CounterMonitor} that delegates to a <a
@ -40,7 +42,7 @@ class YammerCounterMonitor implements CounterMonitor {
}
/**
* @see io.netty.monitor.CounterMonitor#inc()
* @see CounterMonitor#inc()
*/
@Override
public void inc() {
@ -48,7 +50,7 @@ class YammerCounterMonitor implements CounterMonitor {
}
/**
* @see io.netty.monitor.CounterMonitor#inc(long)
* @see CounterMonitor#inc(long)
*/
@Override
public void inc(final long delta) {
@ -56,7 +58,7 @@ class YammerCounterMonitor implements CounterMonitor {
}
/**
* @see io.netty.monitor.CounterMonitor#decr()
* @see CounterMonitor#decr()
*/
@Override
public void decr() {
@ -64,7 +66,7 @@ class YammerCounterMonitor implements CounterMonitor {
}
/**
* @see io.netty.monitor.CounterMonitor#decr(long)
* @see CounterMonitor#decr(long)
*/
@Override
public void decr(final long delta) {
@ -72,7 +74,7 @@ class YammerCounterMonitor implements CounterMonitor {
}
/**
* @see io.netty.monitor.CounterMonitor#reset()
* @see CounterMonitor#reset()
*/
@Override
public void reset() {
@ -80,7 +82,7 @@ class YammerCounterMonitor implements CounterMonitor {
}
/**
* @see java.lang.Object#toString()
* @see Object#toString()
*/
@Override
public String toString() {

12
metrics-yammer/src/main/java/io/netty/monitor/yammer/YammerEventRateMonitor.java
View File

@ -19,6 +19,8 @@ import io.netty.monitor.EventRateMonitor;
import com.yammer.metrics.core.Meter;
import java.lang.Object;
/**
* <p>
* An {@link EventRateMonitor} that delegates to a <a
@ -40,8 +42,8 @@ class YammerEventRateMonitor implements EventRateMonitor {
}
/**
* @see io.netty.monitor.EventRateMonitor#event()
* @see com.yammer.metrics.core.Meter#mark()
* @see EventRateMonitor#event()
* @see Meter#mark()
*/
@Override
public void event() {
@ -49,8 +51,8 @@ class YammerEventRateMonitor implements EventRateMonitor {
}
/**
* @see io.netty.monitor.EventRateMonitor#events(long)
* @see com.yammer.metrics.core.Meter#mark(long)
* @see EventRateMonitor#events(long)
* @see Meter#mark(long)
*/
@Override
public void events(final long count) {
@ -58,7 +60,7 @@ class YammerEventRateMonitor implements EventRateMonitor {
}
/**
* @see java.lang.Object#toString()
* @see Object#toString()
*/
@Override
public String toString() {

15
metrics-yammer/src/main/java/io/netty/monitor/yammer/YammerMonitorRegistry.java
View File

@ -22,6 +22,7 @@ import io.netty.monitor.MonitorRegistry;
import io.netty.monitor.ValueDistributionMonitor;
import io.netty.monitor.ValueMonitor;
import java.lang.Object;
import java.util.concurrent.TimeUnit;
import com.yammer.metrics.Metrics;
@ -64,7 +65,7 @@ public final class YammerMonitorRegistry implements MonitorRegistry {
/**
* Create a new {@link ValueDistributionMonitor} that is backed by a
* {@code Yammer} {@link Histogram}.
* @see io.netty.monitor.MonitorRegistry#newValueDistributionMonitor(io.netty.monitor.MonitorName)
* @see MonitorRegistry#newValueDistributionMonitor(MonitorName)
*/
@Override
public ValueDistributionMonitor newValueDistributionMonitor(final MonitorName monitorName) {
@ -75,8 +76,8 @@ public final class YammerMonitorRegistry implements MonitorRegistry {
/**
* Create a new {@link EventRateMonitor} that is backed by a {@code Yammer}
* {@link Meter}.
* @see io.netty.monitor.MonitorRegistry#newEventRateMonitor(io.netty.monitor.MonitorName,
* java.util.concurrent.TimeUnit)
* @see MonitorRegistry#newEventRateMonitor(MonitorName,
* TimeUnit)
*/
@Override
public EventRateMonitor newEventRateMonitor(final MonitorName monitorName, final TimeUnit rateUnit) {
@ -87,8 +88,8 @@ public final class YammerMonitorRegistry implements MonitorRegistry {
/**
* Register the supplied {@link ValueMonitor valueMonitor}, using it
* internally to create a {@code Yammer} {@link Gauge}.
* @see io.netty.monitor.MonitorRegistry#registerValueMonitor(io.netty.monitor.MonitorName,
* io.netty.monitor.ValueMonitor)
* @see MonitorRegistry#registerValueMonitor(MonitorName,
* ValueMonitor)
*/
@Override
public <T> ValueMonitor<T> registerValueMonitor(final MonitorName monitorName, final ValueMonitor<T> valueMonitor) {
@ -104,7 +105,7 @@ public final class YammerMonitorRegistry implements MonitorRegistry {
/**
* Create a new {@link CounterMonitor} that is backed by a {@code Yammer}
* {@link Counter}.
* @see io.netty.monitor.MonitorRegistry#newCounterMonitor(io.netty.monitor.MonitorName)
* @see MonitorRegistry#newCounterMonitor(MonitorName)
*/
@Override
public CounterMonitor newCounterMonitor(MonitorName monitorName) {
@ -113,7 +114,7 @@ public final class YammerMonitorRegistry implements MonitorRegistry {
}
/**
* @see java.lang.Object#toString()
* @see Object#toString()
*/
@Override
public String toString() {

4
metrics-yammer/src/main/java/io/netty/monitor/yammer/YammerValueDistributionMonitor.java
View File

@ -19,6 +19,8 @@ import io.netty.monitor.ValueDistributionMonitor;
import com.yammer.metrics.core.Histogram;
import java.lang.Object;
/**
* <p>
* An {@link ValueDistributionMonitor} that delegates to a <a
@ -56,7 +58,7 @@ final class YammerValueDistributionMonitor implements ValueDistributionMonitor {
}
/**
* @see java.lang.Object#toString()
* @see Object#toString()
*/
@Override
public String toString() {

8
metrics-yammer/src/main/java/io/netty/monitor/yammer/spi/YammerMonitorRegistryFactory.java
View File

@ -24,6 +24,8 @@ import io.netty.monitor.yammer.YammerProvider;
import com.yammer.metrics.Metrics;
import com.yammer.metrics.core.MetricsRegistry;
import java.lang.Object;
/**
* <p>
* A {@link MonitorRegistryFactory} that produces {@link YammerMonitorRegistry
@ -51,7 +53,7 @@ public class YammerMonitorRegistryFactory implements MonitorRegistryFactory {
}
/**
* @see io.netty.monitor.spi.MonitorRegistryFactory#provider()
* @see MonitorRegistryFactory#provider()
*/
@Override
public MonitorProvider provider() {
@ -59,7 +61,7 @@ public class YammerMonitorRegistryFactory implements MonitorRegistryFactory {
}
/**
* @see io.netty.monitor.spi.MonitorRegistryFactory#newMonitorRegistry()
* @see MonitorRegistryFactory#newMonitorRegistry()
*/
@Override
public MonitorRegistry newMonitorRegistry() {
@ -67,7 +69,7 @@ public class YammerMonitorRegistryFactory implements MonitorRegistryFactory {
}
/**
* @see java.lang.Object#toString()
* @see Object#toString()
*/
@Override
public String toString() {

2
transport/src/main/java/io/netty/channel/socket/DefaultSctpServerChannelConfig.java
View File

@ -40,7 +40,7 @@ public class DefaultSctpServerChannelConfig extends DefaultChannelConfig impleme
/**
* Creates a new instance.
*/
public DefaultSctpServerChannelConfig(com.sun.nio.sctp.SctpServerChannel serverChannel) {
public DefaultSctpServerChannelConfig(SctpServerChannel serverChannel) {
if (serverChannel == null) {
throw new NullPointerException("serverChannel");
}

2
transport/src/main/java/io/netty/channel/socket/SctpChannel.java
View File

@ -24,7 +24,7 @@ import java.net.SocketAddress;
import java.util.Set;
/**
* A SCTP/IP {@link io.netty.channel.Channel}
* A SCTP/IP {@link Channel}
*/
public interface SctpChannel extends Channel {
/**

4
transport/src/main/java/io/netty/channel/socket/SctpChannelConfig.java
View File

@ -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 SctpChannel}.
* A {@link ChannelConfig} for a {@link SctpChannel}.
* <p/>
* <h3>Available options</h3>
* <p/>
* In addition to the options provided by {@link io.netty.channel.ChannelConfig},
* In addition to the options provided by {@link ChannelConfig},
* {@link SctpChannelConfig} allows the following options in the option map:
* <p/>
* <table border="1" cellspacing="0" cellpadding="6">

2
transport/src/main/java/io/netty/channel/socket/SctpServerChannel.java
View File

@ -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.

4
transport/src/main/java/io/netty/channel/socket/SctpServerChannelConfig.java
View File

@ -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}.
* <p/>
* <h3>Available options</h3>
* <p/>
* 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:
* <p/>

3
transport/src/main/java/io/netty/channel/socket/nio/NioTask.java
View File

@ -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<C extends SelectableChannel> {
/**
* Invoked when the {@link SelectableChannel} has been selected by the {@link java.nio.channels.Selector}.
* Invoked when the {@link SelectableChannel} has been selected by the {@link Selector}.
*/
void channelReady(C ch, SelectionKey key) throws Exception;