From 9621a5b98120f9596b5d2a337330339dda199bde Mon Sep 17 00:00:00 2001 From: jimin Date: Thu, 27 Jun 2019 03:08:31 +0800 Subject: [PATCH] remove unused imports (#9287) Motivation: Some imports are not used Modification: remove unused imports Result: Code cleanup --- .../src/test/java/io/netty/buffer/ByteBufDerivationTest.java | 1 - .../io/netty/handler/codec/dns/DatagramDnsQueryEncoder.java | 2 -- .../codec/http/multipart/HttpPostRequestEncoderTest.java | 1 - .../codec/http/websocketx/WebSocketClientHandshakerTest.java | 1 - .../io/netty/handler/codec/http2/HpackHuffmanDecoder.java | 1 - .../io/netty/handler/codec/http2/Http2ServerUpgradeCodec.java | 2 -- .../handler/codec/http2/DefaultHttp2FrameWriterTest.java | 1 - .../handler/codec/http2/Http2ClientUpgradeCodecTest.java | 2 -- .../netty/handler/codec/http2/Http2MultiplexHandlerTest.java | 1 - .../handler/codec/serialization/CompatibleObjectEncoder.java | 2 -- .../codec/serialization/CompatibleObjectEncoderTest.java | 1 - .../main/java/io/netty/util/concurrent/DefaultPromise.java | 1 - .../java/io/netty/util/concurrent/PromiseCombinerTest.java | 1 - .../java/io/netty/util/internal/DefaultPriorityQueueTest.java | 2 -- .../netty/util/internal/logging/Slf4JLoggerFactoryTest.java | 1 - .../http2/helloworld/frame/server/Http2OrHttpHandler.java | 1 - .../netty/handler/ssl/ConscryptOpenSslEngineInteropTest.java | 2 +- .../io/netty/handler/ssl/OpenSslJdkSslEngineInteroptTest.java | 2 +- .../src/test/java/io/netty/handler/ssl/PemEncodedTest.java | 1 - handler/src/test/java/io/netty/handler/ssl/SniClientTest.java | 1 - .../java/io/netty/resolver/dns/DnsAddressResolverGroup.java | 1 - .../netty/resolver/dns/NoopAuthoritativeDnsServerCache.java | 2 -- .../io/netty/resolver/dns/ShuffledDnsServerAddressStream.java | 1 - .../resolver/dns/DefaultAuthoritativeDnsServerCacheTest.java | 1 - .../java/io/netty/testsuite/http2/Http2ServerInitializer.java | 1 - .../main/java/io/netty/testsuite/svm/HttpNativeServer.java | 3 --- .../io/netty/testsuite/svm/HttpNativeServerInitializer.java | 1 - .../transport/socket/CompositeBufferGatheringWriteTest.java | 1 - .../netty/testsuite/transport/socket/SocketConnectTest.java | 2 -- .../java/io/netty/channel/epoll/AbstractEpollChannel.java | 1 - .../io/netty/channel/epoll/AbstractEpollStreamChannel.java | 1 - .../src/main/java/io/netty/channel/epoll/LinuxSocket.java | 1 - .../src/test/java/io/netty/channel/epoll/EpollSpliceTest.java | 1 - .../java/io/netty/channel/kqueue/KQueueDatagramChannel.java | 2 -- .../netty/channel/kqueue/KQueueDomainSocketChannelConfig.java | 1 - .../io/netty/channel/kqueue/KQueueETSocketAutoReadTest.java | 1 - .../channel/kqueue/KQueueETSocketExceptionHandlingTest.java | 1 - .../netty/channel/kqueue/KQueueETSocketReadPendingTest.java | 1 - .../channel/kqueue/KQueueSocketConnectionAttemptTest.java | 4 ---- .../src/main/java/io/netty/channel/CoalescingBufferQueue.java | 1 - .../main/java/io/netty/channel/MultithreadEventLoopGroup.java | 1 - .../src/main/java/io/netty/channel/PendingWriteQueue.java | 1 - .../java/io/netty/channel/socket/nio/NioDatagramChannel.java | 1 - .../netty/channel/DelegatingChannelPromiseNotifierTest.java | 2 -- .../netty/channel/socket/nio/NioServerSocketChannelTest.java | 1 - 45 files changed, 2 insertions(+), 59 deletions(-) diff --git a/buffer/src/test/java/io/netty/buffer/ByteBufDerivationTest.java b/buffer/src/test/java/io/netty/buffer/ByteBufDerivationTest.java index 2983ba906f..b641a16263 100644 --- a/buffer/src/test/java/io/netty/buffer/ByteBufDerivationTest.java +++ b/buffer/src/test/java/io/netty/buffer/ByteBufDerivationTest.java @@ -22,7 +22,6 @@ import java.nio.ByteOrder; import java.util.Random; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.sameInstance; import static org.junit.Assert.*; /** diff --git a/codec-dns/src/main/java/io/netty/handler/codec/dns/DatagramDnsQueryEncoder.java b/codec-dns/src/main/java/io/netty/handler/codec/dns/DatagramDnsQueryEncoder.java index 18c6009a2d..695a9c9ff9 100644 --- a/codec-dns/src/main/java/io/netty/handler/codec/dns/DatagramDnsQueryEncoder.java +++ b/codec-dns/src/main/java/io/netty/handler/codec/dns/DatagramDnsQueryEncoder.java @@ -26,8 +26,6 @@ import io.netty.util.internal.UnstableApi; import java.net.InetSocketAddress; import java.util.List; -import static io.netty.util.internal.ObjectUtil.checkNotNull; - /** * Encodes a {@link DatagramDnsQuery} (or an {@link AddressedEnvelope} of {@link DnsQuery}} into a * {@link DatagramPacket}. diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/multipart/HttpPostRequestEncoderTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/multipart/HttpPostRequestEncoderTest.java index ad03da0b66..d711c1bf44 100755 --- a/codec-http/src/test/java/io/netty/handler/codec/http/multipart/HttpPostRequestEncoderTest.java +++ b/codec-http/src/test/java/io/netty/handler/codec/http/multipart/HttpPostRequestEncoderTest.java @@ -32,7 +32,6 @@ import org.junit.Test; import java.io.ByteArrayInputStream; import java.io.File; -import java.nio.charset.Charset; import java.util.Arrays; import java.util.List; diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshakerTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshakerTest.java index 7e09031441..69de0a1974 100644 --- a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshakerTest.java +++ b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshakerTest.java @@ -32,7 +32,6 @@ import io.netty.handler.codec.http.HttpObjectAggregator; import io.netty.handler.codec.http.HttpRequestEncoder; import io.netty.handler.codec.http.HttpResponseDecoder; import io.netty.util.CharsetUtil; -import io.netty.util.internal.PlatformDependent; import org.junit.Test; import java.net.URI; diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/HpackHuffmanDecoder.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/HpackHuffmanDecoder.java index fb786de27a..dea44c291c 100644 --- a/codec-http2/src/main/java/io/netty/handler/codec/http2/HpackHuffmanDecoder.java +++ b/codec-http2/src/main/java/io/netty/handler/codec/http2/HpackHuffmanDecoder.java @@ -38,7 +38,6 @@ import io.netty.util.internal.ObjectUtil; import io.netty.util.internal.ThrowableUtil; import static io.netty.handler.codec.http2.Http2Error.COMPRESSION_ERROR; -import static io.netty.handler.codec.http2.Http2Exception.connectionError; final class HpackHuffmanDecoder { diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2ServerUpgradeCodec.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2ServerUpgradeCodec.java index f61dae3989..6b25e66efd 100644 --- a/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2ServerUpgradeCodec.java +++ b/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2ServerUpgradeCodec.java @@ -17,7 +17,6 @@ package io.netty.handler.codec.http2; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; import io.netty.channel.ChannelHandler; -import io.netty.channel.ChannelHandlerAdapter; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.base64.Base64; import io.netty.handler.codec.http.FullHttpRequest; @@ -38,7 +37,6 @@ import static io.netty.handler.codec.http2.Http2CodecUtil.FRAME_HEADER_LENGTH; import static io.netty.handler.codec.http2.Http2CodecUtil.HTTP_UPGRADE_SETTINGS_HEADER; import static io.netty.handler.codec.http2.Http2CodecUtil.writeFrameHeader; import static io.netty.handler.codec.http2.Http2FrameTypes.SETTINGS; -import static io.netty.util.internal.ObjectUtil.checkNotNull; /** * Server-side codec for performing a cleartext upgrade from HTTP/1.x to HTTP/2. diff --git a/codec-http2/src/test/java/io/netty/handler/codec/http2/DefaultHttp2FrameWriterTest.java b/codec-http2/src/test/java/io/netty/handler/codec/http2/DefaultHttp2FrameWriterTest.java index b5a40d6cf0..438097f3e3 100644 --- a/codec-http2/src/test/java/io/netty/handler/codec/http2/DefaultHttp2FrameWriterTest.java +++ b/codec-http2/src/test/java/io/netty/handler/codec/http2/DefaultHttp2FrameWriterTest.java @@ -37,7 +37,6 @@ import java.io.IOException; import java.util.Arrays; import static org.junit.Assert.*; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; /** diff --git a/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2ClientUpgradeCodecTest.java b/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2ClientUpgradeCodecTest.java index fcfdb4b75e..2d381e4f88 100644 --- a/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2ClientUpgradeCodecTest.java +++ b/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2ClientUpgradeCodecTest.java @@ -14,11 +14,9 @@ */ package io.netty.handler.codec.http2; -import io.netty.channel.Channel; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; -import io.netty.channel.ChannelInitializer; import io.netty.channel.embedded.EmbeddedChannel; import io.netty.handler.codec.http.DefaultFullHttpRequest; import io.netty.handler.codec.http.FullHttpRequest; diff --git a/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2MultiplexHandlerTest.java b/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2MultiplexHandlerTest.java index f99aac0df7..882d935f11 100644 --- a/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2MultiplexHandlerTest.java +++ b/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2MultiplexHandlerTest.java @@ -15,7 +15,6 @@ package io.netty.handler.codec.http2; import io.netty.channel.ChannelHandler; -import org.junit.Ignore; /** * Unit tests for {@link Http2MultiplexHandler}. diff --git a/codec/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectEncoder.java b/codec/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectEncoder.java index db97def754..c56b499880 100644 --- a/codec/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectEncoder.java +++ b/codec/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectEncoder.java @@ -19,8 +19,6 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufOutputStream; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToByteEncoder; -import io.netty.util.Attribute; -import io.netty.util.AttributeKey; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; diff --git a/codec/src/test/java/io/netty/handler/codec/serialization/CompatibleObjectEncoderTest.java b/codec/src/test/java/io/netty/handler/codec/serialization/CompatibleObjectEncoderTest.java index 238b91e342..60142eb262 100644 --- a/codec/src/test/java/io/netty/handler/codec/serialization/CompatibleObjectEncoderTest.java +++ b/codec/src/test/java/io/netty/handler/codec/serialization/CompatibleObjectEncoderTest.java @@ -26,7 +26,6 @@ import java.io.Serializable; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; public class CompatibleObjectEncoderTest { @Test diff --git a/common/src/main/java/io/netty/util/concurrent/DefaultPromise.java b/common/src/main/java/io/netty/util/concurrent/DefaultPromise.java index 77ef87e49a..f2c6aa826a 100644 --- a/common/src/main/java/io/netty/util/concurrent/DefaultPromise.java +++ b/common/src/main/java/io/netty/util/concurrent/DefaultPromise.java @@ -19,7 +19,6 @@ import io.netty.util.internal.InternalThreadLocalMap; import io.netty.util.internal.PlatformDependent; import io.netty.util.internal.StringUtil; import io.netty.util.internal.SystemPropertyUtil; -import io.netty.util.internal.ThrowableUtil; import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLoggerFactory; diff --git a/common/src/test/java/io/netty/util/concurrent/PromiseCombinerTest.java b/common/src/test/java/io/netty/util/concurrent/PromiseCombinerTest.java index c1ec93784a..6194c5a73f 100644 --- a/common/src/test/java/io/netty/util/concurrent/PromiseCombinerTest.java +++ b/common/src/test/java/io/netty/util/concurrent/PromiseCombinerTest.java @@ -19,7 +19,6 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; -import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; diff --git a/common/src/test/java/io/netty/util/internal/DefaultPriorityQueueTest.java b/common/src/test/java/io/netty/util/internal/DefaultPriorityQueueTest.java index b4adc8e99b..a4e6900243 100644 --- a/common/src/test/java/io/netty/util/internal/DefaultPriorityQueueTest.java +++ b/common/src/test/java/io/netty/util/internal/DefaultPriorityQueueTest.java @@ -15,9 +15,7 @@ */ package io.netty.util.internal; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.ExpectedException; import java.io.Serializable; import java.util.ArrayList; diff --git a/common/src/test/java/io/netty/util/internal/logging/Slf4JLoggerFactoryTest.java b/common/src/test/java/io/netty/util/internal/logging/Slf4JLoggerFactoryTest.java index 9b08fe5397..bf0f30b36b 100644 --- a/common/src/test/java/io/netty/util/internal/logging/Slf4JLoggerFactoryTest.java +++ b/common/src/test/java/io/netty/util/internal/logging/Slf4JLoggerFactoryTest.java @@ -27,7 +27,6 @@ import java.util.Iterator; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; public class Slf4JLoggerFactoryTest { diff --git a/example/src/main/java/io/netty/example/http2/helloworld/frame/server/Http2OrHttpHandler.java b/example/src/main/java/io/netty/example/http2/helloworld/frame/server/Http2OrHttpHandler.java index 01ae593e63..0ec1da985c 100644 --- a/example/src/main/java/io/netty/example/http2/helloworld/frame/server/Http2OrHttpHandler.java +++ b/example/src/main/java/io/netty/example/http2/helloworld/frame/server/Http2OrHttpHandler.java @@ -18,7 +18,6 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.example.http2.helloworld.server.HelloWorldHttp1Handler; import io.netty.handler.codec.http.HttpObjectAggregator; import io.netty.handler.codec.http.HttpServerCodec; -import io.netty.handler.codec.http2.Http2FrameCodec; import io.netty.handler.codec.http2.Http2FrameCodecBuilder; import io.netty.handler.ssl.ApplicationProtocolNames; import io.netty.handler.ssl.ApplicationProtocolNegotiationHandler; diff --git a/handler/src/test/java/io/netty/handler/ssl/ConscryptOpenSslEngineInteropTest.java b/handler/src/test/java/io/netty/handler/ssl/ConscryptOpenSslEngineInteropTest.java index 1fb0d91511..cb55f8fa06 100644 --- a/handler/src/test/java/io/netty/handler/ssl/ConscryptOpenSslEngineInteropTest.java +++ b/handler/src/test/java/io/netty/handler/ssl/ConscryptOpenSslEngineInteropTest.java @@ -22,7 +22,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import javax.net.ssl.SSLEngine; -import javax.net.ssl.SSLException; + import java.security.Provider; import java.util.ArrayList; import java.util.Collection; diff --git a/handler/src/test/java/io/netty/handler/ssl/OpenSslJdkSslEngineInteroptTest.java b/handler/src/test/java/io/netty/handler/ssl/OpenSslJdkSslEngineInteroptTest.java index cd694560bb..9a58dbbad0 100644 --- a/handler/src/test/java/io/netty/handler/ssl/OpenSslJdkSslEngineInteroptTest.java +++ b/handler/src/test/java/io/netty/handler/ssl/OpenSslJdkSslEngineInteroptTest.java @@ -21,7 +21,7 @@ import org.junit.Ignore; import org.junit.Test; import javax.net.ssl.SSLEngine; -import javax.net.ssl.SSLException; + import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/handler/src/test/java/io/netty/handler/ssl/PemEncodedTest.java b/handler/src/test/java/io/netty/handler/ssl/PemEncodedTest.java index b2531eb8f6..e6b36aa85b 100644 --- a/handler/src/test/java/io/netty/handler/ssl/PemEncodedTest.java +++ b/handler/src/test/java/io/netty/handler/ssl/PemEncodedTest.java @@ -26,7 +26,6 @@ import java.io.File; import java.io.FileInputStream; import java.security.PrivateKey; -import io.netty.buffer.Unpooled; import io.netty.buffer.UnpooledByteBufAllocator; import org.junit.Test; diff --git a/handler/src/test/java/io/netty/handler/ssl/SniClientTest.java b/handler/src/test/java/io/netty/handler/ssl/SniClientTest.java index e2df214696..d959e87e5f 100644 --- a/handler/src/test/java/io/netty/handler/ssl/SniClientTest.java +++ b/handler/src/test/java/io/netty/handler/ssl/SniClientTest.java @@ -29,7 +29,6 @@ import io.netty.handler.ssl.util.InsecureTrustManagerFactory; import io.netty.handler.ssl.util.SelfSignedCertificate; import io.netty.util.Mapping; import io.netty.util.ReferenceCountUtil; -import io.netty.util.ReferenceCounted; import io.netty.util.concurrent.Promise; import io.netty.util.internal.PlatformDependent; import org.junit.Assert; diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsAddressResolverGroup.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsAddressResolverGroup.java index 303c42a098..2b7bebd454 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsAddressResolverGroup.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsAddressResolverGroup.java @@ -18,7 +18,6 @@ package io.netty.resolver.dns; import io.netty.channel.ChannelFactory; import io.netty.channel.EventLoop; -import io.netty.channel.ReflectiveChannelFactory; import io.netty.channel.socket.DatagramChannel; import io.netty.resolver.AddressResolver; import io.netty.resolver.AddressResolverGroup; diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/NoopAuthoritativeDnsServerCache.java b/resolver-dns/src/main/java/io/netty/resolver/dns/NoopAuthoritativeDnsServerCache.java index 0cdce779e9..a3a675174f 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/NoopAuthoritativeDnsServerCache.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/NoopAuthoritativeDnsServerCache.java @@ -19,8 +19,6 @@ import io.netty.channel.EventLoop; import io.netty.util.internal.UnstableApi; import java.net.InetSocketAddress; -import java.util.Collections; -import java.util.List; /** * A noop {@link AuthoritativeDnsServerCache} that actually never caches anything. diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/ShuffledDnsServerAddressStream.java b/resolver-dns/src/main/java/io/netty/resolver/dns/ShuffledDnsServerAddressStream.java index 9b56f23b2c..9f9b9cf7d9 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/ShuffledDnsServerAddressStream.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/ShuffledDnsServerAddressStream.java @@ -21,7 +21,6 @@ import io.netty.util.internal.PlatformDependent; import java.net.InetSocketAddress; import java.util.Collections; import java.util.List; -import java.util.Random; final class ShuffledDnsServerAddressStream implements DnsServerAddressStream { diff --git a/resolver-dns/src/test/java/io/netty/resolver/dns/DefaultAuthoritativeDnsServerCacheTest.java b/resolver-dns/src/test/java/io/netty/resolver/dns/DefaultAuthoritativeDnsServerCacheTest.java index ada0eaee26..4b4d23c53c 100644 --- a/resolver-dns/src/test/java/io/netty/resolver/dns/DefaultAuthoritativeDnsServerCacheTest.java +++ b/resolver-dns/src/test/java/io/netty/resolver/dns/DefaultAuthoritativeDnsServerCacheTest.java @@ -25,7 +25,6 @@ import org.junit.Test; import java.net.InetAddress; import java.net.InetSocketAddress; import java.util.Comparator; -import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; diff --git a/testsuite-http2/src/main/java/io/netty/testsuite/http2/Http2ServerInitializer.java b/testsuite-http2/src/main/java/io/netty/testsuite/http2/Http2ServerInitializer.java index 0af251cddd..582de342fb 100644 --- a/testsuite-http2/src/main/java/io/netty/testsuite/http2/Http2ServerInitializer.java +++ b/testsuite-http2/src/main/java/io/netty/testsuite/http2/Http2ServerInitializer.java @@ -33,7 +33,6 @@ import io.netty.handler.codec.http.HttpServerUpgradeHandler.UpgradeCodecFactory; import io.netty.handler.codec.http2.CleartextHttp2ServerUpgradeHandler; import io.netty.handler.codec.http2.Http2CodecUtil; import io.netty.handler.codec.http2.Http2ServerUpgradeCodec; -import io.netty.handler.ssl.SslContext; import io.netty.util.AsciiString; import io.netty.util.ReferenceCountUtil; diff --git a/testsuite-native-image/src/main/java/io/netty/testsuite/svm/HttpNativeServer.java b/testsuite-native-image/src/main/java/io/netty/testsuite/svm/HttpNativeServer.java index 033d80939f..3676cd0510 100644 --- a/testsuite-native-image/src/main/java/io/netty/testsuite/svm/HttpNativeServer.java +++ b/testsuite-native-image/src/main/java/io/netty/testsuite/svm/HttpNativeServer.java @@ -23,9 +23,6 @@ import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.nio.NioServerSocketChannel; import io.netty.handler.logging.LogLevel; import io.netty.handler.logging.LoggingHandler; -import io.netty.handler.ssl.SslContext; -import io.netty.handler.ssl.SslContextBuilder; -import io.netty.handler.ssl.util.SelfSignedCertificate; /** * An HTTP server that sends back the content of the received HTTP request diff --git a/testsuite-native-image/src/main/java/io/netty/testsuite/svm/HttpNativeServerInitializer.java b/testsuite-native-image/src/main/java/io/netty/testsuite/svm/HttpNativeServerInitializer.java index c326c6a7ad..80a53a0b8f 100644 --- a/testsuite-native-image/src/main/java/io/netty/testsuite/svm/HttpNativeServerInitializer.java +++ b/testsuite-native-image/src/main/java/io/netty/testsuite/svm/HttpNativeServerInitializer.java @@ -20,7 +20,6 @@ import io.netty.channel.ChannelPipeline; import io.netty.channel.socket.SocketChannel; import io.netty.handler.codec.http.HttpServerCodec; import io.netty.handler.codec.http.HttpServerExpectContinueHandler; -import io.netty.handler.ssl.SslContext; public class HttpNativeServerInitializer extends ChannelInitializer { diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/CompositeBufferGatheringWriteTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/CompositeBufferGatheringWriteTest.java index 3538d8baa4..c8c61325e1 100644 --- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/CompositeBufferGatheringWriteTest.java +++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/CompositeBufferGatheringWriteTest.java @@ -27,7 +27,6 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelOption; -import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.util.ReferenceCountUtil; import org.junit.Test; diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketConnectTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketConnectTest.java index 0f96d04790..f26bc050bd 100644 --- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketConnectTest.java +++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketConnectTest.java @@ -21,8 +21,6 @@ import io.netty.channel.Channel; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; -import io.netty.testsuite.util.TestUtils; -import io.netty.util.NetUtil; import io.netty.util.concurrent.ImmediateEventExecutor; import io.netty.util.concurrent.Promise; import org.junit.Test; diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/AbstractEpollChannel.java b/transport-native-epoll/src/main/java/io/netty/channel/epoll/AbstractEpollChannel.java index 3b7102c0d1..2f26e0731f 100644 --- a/transport-native-epoll/src/main/java/io/netty/channel/epoll/AbstractEpollChannel.java +++ b/transport-native-epoll/src/main/java/io/netty/channel/epoll/AbstractEpollChannel.java @@ -38,7 +38,6 @@ import io.netty.channel.unix.FileDescriptor; import io.netty.channel.unix.Socket; import io.netty.channel.unix.UnixChannel; import io.netty.util.ReferenceCountUtil; -import io.netty.util.internal.ThrowableUtil; import java.io.IOException; import java.net.InetSocketAddress; diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/AbstractEpollStreamChannel.java b/transport-native-epoll/src/main/java/io/netty/channel/epoll/AbstractEpollStreamChannel.java index 4d8a3ad9b8..6299bf6766 100644 --- a/transport-native-epoll/src/main/java/io/netty/channel/epoll/AbstractEpollStreamChannel.java +++ b/transport-native-epoll/src/main/java/io/netty/channel/epoll/AbstractEpollStreamChannel.java @@ -37,7 +37,6 @@ import io.netty.channel.unix.SocketWritableByteChannel; import io.netty.channel.unix.UnixChannelUtil; import io.netty.util.internal.PlatformDependent; import io.netty.util.internal.StringUtil; -import io.netty.util.internal.ThrowableUtil; import io.netty.util.internal.UnstableApi; import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLoggerFactory; diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/LinuxSocket.java b/transport-native-epoll/src/main/java/io/netty/channel/epoll/LinuxSocket.java index 34648ac5d2..99cc6fe6b8 100644 --- a/transport-native-epoll/src/main/java/io/netty/channel/epoll/LinuxSocket.java +++ b/transport-native-epoll/src/main/java/io/netty/channel/epoll/LinuxSocket.java @@ -17,7 +17,6 @@ package io.netty.channel.epoll; import io.netty.channel.ChannelException; import io.netty.channel.DefaultFileRegion; -import io.netty.channel.socket.DatagramChannelConfig; import io.netty.channel.unix.NativeInetAddress; import io.netty.channel.unix.PeerCredentials; import io.netty.channel.unix.Socket; diff --git a/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSpliceTest.java b/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSpliceTest.java index 7e43db6fa2..b65fc26611 100644 --- a/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSpliceTest.java +++ b/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSpliceTest.java @@ -27,7 +27,6 @@ import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.channel.EventLoopGroup; import io.netty.channel.SimpleChannelInboundHandler; import io.netty.channel.unix.FileDescriptor; -import io.netty.testsuite.util.TestUtils; import io.netty.util.NetUtil; import org.junit.Assert; import org.junit.Test; diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDatagramChannel.java b/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDatagramChannel.java index b2925c58c2..919db07240 100644 --- a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDatagramChannel.java +++ b/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDatagramChannel.java @@ -42,8 +42,6 @@ import java.net.PortUnreachableException; import java.net.SocketAddress; import java.net.SocketException; import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.List; import static io.netty.channel.kqueue.BsdSocket.newSocketDgram; diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDomainSocketChannelConfig.java b/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDomainSocketChannelConfig.java index 5284a4b665..8f16b87663 100644 --- a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDomainSocketChannelConfig.java +++ b/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDomainSocketChannelConfig.java @@ -27,7 +27,6 @@ import io.netty.util.internal.UnstableApi; import java.util.Map; -import static io.netty.channel.ChannelOption.ALLOW_HALF_CLOSURE; import static io.netty.channel.unix.UnixChannelOption.*; @UnstableApi diff --git a/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueETSocketAutoReadTest.java b/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueETSocketAutoReadTest.java index 27dd39296b..a8cd58d884 100644 --- a/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueETSocketAutoReadTest.java +++ b/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueETSocketAutoReadTest.java @@ -17,7 +17,6 @@ package io.netty.channel.kqueue; import io.netty.bootstrap.Bootstrap; import io.netty.bootstrap.ServerBootstrap; -import io.netty.buffer.ByteBufAllocator; import io.netty.testsuite.transport.TestsuitePermutation; import io.netty.testsuite.transport.socket.SocketAutoReadTest; diff --git a/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueETSocketExceptionHandlingTest.java b/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueETSocketExceptionHandlingTest.java index e65bcdd3a2..3a7f151577 100644 --- a/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueETSocketExceptionHandlingTest.java +++ b/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueETSocketExceptionHandlingTest.java @@ -17,7 +17,6 @@ package io.netty.channel.kqueue; import io.netty.bootstrap.Bootstrap; import io.netty.bootstrap.ServerBootstrap; -import io.netty.buffer.ByteBufAllocator; import io.netty.testsuite.transport.TestsuitePermutation; import io.netty.testsuite.transport.socket.SocketExceptionHandlingTest; diff --git a/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueETSocketReadPendingTest.java b/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueETSocketReadPendingTest.java index 628084c7cb..2197b04768 100644 --- a/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueETSocketReadPendingTest.java +++ b/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueETSocketReadPendingTest.java @@ -17,7 +17,6 @@ package io.netty.channel.kqueue; import io.netty.bootstrap.Bootstrap; import io.netty.bootstrap.ServerBootstrap; -import io.netty.buffer.ByteBufAllocator; import io.netty.testsuite.transport.TestsuitePermutation; import io.netty.testsuite.transport.socket.SocketReadPendingTest; diff --git a/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueSocketConnectionAttemptTest.java b/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueSocketConnectionAttemptTest.java index 824c47cb7f..8fa23e9a25 100644 --- a/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueSocketConnectionAttemptTest.java +++ b/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueSocketConnectionAttemptTest.java @@ -16,13 +16,9 @@ package io.netty.channel.kqueue; import io.netty.bootstrap.Bootstrap; -import io.netty.channel.Channel; -import io.netty.channel.ChannelInitializer; import io.netty.testsuite.transport.TestsuitePermutation; import io.netty.testsuite.transport.socket.SocketConnectionAttemptTest; -import org.junit.Test; -import java.net.InetSocketAddress; import java.util.List; public class KQueueSocketConnectionAttemptTest extends SocketConnectionAttemptTest { diff --git a/transport/src/main/java/io/netty/channel/CoalescingBufferQueue.java b/transport/src/main/java/io/netty/channel/CoalescingBufferQueue.java index fd583604e0..346e53f716 100644 --- a/transport/src/main/java/io/netty/channel/CoalescingBufferQueue.java +++ b/transport/src/main/java/io/netty/channel/CoalescingBufferQueue.java @@ -19,7 +19,6 @@ import io.netty.buffer.ByteBufAllocator; import io.netty.buffer.CompositeByteBuf; import io.netty.buffer.Unpooled; import io.netty.util.internal.ObjectUtil; -import io.netty.util.internal.PlatformDependent; /** * A FIFO queue of bytes where producers add bytes by repeatedly adding {@link ByteBuf} and consumers take bytes in diff --git a/transport/src/main/java/io/netty/channel/MultithreadEventLoopGroup.java b/transport/src/main/java/io/netty/channel/MultithreadEventLoopGroup.java index e2e3878822..ba05062607 100644 --- a/transport/src/main/java/io/netty/channel/MultithreadEventLoopGroup.java +++ b/transport/src/main/java/io/netty/channel/MultithreadEventLoopGroup.java @@ -23,7 +23,6 @@ import io.netty.util.internal.SystemPropertyUtil; import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLoggerFactory; -import java.util.Queue; import java.util.concurrent.Executor; import java.util.concurrent.ThreadFactory; diff --git a/transport/src/main/java/io/netty/channel/PendingWriteQueue.java b/transport/src/main/java/io/netty/channel/PendingWriteQueue.java index bbc661bf6c..5d4624185a 100644 --- a/transport/src/main/java/io/netty/channel/PendingWriteQueue.java +++ b/transport/src/main/java/io/netty/channel/PendingWriteQueue.java @@ -18,7 +18,6 @@ package io.netty.channel; import io.netty.util.Recycler; import io.netty.util.ReferenceCountUtil; import io.netty.util.concurrent.PromiseCombiner; -import io.netty.util.internal.ObjectUtil; import io.netty.util.internal.SystemPropertyUtil; import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLoggerFactory; diff --git a/transport/src/main/java/io/netty/channel/socket/nio/NioDatagramChannel.java b/transport/src/main/java/io/netty/channel/socket/nio/NioDatagramChannel.java index 2fc314d752..445845bbc8 100644 --- a/transport/src/main/java/io/netty/channel/socket/nio/NioDatagramChannel.java +++ b/transport/src/main/java/io/netty/channel/socket/nio/NioDatagramChannel.java @@ -33,7 +33,6 @@ import io.netty.channel.socket.InternetProtocolFamily; import io.netty.util.internal.SocketUtils; import io.netty.util.internal.PlatformDependent; import io.netty.util.internal.StringUtil; -import io.netty.util.internal.UnstableApi; import java.io.IOException; import java.net.InetAddress; diff --git a/transport/src/test/java/io/netty/channel/DelegatingChannelPromiseNotifierTest.java b/transport/src/test/java/io/netty/channel/DelegatingChannelPromiseNotifierTest.java index 2f4b0aa2b6..d187773338 100644 --- a/transport/src/test/java/io/netty/channel/DelegatingChannelPromiseNotifierTest.java +++ b/transport/src/test/java/io/netty/channel/DelegatingChannelPromiseNotifierTest.java @@ -20,8 +20,6 @@ import io.netty.util.concurrent.GenericFutureListener; import org.junit.Test; import org.mockito.Mockito; -import static org.junit.Assert.*; - public class DelegatingChannelPromiseNotifierTest { @Test public void varargsNotifiersAllowed() { diff --git a/transport/src/test/java/io/netty/channel/socket/nio/NioServerSocketChannelTest.java b/transport/src/test/java/io/netty/channel/socket/nio/NioServerSocketChannelTest.java index 1292220aaa..f9c68b6b5e 100644 --- a/transport/src/test/java/io/netty/channel/socket/nio/NioServerSocketChannelTest.java +++ b/transport/src/test/java/io/netty/channel/socket/nio/NioServerSocketChannelTest.java @@ -16,7 +16,6 @@ package io.netty.channel.socket.nio; import io.netty.channel.Channel; -import io.netty.channel.ChannelFuture; import io.netty.channel.EventLoopGroup; import io.netty.channel.nio.NioEventLoopGroup; import org.junit.Assert;