diff --git a/buffer/src/main/java/io/netty/buffer/AbstractReferenceCountedByteBuf.java b/buffer/src/main/java/io/netty/buffer/AbstractReferenceCountedByteBuf.java index aaaa77de6e..05751cbef7 100644 --- a/buffer/src/main/java/io/netty/buffer/AbstractReferenceCountedByteBuf.java +++ b/buffer/src/main/java/io/netty/buffer/AbstractReferenceCountedByteBuf.java @@ -42,7 +42,7 @@ public abstract class AbstractReferenceCountedByteBuf extends AbstractByteBuf { }; // Value might not equal "real" reference count, all access should be via the updater - @SuppressWarnings("unused") + @SuppressWarnings({"unused", "FieldMayBeFinal"}) private volatile int refCnt = updater.initialValue(); protected AbstractReferenceCountedByteBuf(int maxCapacity) { diff --git a/buffer/src/test/java/io/netty/buffer/ByteBufUtilTest.java b/buffer/src/test/java/io/netty/buffer/ByteBufUtilTest.java index 42796a21a8..9cd7a4af4f 100644 --- a/buffer/src/test/java/io/netty/buffer/ByteBufUtilTest.java +++ b/buffer/src/test/java/io/netty/buffer/ByteBufUtilTest.java @@ -652,7 +652,7 @@ public class ByteBufUtilTest { ByteBufUtil.utf8Bytes(usAscii, 5, 18)); } - private static int[][] INVALID_RANGES = new int[][] { + private static final int[][] INVALID_RANGES = new int[][] { { -1, 5 }, { 5, 30 }, { 10, 5 } }; diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/cors/CorsHandler.java b/codec-http/src/main/java/io/netty/handler/codec/http/cors/CorsHandler.java index 79557b7c11..6791426c71 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/cors/CorsHandler.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/cors/CorsHandler.java @@ -55,7 +55,7 @@ public class CorsHandler implements ChannelHandler { private HttpRequest request; private final List configList; - private boolean isShortCircuit; + private final boolean isShortCircuit; /** * Creates a new instance with a single {@link CorsConfig}. diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostMultipartRequestDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostMultipartRequestDecoder.java index 767a60d125..cc389cba8f 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostMultipartRequestDecoder.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostMultipartRequestDecoder.java @@ -102,7 +102,7 @@ public class HttpPostMultipartRequestDecoder implements InterfaceHttpPostRequest /** * If multipart, this is the boundary for the global multipart */ - private String multipartDataBoundary; + private final String multipartDataBoundary; /** * If multipart, there could be internal multiparts (mixed) to the global diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/MixedAttribute.java b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/MixedAttribute.java index 9b89af43fa..fbd23fd2fb 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/MixedAttribute.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/MixedAttribute.java @@ -27,8 +27,8 @@ import java.nio.charset.Charset; * Mixed implementation using both in Memory and in File with a limit of size */ public class MixedAttribute implements Attribute { - private String baseDir; - private boolean deleteOnExit; + private final String baseDir; + private final boolean deleteOnExit; private Attribute attribute; private final long limitSize; diff --git a/codec-http2/src/test/java/io/netty/handler/codec/http2/AbstractWeightedFairQueueByteDistributorDependencyTest.java b/codec-http2/src/test/java/io/netty/handler/codec/http2/AbstractWeightedFairQueueByteDistributorDependencyTest.java index ca4704fe06..c796204dee 100644 --- a/codec-http2/src/test/java/io/netty/handler/codec/http2/AbstractWeightedFairQueueByteDistributorDependencyTest.java +++ b/codec-http2/src/test/java/io/netty/handler/codec/http2/AbstractWeightedFairQueueByteDistributorDependencyTest.java @@ -24,7 +24,7 @@ import org.mockito.stubbing.Answer; abstract class AbstractWeightedFairQueueByteDistributorDependencyTest { Http2Connection connection; WeightedFairQueueByteDistributor distributor; - private IntObjectMap stateMap = + private final IntObjectMap stateMap = new IntObjectHashMap(); @Mock diff --git a/codec-http2/src/test/java/io/netty/handler/codec/http2/HpackTestCase.java b/codec-http2/src/test/java/io/netty/handler/codec/http2/HpackTestCase.java index a5be961d48..66f3da42ee 100644 --- a/codec-http2/src/test/java/io/netty/handler/codec/http2/HpackTestCase.java +++ b/codec-http2/src/test/java/io/netty/handler/codec/http2/HpackTestCase.java @@ -237,6 +237,7 @@ final class HpackTestCase { } static class HeaderBlock { + @SuppressWarnings("FieldMayBeFinal") private int maxHeaderTableSize = -1; private byte[] encodedBytes; private List encoded; diff --git a/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2ControlFrameLimitEncoderTest.java b/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2ControlFrameLimitEncoderTest.java index 715b28b8a0..43c22f8339 100644 --- a/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2ControlFrameLimitEncoderTest.java +++ b/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2ControlFrameLimitEncoderTest.java @@ -74,7 +74,7 @@ public class Http2ControlFrameLimitEncoderTest { private int numWrites; - private Queue goAwayPromises = new ArrayDeque(); + private final Queue goAwayPromises = new ArrayDeque(); /** * Init fields and do mocking. diff --git a/codec-mqtt/src/main/java/io/netty/handler/codec/mqtt/MqttMessageBuilders.java b/codec-mqtt/src/main/java/io/netty/handler/codec/mqtt/MqttMessageBuilders.java index 1bd52417fa..d07a6dee5f 100644 --- a/codec-mqtt/src/main/java/io/netty/handler/codec/mqtt/MqttMessageBuilders.java +++ b/codec-mqtt/src/main/java/io/netty/handler/codec/mqtt/MqttMessageBuilders.java @@ -356,7 +356,7 @@ public final class MqttMessageBuilders { private Long maximumPacketSize; private int topicAliasMaximum; private String reasonString; - private MqttProperties.UserProperties userProperties = new MqttProperties.UserProperties(); + private final MqttProperties.UserProperties userProperties = new MqttProperties.UserProperties(); private Boolean wildcardSubscriptionAvailable; private Boolean subscriptionIdentifiersAvailable; private Boolean sharedSubscriptionAvailable; diff --git a/common/src/main/java/io/netty/util/AbstractReferenceCounted.java b/common/src/main/java/io/netty/util/AbstractReferenceCounted.java index 2d8f3fee77..364b980979 100644 --- a/common/src/main/java/io/netty/util/AbstractReferenceCounted.java +++ b/common/src/main/java/io/netty/util/AbstractReferenceCounted.java @@ -41,7 +41,7 @@ public abstract class AbstractReferenceCounted implements ReferenceCounted { }; // Value might not equal "real" reference count, all access should be via the updater - @SuppressWarnings("unused") + @SuppressWarnings({"unused", "FieldMayBeFinal"}) private volatile int refCnt = updater.initialValue(); @Override diff --git a/common/src/test/java/io/netty/util/AsciiStringMemoryTest.java b/common/src/test/java/io/netty/util/AsciiStringMemoryTest.java index eb15895f5d..ed4d1db1d0 100644 --- a/common/src/test/java/io/netty/util/AsciiStringMemoryTest.java +++ b/common/src/test/java/io/netty/util/AsciiStringMemoryTest.java @@ -36,7 +36,7 @@ public class AsciiStringMemoryTest { private int length = 100; private AsciiString aAsciiString; private AsciiString bAsciiString; - private Random r = new Random(); + private final Random r = new Random(); @BeforeEach public void setup() { diff --git a/common/src/test/java/io/netty/util/ResourceLeakDetectorTest.java b/common/src/test/java/io/netty/util/ResourceLeakDetectorTest.java index 37d165b46c..7414df21b7 100644 --- a/common/src/test/java/io/netty/util/ResourceLeakDetectorTest.java +++ b/common/src/test/java/io/netty/util/ResourceLeakDetectorTest.java @@ -37,7 +37,7 @@ public class ResourceLeakDetectorTest { final CyclicBarrier barrier = new CyclicBarrier(threads.length); for (int i = 0; i < threads.length; i++) { Thread t = new Thread(new Runnable() { - Queue resources = new ArrayDeque<>(100); + final Queue resources = new ArrayDeque<>(100); @Override public void run() { diff --git a/microbench/src/main/java/io/netty/handler/codec/http/HttpRequestEncoderInsertBenchmark.java b/microbench/src/main/java/io/netty/handler/codec/http/HttpRequestEncoderInsertBenchmark.java index a7bb7b2179..7d7df184c6 100644 --- a/microbench/src/main/java/io/netty/handler/codec/http/HttpRequestEncoderInsertBenchmark.java +++ b/microbench/src/main/java/io/netty/handler/codec/http/HttpRequestEncoderInsertBenchmark.java @@ -34,9 +34,9 @@ import static io.netty.handler.codec.http.HttpConstants.*; @Measurement(iterations = 20) public class HttpRequestEncoderInsertBenchmark extends AbstractMicrobenchmark { - private String uri = "http://localhost?eventType=CRITICAL&from=0&to=1497437160327&limit=10&offset=0"; - private OldHttpRequestEncoder encoderOld = new OldHttpRequestEncoder(); - private HttpRequestEncoder encoderNew = new HttpRequestEncoder(); + private final String uri = "http://localhost?eventType=CRITICAL&from=0&to=1497437160327&limit=10&offset=0"; + private final OldHttpRequestEncoder encoderOld = new OldHttpRequestEncoder(); + private final HttpRequestEncoder encoderNew = new HttpRequestEncoder(); @Benchmark public ByteBuf oldEncoder() throws Exception { diff --git a/microbench/src/main/java/io/netty/handler/codec/http2/Http2FrameWriterDataBenchmark.java b/microbench/src/main/java/io/netty/handler/codec/http2/Http2FrameWriterDataBenchmark.java index fa7279e47a..4a7b8a440d 100644 --- a/microbench/src/main/java/io/netty/handler/codec/http2/Http2FrameWriterDataBenchmark.java +++ b/microbench/src/main/java/io/netty/handler/codec/http2/Http2FrameWriterDataBenchmark.java @@ -115,7 +115,7 @@ public class Http2FrameWriterDataBenchmark extends AbstractMicrobenchmark { private static final class OldDefaultHttp2FrameWriter implements Http2DataWriter { private static final ByteBuf ZERO_BUFFER = unreleasableBuffer(directBuffer(MAX_UNSIGNED_BYTE).writeZero(MAX_UNSIGNED_BYTE)).asReadOnly(); - private int maxFrameSize = DEFAULT_MAX_FRAME_SIZE; + private final int maxFrameSize = DEFAULT_MAX_FRAME_SIZE; @Override public ChannelFuture writeData(ChannelHandlerContext ctx, int streamId, ByteBuf data, int padding, boolean endStream, ChannelPromise promise) { diff --git a/microbench/src/main/java/io/netty/microbench/channel/EmbeddedChannelWriteAccumulatingHandlerContext.java b/microbench/src/main/java/io/netty/microbench/channel/EmbeddedChannelWriteAccumulatingHandlerContext.java index e94d301303..5bfe3f8dae 100644 --- a/microbench/src/main/java/io/netty/microbench/channel/EmbeddedChannelWriteAccumulatingHandlerContext.java +++ b/microbench/src/main/java/io/netty/microbench/channel/EmbeddedChannelWriteAccumulatingHandlerContext.java @@ -26,7 +26,7 @@ import io.netty.handler.codec.ByteToMessageDecoder; public abstract class EmbeddedChannelWriteAccumulatingHandlerContext extends EmbeddedChannelHandlerContext { private ByteBuf cumulation; - private ByteToMessageDecoder.Cumulator cumulator; + private final ByteToMessageDecoder.Cumulator cumulator; protected EmbeddedChannelWriteAccumulatingHandlerContext(ByteBufAllocator alloc, ChannelHandler handler, ByteToMessageDecoder.Cumulator writeCumulator) { diff --git a/microbench/src/main/java/io/netty/microbench/http2/NoPriorityByteDistributionBenchmark.java b/microbench/src/main/java/io/netty/microbench/http2/NoPriorityByteDistributionBenchmark.java index 386e2a8ebd..458c8b6171 100644 --- a/microbench/src/main/java/io/netty/microbench/http2/NoPriorityByteDistributionBenchmark.java +++ b/microbench/src/main/java/io/netty/microbench/http2/NoPriorityByteDistributionBenchmark.java @@ -98,7 +98,7 @@ public class NoPriorityByteDistributionBenchmark extends AbstractMicrobenchmark } } - private Http2StreamVisitor invocationVisitor = stream -> { + private final Http2StreamVisitor invocationVisitor = stream -> { // Restore the connection window. resetWindow(stream); diff --git a/microbench/src/main/java/io/netty/microbench/util/AbstractSharedExecutorMicrobenchmark.java b/microbench/src/main/java/io/netty/microbench/util/AbstractSharedExecutorMicrobenchmark.java index 40d7c6db1a..b6ea697f57 100644 --- a/microbench/src/main/java/io/netty/microbench/util/AbstractSharedExecutorMicrobenchmark.java +++ b/microbench/src/main/java/io/netty/microbench/util/AbstractSharedExecutorMicrobenchmark.java @@ -65,7 +65,7 @@ public class AbstractSharedExecutorMicrobenchmark extends AbstractMicrobenchmark */ public static final class DelegateHarnessExecutor extends AbstractEventExecutor { private static EventLoop executor; - private InternalLogger logger = InternalLoggerFactory.getInstance(DelegateHarnessExecutor.class); + private final InternalLogger logger = InternalLoggerFactory.getInstance(DelegateHarnessExecutor.class); public DelegateHarnessExecutor(int maxThreads, String prefix) { logger.debug("Using DelegateHarnessExecutor executor {}", this); 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 5a2d77eafd..43a7c42616 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 @@ -191,7 +191,7 @@ class TestDnsServer extends DnsServer { @Override public ProtocolDecoder getDecoder(IoSession session) { return new ProtocolDecoderAdapter() { - private DnsMessageDecoder decoder = new DnsMessageDecoder(); + private final DnsMessageDecoder decoder = new DnsMessageDecoder(); @Override public void decode(IoSession session, IoBuffer in, ProtocolDecoderOutput out) throws IOException { diff --git a/transport/src/test/java/io/netty/channel/AdaptiveRecvByteBufAllocatorTest.java b/transport/src/test/java/io/netty/channel/AdaptiveRecvByteBufAllocatorTest.java index cf8ae04c9a..f2ec812f16 100644 --- a/transport/src/test/java/io/netty/channel/AdaptiveRecvByteBufAllocatorTest.java +++ b/transport/src/test/java/io/netty/channel/AdaptiveRecvByteBufAllocatorTest.java @@ -29,7 +29,7 @@ import static org.mockito.Mockito.when; public class AdaptiveRecvByteBufAllocatorTest { @Mock private ChannelConfig config; - private ByteBufAllocator alloc = UnpooledByteBufAllocator.DEFAULT; + private final ByteBufAllocator alloc = UnpooledByteBufAllocator.DEFAULT; private RecvByteBufAllocator.ExtendedHandle handle; @BeforeEach diff --git a/transport/src/test/java/io/netty/channel/embedded/CustomChannelId.java b/transport/src/test/java/io/netty/channel/embedded/CustomChannelId.java index 81080c38a9..54fa7b43f7 100644 --- a/transport/src/test/java/io/netty/channel/embedded/CustomChannelId.java +++ b/transport/src/test/java/io/netty/channel/embedded/CustomChannelId.java @@ -21,7 +21,7 @@ public class CustomChannelId implements ChannelId { private static final long serialVersionUID = 1L; - private int id; + private final int id; CustomChannelId(int id) { this.id = id;