From 934a07fbe2f7fd3fb378d34e83b2bcf34a246743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E6=AC=A7?= Date: Mon, 28 Jan 2019 12:55:30 +0800 Subject: [PATCH] migrate java8 (#8779) Motivation: We can omit argument types when using Java8. Modification: Omit arguments where possible. Result: Cleaner code. --- .../handler/codec/haproxy/HAProxyMessage.java | 4 +-- .../codec/haproxy/HAProxySSLTLVTest.java | 6 ++-- ...DeflateFrameClientExtensionHandshaker.java | 2 +- ...DeflateFrameServerExtensionHandshaker.java | 2 +- .../http/HttpServerUpgradeHandlerTest.java | 2 +- .../WebSocketClientExtensionHandlerTest.java | 16 +++++------ .../WebSocketServerExtensionHandlerTest.java | 6 ++-- ...ateFrameClientExtensionHandshakerTest.java | 2 +- ...ateFrameServerExtensionHandshakerTest.java | 4 +-- ...eDeflateClientExtensionHandshakerTest.java | 2 +- ...eDeflateServerExtensionHandshakerTest.java | 4 +-- .../handler/codec/http2/CharSequenceMap.java | 2 +- .../handler/codec/http2/HpackStaticTable.java | 2 +- .../http2/Http2StreamChannelBootstrap.java | 2 +- .../codec/http2/HttpConversionUtil.java | 2 +- .../http2/Http2ConnectionHandlerTest.java | 6 ++-- .../codec/http2/Http2MultiplexCodecTest.java | 12 ++++---- .../codec/http2/LastInboundHandler.java | 2 +- .../codec/smtp/DefaultSmtpRequest.java | 2 +- .../concurrent/AbstractEventExecutor.java | 2 +- .../SingleThreadEventExecutorTest.java | 2 +- .../logging/Slf4JLoggerFactoryTest.java | 20 ++++++------- .../handler/ssl/ConscryptAlpnSslEngine.java | 2 +- .../ssl/ReferenceCountedOpenSslEngine.java | 2 +- .../java/io/netty/handler/ssl/SniHandler.java | 2 +- .../java/io/netty/handler/ssl/SslHandler.java | 2 +- .../io/netty/handler/ssl/SslErrorTest.java | 2 +- .../io/netty/handler/ssl/SslHandlerTest.java | 4 +-- .../java/io/netty/resolver/dns/Cache.java | 4 +-- .../netty/resolver/dns/DefaultDnsCache.java | 2 +- .../netty/resolver/dns/DnsNameResolver.java | 2 +- .../netty/resolver/dns/DnsResolveContext.java | 2 +- .../resolver/dns/InflightNameResolver.java | 4 +-- .../dns/DnsNameResolverClientSubnetTest.java | 2 +- .../resolver/dns/DnsNameResolverTest.java | 28 +++++++++---------- .../netty/resolver/dns/SearchDomainTest.java | 4 +-- .../io/netty/resolver/dns/TestDnsServer.java | 2 +- .../transport/sctp/SctpTestPermutation.java | 4 +-- .../socket/SocketTestPermutation.java | 8 +++--- .../channel/epoll/EpollSocketTcpMd5Test.java | 16 +++++------ .../epoll/EpollSocketTestPermutation.java | 6 ++-- .../kqueue/KQueueSocketTestPermutation.java | 6 ++-- .../netty/channel/SingleThreadEventLoop.java | 4 +-- 43 files changed, 106 insertions(+), 106 deletions(-) diff --git a/codec-haproxy/src/main/java/io/netty/handler/codec/haproxy/HAProxyMessage.java b/codec-haproxy/src/main/java/io/netty/handler/codec/haproxy/HAProxyMessage.java index cff30adc2f..9540e538ca 100644 --- a/codec-haproxy/src/main/java/io/netty/handler/codec/haproxy/HAProxyMessage.java +++ b/codec-haproxy/src/main/java/io/netty/handler/codec/haproxy/HAProxyMessage.java @@ -79,7 +79,7 @@ public final class HAProxyMessage { String sourceAddress, String destinationAddress, int sourcePort, int destinationPort) { this(protocolVersion, command, proxiedProtocol, - sourceAddress, destinationAddress, sourcePort, destinationPort, Collections.emptyList()); + sourceAddress, destinationAddress, sourcePort, destinationPort, Collections.emptyList()); } /** @@ -285,7 +285,7 @@ public final class HAProxyMessage { return new HAProxySSLTLV(verify, client, encapsulatedTlvs, rawContent); } - return new HAProxySSLTLV(verify, client, Collections.emptyList(), rawContent); + return new HAProxySSLTLV(verify, client, Collections.emptyList(), rawContent); // If we're not dealing with a SSL Type, we can use the same mechanism case PP2_TYPE_ALPN: case PP2_TYPE_AUTHORITY: diff --git a/codec-haproxy/src/test/java/io/netty/handler/codec/haproxy/HAProxySSLTLVTest.java b/codec-haproxy/src/test/java/io/netty/handler/codec/haproxy/HAProxySSLTLVTest.java index 51cc85d1a7..030b8cb211 100644 --- a/codec-haproxy/src/test/java/io/netty/handler/codec/haproxy/HAProxySSLTLVTest.java +++ b/codec-haproxy/src/test/java/io/netty/handler/codec/haproxy/HAProxySSLTLVTest.java @@ -31,7 +31,7 @@ public class HAProxySSLTLVTest { // 0b0000_0111 final byte allClientsEnabled = 0x7; final HAProxySSLTLV allClientsEnabledTLV = - new HAProxySSLTLV(0, allClientsEnabled, Collections.emptyList(), Unpooled.buffer()); + new HAProxySSLTLV(0, allClientsEnabled, Collections.emptyList(), Unpooled.buffer()); assertTrue(allClientsEnabledTLV.isPP2ClientCertConn()); assertTrue(allClientsEnabledTLV.isPP2ClientSSL()); @@ -43,7 +43,7 @@ public class HAProxySSLTLVTest { final byte clientSSLandClientCertSessEnabled = 0x5; final HAProxySSLTLV clientSSLandClientCertSessTLV = - new HAProxySSLTLV(0, clientSSLandClientCertSessEnabled, Collections.emptyList(), + new HAProxySSLTLV(0, clientSSLandClientCertSessEnabled, Collections.emptyList(), Unpooled.buffer()); assertFalse(clientSSLandClientCertSessTLV.isPP2ClientCertConn()); @@ -55,7 +55,7 @@ public class HAProxySSLTLVTest { final byte noClientEnabled = 0x0; final HAProxySSLTLV noClientTlv = - new HAProxySSLTLV(0, noClientEnabled, Collections.emptyList(), + new HAProxySSLTLV(0, noClientEnabled, Collections.emptyList(), Unpooled.buffer()); assertFalse(noClientTlv.isPP2ClientCertConn()); diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateFrameClientExtensionHandshaker.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateFrameClientExtensionHandshaker.java index c167b375e4..6f508e7877 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateFrameClientExtensionHandshaker.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateFrameClientExtensionHandshaker.java @@ -60,7 +60,7 @@ public final class DeflateFrameClientExtensionHandshaker implements WebSocketCli public WebSocketExtensionData newRequestData() { return new WebSocketExtensionData( useWebkitExtensionName ? X_WEBKIT_DEFLATE_FRAME_EXTENSION : DEFLATE_FRAME_EXTENSION, - Collections.emptyMap()); + Collections.emptyMap()); } @Override diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateFrameServerExtensionHandshaker.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateFrameServerExtensionHandshaker.java index a463fbb755..0d85a15980 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateFrameServerExtensionHandshaker.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateFrameServerExtensionHandshaker.java @@ -96,7 +96,7 @@ public final class DeflateFrameServerExtensionHandshaker implements WebSocketSer @Override public WebSocketExtensionData newReponseData() { - return new WebSocketExtensionData(extensionName, Collections.emptyMap()); + return new WebSocketExtensionData(extensionName, Collections.emptyMap()); } } diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/HttpServerUpgradeHandlerTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/HttpServerUpgradeHandlerTest.java index f39c228067..7c9a417c38 100644 --- a/codec-http/src/test/java/io/netty/handler/codec/http/HttpServerUpgradeHandlerTest.java +++ b/codec-http/src/test/java/io/netty/handler/codec/http/HttpServerUpgradeHandlerTest.java @@ -41,7 +41,7 @@ public class HttpServerUpgradeHandlerTest { private class TestUpgradeCodec implements UpgradeCodec { @Override public Collection requiredUpgradeHeaders() { - return Collections.emptyList(); + return Collections.emptyList(); } @Override diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/WebSocketClientExtensionHandlerTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/WebSocketClientExtensionHandlerTest.java index 1a5d8dcf67..0e4f608def 100644 --- a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/WebSocketClientExtensionHandlerTest.java +++ b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/WebSocketClientExtensionHandlerTest.java @@ -49,10 +49,10 @@ public class WebSocketClientExtensionHandlerTest { public void testMainSuccess() { // initialize when(mainHandshakerMock.newRequestData()). - thenReturn(new WebSocketExtensionData("main", Collections.emptyMap())); + thenReturn(new WebSocketExtensionData("main", Collections.emptyMap())); when(mainHandshakerMock.handshakeExtension(any(WebSocketExtensionData.class))).thenReturn(mainExtensionMock); when(fallbackHandshakerMock.newRequestData()). - thenReturn(new WebSocketExtensionData("fallback", Collections.emptyMap())); + thenReturn(new WebSocketExtensionData("fallback", Collections.emptyMap())); when(mainExtensionMock.rsv()).thenReturn(WebSocketExtension.RSV1); when(mainExtensionMock.newExtensionEncoder()).thenReturn(new DummyEncoder()); when(mainExtensionMock.newExtensionDecoder()).thenReturn(new DummyDecoder()); @@ -98,10 +98,10 @@ public class WebSocketClientExtensionHandlerTest { public void testFallbackSuccess() { // initialize when(mainHandshakerMock.newRequestData()). - thenReturn(new WebSocketExtensionData("main", Collections.emptyMap())); + thenReturn(new WebSocketExtensionData("main", Collections.emptyMap())); when(mainHandshakerMock.handshakeExtension(any(WebSocketExtensionData.class))).thenReturn(null); when(fallbackHandshakerMock.newRequestData()). - thenReturn(new WebSocketExtensionData("fallback", Collections.emptyMap())); + thenReturn(new WebSocketExtensionData("fallback", Collections.emptyMap())); when(fallbackHandshakerMock.handshakeExtension( any(WebSocketExtensionData.class))).thenReturn(fallbackExtensionMock); when(fallbackExtensionMock.rsv()).thenReturn(WebSocketExtension.RSV1); @@ -150,13 +150,13 @@ public class WebSocketClientExtensionHandlerTest { public void testAllSuccess() { // initialize when(mainHandshakerMock.newRequestData()). - thenReturn(new WebSocketExtensionData("main", Collections.emptyMap())); + thenReturn(new WebSocketExtensionData("main", Collections.emptyMap())); when(mainHandshakerMock.handshakeExtension( webSocketExtensionDataMatcher("main"))).thenReturn(mainExtensionMock); when(mainHandshakerMock.handshakeExtension( webSocketExtensionDataMatcher("fallback"))).thenReturn(null); when(fallbackHandshakerMock.newRequestData()). - thenReturn(new WebSocketExtensionData("fallback", Collections.emptyMap())); + thenReturn(new WebSocketExtensionData("fallback", Collections.emptyMap())); when(fallbackHandshakerMock.handshakeExtension( webSocketExtensionDataMatcher("main"))).thenReturn(null); when(fallbackHandshakerMock.handshakeExtension( @@ -222,13 +222,13 @@ public class WebSocketClientExtensionHandlerTest { public void testIfMainAndFallbackUseRSV1WillFail() { // initialize when(mainHandshakerMock.newRequestData()). - thenReturn(new WebSocketExtensionData("main", Collections.emptyMap())); + thenReturn(new WebSocketExtensionData("main", Collections.emptyMap())); when(mainHandshakerMock.handshakeExtension( webSocketExtensionDataMatcher("main"))).thenReturn(mainExtensionMock); when(mainHandshakerMock.handshakeExtension( webSocketExtensionDataMatcher("fallback"))).thenReturn(null); when(fallbackHandshakerMock.newRequestData()). - thenReturn(new WebSocketExtensionData("fallback", Collections.emptyMap())); + thenReturn(new WebSocketExtensionData("fallback", Collections.emptyMap())); when(fallbackHandshakerMock.handshakeExtension( webSocketExtensionDataMatcher("main"))).thenReturn(null); when(fallbackHandshakerMock.handshakeExtension( diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/WebSocketServerExtensionHandlerTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/WebSocketServerExtensionHandlerTest.java index c02853f38d..e0af07a908 100644 --- a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/WebSocketServerExtensionHandlerTest.java +++ b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/WebSocketServerExtensionHandlerTest.java @@ -55,7 +55,7 @@ public class WebSocketServerExtensionHandlerTest { when(mainExtensionMock.rsv()).thenReturn(WebSocketExtension.RSV1); when(mainExtensionMock.newReponseData()).thenReturn( - new WebSocketExtensionData("main", Collections.emptyMap())); + new WebSocketExtensionData("main", Collections.emptyMap())); when(mainExtensionMock.newExtensionEncoder()).thenReturn(new DummyEncoder()); when(mainExtensionMock.newExtensionDecoder()).thenReturn(new DummyDecoder()); @@ -108,13 +108,13 @@ public class WebSocketServerExtensionHandlerTest { when(mainExtensionMock.rsv()).thenReturn(WebSocketExtension.RSV1); when(mainExtensionMock.newReponseData()).thenReturn( - new WebSocketExtensionData("main", Collections.emptyMap())); + new WebSocketExtensionData("main", Collections.emptyMap())); when(mainExtensionMock.newExtensionEncoder()).thenReturn(new DummyEncoder()); when(mainExtensionMock.newExtensionDecoder()).thenReturn(new DummyDecoder()); when(fallbackExtensionMock.rsv()).thenReturn(WebSocketExtension.RSV2); when(fallbackExtensionMock.newReponseData()).thenReturn( - new WebSocketExtensionData("fallback", Collections.emptyMap())); + new WebSocketExtensionData("fallback", Collections.emptyMap())); when(fallbackExtensionMock.newExtensionEncoder()).thenReturn(new Dummy2Encoder()); when(fallbackExtensionMock.newExtensionDecoder()).thenReturn(new Dummy2Decoder()); diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateFrameClientExtensionHandshakerTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateFrameClientExtensionHandshakerTest.java index 0d241db78e..f00f7aa2bc 100644 --- a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateFrameClientExtensionHandshakerTest.java +++ b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateFrameClientExtensionHandshakerTest.java @@ -57,7 +57,7 @@ public class DeflateFrameClientExtensionHandshakerTest { new DeflateFrameClientExtensionHandshaker(false); WebSocketClientExtension extension = handshaker.handshakeExtension( - new WebSocketExtensionData(DEFLATE_FRAME_EXTENSION, Collections.emptyMap())); + new WebSocketExtensionData(DEFLATE_FRAME_EXTENSION, Collections.emptyMap())); assertNotNull(extension); assertEquals(WebSocketClientExtension.RSV1, extension.rsv()); diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateFrameServerExtensionHandshakerTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateFrameServerExtensionHandshakerTest.java index a18df0aac2..27a1f8adc3 100644 --- a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateFrameServerExtensionHandshakerTest.java +++ b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateFrameServerExtensionHandshakerTest.java @@ -37,7 +37,7 @@ public class DeflateFrameServerExtensionHandshakerTest { // execute WebSocketServerExtension extension = handshaker.handshakeExtension( - new WebSocketExtensionData(DEFLATE_FRAME_EXTENSION, Collections.emptyMap())); + new WebSocketExtensionData(DEFLATE_FRAME_EXTENSION, Collections.emptyMap())); // test assertNotNull(extension); @@ -54,7 +54,7 @@ public class DeflateFrameServerExtensionHandshakerTest { // execute WebSocketServerExtension extension = handshaker.handshakeExtension( - new WebSocketExtensionData(X_WEBKIT_DEFLATE_FRAME_EXTENSION, Collections.emptyMap())); + new WebSocketExtensionData(X_WEBKIT_DEFLATE_FRAME_EXTENSION, Collections.emptyMap())); // test assertNotNull(extension); diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateClientExtensionHandshakerTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateClientExtensionHandshakerTest.java index 6f94bbe571..6ed56cfc90 100644 --- a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateClientExtensionHandshakerTest.java +++ b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateClientExtensionHandshakerTest.java @@ -67,7 +67,7 @@ public class PerMessageDeflateClientExtensionHandshakerTest { new PerMessageDeflateClientExtensionHandshaker(); WebSocketClientExtension extension = handshaker.handshakeExtension( - new WebSocketExtensionData(PERMESSAGE_DEFLATE_EXTENSION, Collections.emptyMap())); + new WebSocketExtensionData(PERMESSAGE_DEFLATE_EXTENSION, Collections.emptyMap())); assertNotNull(extension); assertEquals(RSV1, extension.rsv()); diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateServerExtensionHandshakerTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateServerExtensionHandshakerTest.java index 8691b1d23b..bdc854f4ca 100644 --- a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateServerExtensionHandshakerTest.java +++ b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateServerExtensionHandshakerTest.java @@ -41,7 +41,7 @@ public class PerMessageDeflateServerExtensionHandshakerTest { // execute extension = handshaker.handshakeExtension( - new WebSocketExtensionData(PERMESSAGE_DEFLATE_EXTENSION, Collections.emptyMap())); + new WebSocketExtensionData(PERMESSAGE_DEFLATE_EXTENSION, Collections.emptyMap())); // test assertNotNull(extension); @@ -62,7 +62,7 @@ public class PerMessageDeflateServerExtensionHandshakerTest { // execute extension = handshaker.handshakeExtension( - new WebSocketExtensionData(PERMESSAGE_DEFLATE_EXTENSION, Collections.emptyMap())); + new WebSocketExtensionData(PERMESSAGE_DEFLATE_EXTENSION, Collections.emptyMap())); // test assertNotNull(extension); diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/CharSequenceMap.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/CharSequenceMap.java index ee7575a52d..ae8fdf4458 100644 --- a/codec-http2/src/main/java/io/netty/handler/codec/http2/CharSequenceMap.java +++ b/codec-http2/src/main/java/io/netty/handler/codec/http2/CharSequenceMap.java @@ -33,7 +33,7 @@ public final class CharSequenceMap extends DefaultHeadersinstance()); + this(caseSensitive, UnsupportedValueConverter.instance()); } public CharSequenceMap(boolean caseSensitive, ValueConverter valueConverter) { diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/HpackStaticTable.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/HpackStaticTable.java index 38c321d6e0..068ba0bfd9 100644 --- a/codec-http2/src/main/java/io/netty/handler/codec/http2/HpackStaticTable.java +++ b/codec-http2/src/main/java/io/netty/handler/codec/http2/HpackStaticTable.java @@ -171,7 +171,7 @@ final class HpackStaticTable { int length = STATIC_TABLE.size(); @SuppressWarnings("unchecked") CharSequenceMap ret = new CharSequenceMap<>(true, - UnsupportedValueConverter.instance(), length); + UnsupportedValueConverter.instance(), length); // Iterate through the static table in reverse order to // save the smallest index for a given name in the map. for (int index = length; index > 0; index--) { diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2StreamChannelBootstrap.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2StreamChannelBootstrap.java index 118be6c7b6..2607d0c6e6 100644 --- a/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2StreamChannelBootstrap.java +++ b/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2StreamChannelBootstrap.java @@ -101,7 +101,7 @@ public final class Http2StreamChannelBootstrap { } public Future open() { - return open(channel.eventLoop().newPromise()); + return open(channel.eventLoop().newPromise()); } public Future open(final Promise promise) { diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/HttpConversionUtil.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/HttpConversionUtil.java index 79ab054166..952d9c38b1 100644 --- a/codec-http2/src/main/java/io/netty/handler/codec/http2/HttpConversionUtil.java +++ b/codec-http2/src/main/java/io/netty/handler/codec/http2/HttpConversionUtil.java @@ -423,7 +423,7 @@ public final class HttpConversionUtil { private static CharSequenceMap toLowercaseMap(Iterator valuesIter, int arraySizeHint) { - UnsupportedValueConverter valueConverter = UnsupportedValueConverter.instance(); + UnsupportedValueConverter valueConverter = UnsupportedValueConverter.instance(); CharSequenceMap result = new CharSequenceMap<>(true, valueConverter, arraySizeHint); while (valuesIter.hasNext()) { diff --git a/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2ConnectionHandlerTest.java b/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2ConnectionHandlerTest.java index 9b8c624027..fd7d8fe625 100644 --- a/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2ConnectionHandlerTest.java +++ b/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2ConnectionHandlerTest.java @@ -344,7 +344,7 @@ public class Http2ConnectionHandlerTest { ByteBuf prefacePlusSome = addSettingsHeader(Unpooled.buffer().writeBytes(connectionPrefaceBuf())); handler.channelRead(ctx, prefacePlusSome); verify(decoder, atLeastOnce()).decodeFrame(any(ChannelHandlerContext.class), - any(ByteBuf.class), ArgumentMatchers.>any()); + any(ByteBuf.class), ArgumentMatchers.any()); } @Test @@ -356,7 +356,7 @@ public class Http2ConnectionHandlerTest { ByteBuf preface = connectionPrefaceBuf(); handler.channelRead(ctx, preface); verify(decoder, never()).decodeFrame(any(ChannelHandlerContext.class), - any(ByteBuf.class), ArgumentMatchers.>any()); + any(ByteBuf.class), ArgumentMatchers.any()); // Now remove and add the handler...this is setting up the test condition. handler.handlerRemoved(ctx); @@ -365,7 +365,7 @@ public class Http2ConnectionHandlerTest { // Now verify we can continue as normal, reading connection preface plus more. ByteBuf prefacePlusSome = addSettingsHeader(Unpooled.buffer().writeBytes(connectionPrefaceBuf())); handler.channelRead(ctx, prefacePlusSome); - verify(decoder, atLeastOnce()).decodeFrame(eq(ctx), any(ByteBuf.class), ArgumentMatchers.>any()); + verify(decoder, atLeastOnce()).decodeFrame(eq(ctx), any(ByteBuf.class), ArgumentMatchers.any()); } @SuppressWarnings("unchecked") diff --git a/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2MultiplexCodecTest.java b/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2MultiplexCodecTest.java index 20d6c4b937..0cfbe4b889 100644 --- a/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2MultiplexCodecTest.java +++ b/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2MultiplexCodecTest.java @@ -203,8 +203,8 @@ public class Http2MultiplexCodecTest { assertEquals(headersFrame, inboundHandler.readInbound()); - assertEqualsAndRelease(dataFrame1, inboundHandler.readInbound()); - assertEqualsAndRelease(dataFrame2, inboundHandler.readInbound()); + assertEqualsAndRelease(dataFrame1, inboundHandler.readInbound()); + assertEqualsAndRelease(dataFrame2, inboundHandler.readInbound()); assertNull(inboundHandler.readInbound()); } @@ -952,7 +952,7 @@ public class Http2MultiplexCodecTest { frameInboundWriter.writeInboundData(childChannel.stream().id(), bb("1"), 0, false); - assertEqualsAndRelease(dataFrame1, inboundHandler.readInbound()); + assertEqualsAndRelease(dataFrame1, inboundHandler.readInbound()); // We want one item to be in the queue, and allow the numReads to be larger than 1. This will ensure that // when beginRead() is called the child channel is added to the readPending queue of the parent channel. @@ -961,7 +961,7 @@ public class Http2MultiplexCodecTest { numReads.set(2); childChannel.read(); - assertEqualsAndRelease(dataFrame2, inboundHandler.readInbound()); + assertEqualsAndRelease(dataFrame2, inboundHandler.readInbound()); assertNull(inboundHandler.readInbound()); @@ -969,14 +969,14 @@ public class Http2MultiplexCodecTest { // notify of readComplete(). frameInboundWriter.writeInboundData(childChannel.stream().id(), bb("3"), 0, false); - assertEqualsAndRelease(dataFrame3, inboundHandler.readInbound()); + assertEqualsAndRelease(dataFrame3, inboundHandler.readInbound()); frameInboundWriter.writeInboundData(childChannel.stream().id(), bb("4"), 0, false); assertNull(inboundHandler.readInbound()); childChannel.read(); - assertEqualsAndRelease(dataFrame4, inboundHandler.readInbound()); + assertEqualsAndRelease(dataFrame4, inboundHandler.readInbound()); assertNull(inboundHandler.readInbound()); diff --git a/codec-http2/src/test/java/io/netty/handler/codec/http2/LastInboundHandler.java b/codec-http2/src/test/java/io/netty/handler/codec/http2/LastInboundHandler.java index a3278c9b80..120e171552 100644 --- a/codec-http2/src/test/java/io/netty/handler/codec/http2/LastInboundHandler.java +++ b/codec-http2/src/test/java/io/netty/handler/codec/http2/LastInboundHandler.java @@ -58,7 +58,7 @@ public class LastInboundHandler extends ChannelDuplexHandler { } public LastInboundHandler() { - this(LastInboundHandler.noopConsumer()); + this(LastInboundHandler.noopConsumer()); } public LastInboundHandler(Consumer channelReadCompleteConsumer) { diff --git a/codec-smtp/src/main/java/io/netty/handler/codec/smtp/DefaultSmtpRequest.java b/codec-smtp/src/main/java/io/netty/handler/codec/smtp/DefaultSmtpRequest.java index 8f4d697d82..7a298405e2 100644 --- a/codec-smtp/src/main/java/io/netty/handler/codec/smtp/DefaultSmtpRequest.java +++ b/codec-smtp/src/main/java/io/netty/handler/codec/smtp/DefaultSmtpRequest.java @@ -56,7 +56,7 @@ public final class DefaultSmtpRequest implements SmtpRequest { DefaultSmtpRequest(SmtpCommand command, List parameters) { this.command = ObjectUtil.checkNotNull(command, "command"); this.parameters = parameters != null ? - Collections.unmodifiableList(parameters) : Collections.emptyList(); + Collections.unmodifiableList(parameters) : Collections.emptyList(); } @Override diff --git a/common/src/main/java/io/netty/util/concurrent/AbstractEventExecutor.java b/common/src/main/java/io/netty/util/concurrent/AbstractEventExecutor.java index b5dd65c736..09af5b9b36 100644 --- a/common/src/main/java/io/netty/util/concurrent/AbstractEventExecutor.java +++ b/common/src/main/java/io/netty/util/concurrent/AbstractEventExecutor.java @@ -36,7 +36,7 @@ public abstract class AbstractEventExecutor extends AbstractExecutorService impl static final long DEFAULT_SHUTDOWN_QUIET_PERIOD = 2; static final long DEFAULT_SHUTDOWN_TIMEOUT = 15; - private final Collection selfCollection = Collections.singleton(this); + private final Collection selfCollection = Collections.singleton(this); @Override public EventExecutor next() { diff --git a/common/src/test/java/io/netty/util/concurrent/SingleThreadEventExecutorTest.java b/common/src/test/java/io/netty/util/concurrent/SingleThreadEventExecutorTest.java index 77e4567ed0..f01b86ac6c 100644 --- a/common/src/test/java/io/netty/util/concurrent/SingleThreadEventExecutorTest.java +++ b/common/src/test/java/io/netty/util/concurrent/SingleThreadEventExecutorTest.java @@ -137,7 +137,7 @@ public class SingleThreadEventExecutorTest { @Override public void run() { try { - Set> set = Collections.>singleton(new Callable() { + Set> set = Collections.singleton(new Callable() { @Override public Boolean call() throws Exception { promise.setFailure(new AssertionError("Should never execute the Callable")); 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 8cb2f84f7a..8e868db914 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 @@ -84,21 +84,21 @@ public class Slf4JLoggerFactoryTest { internalLogger.warn("{}", "warn"); internalLogger.warn("{} {}", "warn1", "warn2"); - verify(logger, times(2)).log(ArgumentMatchers.isNull(), eq(LocationAwareSlf4JLogger.FQCN), + verify(logger, times(2)).log(ArgumentMatchers.isNull(), eq(LocationAwareSlf4JLogger.FQCN), eq(LocationAwareLogger.DEBUG_INT), captor.capture(), any(Object[].class), - ArgumentMatchers.isNull()); - verify(logger, times(2)).log(ArgumentMatchers.isNull(), eq(LocationAwareSlf4JLogger.FQCN), + ArgumentMatchers.isNull()); + verify(logger, times(2)).log(ArgumentMatchers.isNull(), eq(LocationAwareSlf4JLogger.FQCN), eq(LocationAwareLogger.ERROR_INT), captor.capture(), any(Object[].class), - ArgumentMatchers.isNull()); - verify(logger, times(2)).log(ArgumentMatchers.isNull(), eq(LocationAwareSlf4JLogger.FQCN), + ArgumentMatchers.isNull()); + verify(logger, times(2)).log(ArgumentMatchers.isNull(), eq(LocationAwareSlf4JLogger.FQCN), eq(LocationAwareLogger.INFO_INT), captor.capture(), any(Object[].class), - ArgumentMatchers.isNull()); - verify(logger, times(2)).log(ArgumentMatchers.isNull(), eq(LocationAwareSlf4JLogger.FQCN), + ArgumentMatchers.isNull()); + verify(logger, times(2)).log(ArgumentMatchers.isNull(), eq(LocationAwareSlf4JLogger.FQCN), eq(LocationAwareLogger.TRACE_INT), captor.capture(), any(Object[].class), - ArgumentMatchers.isNull()); - verify(logger, times(2)).log(ArgumentMatchers.isNull(), eq(LocationAwareSlf4JLogger.FQCN), + ArgumentMatchers.isNull()); + verify(logger, times(2)).log(ArgumentMatchers.isNull(), eq(LocationAwareSlf4JLogger.FQCN), eq(LocationAwareLogger.WARN_INT), captor.capture(), any(Object[].class), - ArgumentMatchers.isNull()); + ArgumentMatchers.isNull()); Iterator logMessages = captor.getAllValues().iterator(); assertEquals("debug", logMessages.next()); diff --git a/handler/src/main/java/io/netty/handler/ssl/ConscryptAlpnSslEngine.java b/handler/src/main/java/io/netty/handler/ssl/ConscryptAlpnSslEngine.java index 16b564b7dc..16eb9c05e5 100644 --- a/handler/src/main/java/io/netty/handler/ssl/ConscryptAlpnSslEngine.java +++ b/handler/src/main/java/io/netty/handler/ssl/ConscryptAlpnSslEngine.java @@ -147,7 +147,7 @@ abstract class ConscryptAlpnSslEngine extends JdkSslEngine { try { String protocol = Conscrypt.getApplicationProtocol(getWrappedEngine()); protocolSelector.select(protocol != null ? Collections.singletonList(protocol) - : Collections.emptyList()); + : Collections.emptyList()); } catch (Throwable e) { throw toSSLHandshakeException(e); } diff --git a/handler/src/main/java/io/netty/handler/ssl/ReferenceCountedOpenSslEngine.java b/handler/src/main/java/io/netty/handler/ssl/ReferenceCountedOpenSslEngine.java index 06b02de053..e54c3d93ac 100644 --- a/handler/src/main/java/io/netty/handler/ssl/ReferenceCountedOpenSslEngine.java +++ b/handler/src/main/java/io/netty/handler/ssl/ReferenceCountedOpenSslEngine.java @@ -315,7 +315,7 @@ public class ReferenceCountedOpenSslEngine extends SSLEngine implements Referenc } } return ocspResponse == null ? - Collections.emptyList() : Collections.singletonList(ocspResponse); + Collections.emptyList() : Collections.singletonList(ocspResponse); } }; engineMap = context.engineMap; diff --git a/handler/src/main/java/io/netty/handler/ssl/SniHandler.java b/handler/src/main/java/io/netty/handler/ssl/SniHandler.java index cda2bbdce7..51e880e94d 100644 --- a/handler/src/main/java/io/netty/handler/ssl/SniHandler.java +++ b/handler/src/main/java/io/netty/handler/ssl/SniHandler.java @@ -93,7 +93,7 @@ public class SniHandler extends AbstractSniHandler { */ @Override protected Future lookup(ChannelHandlerContext ctx, String hostname) throws Exception { - return mapping.map(hostname, ctx.executor().newPromise()); + return mapping.map(hostname, ctx.executor().newPromise()); } @Override 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 049aecde67..305298aded 100644 --- a/handler/src/main/java/io/netty/handler/ssl/SslHandler.java +++ b/handler/src/main/java/io/netty/handler/ssl/SslHandler.java @@ -1691,7 +1691,7 @@ public class SslHandler extends ByteToMessageDecoder implements ChannelOutboundH throw new IllegalStateException(); } - return renegotiate(ctx.executor().newPromise()); + return renegotiate(ctx.executor().newPromise()); } /** diff --git a/handler/src/test/java/io/netty/handler/ssl/SslErrorTest.java b/handler/src/test/java/io/netty/handler/ssl/SslErrorTest.java index 0b601d27e2..415337ab8f 100644 --- a/handler/src/test/java/io/netty/handler/ssl/SslErrorTest.java +++ b/handler/src/test/java/io/netty/handler/ssl/SslErrorTest.java @@ -85,7 +85,7 @@ public class SslErrorTest { exceptions.add(new CertificateNotYetValidException()); exceptions.add(new CertificateRevokedException( new Date(), CRLReason.AA_COMPROMISE, new X500Principal(""), - Collections.emptyMap())); + Collections.emptyMap())); // Also use wrapped exceptions as this is what the JDK implementation of X509TrustManagerFactory is doing. exceptions.add(newCertificateException(CertPathValidatorException.BasicReason.EXPIRED)); diff --git a/handler/src/test/java/io/netty/handler/ssl/SslHandlerTest.java b/handler/src/test/java/io/netty/handler/ssl/SslHandlerTest.java index df35484910..ecbbeca9f5 100644 --- a/handler/src/test/java/io/netty/handler/ssl/SslHandlerTest.java +++ b/handler/src/test/java/io/netty/handler/ssl/SslHandlerTest.java @@ -740,7 +740,7 @@ public class SslHandlerTest { throw error; } assertThat(sslHandler.handshakeFuture().await().cause(), - CoreMatchers.instanceOf(SSLException.class)); + CoreMatchers.instanceOf(SSLException.class)); } finally { if (cc != null) { cc.close().syncUninterruptibly(); @@ -812,7 +812,7 @@ public class SslHandlerTest { cc = future.syncUninterruptibly().channel(); Throwable cause = sslHandler.handshakeFuture().await().cause(); - assertThat(cause, CoreMatchers.instanceOf(SSLException.class)); + assertThat(cause, CoreMatchers.instanceOf(SSLException.class)); assertThat(cause.getMessage(), containsString("timed out")); } finally { if (cc != null) { diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/Cache.java b/resolver-dns/src/main/java/io/netty/resolver/dns/Cache.java index 4e61397d47..75ac25e2b3 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/Cache.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/Cache.java @@ -166,7 +166,7 @@ abstract class Cache { volatile ScheduledFuture expirationFuture; Entries(String hostname) { - super(Collections.emptyList()); + super(Collections.emptyList()); this.hostname = hostname; } @@ -260,7 +260,7 @@ abstract class Cache { } boolean clearAndCancel() { - List entries = getAndSet(Collections.emptyList()); + List entries = getAndSet(Collections.emptyList()); if (entries.isEmpty()) { return false; } diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DefaultDnsCache.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DefaultDnsCache.java index c197839520..86a4586f03 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/DefaultDnsCache.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DefaultDnsCache.java @@ -127,7 +127,7 @@ public class DefaultDnsCache implements DnsCache { public List get(String hostname, DnsRecord[] additionals) { checkNotNull(hostname, "hostname"); if (!emptyAdditionals(additionals)) { - return Collections.emptyList(); + return Collections.emptyList(); } return resolveCache.get(appendDot(hostname)); diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolver.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolver.java index 6b0279f8f9..a2fc58a4d1 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolver.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolver.java @@ -748,7 +748,7 @@ public class DnsNameResolver extends InetNameResolver { if (content != null) { // Our current implementation does not support reloading the hosts file, // so use a fairly large TTL (1 day, i.e. 86400 seconds). - trySuccess(promise, Collections.singletonList( + trySuccess(promise, Collections.singletonList( new DefaultDnsRawRecord(hostname, type, 86400, content))); return promise; } diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsResolveContext.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsResolveContext.java index 51347f9137..cd62e3e537 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsResolveContext.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsResolveContext.java @@ -781,7 +781,7 @@ abstract class DnsResolveContext { } } - return cnames != null? cnames : Collections.emptyMap(); + return cnames != null? cnames : Collections.emptyMap(); } private void tryToFinishResolve(final DnsServerAddressStream nameServerAddrStream, diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/InflightNameResolver.java b/resolver-dns/src/main/java/io/netty/resolver/dns/InflightNameResolver.java index cb93f9a212..f9eeb1a894 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/InflightNameResolver.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/InflightNameResolver.java @@ -48,12 +48,12 @@ final class InflightNameResolver implements NameResolver { @Override public Future resolve(String inetHost) { - return resolve(inetHost, executor.newPromise()); + return resolve(inetHost, executor.newPromise()); } @Override public Future> resolveAll(String inetHost) { - return resolveAll(inetHost, executor.>newPromise()); + return resolveAll(inetHost, executor.newPromise()); } @Override diff --git a/resolver-dns/src/test/java/io/netty/resolver/dns/DnsNameResolverClientSubnetTest.java b/resolver-dns/src/test/java/io/netty/resolver/dns/DnsNameResolverClientSubnetTest.java index a3aef339ab..56e66c7413 100644 --- a/resolver-dns/src/test/java/io/netty/resolver/dns/DnsNameResolverClientSubnetTest.java +++ b/resolver-dns/src/test/java/io/netty/resolver/dns/DnsNameResolverClientSubnetTest.java @@ -44,7 +44,7 @@ public class DnsNameResolverClientSubnetTest { // Same as: // # /.bind-9.9.3-edns/bin/dig @ns1.google.com www.google.es +client=157.88.0.0/24 Future> future = resolver.resolveAll("www.google.es", - Collections.singleton( + Collections.singleton( // Suggest max payload size of 1024 // 157.88.0.0 / 24 new DefaultDnsOptEcsRecord(1024, 24, diff --git a/resolver-dns/src/test/java/io/netty/resolver/dns/DnsNameResolverTest.java b/resolver-dns/src/test/java/io/netty/resolver/dns/DnsNameResolverTest.java index b8b0d9f46f..a8fd308ab9 100644 --- a/resolver-dns/src/test/java/io/netty/resolver/dns/DnsNameResolverTest.java +++ b/resolver-dns/src/test/java/io/netty/resolver/dns/DnsNameResolverTest.java @@ -404,7 +404,7 @@ public class DnsNameResolverTest { case A: Map attr = new HashMap<>(); attr.put(DnsAttribute.IP_ADDRESS.toLowerCase(Locale.US), overriddenIP); - return Collections.singleton( + return Collections.singleton( new TestDnsServer.TestResourceRecord( question.getDomainName(), question.getRecordType(), attr)); default: @@ -1037,8 +1037,8 @@ public class DnsNameResolverTest { final List records = resolver.resolveAll(new DefaultDnsQuestion("foo.com.", A)) .syncUninterruptibly().getNow(); - assertThat(records, Matchers.hasSize(1)); - assertThat(records.get(0), Matchers.instanceOf(DnsRawRecord.class)); + assertThat(records, Matchers.hasSize(1)); + assertThat(records.get(0), Matchers.instanceOf(DnsRawRecord.class)); final DnsRawRecord record = (DnsRawRecord) records.get(0); final ByteBuf content = record.content(); @@ -2098,7 +2098,7 @@ public class DnsNameResolverTest { if (question.getDomainName().equals("cname.netty.io")) { Map map1 = new HashMap<>(); map1.put(DnsAttribute.IP_ADDRESS.toLowerCase(), "10.0.0.99"); - return Collections.singleton( + return Collections.singleton( new TestDnsServer.TestResourceRecord(question.getDomainName(), RecordType.A, map1)); } else { Set records = new LinkedHashSet<>(2); @@ -2148,19 +2148,19 @@ public class DnsNameResolverTest { Set records = new LinkedHashSet<>(4); records.add(new TestDnsServer.TestResourceRecord("x." + question.getDomainName(), - RecordType.A, Collections.singletonMap( + RecordType.A, Collections.singletonMap( DnsAttribute.IP_ADDRESS.toLowerCase(), "10.0.0.99"))); records.add(new TestDnsServer.TestResourceRecord( "cname2.netty.io", RecordType.CNAME, - Collections.singletonMap( + Collections.singletonMap( DnsAttribute.DOMAIN_NAME.toLowerCase(), "cname.netty.io"))); records.add(new TestDnsServer.TestResourceRecord( "cname.netty.io", RecordType.CNAME, - Collections.singletonMap( + Collections.singletonMap( DnsAttribute.DOMAIN_NAME.toLowerCase(), "cname2.netty.io"))); records.add(new TestDnsServer.TestResourceRecord( question.getDomainName(), RecordType.CNAME, - Collections.singletonMap( + Collections.singletonMap( DnsAttribute.DOMAIN_NAME.toLowerCase(), "cname.netty.io"))); return records; } @@ -2351,25 +2351,25 @@ public class DnsNameResolverTest { if ("cname.netty.io".equals(question.getDomainName())) { aQueries.incrementAndGet(); - return Collections.singleton(new TestDnsServer.TestResourceRecord( + return Collections.singleton(new TestDnsServer.TestResourceRecord( question.getDomainName(), RecordType.A, - Collections.singletonMap( + Collections.singletonMap( DnsAttribute.IP_ADDRESS.toLowerCase(), "10.0.0.99"))); } if ("x.netty.io".equals(question.getDomainName())) { cnameQueries.incrementAndGet(); - return Collections.singleton(new TestDnsServer.TestResourceRecord( + return Collections.singleton(new TestDnsServer.TestResourceRecord( question.getDomainName(), RecordType.CNAME, - Collections.singletonMap( + Collections.singletonMap( DnsAttribute.DOMAIN_NAME.toLowerCase(), "cname.netty.io"))); } if ("y.netty.io".equals(question.getDomainName())) { cnameQueries.incrementAndGet(); - return Collections.singleton(new TestDnsServer.TestResourceRecord( + return Collections.singleton(new TestDnsServer.TestResourceRecord( question.getDomainName(), RecordType.CNAME, - Collections.singletonMap( + Collections.singletonMap( DnsAttribute.DOMAIN_NAME.toLowerCase(), "x.netty.io"))); } return Collections.emptySet(); diff --git a/resolver-dns/src/test/java/io/netty/resolver/dns/SearchDomainTest.java b/resolver-dns/src/test/java/io/netty/resolver/dns/SearchDomainTest.java index 382db5e6ca..e3ce7dee00 100644 --- a/resolver-dns/src/test/java/io/netty/resolver/dns/SearchDomainTest.java +++ b/resolver-dns/src/test/java/io/netty/resolver/dns/SearchDomainTest.java @@ -282,7 +282,7 @@ public class SearchDomainTest { @Test public void testExceptionMsgContainsSearchDomain() throws Exception { - TestDnsServer.MapRecordStoreA store = new TestDnsServer.MapRecordStoreA(Collections.emptySet()); + TestDnsServer.MapRecordStoreA store = new TestDnsServer.MapRecordStoreA(Collections.emptySet()); dnsServer = new TestDnsServer(store); dnsServer.start(); @@ -299,7 +299,7 @@ public class SearchDomainTest { @Test public void testExceptionMsgDoesNotContainSearchDomainIfNdotsIsNotReached() throws Exception { - TestDnsServer.MapRecordStoreA store = new TestDnsServer.MapRecordStoreA(Collections.emptySet()); + TestDnsServer.MapRecordStoreA store = new TestDnsServer.MapRecordStoreA(Collections.emptySet()); dnsServer = new TestDnsServer(store); dnsServer.start(); diff --git a/resolver-dns/src/test/java/io/netty/resolver/dns/TestDnsServer.java b/resolver-dns/src/test/java/io/netty/resolver/dns/TestDnsServer.java index 67843c32f5..9066cc6d1d 100644 --- a/resolver-dns/src/test/java/io/netty/resolver/dns/TestDnsServer.java +++ b/resolver-dns/src/test/java/io/netty/resolver/dns/TestDnsServer.java @@ -303,7 +303,7 @@ class TestDnsServer extends DnsServer { default: return null; } - return Collections.singleton( + return Collections.singleton( new TestResourceRecord(name, questionRecord.getRecordType(), attr)); } return null; diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/sctp/SctpTestPermutation.java b/testsuite/src/main/java/io/netty/testsuite/transport/sctp/SctpTestPermutation.java index 0f0f140614..aac9b38a02 100644 --- a/testsuite/src/main/java/io/netty/testsuite/transport/sctp/SctpTestPermutation.java +++ b/testsuite/src/main/java/io/netty/testsuite/transport/sctp/SctpTestPermutation.java @@ -48,7 +48,7 @@ public final class SctpTestPermutation { } // Make the list of ServerBootstrap factories. - return Collections.>singletonList(new BootstrapFactory() { + return Collections.singletonList(new BootstrapFactory() { @Override public ServerBootstrap newInstance() { return new ServerBootstrap(). @@ -63,7 +63,7 @@ public final class SctpTestPermutation { return Collections.emptyList(); } - return Collections.>singletonList(new BootstrapFactory() { + return Collections.singletonList(new BootstrapFactory() { @Override public Bootstrap newInstance() { return new Bootstrap().group(nioWorkerGroup).channel(NioSctpChannel.class); diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java index 0619832191..8fa2377ace 100644 --- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java +++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java @@ -102,7 +102,7 @@ public class SocketTestPermutation { public List> datagram() { // Make the list of Bootstrap factories. - List> bfs = Collections.>singletonList( + List> bfs = Collections.singletonList( new BootstrapFactory() { @Override public Bootstrap newInstance() { @@ -126,7 +126,7 @@ public class SocketTestPermutation { } public List> serverSocket() { - return Collections.>singletonList( + return Collections.singletonList( new BootstrapFactory() { @Override public ServerBootstrap newInstance() { @@ -138,7 +138,7 @@ public class SocketTestPermutation { } public List> clientSocket() { - return Collections.>singletonList( + return Collections.singletonList( new BootstrapFactory() { @Override public Bootstrap newInstance() { @@ -149,7 +149,7 @@ public class SocketTestPermutation { } public List> datagramSocket() { - return Collections.>singletonList( + return Collections.singletonList( new BootstrapFactory() { @Override public Bootstrap newInstance() { diff --git a/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSocketTcpMd5Test.java b/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSocketTcpMd5Test.java index 35018d388c..6aa0660e3f 100644 --- a/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSocketTcpMd5Test.java +++ b/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSocketTcpMd5Test.java @@ -68,8 +68,8 @@ public class EpollSocketTcpMd5Test { @Test public void testServerSocketChannelOption() throws Exception { server.config().setOption(EpollChannelOption.TCP_MD5SIG, - Collections.singletonMap(NetUtil.LOCALHOST4, SERVER_KEY)); - server.config().setOption(EpollChannelOption.TCP_MD5SIG, Collections.emptyMap()); + Collections.singletonMap(NetUtil.LOCALHOST4, SERVER_KEY)); + server.config().setOption(EpollChannelOption.TCP_MD5SIG, Collections.emptyMap()); } @Test @@ -81,8 +81,8 @@ public class EpollSocketTcpMd5Test { .bind(new InetSocketAddress(0)).syncUninterruptibly().channel(); ch.config().setOption(EpollChannelOption.TCP_MD5SIG, - Collections.singletonMap(NetUtil.LOCALHOST4, SERVER_KEY)); - ch.config().setOption(EpollChannelOption.TCP_MD5SIG, Collections.emptyMap()); + Collections.singletonMap(NetUtil.LOCALHOST4, SERVER_KEY)); + ch.config().setOption(EpollChannelOption.TCP_MD5SIG, Collections.emptyMap()); ch.close().syncUninterruptibly(); } @@ -90,13 +90,13 @@ public class EpollSocketTcpMd5Test { @Test(expected = ConnectTimeoutException.class) public void testKeyMismatch() throws Exception { server.config().setOption(EpollChannelOption.TCP_MD5SIG, - Collections.singletonMap(NetUtil.LOCALHOST4, SERVER_KEY)); + Collections.singletonMap(NetUtil.LOCALHOST4, SERVER_KEY)); EpollSocketChannel client = (EpollSocketChannel) new Bootstrap().group(GROUP) .channel(EpollSocketChannel.class) .handler(new ChannelInboundHandlerAdapter()) .option(EpollChannelOption.TCP_MD5SIG, - Collections.singletonMap(NetUtil.LOCALHOST4, BAD_KEY)) + Collections.singletonMap(NetUtil.LOCALHOST4, BAD_KEY)) .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 1000) .connect(server.localAddress()).syncUninterruptibly().channel(); client.close().syncUninterruptibly(); @@ -105,13 +105,13 @@ public class EpollSocketTcpMd5Test { @Test public void testKeyMatch() throws Exception { server.config().setOption(EpollChannelOption.TCP_MD5SIG, - Collections.singletonMap(NetUtil.LOCALHOST4, SERVER_KEY)); + Collections.singletonMap(NetUtil.LOCALHOST4, SERVER_KEY)); EpollSocketChannel client = (EpollSocketChannel) new Bootstrap().group(GROUP) .channel(EpollSocketChannel.class) .handler(new ChannelInboundHandlerAdapter()) .option(EpollChannelOption.TCP_MD5SIG, - Collections.singletonMap(NetUtil.LOCALHOST4, SERVER_KEY)) + Collections.singletonMap(NetUtil.LOCALHOST4, SERVER_KEY)) .connect(server.localAddress()).syncUninterruptibly().channel(); client.close().syncUninterruptibly(); } diff --git a/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSocketTestPermutation.java b/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSocketTestPermutation.java index 0bbee682dd..f4f05cd49b 100644 --- a/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSocketTestPermutation.java +++ b/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSocketTestPermutation.java @@ -160,7 +160,7 @@ class EpollSocketTestPermutation extends SocketTestPermutation { } public List> serverDomainSocket() { - return Collections.>singletonList( + return Collections.singletonList( new BootstrapFactory() { @Override public ServerBootstrap newInstance() { @@ -172,7 +172,7 @@ class EpollSocketTestPermutation extends SocketTestPermutation { } public List> clientDomainSocket() { - return Collections.>singletonList( + return Collections.singletonList( new BootstrapFactory() { @Override public Bootstrap newInstance() { @@ -184,7 +184,7 @@ class EpollSocketTestPermutation extends SocketTestPermutation { @Override public List> datagramSocket() { - return Collections.>singletonList( + return Collections.singletonList( new BootstrapFactory() { @Override public Bootstrap newInstance() { diff --git a/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueSocketTestPermutation.java b/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueSocketTestPermutation.java index bb9bbcac0a..23ef178c84 100644 --- a/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueSocketTestPermutation.java +++ b/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueSocketTestPermutation.java @@ -145,7 +145,7 @@ class KQueueSocketTestPermutation extends SocketTestPermutation { } public List> serverDomainSocket() { - return Collections.>singletonList( + return Collections.singletonList( new BootstrapFactory() { @Override public ServerBootstrap newInstance() { @@ -157,7 +157,7 @@ class KQueueSocketTestPermutation extends SocketTestPermutation { } public List> clientDomainSocket() { - return Collections.>singletonList( + return Collections.singletonList( new BootstrapFactory() { @Override public Bootstrap newInstance() { @@ -169,7 +169,7 @@ class KQueueSocketTestPermutation extends SocketTestPermutation { @Override public List> datagramSocket() { - return Collections.>singletonList( + return Collections.singletonList( new BootstrapFactory() { @Override public Bootstrap newInstance() { diff --git a/transport/src/main/java/io/netty/channel/SingleThreadEventLoop.java b/transport/src/main/java/io/netty/channel/SingleThreadEventLoop.java index 271d9b91f3..831c58921a 100644 --- a/transport/src/main/java/io/netty/channel/SingleThreadEventLoop.java +++ b/transport/src/main/java/io/netty/channel/SingleThreadEventLoop.java @@ -161,8 +161,8 @@ public class SingleThreadEventLoop extends SingleThreadEventExecutor implements @Override protected Queue newTaskQueue(int maxPendingTasks) { // This event loop never calls takeTask() - return maxPendingTasks == Integer.MAX_VALUE ? PlatformDependent.newMpscQueue() - : PlatformDependent.newMpscQueue(maxPendingTasks); + return maxPendingTasks == Integer.MAX_VALUE ? PlatformDependent.newMpscQueue() + : PlatformDependent.newMpscQueue(maxPendingTasks); } @Override