From 4a10357fd8490bf3202be25ba65aed4cb5e377ed Mon Sep 17 00:00:00 2001 From: Dmitriy Dumanskiy Date: Wed, 23 Jan 2019 15:01:48 +0200 Subject: [PATCH] IDE warnings cleanup (#8768) Motivation: IDE shows some warnings Modification: Small IDE warnings cleanup in different places. Result: Less warnings --- .../src/main/java/io/netty/buffer/PoolArena.java | 14 ++++---------- .../netty/handler/codec/http2/Http2Exception.java | 4 ++-- .../io/netty/handler/codec/smtp/SmtpRequests.java | 9 +++------ .../java/io/netty/handler/ssl/JdkSslContext.java | 4 +--- .../main/java/io/netty/handler/ssl/PemReader.java | 5 +---- .../main/java/io/netty/handler/ssl/SslUtils.java | 4 +--- .../socket/SocketMultipleConnectTest.java | 8 +------- 7 files changed, 13 insertions(+), 35 deletions(-) diff --git a/buffer/src/main/java/io/netty/buffer/PoolArena.java b/buffer/src/main/java/io/netty/buffer/PoolArena.java index 46374a8ab8..b9a0991c87 100644 --- a/buffer/src/main/java/io/netty/buffer/PoolArena.java +++ b/buffer/src/main/java/io/netty/buffer/PoolArena.java @@ -461,13 +461,10 @@ abstract class PoolArena implements PoolArenaMetric { continue; } PoolSubpage s = head.next; - for (;;) { + do { metrics.add(s); s = s.next; - if (s == head) { - break; - } - } + } while (s != head); } return metrics; } @@ -631,13 +628,10 @@ abstract class PoolArena implements PoolArenaMetric { .append(i) .append(": "); PoolSubpage s = head.next; - for (;;) { + do { buf.append(s); s = s.next; - if (s == head) { - break; - } - } + } while (s != head); } } diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2Exception.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2Exception.java index 092ab085dc..37f5b22de5 100644 --- a/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2Exception.java +++ b/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2Exception.java @@ -194,7 +194,7 @@ public class Http2Exception extends Exception { /** * Provides a hint as to if shutdown is justified, what type of shutdown should be executed. */ - public static enum ShutdownHint { + public enum ShutdownHint { /** * Do not shutdown the underlying channel. */ @@ -207,7 +207,7 @@ public class Http2Exception extends Exception { /** * Close the channel immediately after a {@code GOAWAY} is sent. */ - HARD_SHUTDOWN; + HARD_SHUTDOWN } /** diff --git a/codec-smtp/src/main/java/io/netty/handler/codec/smtp/SmtpRequests.java b/codec-smtp/src/main/java/io/netty/handler/codec/smtp/SmtpRequests.java index cd217f34d8..ae917ad26a 100644 --- a/codec-smtp/src/main/java/io/netty/handler/codec/smtp/SmtpRequests.java +++ b/codec-smtp/src/main/java/io/netty/handler/codec/smtp/SmtpRequests.java @@ -20,6 +20,7 @@ import io.netty.util.internal.ObjectUtil; import io.netty.util.internal.UnstableApi; import java.util.ArrayList; +import java.util.Collections; import java.util.List; /** @@ -94,9 +95,7 @@ public final class SmtpRequests { } else { List params = new ArrayList<>(mailParameters.length + 1); params.add(sender != null? "FROM:<" + sender + '>' : FROM_NULL_SENDER); - for (CharSequence param : mailParameters) { - params.add(param); - } + Collections.addAll(params, mailParameters); return new DefaultSmtpRequest(SmtpCommand.MAIL, params); } } @@ -111,9 +110,7 @@ public final class SmtpRequests { } else { List params = new ArrayList<>(rcptParameters.length + 1); params.add("TO:<" + recipient + '>'); - for (CharSequence param : rcptParameters) { - params.add(param); - } + Collections.addAll(params, rcptParameters); return new DefaultSmtpRequest(SmtpCommand.RCPT, params); } } diff --git a/handler/src/main/java/io/netty/handler/ssl/JdkSslContext.java b/handler/src/main/java/io/netty/handler/ssl/JdkSslContext.java index 00e3e2fba8..5c36cb93eb 100644 --- a/handler/src/main/java/io/netty/handler/ssl/JdkSslContext.java +++ b/handler/src/main/java/io/netty/handler/ssl/JdkSslContext.java @@ -101,9 +101,7 @@ public class JdkSslContext extends SslContext { // Choose the sensible default list of protocols. final String[] supportedProtocols = engine.getSupportedProtocols(); Set supportedProtocolsSet = new HashSet<>(supportedProtocols.length); - for (int i = 0; i < supportedProtocols.length; ++i) { - supportedProtocolsSet.add(supportedProtocols[i]); - } + Collections.addAll(supportedProtocolsSet, supportedProtocols); List protocols = new ArrayList<>(); addIfSupported( supportedProtocolsSet, protocols, diff --git a/handler/src/main/java/io/netty/handler/ssl/PemReader.java b/handler/src/main/java/io/netty/handler/ssl/PemReader.java index 091d859816..08cf80950d 100644 --- a/handler/src/main/java/io/netty/handler/ssl/PemReader.java +++ b/handler/src/main/java/io/netty/handler/ssl/PemReader.java @@ -81,10 +81,7 @@ final class PemReader { List certs = new ArrayList<>(); Matcher m = CERT_PATTERN.matcher(content); int start = 0; - for (;;) { - if (!m.find(start)) { - break; - } + while (m.find(start)) { ByteBuf base64 = Unpooled.copiedBuffer(m.group(1), CharsetUtil.US_ASCII); ByteBuf der = Base64.decode(base64); diff --git a/handler/src/main/java/io/netty/handler/ssl/SslUtils.java b/handler/src/main/java/io/netty/handler/ssl/SslUtils.java index 7f2204d9d4..654b8e2014 100644 --- a/handler/src/main/java/io/netty/handler/ssl/SslUtils.java +++ b/handler/src/main/java/io/netty/handler/ssl/SslUtils.java @@ -122,9 +122,7 @@ final class SslUtils { // AES256 requires JCE unlimited strength jurisdiction policy files. defaultCiphers.add("TLS_RSA_WITH_AES_256_CBC_SHA"); - for (String tlsv13Cipher: DEFAULT_TLSV13_CIPHER_SUITES) { - defaultCiphers.add(tlsv13Cipher); - } + Collections.addAll(defaultCiphers, DEFAULT_TLSV13_CIPHER_SUITES); DEFAULT_CIPHER_SUITES = defaultCiphers.toArray(new String[0]); } diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketMultipleConnectTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketMultipleConnectTest.java index f59059e8c7..25ccab0529 100644 --- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketMultipleConnectTest.java +++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketMultipleConnectTest.java @@ -61,12 +61,6 @@ public class SocketMultipleConnectTest extends AbstractSocketTest { @Override protected List> newFactories() { - List> factories - = new ArrayList<>(); - for (TestsuitePermutation.BootstrapComboFactory comboFactory - : SocketTestPermutation.INSTANCE.socket()) { - factories.add(comboFactory); - } - return factories; + return new ArrayList<>(SocketTestPermutation.INSTANCE.socket()); } }