diff --git a/buffer/src/test/java/io/netty/buffer/PooledByteBufAllocatorTest.java b/buffer/src/test/java/io/netty/buffer/PooledByteBufAllocatorTest.java index de004fc7a1..6cbdf0cb48 100644 --- a/buffer/src/test/java/io/netty/buffer/PooledByteBufAllocatorTest.java +++ b/buffer/src/test/java/io/netty/buffer/PooledByteBufAllocatorTest.java @@ -461,7 +461,7 @@ public class PooledByteBufAllocatorTest extends AbstractByteBufAllocatorTest finish = new AtomicReference<>(); - public AllocationThread(ByteBufAllocator allocator) { + AllocationThread(ByteBufAllocator allocator) { this.allocator = allocator; } diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/CombinedHttpHeaders.java b/codec-http/src/main/java/io/netty/handler/codec/http/CombinedHttpHeaders.java index ae494934d7..b8a2d0b891 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/CombinedHttpHeaders.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/CombinedHttpHeaders.java @@ -79,7 +79,7 @@ public class CombinedHttpHeaders extends DefaultHttpHeaders { return charSequenceEscaper; } - public CombinedHttpHeadersImpl(HashingStrategy nameHashingStrategy, + CombinedHttpHeadersImpl(HashingStrategy nameHashingStrategy, ValueConverter valueConverter, io.netty.handler.codec.DefaultHeaders.NameValidator nameValidator) { super(nameHashingStrategy, valueConverter, nameValidator); diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpServerCodec.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpServerCodec.java index 66883d4cee..411fc8827d 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpServerCodec.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpServerCodec.java @@ -81,16 +81,16 @@ public final class HttpServerCodec extends CombinedChannelDuplexHandler streams = new LinkedHashSet<>(); private int pendingIterations; - public ActiveStreams(List listeners) { + ActiveStreams(List listeners) { this.listeners = listeners; } diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/DefaultHttp2LocalFlowController.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/DefaultHttp2LocalFlowController.java index 74dc3ae31c..9c8308ecf3 100644 --- a/codec-http2/src/main/java/io/netty/handler/codec/http2/DefaultHttp2LocalFlowController.java +++ b/codec-http2/src/main/java/io/netty/handler/codec/http2/DefaultHttp2LocalFlowController.java @@ -296,7 +296,7 @@ public class DefaultHttp2LocalFlowController implements Http2LocalFlowController * received. */ private final class AutoRefillState extends DefaultState { - public AutoRefillState(Http2Stream stream, int initialWindowSize) { + AutoRefillState(Http2Stream stream, int initialWindowSize) { super(stream, initialWindowSize); } @@ -349,7 +349,7 @@ public class DefaultHttp2LocalFlowController implements Http2LocalFlowController private int lowerBound; private boolean endOfStream; - public DefaultState(Http2Stream stream, int initialWindowSize) { + DefaultState(Http2Stream stream, int initialWindowSize) { this.stream = stream; window(initialWindowSize); streamWindowUpdateRatio = windowUpdateRatio; @@ -613,7 +613,7 @@ public class DefaultHttp2LocalFlowController implements Http2LocalFlowController private CompositeStreamException compositeException; private final int delta; - public WindowUpdateVisitor(int delta) { + WindowUpdateVisitor(int delta) { this.delta = delta; } diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/HpackDecoder.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/HpackDecoder.java index 9c680e6a99..389fc04836 100644 --- a/codec-http2/src/main/java/io/netty/handler/codec/http2/HpackDecoder.java +++ b/codec-http2/src/main/java/io/netty/handler/codec/http2/HpackDecoder.java @@ -528,7 +528,7 @@ final class HpackDecoder { private HeaderType previousType; private Http2Exception validationException; - public Http2HeadersSink(int streamId, Http2Headers headers, long maxHeaderListSize, boolean validate) { + Http2HeadersSink(int streamId, Http2Headers headers, long maxHeaderListSize, boolean validate) { this.headers = headers; this.maxHeaderListSize = maxHeaderListSize; this.streamId = streamId; diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/HpackEncoder.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/HpackEncoder.java index 7719072a49..301a2c51cf 100644 --- a/codec-http2/src/main/java/io/netty/handler/codec/http2/HpackEncoder.java +++ b/codec-http2/src/main/java/io/netty/handler/codec/http2/HpackEncoder.java @@ -75,14 +75,14 @@ final class HpackEncoder { /** * Creates a new encoder. */ - public HpackEncoder(boolean ignoreMaxHeaderListSize) { + HpackEncoder(boolean ignoreMaxHeaderListSize) { this(ignoreMaxHeaderListSize, 16); } /** * Creates a new encoder. */ - public HpackEncoder(boolean ignoreMaxHeaderListSize, int arraySizeHint) { + HpackEncoder(boolean ignoreMaxHeaderListSize, int arraySizeHint) { this.ignoreMaxHeaderListSize = ignoreMaxHeaderListSize; maxHeaderTableSize = DEFAULT_HEADER_TABLE_SIZE; maxHeaderListSize = MAX_HEADER_LIST_SIZE; diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2ConnectionHandler.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2ConnectionHandler.java index f0cdc2c42b..0c260e0a16 100644 --- a/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2ConnectionHandler.java +++ b/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2ConnectionHandler.java @@ -233,7 +233,7 @@ public class Http2ConnectionHandler extends ByteToMessageDecoder implements Http private ByteBuf clientPrefaceString; private boolean prefaceSent; - public PrefaceDecoder(ChannelHandlerContext ctx) throws Exception { + PrefaceDecoder(ChannelHandlerContext ctx) throws Exception { clientPrefaceString = clientPrefaceString(encoder.connection()); // This handler was just added to the context. In case it was handled after // the connection became active, send the connection preface now. diff --git a/codec-http2/src/test/java/io/netty/handler/codec/http2/DefaultHttp2ConnectionTest.java b/codec-http2/src/test/java/io/netty/handler/codec/http2/DefaultHttp2ConnectionTest.java index 5b467949bc..f5eee1d166 100644 --- a/codec-http2/src/test/java/io/netty/handler/codec/http2/DefaultHttp2ConnectionTest.java +++ b/codec-http2/src/test/java/io/netty/handler/codec/http2/DefaultHttp2ConnectionTest.java @@ -626,7 +626,7 @@ public class DefaultHttp2ConnectionTest { private final boolean[] array; private final int index; - public ListenerExceptionThrower(boolean[] array, int index) { + ListenerExceptionThrower(boolean[] array, int index) { this.array = array; this.index = index; } @@ -642,7 +642,7 @@ public class DefaultHttp2ConnectionTest { private final boolean[] array; private final int index; - public ListenerVerifyCallAnswer(boolean[] array, int index) { + ListenerVerifyCallAnswer(boolean[] array, int index) { this.array = array; this.index = index; } diff --git a/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlAttribute.java b/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlAttribute.java index d40ce138c3..968d306c30 100644 --- a/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlAttribute.java +++ b/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlAttribute.java @@ -57,16 +57,30 @@ public class XmlAttribute { @Override public boolean equals(Object o) { - if (this == o) { return true; } - if (o == null || getClass() != o.getClass()) { return false; } + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } XmlAttribute that = (XmlAttribute) o; - if (!name.equals(that.name)) { return false; } - if (namespace != null ? !namespace.equals(that.namespace) : that.namespace != null) { return false; } - if (prefix != null ? !prefix.equals(that.prefix) : that.prefix != null) { return false; } - if (type != null ? !type.equals(that.type) : that.type != null) { return false; } - if (value != null ? !value.equals(that.value) : that.value != null) { return false; } + if (!name.equals(that.name)) { + return false; + } + if (namespace != null ? !namespace.equals(that.namespace) : that.namespace != null) { + return false; + } + if (prefix != null ? !prefix.equals(that.prefix) : that.prefix != null) { + return false; + } + if (type != null ? !type.equals(that.type) : that.type != null) { + return false; + } + if (value != null ? !value.equals(that.value) : that.value != null) { + return false; + } return true; } diff --git a/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlContent.java b/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlContent.java index a47df3312c..275297c641 100644 --- a/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlContent.java +++ b/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlContent.java @@ -32,12 +32,18 @@ public abstract class XmlContent { @Override public boolean equals(Object o) { - if (this == o) { return true; } - if (o == null || getClass() != o.getClass()) { return false; } + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } XmlContent that = (XmlContent) o; - if (data != null ? !data.equals(that.data) : that.data != null) { return false; } + if (data != null ? !data.equals(that.data) : that.data != null) { + return false; + } return true; } diff --git a/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlDTD.java b/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlDTD.java index 754539b243..e36648f55e 100644 --- a/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlDTD.java +++ b/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlDTD.java @@ -32,12 +32,18 @@ public class XmlDTD { @Override public boolean equals(Object o) { - if (this == o) { return true; } - if (o == null || getClass() != o.getClass()) { return false; } + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } XmlDTD xmlDTD = (XmlDTD) o; - if (text != null ? !text.equals(xmlDTD.text) : xmlDTD.text != null) { return false; } + if (text != null ? !text.equals(xmlDTD.text) : xmlDTD.text != null) { + return false; + } return true; } diff --git a/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlDocumentStart.java b/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlDocumentStart.java index 311a1f5702..98ce875cf1 100644 --- a/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlDocumentStart.java +++ b/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlDocumentStart.java @@ -54,17 +54,27 @@ public class XmlDocumentStart { @Override public boolean equals(Object o) { - if (this == o) { return true; } - if (o == null || getClass() != o.getClass()) { return false; } + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } XmlDocumentStart that = (XmlDocumentStart) o; - if (standalone != that.standalone) { return false; } - if (encoding != null ? !encoding.equals(that.encoding) : that.encoding != null) { return false; } + if (standalone != that.standalone) { + return false; + } + if (encoding != null ? !encoding.equals(that.encoding) : that.encoding != null) { + return false; + } if (encodingScheme != null ? !encodingScheme.equals(that.encodingScheme) : that.encodingScheme != null) { return false; } - if (version != null ? !version.equals(that.version) : that.version != null) { return false; } + if (version != null ? !version.equals(that.version) : that.version != null) { + return false; + } return true; } diff --git a/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlElement.java b/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlElement.java index 138bd7c1a2..b42d7e7831 100644 --- a/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlElement.java +++ b/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlElement.java @@ -54,15 +54,27 @@ public abstract class XmlElement { @Override public boolean equals(Object o) { - if (this == o) { return true; } - if (o == null || getClass() != o.getClass()) { return false; } + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } XmlElement that = (XmlElement) o; - if (!name.equals(that.name)) { return false; } - if (namespace != null ? !namespace.equals(that.namespace) : that.namespace != null) { return false; } - if (namespaces != null ? !namespaces.equals(that.namespaces) : that.namespaces != null) { return false; } - if (prefix != null ? !prefix.equals(that.prefix) : that.prefix != null) { return false; } + if (!name.equals(that.name)) { + return false; + } + if (namespace != null ? !namespace.equals(that.namespace) : that.namespace != null) { + return false; + } + if (namespaces != null ? !namespaces.equals(that.namespaces) : that.namespaces != null) { + return false; + } + if (prefix != null ? !prefix.equals(that.prefix) : that.prefix != null) { + return false; + } return true; } diff --git a/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlElementStart.java b/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlElementStart.java index 12479dddd7..9996989b74 100644 --- a/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlElementStart.java +++ b/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlElementStart.java @@ -35,13 +35,21 @@ public class XmlElementStart extends XmlElement { @Override public boolean equals(Object o) { - if (this == o) { return true; } - if (o == null || getClass() != o.getClass()) { return false; } - if (!super.equals(o)) { return false; } + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + if (!super.equals(o)) { + return false; + } XmlElementStart that = (XmlElementStart) o; - if (attributes != null ? !attributes.equals(that.attributes) : that.attributes != null) { return false; } + if (attributes != null ? !attributes.equals(that.attributes) : that.attributes != null) { + return false; + } return true; } diff --git a/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlEntityReference.java b/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlEntityReference.java index ba3cba9ada..78ed9e709e 100644 --- a/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlEntityReference.java +++ b/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlEntityReference.java @@ -38,13 +38,21 @@ public class XmlEntityReference { @Override public boolean equals(Object o) { - if (this == o) { return true; } - if (o == null || getClass() != o.getClass()) { return false; } + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } XmlEntityReference that = (XmlEntityReference) o; - if (name != null ? !name.equals(that.name) : that.name != null) { return false; } - if (text != null ? !text.equals(that.text) : that.text != null) { return false; } + if (name != null ? !name.equals(that.name) : that.name != null) { + return false; + } + if (text != null ? !text.equals(that.text) : that.text != null) { + return false; + } return true; } diff --git a/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlNamespace.java b/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlNamespace.java index 9cbb86fb42..2d0ae5696b 100644 --- a/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlNamespace.java +++ b/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlNamespace.java @@ -38,13 +38,21 @@ public class XmlNamespace { @Override public boolean equals(Object o) { - if (this == o) { return true; } - if (o == null || getClass() != o.getClass()) { return false; } + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } XmlNamespace that = (XmlNamespace) o; - if (prefix != null ? !prefix.equals(that.prefix) : that.prefix != null) { return false; } - if (uri != null ? !uri.equals(that.uri) : that.uri != null) { return false; } + if (prefix != null ? !prefix.equals(that.prefix) : that.prefix != null) { + return false; + } + if (uri != null ? !uri.equals(that.uri) : that.uri != null) { + return false; + } return true; } diff --git a/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlProcessingInstruction.java b/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlProcessingInstruction.java index 27dc4deee0..6f7588062c 100644 --- a/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlProcessingInstruction.java +++ b/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlProcessingInstruction.java @@ -38,13 +38,21 @@ public class XmlProcessingInstruction { @Override public boolean equals(Object o) { - if (this == o) { return true; } - if (o == null || getClass() != o.getClass()) { return false; } + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } XmlProcessingInstruction that = (XmlProcessingInstruction) o; - if (data != null ? !data.equals(that.data) : that.data != null) { return false; } - if (target != null ? !target.equals(that.target) : that.target != null) { return false; } + if (data != null ? !data.equals(that.data) : that.data != null) { + return false; + } + if (target != null ? !target.equals(that.target) : that.target != null) { + return false; + } return true; } diff --git a/codec/src/main/java/io/netty/handler/codec/compression/Bzip2DivSufSort.java b/codec/src/main/java/io/netty/handler/codec/compression/Bzip2DivSufSort.java index cdf92a6983..813872938c 100644 --- a/codec/src/main/java/io/netty/handler/codec/compression/Bzip2DivSufSort.java +++ b/codec/src/main/java/io/netty/handler/codec/compression/Bzip2DivSufSort.java @@ -568,7 +568,9 @@ final class Bzip2DivSufSort { SA[i++] = SA[k]; SA[k++] = SA[i]; if (last <= k) { - while (j < bufend) { SA[i++] = buf[j]; buf[j++] = SA[i]; } + while (j < bufend) { + SA[i++] = buf[j]; buf[j++] = SA[i]; + } SA[i] = buf[j]; buf[j] = t; return; } diff --git a/codec/src/test/java/io/netty/handler/codec/DefaultHeadersTest.java b/codec/src/test/java/io/netty/handler/codec/DefaultHeadersTest.java index 8e4dd1700d..d4f4114e7a 100644 --- a/codec/src/test/java/io/netty/handler/codec/DefaultHeadersTest.java +++ b/codec/src/test/java/io/netty/handler/codec/DefaultHeadersTest.java @@ -41,11 +41,11 @@ public class DefaultHeadersTest { private static final class TestDefaultHeaders extends DefaultHeaders { - public TestDefaultHeaders() { + TestDefaultHeaders() { this(CharSequenceValueConverter.INSTANCE); } - public TestDefaultHeaders(ValueConverter converter) { + TestDefaultHeaders(ValueConverter converter) { super(converter); } } diff --git a/common/src/main/java/io/netty/util/ResourceLeakDetector.java b/common/src/main/java/io/netty/util/ResourceLeakDetector.java index 106bfd97b9..942d519baa 100644 --- a/common/src/main/java/io/netty/util/ResourceLeakDetector.java +++ b/common/src/main/java/io/netty/util/ResourceLeakDetector.java @@ -496,8 +496,9 @@ public class ResourceLeakDetector { */ private static void reachabilityFence0(Object ref) { if (ref != null) { - // Empty synchronized is ok: https://stackoverflow.com/a/31933260/1151521 - synchronized (ref) { } + synchronized (ref) { + // Empty synchronized is ok: https://stackoverflow.com/a/31933260/1151521 + } } } diff --git a/example/src/main/java/io/netty/example/ocsp/OcspClientExample.java b/example/src/main/java/io/netty/example/ocsp/OcspClientExample.java index e1019e8cc9..809db41e46 100644 --- a/example/src/main/java/io/netty/example/ocsp/OcspClientExample.java +++ b/example/src/main/java/io/netty/example/ocsp/OcspClientExample.java @@ -158,7 +158,7 @@ public class OcspClientExample { private final Promise promise; - public HttpClientHandler(String host, Promise promise) { + HttpClientHandler(String host, Promise promise) { this.host = host; this.promise = promise; } @@ -204,7 +204,7 @@ public class OcspClientExample { private static class ExampleOcspClientHandler extends OcspClientHandler { - public ExampleOcspClientHandler(ReferenceCountedOpenSslEngine engine) { + ExampleOcspClientHandler(ReferenceCountedOpenSslEngine engine) { super(engine); } diff --git a/handler-proxy/src/test/java/io/netty/handler/proxy/ProxyHandlerTest.java b/handler-proxy/src/test/java/io/netty/handler/proxy/ProxyHandlerTest.java index beb7154b06..f1ee543561 100644 --- a/handler-proxy/src/test/java/io/netty/handler/proxy/ProxyHandlerTest.java +++ b/handler-proxy/src/test/java/io/netty/handler/proxy/ProxyHandlerTest.java @@ -433,7 +433,9 @@ public class ProxyHandlerTest { private final TestItem testItem; - public ProxyHandlerTest(TestItem testItem) { this.testItem = testItem; } + public ProxyHandlerTest(TestItem testItem) { + this.testItem = testItem; + } @Before public void clearServerExceptions() throws Exception { diff --git a/handler/src/main/java/io/netty/handler/ssl/OpenSslJavaxX509Certificate.java b/handler/src/main/java/io/netty/handler/ssl/OpenSslJavaxX509Certificate.java index da10dedf0c..af52ddc92a 100644 --- a/handler/src/main/java/io/netty/handler/ssl/OpenSslJavaxX509Certificate.java +++ b/handler/src/main/java/io/netty/handler/ssl/OpenSslJavaxX509Certificate.java @@ -32,7 +32,7 @@ final class OpenSslJavaxX509Certificate extends X509Certificate { private final byte[] bytes; private X509Certificate wrapped; - public OpenSslJavaxX509Certificate(byte[] bytes) { + OpenSslJavaxX509Certificate(byte[] bytes) { this.bytes = bytes; } diff --git a/handler/src/main/java/io/netty/handler/ssl/OpenSslX509Certificate.java b/handler/src/main/java/io/netty/handler/ssl/OpenSslX509Certificate.java index b94a19577b..52dbbdfa8d 100644 --- a/handler/src/main/java/io/netty/handler/ssl/OpenSslX509Certificate.java +++ b/handler/src/main/java/io/netty/handler/ssl/OpenSslX509Certificate.java @@ -41,7 +41,7 @@ final class OpenSslX509Certificate extends X509Certificate { private final byte[] bytes; private X509Certificate wrapped; - public OpenSslX509Certificate(byte[] bytes) { + OpenSslX509Certificate(byte[] bytes) { this.bytes = bytes; } diff --git a/handler/src/main/java/io/netty/handler/ssl/PemValue.java b/handler/src/main/java/io/netty/handler/ssl/PemValue.java index becb5b8492..ada5e4ddf6 100644 --- a/handler/src/main/java/io/netty/handler/ssl/PemValue.java +++ b/handler/src/main/java/io/netty/handler/ssl/PemValue.java @@ -34,7 +34,7 @@ class PemValue extends AbstractReferenceCounted implements PemEncoded { private final boolean sensitive; - public PemValue(ByteBuf content, boolean sensitive) { + PemValue(ByteBuf content, boolean sensitive) { this.content = ObjectUtil.checkNotNull(content, "content"); this.sensitive = sensitive; } diff --git a/handler/src/test/java/io/netty/handler/ssl/SniHandlerTest.java b/handler/src/test/java/io/netty/handler/ssl/SniHandlerTest.java index 9d7d2f934a..ff8b7dc150 100644 --- a/handler/src/test/java/io/netty/handler/ssl/SniHandlerTest.java +++ b/handler/src/test/java/io/netty/handler/ssl/SniHandlerTest.java @@ -543,7 +543,7 @@ public class SniHandlerTest { private static class CustomSslHandler extends SslHandler { private final SslContext sslContext; - public CustomSslHandler(SslContext sslContext, SSLEngine sslEngine) { + CustomSslHandler(SslContext sslContext, SSLEngine sslEngine) { super(sslEngine); this.sslContext = ObjectUtil.checkNotNull(sslContext, "sslContext"); } 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 b8bc00e623..0b601d27e2 100644 --- a/handler/src/test/java/io/netty/handler/ssl/SslErrorTest.java +++ b/handler/src/test/java/io/netty/handler/ssl/SslErrorTest.java @@ -263,7 +263,7 @@ public class SslErrorTest { private static final class TestCertificateException extends CertificateException { private static final long serialVersionUID = -5816338303868751410L; - public TestCertificateException(Throwable cause) { + TestCertificateException(Throwable cause) { super(cause); } } diff --git a/handler/src/test/java/io/netty/handler/ssl/ocsp/OcspTest.java b/handler/src/test/java/io/netty/handler/ssl/ocsp/OcspTest.java index e9bfc174f3..1cc78db85b 100644 --- a/handler/src/test/java/io/netty/handler/ssl/ocsp/OcspTest.java +++ b/handler/src/test/java/io/netty/handler/ssl/ocsp/OcspTest.java @@ -460,7 +460,7 @@ public class OcspTest { private volatile byte[] response; - public TestClientOcspContext(boolean valid) { + TestClientOcspContext(boolean valid) { this.valid = valid; } @@ -482,7 +482,7 @@ public class OcspTest { private final OcspClientCallback callback; - public OcspClientCallbackHandler(ReferenceCountedOpenSslEngine engine, OcspClientCallback callback) { + OcspClientCallbackHandler(ReferenceCountedOpenSslEngine engine, OcspClientCallback callback) { super(engine); this.callback = callback; } @@ -497,7 +497,7 @@ public class OcspTest { private static final class OcspTestException extends IllegalStateException { private static final long serialVersionUID = 4516426833250228159L; - public OcspTestException(String message) { + OcspTestException(String message) { super(message); } } diff --git a/handler/src/test/java/io/netty/handler/timeout/IdleStateHandlerTest.java b/handler/src/test/java/io/netty/handler/timeout/IdleStateHandlerTest.java index 56891f6848..5a54ec623d 100644 --- a/handler/src/test/java/io/netty/handler/timeout/IdleStateHandlerTest.java +++ b/handler/src/test/java/io/netty/handler/timeout/IdleStateHandlerTest.java @@ -317,7 +317,7 @@ public class IdleStateHandlerTest { private long ticksInNanos; - public TestableIdleStateHandler(boolean observeOutput, + TestableIdleStateHandler(boolean observeOutput, long readerIdleTime, long writerIdleTime, long allIdleTime, TimeUnit unit) { super(observeOutput, readerIdleTime, writerIdleTime, allIdleTime, unit); @@ -369,7 +369,7 @@ public class IdleStateHandlerTest { private static class ObservableChannel extends EmbeddedChannel { - public ObservableChannel(ChannelHandler... handlers) { + ObservableChannel(ChannelHandler... handlers) { super(handlers); } diff --git a/microbench/src/main/java/io/netty/handler/codec/http2/HpackBenchmarkUtil.java b/microbench/src/main/java/io/netty/handler/codec/http2/HpackBenchmarkUtil.java index d815cb5dd3..5ef41afe4a 100644 --- a/microbench/src/main/java/io/netty/handler/codec/http2/HpackBenchmarkUtil.java +++ b/microbench/src/main/java/io/netty/handler/codec/http2/HpackBenchmarkUtil.java @@ -49,7 +49,7 @@ public final class HpackBenchmarkUtil { final HpackHeadersSize size; final boolean limitToAscii; - public HeadersKey(HpackHeadersSize size, boolean limitToAscii) { + HeadersKey(HpackHeadersSize size, boolean limitToAscii) { this.size = size; this.limitToAscii = limitToAscii; } diff --git a/microbench/src/main/java/io/netty/microbench/concurrent/BurstCostExecutorsBenchmark.java b/microbench/src/main/java/io/netty/microbench/concurrent/BurstCostExecutorsBenchmark.java index 40e862e08c..bd78a6c51e 100644 --- a/microbench/src/main/java/io/netty/microbench/concurrent/BurstCostExecutorsBenchmark.java +++ b/microbench/src/main/java/io/netty/microbench/concurrent/BurstCostExecutorsBenchmark.java @@ -71,7 +71,7 @@ public class BurstCostExecutorsBenchmark extends AbstractMicrobenchmark { private final AtomicBoolean poisoned = new AtomicBoolean(); private final Thread executorThread; - public SpinExecutorService(int maxTasks) { + SpinExecutorService(int maxTasks) { tasks = PlatformDependent.newFixedMpscQueue(maxTasks); executorThread = new Thread(new Runnable() { @Override diff --git a/pom.xml b/pom.xml index 1cb274bf39..b7c4a4e6d4 100644 --- a/pom.xml +++ b/pom.xml @@ -247,7 +247,7 @@ ${project.build.directory}/dev-tools UTF-8 UTF-8 - 22 + 23 1.4.11.Final 2.0.8 "${settings.localRepository}"/org/mortbay/jetty/alpn/jetty-alpn-agent/${jetty.alpnAgent.version}/jetty-alpn-agent-${jetty.alpnAgent.version}.jar @@ -754,7 +754,7 @@ maven-checkstyle-plugin - 2.12.1 + 3.0.0 check-style @@ -768,7 +768,10 @@ true true io/netty/checkstyle.xml - true + + ${project.build.sourceDirectory} + ${project.build.testSourceDirectory} + diff --git a/transport-native-epoll/pom.xml b/transport-native-epoll/pom.xml index ec7d927100..929325769a 100644 --- a/transport-native-epoll/pom.xml +++ b/transport-native-epoll/pom.xml @@ -161,7 +161,6 @@ generate build - compile 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 ae13861592..8b7f3915d7 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 @@ -389,7 +389,9 @@ abstract class AbstractEpollChannel extends AbstractChannel implements UnixChann */ abstract void epollInReady(); - final void epollInBefore() { maybeMoreDataToRead = false; } + final void epollInBefore() { + maybeMoreDataToRead = false; + } final void epollInFinally(ChannelConfig config) { maybeMoreDataToRead = allocHandle.maybeMoreDataToRead(); diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollRecvByteAllocatorStreamingHandle.java b/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollRecvByteAllocatorStreamingHandle.java index f6ba5f58b5..071acd578c 100644 --- a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollRecvByteAllocatorStreamingHandle.java +++ b/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollRecvByteAllocatorStreamingHandle.java @@ -18,7 +18,7 @@ package io.netty.channel.epoll; import io.netty.channel.RecvByteBufAllocator; final class EpollRecvByteAllocatorStreamingHandle extends EpollRecvByteAllocatorHandle { - public EpollRecvByteAllocatorStreamingHandle(RecvByteBufAllocator.ExtendedHandle handle) { + EpollRecvByteAllocatorStreamingHandle(RecvByteBufAllocator.ExtendedHandle handle) { super(handle); } 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 d3578b4dae..a20dc4aa06 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 @@ -40,7 +40,7 @@ final class LinuxSocket extends Socket { private static final ClosedChannelException SENDFILE_CLOSED_CHANNEL_EXCEPTION = ThrowableUtil.unknownStackTrace( new ClosedChannelException(), Native.class, "sendfile(...)"); - public LinuxSocket(int fd) { + LinuxSocket(int fd) { super(fd); } 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 c009018540..feb6e6c630 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 @@ -296,7 +296,7 @@ public class EpollSpliceTest { volatile ChannelFuture future; final AtomicReference exception = new AtomicReference<>(); - public SpliceHandler(File file) { + SpliceHandler(File file) { this.file = file; } diff --git a/transport-native-kqueue/pom.xml b/transport-native-kqueue/pom.xml index e2d6b95227..da72573ebf 100644 --- a/transport-native-kqueue/pom.xml +++ b/transport-native-kqueue/pom.xml @@ -90,7 +90,6 @@ generate build - compile @@ -198,7 +197,6 @@ generate build - compile @@ -305,7 +303,6 @@ generate build - compile diff --git a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/AbstractKQueueChannel.java b/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/AbstractKQueueChannel.java index 5828e334ec..2b8bafc268 100644 --- a/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/AbstractKQueueChannel.java +++ b/transport-native-kqueue/src/main/java/io/netty/channel/kqueue/AbstractKQueueChannel.java @@ -392,7 +392,9 @@ abstract class AbstractKQueueChannel extends AbstractChannel implements UnixChan abstract void readReady(KQueueRecvByteAllocatorHandle allocHandle); - final void readReadyBefore() { maybeMoreDataToRead = false; } + final void readReadyBefore() { + maybeMoreDataToRead = false; + } final void readReadyFinally(ChannelConfig config) { maybeMoreDataToRead = allocHandle.maybeMoreDataToRead(); diff --git a/transport/src/main/java/io/netty/channel/AdaptiveRecvByteBufAllocator.java b/transport/src/main/java/io/netty/channel/AdaptiveRecvByteBufAllocator.java index dae0b8f80b..fe939b9028 100644 --- a/transport/src/main/java/io/netty/channel/AdaptiveRecvByteBufAllocator.java +++ b/transport/src/main/java/io/netty/channel/AdaptiveRecvByteBufAllocator.java @@ -95,7 +95,7 @@ public class AdaptiveRecvByteBufAllocator extends DefaultMaxMessagesRecvByteBufA private int nextReceiveBufferSize; private boolean decreaseNow; - public HandleImpl(int minIndex, int maxIndex, int initial) { + HandleImpl(int minIndex, int maxIndex, int initial) { this.minIndex = minIndex; this.maxIndex = maxIndex; diff --git a/transport/src/main/java/io/netty/channel/FixedRecvByteBufAllocator.java b/transport/src/main/java/io/netty/channel/FixedRecvByteBufAllocator.java index 8dab77dad7..bcc091ea7e 100644 --- a/transport/src/main/java/io/netty/channel/FixedRecvByteBufAllocator.java +++ b/transport/src/main/java/io/netty/channel/FixedRecvByteBufAllocator.java @@ -26,7 +26,7 @@ public class FixedRecvByteBufAllocator extends DefaultMaxMessagesRecvByteBufAllo private final class HandleImpl extends MaxMessageHandle { private final int bufferSize; - public HandleImpl(int bufferSize) { + HandleImpl(int bufferSize) { this.bufferSize = bufferSize; } diff --git a/transport/src/test/java/io/netty/channel/AbstractChannelTest.java b/transport/src/test/java/io/netty/channel/AbstractChannelTest.java index 259d55b2b9..397641d42a 100644 --- a/transport/src/test/java/io/netty/channel/AbstractChannelTest.java +++ b/transport/src/test/java/io/netty/channel/AbstractChannelTest.java @@ -99,7 +99,7 @@ public class AbstractChannelTest { public void connect(SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise) { } } - public TestChannel(EventLoop eventLoop) { + TestChannel(EventLoop eventLoop) { super(null, eventLoop); } diff --git a/transport/src/test/java/io/netty/channel/DefaultChannelPipelineTailTest.java b/transport/src/test/java/io/netty/channel/DefaultChannelPipelineTailTest.java index 9764458b05..bedc64e167 100644 --- a/transport/src/test/java/io/netty/channel/DefaultChannelPipelineTailTest.java +++ b/transport/src/test/java/io/netty/channel/DefaultChannelPipelineTailTest.java @@ -293,7 +293,7 @@ public class DefaultChannelPipelineTailTest { private class MyChannelPipeline extends DefaultChannelPipeline { - public MyChannelPipeline(Channel channel) { + MyChannelPipeline(Channel channel) { super(channel); }