From f5b03525baf1467d224e76bc95bb7ccd6d6a9713 Mon Sep 17 00:00:00 2001 From: Aayush Atharva Date: Wed, 11 Aug 2021 20:35:48 +0530 Subject: [PATCH] Inline variables to make code more readable (#11565) Motivation: There are lots of redundant variable declarations which should be inlined to make good look better. Modification: Made variables inlined. Result: Less redundant variable and more readable code. --- .../codec/http2/Http2ConnectionRoundtripTest.java | 3 +-- ...ightedFairQueueByteDistributorDependencyTreeTest.java | 7 +++---- .../codec/compression/Bzip2HuffmanStageEncoder.java | 3 +-- .../main/java/io/netty/util/ResourceLeakException.java | 3 +-- .../src/main/java/io/netty/util/internal/StringUtil.java | 3 +-- .../test/java/io/netty/util/internal/StringUtilTest.java | 9 +++------ .../io/netty/handler/codec/http/DecodeHexBenchmark.java | 7 +++---- .../netty/channel/epoll/EpollSocketTestPermutation.java | 5 +---- .../channel/kqueue/KQueueSocketTestPermutation.java | 5 +---- 9 files changed, 15 insertions(+), 30 deletions(-) diff --git a/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2ConnectionRoundtripTest.java b/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2ConnectionRoundtripTest.java index 95c7c1219fe..09d363c6e0f 100644 --- a/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2ConnectionRoundtripTest.java +++ b/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2ConnectionRoundtripTest.java @@ -1278,8 +1278,7 @@ private static void mockFlowControl(Http2FrameListener listener) throws Http2Exc public Integer answer(InvocationOnMock invocation) throws Throwable { ByteBuf buf = (ByteBuf) invocation.getArguments()[2]; int padding = (Integer) invocation.getArguments()[3]; - int processedBytes = buf.readableBytes() + padding; - return processedBytes; + return buf.readableBytes() + padding; } }).when(listener).onDataRead(any(ChannelHandlerContext.class), anyInt(), diff --git a/codec-http2/src/test/java/io/netty/handler/codec/http2/WeightedFairQueueByteDistributorDependencyTreeTest.java b/codec-http2/src/test/java/io/netty/handler/codec/http2/WeightedFairQueueByteDistributorDependencyTreeTest.java index 0449348030a..349e8765581 100644 --- a/codec-http2/src/test/java/io/netty/handler/codec/http2/WeightedFairQueueByteDistributorDependencyTreeTest.java +++ b/codec-http2/src/test/java/io/netty/handler/codec/http2/WeightedFairQueueByteDistributorDependencyTreeTest.java @@ -301,17 +301,16 @@ public void lowestPrecedenceStateShouldBeDropped() throws Http2Exception { // Stream 3 (hasn't been opened) should result in stream 5 being dropped. // dropping stream 5 will distribute its weight to children (only 9) setPriority(3, 9, weight3, false); - short newWeight9 = weight5; - verifyLowestPrecedenceStateShouldBeDropped3(weight3, weight7, newWeight9); + verifyLowestPrecedenceStateShouldBeDropped3(weight3, weight7, weight5); // Stream 5's state has been discarded so we should be able to re-insert this state. setPriority(5, 0, weight5, false); - verifyLowestPrecedenceStateShouldBeDropped4(weight5, weight7, newWeight9); + verifyLowestPrecedenceStateShouldBeDropped4(weight5, weight7, weight5); // All streams are at the same level, so stream ID should be used to drop the numeric lowest valued stream. short weight11 = (short) (weight9 - 1); setPriority(11, 0, weight11, false); - verifyLowestPrecedenceStateShouldBeDropped5(weight7, newWeight9, weight11); + verifyLowestPrecedenceStateShouldBeDropped5(weight7, weight5, weight11); } private void verifyLowestPrecedenceStateShouldBeDropped1(short weight3, short weight5, short weight7) { diff --git a/codec/src/main/java/io/netty/handler/codec/compression/Bzip2HuffmanStageEncoder.java b/codec/src/main/java/io/netty/handler/codec/compression/Bzip2HuffmanStageEncoder.java index 4e252685190..2ad006b2677 100644 --- a/codec/src/main/java/io/netty/handler/codec/compression/Bzip2HuffmanStageEncoder.java +++ b/codec/src/main/java/io/netty/handler/codec/compression/Bzip2HuffmanStageEncoder.java @@ -341,7 +341,6 @@ private void writeBlockData(ByteBuf out) { final Bzip2BitWriter writer = this.writer; final int[][] huffmanMergedCodeSymbols = this.huffmanMergedCodeSymbols; final byte[] selectors = this.selectors; - final char[] mtf = mtfBlock; final int mtfLength = this.mtfLength; int selectorIndex = 0; @@ -350,7 +349,7 @@ private void writeBlockData(ByteBuf out) { final int[] tableMergedCodeSymbols = huffmanMergedCodeSymbols[selectors[selectorIndex++]]; while (mtfIndex <= groupEnd) { - final int mergedCodeSymbol = tableMergedCodeSymbols[mtf[mtfIndex++]]; + final int mergedCodeSymbol = tableMergedCodeSymbols[mtfBlock[mtfIndex++]]; writer.writeBits(out, mergedCodeSymbol >>> 24, mergedCodeSymbol); } } diff --git a/common/src/main/java/io/netty/util/ResourceLeakException.java b/common/src/main/java/io/netty/util/ResourceLeakException.java index 4616209e18a..bccfa89ad5e 100644 --- a/common/src/main/java/io/netty/util/ResourceLeakException.java +++ b/common/src/main/java/io/netty/util/ResourceLeakException.java @@ -49,9 +49,8 @@ public ResourceLeakException(Throwable cause) { @Override public int hashCode() { - StackTraceElement[] trace = cachedStackTrace; int hashCode = 0; - for (StackTraceElement e: trace) { + for (StackTraceElement e: cachedStackTrace) { hashCode = hashCode * 31 + e.hashCode(); } return hashCode; diff --git a/common/src/main/java/io/netty/util/internal/StringUtil.java b/common/src/main/java/io/netty/util/internal/StringUtil.java index 70c979e0553..7b4a78e7d66 100644 --- a/common/src/main/java/io/netty/util/internal/StringUtil.java +++ b/common/src/main/java/io/netty/util/internal/StringUtil.java @@ -243,8 +243,7 @@ public static int decodeHexNibble(final char c) { assert HEX2B.length == (Character.MAX_VALUE + 1); // Character.digit() is not used here, as it addresses a larger // set of characters (both ASCII and full-width latin letters). - final int index = c; - return HEX2B[index]; + return HEX2B[c]; } /** diff --git a/common/src/test/java/io/netty/util/internal/StringUtilTest.java b/common/src/test/java/io/netty/util/internal/StringUtilTest.java index 65d9128346b..962fc373ad4 100644 --- a/common/src/test/java/io/netty/util/internal/StringUtilTest.java +++ b/common/src/test/java/io/netty/util/internal/StringUtilTest.java @@ -175,15 +175,13 @@ public void execute() { @Test public void escapeCsvEmpty() { CharSequence value = ""; - CharSequence expected = value; - escapeCsv(value, expected); + escapeCsv(value, value); } @Test public void escapeCsvUnquoted() { CharSequence value = "something"; - CharSequence expected = value; - escapeCsv(value, expected); + escapeCsv(value, value); } @Test @@ -259,8 +257,7 @@ public void escapeCsvAlreadyEscapedQuote() { @Test public void escapeCsvQuoted() { CharSequence value = "\"foo,goo\""; - CharSequence expected = value; - escapeCsv(value, expected); + escapeCsv(value, value); } @Test diff --git a/microbench/src/main/java/io/netty/handler/codec/http/DecodeHexBenchmark.java b/microbench/src/main/java/io/netty/handler/codec/http/DecodeHexBenchmark.java index 2dc8c6d8e73..fb297e4c19c 100644 --- a/microbench/src/main/java/io/netty/handler/codec/http/DecodeHexBenchmark.java +++ b/microbench/src/main/java/io/netty/handler/codec/http/DecodeHexBenchmark.java @@ -165,14 +165,13 @@ private static int decodeHexNibble(final char c) { } private static int decodeHexNibbleWithCheck(final char c) { - final int index = c; - if (index >= HEX2B.length) { + if ((int) c >= HEX2B.length) { return -1; } if (PlatformDependent.hasUnsafe()) { - return PlatformDependent.getByte(HEX2B, index); + return PlatformDependent.getByte(HEX2B, c); } - return HEX2B[index]; + return HEX2B[c]; } } 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 38804575ef8..be126457098 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 @@ -207,10 +207,7 @@ public String toString() { } public List> domainSocket() { - - List> list = - combo(serverDomainSocket(), clientDomainSocket()); - return list; + return combo(serverDomainSocket(), clientDomainSocket()); } public List> serverDomainSocket() { 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 93595b87a65..fe922eaefb5 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 @@ -135,10 +135,7 @@ public Bootstrap newInstance() { } public List> domainSocket() { - - List> list = - combo(serverDomainSocket(), clientDomainSocket()); - return list; + return combo(serverDomainSocket(), clientDomainSocket()); } public List> serverDomainSocket() {