diff --git a/common/src/main/java/io/netty/monitor/MonitorName.java b/common/src/main/java/io/netty/monitor/MonitorName.java index ad5d7e0cf5..02d756d42d 100644 --- a/common/src/main/java/io/netty/monitor/MonitorName.java +++ b/common/src/main/java/io/netty/monitor/MonitorName.java @@ -15,8 +15,6 @@ */ package io.netty.monitor; -import java.lang.Object; - /** *

* Represents a {@code Monitor}'s unique name. This name is composed of diff --git a/common/src/main/java/io/netty/monitor/MonitorRegistries.java b/common/src/main/java/io/netty/monitor/MonitorRegistries.java index dedca8beb1..a27423e8a0 100644 --- a/common/src/main/java/io/netty/monitor/MonitorRegistries.java +++ b/common/src/main/java/io/netty/monitor/MonitorRegistries.java @@ -18,7 +18,6 @@ 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; diff --git a/common/src/main/java/io/netty/monitor/spi/MonitorProvider.java b/common/src/main/java/io/netty/monitor/spi/MonitorProvider.java index 5c5d1f3720..057b3902a7 100644 --- a/common/src/main/java/io/netty/monitor/spi/MonitorProvider.java +++ b/common/src/main/java/io/netty/monitor/spi/MonitorProvider.java @@ -16,8 +16,6 @@ package io.netty.monitor.spi; import java.io.Serializable; -import java.lang.Comparable; -import java.lang.Object; /** *

diff --git a/metrics-yammer/src/main/java/io/netty/monitor/yammer/Utils.java b/metrics-yammer/src/main/java/io/netty/monitor/yammer/Utils.java index cca960f277..a729c7503b 100644 --- a/metrics-yammer/src/main/java/io/netty/monitor/yammer/Utils.java +++ b/metrics-yammer/src/main/java/io/netty/monitor/yammer/Utils.java @@ -15,9 +15,8 @@ */ package io.netty.monitor.yammer; -import io.netty.monitor.MonitorName; - import com.yammer.metrics.core.MetricName; +import io.netty.monitor.MonitorName; /** *

diff --git a/metrics-yammer/src/main/java/io/netty/monitor/yammer/YammerCounterMonitor.java b/metrics-yammer/src/main/java/io/netty/monitor/yammer/YammerCounterMonitor.java index da4d77cb8c..2c19d1a57f 100644 --- a/metrics-yammer/src/main/java/io/netty/monitor/yammer/YammerCounterMonitor.java +++ b/metrics-yammer/src/main/java/io/netty/monitor/yammer/YammerCounterMonitor.java @@ -15,11 +15,8 @@ */ package io.netty.monitor.yammer; -import io.netty.monitor.CounterMonitor; - import com.yammer.metrics.core.Counter; - -import java.lang.Object; +import io.netty.monitor.CounterMonitor; /** *

diff --git a/metrics-yammer/src/main/java/io/netty/monitor/yammer/YammerEventRateMonitor.java b/metrics-yammer/src/main/java/io/netty/monitor/yammer/YammerEventRateMonitor.java index f3df52c0c9..9fd97cc449 100644 --- a/metrics-yammer/src/main/java/io/netty/monitor/yammer/YammerEventRateMonitor.java +++ b/metrics-yammer/src/main/java/io/netty/monitor/yammer/YammerEventRateMonitor.java @@ -15,11 +15,8 @@ */ package io.netty.monitor.yammer; -import io.netty.monitor.EventRateMonitor; - import com.yammer.metrics.core.Meter; - -import java.lang.Object; +import io.netty.monitor.EventRateMonitor; /** *

diff --git a/metrics-yammer/src/main/java/io/netty/monitor/yammer/YammerMonitorRegistry.java b/metrics-yammer/src/main/java/io/netty/monitor/yammer/YammerMonitorRegistry.java index f4319825ba..d8d8e78fb0 100644 --- a/metrics-yammer/src/main/java/io/netty/monitor/yammer/YammerMonitorRegistry.java +++ b/metrics-yammer/src/main/java/io/netty/monitor/yammer/YammerMonitorRegistry.java @@ -15,6 +15,12 @@ */ package io.netty.monitor.yammer; +import com.yammer.metrics.Metrics; +import com.yammer.metrics.core.Counter; +import com.yammer.metrics.core.Gauge; +import com.yammer.metrics.core.Histogram; +import com.yammer.metrics.core.Meter; +import com.yammer.metrics.core.MetricsRegistry; import io.netty.monitor.CounterMonitor; import io.netty.monitor.EventRateMonitor; import io.netty.monitor.MonitorName; @@ -22,16 +28,8 @@ 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; -import com.yammer.metrics.core.Counter; -import com.yammer.metrics.core.Gauge; -import com.yammer.metrics.core.Histogram; -import com.yammer.metrics.core.Meter; -import com.yammer.metrics.core.MetricsRegistry; - /** *

* A {@link MonitorRegistry} that delegates to a diff --git a/metrics-yammer/src/main/java/io/netty/monitor/yammer/spi/YammerMonitorRegistryFactory.java b/metrics-yammer/src/main/java/io/netty/monitor/yammer/spi/YammerMonitorRegistryFactory.java index 56103dfc15..1e19ae7df8 100644 --- a/metrics-yammer/src/main/java/io/netty/monitor/yammer/spi/YammerMonitorRegistryFactory.java +++ b/metrics-yammer/src/main/java/io/netty/monitor/yammer/spi/YammerMonitorRegistryFactory.java @@ -15,17 +15,14 @@ */ package io.netty.monitor.yammer.spi; +import com.yammer.metrics.Metrics; +import com.yammer.metrics.core.MetricsRegistry; import io.netty.monitor.MonitorRegistry; import io.netty.monitor.spi.MonitorProvider; import io.netty.monitor.spi.MonitorRegistryFactory; import io.netty.monitor.yammer.YammerMonitorRegistry; import io.netty.monitor.yammer.YammerProvider; -import com.yammer.metrics.Metrics; -import com.yammer.metrics.core.MetricsRegistry; - -import java.lang.Object; - /** *

* A {@link MonitorRegistryFactory} that produces {@link YammerMonitorRegistry diff --git a/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java b/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java index 1c9a309c53..110819c98b 100755 --- a/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java +++ b/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java @@ -1352,7 +1352,7 @@ public class DefaultChannelPipeline implements ChannelPipeline { flush0(ctx, future); return future; } - + final DefaultChannelHandlerContext ctx0 = ctx; executor.execute(new Runnable() { @Override