From 7b9366e0f007051394f7a6bef94ac3c5005efd32 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Mon, 11 Aug 2025 12:28:39 -0700 Subject: [PATCH] Apply `UnnecessaryParentheses`. And sneak in a few other simplifications, mostly to remove explicit type arguments. Fixes #7930 RELNOTES=n/a PiperOrigin-RevId: 793754837 --- .../collect/testing/MapInterfaceTest.java | 2 +- .../SortedMultisetTestSuiteBuilder.java | 2 +- .../testing/testers/SetHashCodeTester.java | 4 ++-- .../common/base/StopwatchBenchmark.java | 2 +- .../google/common/hash/HashCodeBenchmark.java | 6 ++--- .../util/concurrent/MonitorBenchmark.java | 2 +- .../google/common/cache/CacheLoadingTest.java | 2 +- .../com/google/common/cache/CacheTesting.java | 2 +- .../google/common/cache/LocalCacheTest.java | 8 +++---- .../ConcurrentHashMultisetBasherTest.java | 4 ++-- .../google/common/hash/BloomFilterTest.java | 2 +- .../common/hash/Crc32cHashFunctionTest.java | 2 +- .../com/google/common/hash/HashTestUtils.java | 2 +- .../com/google/common/math/IntMathTest.java | 2 +- .../com/google/common/math/LongMathTest.java | 2 +- .../google/common/net/HostAndPortTest.java | 2 +- .../util/concurrent/GeneratedMonitorTest.java | 2 +- .../util/concurrent/RateLimiterTest.java | 2 +- .../src/com/google/common/base/Utf8.java | 2 +- .../com/google/common/cache/LocalCache.java | 6 ++--- .../collect/AbstractMapBasedMultimap.java | 10 ++++----- .../google/common/collect/CompactHashing.java | 2 +- .../src/com/google/common/collect/Cut.java | 10 ++++----- .../common/collect/FilteredEntryMultimap.java | 7 +++--- .../com/google/common/collect/HashBiMap.java | 2 +- .../common/collect/ImmutableRangeSet.java | 10 ++++----- .../common/collect/MapMakerInternalMap.java | 6 ++--- .../common/collect/RegularImmutableBiMap.java | 10 ++++----- .../google/common/collect/TreeRangeSet.java | 22 +++++++++---------- .../google/common/graph/EdgesConnecting.java | 2 +- .../common/hash/FarmHashFingerprint64.java | 6 ++--- .../google/common/hash/Fingerprint2011.java | 4 ++-- .../src/com/google/common/hash/HashCode.java | 8 +++---- .../common/math/LinearTransformation.java | 2 +- .../com/google/common/net/HostAndPort.java | 2 +- .../common/primitives/UnsignedLongs.java | 2 +- .../com/google/common/cache/LocalCache.java | 4 ++-- .../collect/testing/MapInterfaceTest.java | 2 +- .../SortedMultisetTestSuiteBuilder.java | 2 +- .../testing/testers/SetHashCodeTester.java | 4 ++-- .../common/base/StopwatchBenchmark.java | 2 +- .../google/common/hash/HashCodeBenchmark.java | 6 ++--- .../util/concurrent/MonitorBenchmark.java | 2 +- .../google/common/cache/CacheLoadingTest.java | 2 +- .../com/google/common/cache/CacheTesting.java | 2 +- .../google/common/cache/LocalCacheTest.java | 8 +++---- .../ConcurrentHashMultisetBasherTest.java | 4 ++-- .../com/google/common/collect/MapsTest.java | 4 ++-- .../google/common/hash/BloomFilterTest.java | 2 +- .../common/hash/Crc32cHashFunctionTest.java | 2 +- .../com/google/common/hash/HashTestUtils.java | 2 +- .../com/google/common/math/IntMathTest.java | 2 +- .../com/google/common/math/LongMathTest.java | 2 +- .../google/common/net/HostAndPortTest.java | 2 +- .../util/concurrent/GeneratedMonitorTest.java | 2 +- .../util/concurrent/RateLimiterTest.java | 2 +- guava/src/com/google/common/base/Utf8.java | 2 +- .../com/google/common/cache/LocalCache.java | 6 ++--- .../collect/AbstractMapBasedMultimap.java | 10 ++++----- .../collect/AbstractMapBasedMultiset.java | 2 +- .../google/common/collect/CompactHashing.java | 2 +- guava/src/com/google/common/collect/Cut.java | 10 ++++----- .../common/collect/FilteredEntryMultimap.java | 7 +++--- .../common/collect/ImmutableRangeSet.java | 10 ++++----- .../common/collect/MapMakerInternalMap.java | 6 ++--- .../google/common/collect/TreeRangeSet.java | 22 +++++++++---------- .../google/common/graph/EdgesConnecting.java | 2 +- .../common/hash/FarmHashFingerprint64.java | 6 ++--- .../google/common/hash/Fingerprint2011.java | 4 ++-- .../src/com/google/common/hash/HashCode.java | 8 +++---- .../common/math/LinearTransformation.java | 2 +- .../com/google/common/net/HostAndPort.java | 2 +- .../common/primitives/UnsignedLongs.java | 2 +- .../common/util/concurrent/AtomicLongMap.java | 3 +-- 74 files changed, 162 insertions(+), 165 deletions(-) diff --git a/android/guava-testlib/src/com/google/common/collect/testing/MapInterfaceTest.java b/android/guava-testlib/src/com/google/common/collect/testing/MapInterfaceTest.java index a872bd0d31a8..f62bcadc668a 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/MapInterfaceTest.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/MapInterfaceTest.java @@ -687,7 +687,7 @@ public void testEntrySetRetainAll() { Set> entriesToRetain = singleton(mapEntry(originalEntry.getKey(), originalEntry.getValue())); if (supportsRemove) { - boolean shouldRemove = (entrySet.size() > entriesToRetain.size()); + boolean shouldRemove = entrySet.size() > entriesToRetain.size(); boolean didRemove = entrySet.retainAll(entriesToRetain); assertEquals(shouldRemove, didRemove); assertEquals(entriesToRetain.size(), map.size()); diff --git a/android/guava-testlib/src/com/google/common/collect/testing/google/SortedMultisetTestSuiteBuilder.java b/android/guava-testlib/src/com/google/common/collect/testing/google/SortedMultisetTestSuiteBuilder.java index ddadb82f4b40..3fb03bb55dcd 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/google/SortedMultisetTestSuiteBuilder.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/google/SortedMultisetTestSuiteBuilder.java @@ -274,7 +274,7 @@ private TestSuite createReserializedSuite(SortedMultisetTestSuiteBuilder pare new ForwardingTestMultisetGenerator(delegate) { @Override public SortedMultiset create(Object... entries) { - return SerializableTester.reserialize(((SortedMultiset) super.create(entries))); + return SerializableTester.reserialize((SortedMultiset) super.create(entries)); } }) .named(parentBuilder.getName() + " reserialized") diff --git a/android/guava-testlib/src/com/google/common/collect/testing/testers/SetHashCodeTester.java b/android/guava-testlib/src/com/google/common/collect/testing/testers/SetHashCodeTester.java index 36034167734e..c462a2c41021 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/testers/SetHashCodeTester.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/testers/SetHashCodeTester.java @@ -41,7 +41,7 @@ public class SetHashCodeTester extends AbstractSetTester { public void testHashCode() { int expectedHashCode = 0; for (E element : getSampleElements()) { - expectedHashCode += ((element == null) ? 0 : element.hashCode()); + expectedHashCode += (element == null) ? 0 : element.hashCode(); } assertEquals( "A Set's hashCode() should be the sum of those of its elements.", @@ -55,7 +55,7 @@ public void testHashCode_containingNull() { Collection elements = getSampleElements(getNumElements() - 1); int expectedHashCode = 0; for (E element : elements) { - expectedHashCode += ((element == null) ? 0 : element.hashCode()); + expectedHashCode += (element == null) ? 0 : element.hashCode(); } elements.add(null); diff --git a/android/guava-tests/benchmark/com/google/common/base/StopwatchBenchmark.java b/android/guava-tests/benchmark/com/google/common/base/StopwatchBenchmark.java index 21e71774391e..34ea0992b4bf 100644 --- a/android/guava-tests/benchmark/com/google/common/base/StopwatchBenchmark.java +++ b/android/guava-tests/benchmark/com/google/common/base/StopwatchBenchmark.java @@ -46,7 +46,7 @@ long manual(int reps) { for (int i = 0; i < reps; i++) { long start = System.nanoTime(); // here is where you would do something - total += (System.nanoTime() - start); + total += System.nanoTime() - start; } return total; } diff --git a/android/guava-tests/benchmark/com/google/common/hash/HashCodeBenchmark.java b/android/guava-tests/benchmark/com/google/common/hash/HashCodeBenchmark.java index d7b6eb110454..17a1e86d7b45 100644 --- a/android/guava-tests/benchmark/com/google/common/hash/HashCodeBenchmark.java +++ b/android/guava-tests/benchmark/com/google/common/hash/HashCodeBenchmark.java @@ -70,7 +70,7 @@ boolean doEquals(byte[] a, byte[] b) { } boolean areEqual = true; for (int i = 0; i < a.length; i++) { - areEqual &= (a[i] == b[i]); + areEqual &= a[i] == b[i]; } return areEqual; } @@ -85,7 +85,7 @@ boolean doEquals(byte[] a, byte[] b) { for (int i = 0; i < a.length; i++) { result = (byte) (result | a[i] ^ b[i]); } - return (result == 0); + return result == 0; } }, XORING_TO_INT { @@ -98,7 +98,7 @@ boolean doEquals(byte[] a, byte[] b) { for (int i = 0; i < a.length; i++) { result |= a[i] ^ b[i]; } - return (result == 0); + return result == 0; } }, MESSAGE_DIGEST_IS_EQUAL { diff --git a/android/guava-tests/benchmark/com/google/common/util/concurrent/MonitorBenchmark.java b/android/guava-tests/benchmark/com/google/common/util/concurrent/MonitorBenchmark.java index 2513d861776b..adef4f5cd42b 100644 --- a/android/guava-tests/benchmark/com/google/common/util/concurrent/MonitorBenchmark.java +++ b/android/guava-tests/benchmark/com/google/common/util/concurrent/MonitorBenchmark.java @@ -46,7 +46,7 @@ public class MonitorBenchmark { @SuppressWarnings("unchecked") void setUp() throws Exception { String prefix = - (useMonitor ? "com.google.common.util.concurrent.MonitorBased" : "java.util.concurrent."); + useMonitor ? "com.google.common.util.concurrent.MonitorBased" : "java.util.concurrent."; String className = prefix + queueType + "BlockingQueue"; Constructor constructor = Class.forName(className).getConstructor(int.class); queue = (BlockingQueue) constructor.newInstance(capacity); diff --git a/android/guava-tests/test/com/google/common/cache/CacheLoadingTest.java b/android/guava-tests/test/com/google/common/cache/CacheLoadingTest.java index a3c03424a5c2..a2e3883d95b9 100644 --- a/android/guava-tests/test/com/google/common/cache/CacheLoadingTest.java +++ b/android/guava-tests/test/com/google/common/cache/CacheLoadingTest.java @@ -1941,7 +1941,7 @@ public String load(String key) throws InterruptedException { // doConcurrentGet alternates between calling getUnchecked and calling get, but an unchecked // exception thrown by the loader is always wrapped as an UncheckedExecutionException. assertThat(result.get(i)).isInstanceOf(UncheckedExecutionException.class); - assertThat(((UncheckedExecutionException) result.get(i))).hasCauseThat().isSameInstanceAs(e); + assertThat((UncheckedExecutionException) result.get(i)).hasCauseThat().isSameInstanceAs(e); } // subsequent calls should call the loader again, not get the old exception diff --git a/android/guava-tests/test/com/google/common/cache/CacheTesting.java b/android/guava-tests/test/com/google/common/cache/CacheTesting.java index ffabf140498a..eae92c1cc29b 100644 --- a/android/guava-tests/test/com/google/common/cache/CacheTesting.java +++ b/android/guava-tests/test/com/google/common/cache/CacheTesting.java @@ -128,7 +128,7 @@ static LocalCache toLocalCache(Cache cache) { * without throwing an exception. */ static boolean hasLocalCache(Cache cache) { - return (checkNotNull(cache) instanceof LocalLoadingCache); + return checkNotNull(cache) instanceof LocalLoadingCache; } static void drainRecencyQueues(Cache cache) { diff --git a/android/guava-tests/test/com/google/common/cache/LocalCacheTest.java b/android/guava-tests/test/com/google/common/cache/LocalCacheTest.java index 3e9c7e52a00a..cf9739a7640b 100644 --- a/android/guava-tests/test/com/google/common/cache/LocalCacheTest.java +++ b/android/guava-tests/test/com/google/common/cache/LocalCacheTest.java @@ -3055,7 +3055,7 @@ public int hashCode() { @Override public boolean equals(@Nullable Object o) { - return (o instanceof SerializableCacheLoader); + return o instanceof SerializableCacheLoader; } } @@ -3071,7 +3071,7 @@ public int hashCode() { @Override public boolean equals(@Nullable Object o) { - return (o instanceof SerializableRemovalListener); + return o instanceof SerializableRemovalListener; } } @@ -3088,7 +3088,7 @@ public int hashCode() { @Override public boolean equals(@Nullable Object o) { - return (o instanceof SerializableTicker); + return o instanceof SerializableTicker; } } @@ -3105,7 +3105,7 @@ public int hashCode() { @Override public boolean equals(@Nullable Object o) { - return (o instanceof SerializableWeigher); + return o instanceof SerializableWeigher; } } } diff --git a/android/guava-tests/test/com/google/common/collect/ConcurrentHashMultisetBasherTest.java b/android/guava-tests/test/com/google/common/collect/ConcurrentHashMultisetBasherTest.java index 321b71142410..325aa4d7b14f 100644 --- a/android/guava-tests/test/com/google/common/collect/ConcurrentHashMultisetBasherTest.java +++ b/android/guava-tests/test/com/google/common/collect/ConcurrentHashMultisetBasherTest.java @@ -138,7 +138,7 @@ public int[] call() throws Exception { { int newValue = random.nextInt(3); int oldValue = multiset.setCount(key, newValue); - deltas[keyIndex] += (newValue - oldValue); + deltas[keyIndex] += newValue - oldValue; break; } case SET_COUNT_IF: @@ -146,7 +146,7 @@ public int[] call() throws Exception { int newValue = random.nextInt(3); int oldValue = multiset.count(key); if (multiset.setCount(key, oldValue, newValue)) { - deltas[keyIndex] += (newValue - oldValue); + deltas[keyIndex] += newValue - oldValue; } break; } diff --git a/android/guava-tests/test/com/google/common/hash/BloomFilterTest.java b/android/guava-tests/test/com/google/common/hash/BloomFilterTest.java index da385852e792..b2f527cae8a6 100644 --- a/android/guava-tests/test/com/google/common/hash/BloomFilterTest.java +++ b/android/guava-tests/test/com/google/common/hash/BloomFilterTest.java @@ -409,7 +409,7 @@ public void funnel(Long value, PrimitiveSink into) { @Override public boolean equals(@Nullable Object object) { - return (object instanceof CustomFunnel); + return object instanceof CustomFunnel; } @Override diff --git a/android/guava-tests/test/com/google/common/hash/Crc32cHashFunctionTest.java b/android/guava-tests/test/com/google/common/hash/Crc32cHashFunctionTest.java index 2d63f46b20ca..9f19b70a6da5 100644 --- a/android/guava-tests/test/com/google/common/hash/Crc32cHashFunctionTest.java +++ b/android/guava-tests/test/com/google/common/hash/Crc32cHashFunctionTest.java @@ -164,7 +164,7 @@ public void testCrc32cByteTable() { int crc = i; for (int j = 7; j >= 0; j--) { int mask = -(crc & 1); - crc = ((crc >>> 1) ^ (CRC32C_GENERATOR_FLIPPED & mask)); + crc = (crc >>> 1) ^ (CRC32C_GENERATOR_FLIPPED & mask); } expected[i] = crc; } diff --git a/android/guava-tests/test/com/google/common/hash/HashTestUtils.java b/android/guava-tests/test/com/google/common/hash/HashTestUtils.java index 85096df34df9..189450bde9ca 100644 --- a/android/guava-tests/test/com/google/common/hash/HashTestUtils.java +++ b/android/guava-tests/test/com/google/common/hash/HashTestUtils.java @@ -306,7 +306,7 @@ static void checkNoFunnels(HashFunction function) { // test whether the hash values have same output bits same |= ~(hash1 ^ hash2); // test whether the hash values have different output bits - diff |= (hash1 ^ hash2); + diff |= hash1 ^ hash2; count++; // check whether we've exceeded the probabilistically diff --git a/android/guava-tests/test/com/google/common/math/IntMathTest.java b/android/guava-tests/test/com/google/common/math/IntMathTest.java index ab48bcaa43ca..e07bb0deae9c 100644 --- a/android/guava-tests/test/com/google/common/math/IntMathTest.java +++ b/android/guava-tests/test/com/google/common/math/IntMathTest.java @@ -299,7 +299,7 @@ public void testSqrtExactMatchesFloorOrThrows() { for (int x : POSITIVE_INTEGER_CANDIDATES) { int floor = IntMath.sqrt(x, FLOOR); // We only expect an exception if x was not a perfect square. - boolean isPerfectSquare = (floor * floor == x); + boolean isPerfectSquare = floor * floor == x; try { assertEquals(floor, IntMath.sqrt(x, UNNECESSARY)); assertTrue(isPerfectSquare); diff --git a/android/guava-tests/test/com/google/common/math/LongMathTest.java b/android/guava-tests/test/com/google/common/math/LongMathTest.java index 29ed8e0f9875..0d1b60955afd 100644 --- a/android/guava-tests/test/com/google/common/math/LongMathTest.java +++ b/android/guava-tests/test/com/google/common/math/LongMathTest.java @@ -338,7 +338,7 @@ public void testSqrtExactMatchesFloorOrThrows() { for (long x : POSITIVE_LONG_CANDIDATES) { long sqrtFloor = LongMath.sqrt(x, FLOOR); // We only expect an exception if x was not a perfect square. - boolean isPerfectSquare = (sqrtFloor * sqrtFloor == x); + boolean isPerfectSquare = sqrtFloor * sqrtFloor == x; try { assertEquals(sqrtFloor, LongMath.sqrt(x, UNNECESSARY)); assertTrue(isPerfectSquare); diff --git a/android/guava-tests/test/com/google/common/net/HostAndPortTest.java b/android/guava-tests/test/com/google/common/net/HostAndPortTest.java index b52ce8334898..7d92d5746838 100644 --- a/android/guava-tests/test/com/google/common/net/HostAndPortTest.java +++ b/android/guava-tests/test/com/google/common/net/HostAndPortTest.java @@ -121,7 +121,7 @@ private static void checkFromStringCase( assertNotNull(expectHost); // Apply withDefaultPort(), yielding hp2. - boolean badDefaultPort = (defaultPort < 0 || defaultPort > 65535); + boolean badDefaultPort = defaultPort < 0 || defaultPort > 65535; HostAndPort hp2 = null; try { hp2 = hp.withDefaultPort(defaultPort); diff --git a/android/guava-tests/test/com/google/common/util/concurrent/GeneratedMonitorTest.java b/android/guava-tests/test/com/google/common/util/concurrent/GeneratedMonitorTest.java index 1af71f11dc60..d2ac234b2e73 100644 --- a/android/guava-tests/test/com/google/common/util/concurrent/GeneratedMonitorTest.java +++ b/android/guava-tests/test/com/google/common/util/concurrent/GeneratedMonitorTest.java @@ -424,7 +424,7 @@ private static void addTests( suite.addTest(new GeneratedMonitorTest(method, scenario, fair, timeout, expectedOutcome)); } } else { - Timeout implicitTimeout = (isTryEnter(method) ? Timeout.ZERO : Timeout.MAX); + Timeout implicitTimeout = isTryEnter(method) ? Timeout.ZERO : Timeout.MAX; if (timeoutsToUse.timeouts.contains(implicitTimeout)) { suite.addTest(new GeneratedMonitorTest(method, scenario, fair, null, expectedOutcome)); } diff --git a/android/guava-tests/test/com/google/common/util/concurrent/RateLimiterTest.java b/android/guava-tests/test/com/google/common/util/concurrent/RateLimiterTest.java index 1c0f07e58503..e9b0b1d5c080 100644 --- a/android/guava-tests/test/com/google/common/util/concurrent/RateLimiterTest.java +++ b/android/guava-tests/test/com/google/common/util/concurrent/RateLimiterTest.java @@ -509,7 +509,7 @@ void sleepMillis(int millis) { void sleepMicros(String caption, long micros) { instant += MICROSECONDS.toNanos(micros); - events.add(caption + String.format(Locale.ROOT, "%3.2f", (micros / 1000000.0))); + events.add(caption + String.format(Locale.ROOT, "%3.2f", micros / 1000000.0)); } @Override diff --git a/android/guava/src/com/google/common/base/Utf8.java b/android/guava/src/com/google/common/base/Utf8.java index 17102e9bd9a7..0a54460cddec 100644 --- a/android/guava/src/com/google/common/base/Utf8.java +++ b/android/guava/src/com/google/common/base/Utf8.java @@ -60,7 +60,7 @@ public static int encodedLength(CharSequence sequence) { for (; i < utf16Length; i++) { char c = sequence.charAt(i); if (c < 0x800) { - utf8Length += ((0x7f - c) >>> 31); // branch free! + utf8Length += (0x7f - c) >>> 31; // branch free! } else { utf8Length += encodedLengthGeneral(sequence, i); break; diff --git a/android/guava/src/com/google/common/cache/LocalCache.java b/android/guava/src/com/google/common/cache/LocalCache.java index 934fef433148..1acbe7982ed3 100644 --- a/android/guava/src/com/google/common/cache/LocalCache.java +++ b/android/guava/src/com/google/common/cache/LocalCache.java @@ -1679,9 +1679,9 @@ static int rehash(int h) { // using variant of single-word Wang/Jenkins hash. // TODO(kevinb): use Hashing/move this to Hashing? h += (h << 15) ^ 0xffffcd7d; - h ^= (h >>> 10); - h += (h << 3); - h ^= (h >>> 6); + h ^= h >>> 10; + h += h << 3; + h ^= h >>> 6; h += (h << 2) + (h << 14); return h ^ (h >>> 16); } diff --git a/android/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java b/android/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java index 1a2c95409e8a..c9191b696442 100644 --- a/android/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java +++ b/android/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java @@ -515,7 +515,7 @@ public boolean addAll(Collection collection) { boolean changed = delegate.addAll(collection); if (changed) { int newSize = delegate.size(); - totalSize += (newSize - oldSize); + totalSize += newSize - oldSize; if (oldSize == 0) { addToMap(); } @@ -566,7 +566,7 @@ public boolean removeAll(Collection c) { boolean changed = delegate.removeAll(c); if (changed) { int newSize = delegate.size(); - totalSize += (newSize - oldSize); + totalSize += newSize - oldSize; removeIfEmpty(); } return changed; @@ -579,7 +579,7 @@ public boolean retainAll(Collection c) { boolean changed = delegate.retainAll(c); if (changed) { int newSize = delegate.size(); - totalSize += (newSize - oldSize); + totalSize += newSize - oldSize; removeIfEmpty(); } return changed; @@ -613,7 +613,7 @@ public boolean removeAll(Collection c) { boolean changed = Sets.removeAllImpl((Set) delegate, c); if (changed) { int newSize = delegate.size(); - totalSize += (newSize - oldSize); + totalSize += newSize - oldSize; removeIfEmpty(); } return changed; @@ -776,7 +776,7 @@ public boolean addAll(int index, Collection c) { boolean changed = getListDelegate().addAll(index, c); if (changed) { int newSize = getDelegate().size(); - totalSize += (newSize - oldSize); + totalSize += newSize - oldSize; if (oldSize == 0) { addToMap(); } diff --git a/android/guava/src/com/google/common/collect/CompactHashing.java b/android/guava/src/com/google/common/collect/CompactHashing.java index 7c9320a022fd..55dc414c868a 100644 --- a/android/guava/src/com/google/common/collect/CompactHashing.java +++ b/android/guava/src/com/google/common/collect/CompactHashing.java @@ -40,7 +40,7 @@ private CompactHashing() {} private static final int HASH_TABLE_BITS_MAX_BITS = 5; /** Use high bits of metadata for modification count. */ - static final int MODIFICATION_COUNT_INCREMENT = (1 << HASH_TABLE_BITS_MAX_BITS); + static final int MODIFICATION_COUNT_INCREMENT = 1 << HASH_TABLE_BITS_MAX_BITS; /** Bitmask that selects the low bits of metadata to get hashTableBits. */ static final int HASH_TABLE_BITS_MASK = (1 << HASH_TABLE_BITS_MAX_BITS) - 1; diff --git a/android/guava/src/com/google/common/collect/Cut.java b/android/guava/src/com/google/common/collect/Cut.java index 4d682aee35d4..dffa6676e7c6 100644 --- a/android/guava/src/com/google/common/collect/Cut.java +++ b/android/guava/src/com/google/common/collect/Cut.java @@ -337,7 +337,7 @@ Cut withLowerBoundType(BoundType boundType, DiscreteDomain domain) { return this; case OPEN: C previous = domain.previous(endpoint); - return (previous == null) ? Cut.belowAll() : new AboveValue(previous); + return (previous == null) ? Cut.belowAll() : new AboveValue<>(previous); } throw new AssertionError(); } @@ -347,7 +347,7 @@ Cut withUpperBoundType(BoundType boundType, DiscreteDomain domain) { switch (boundType) { case CLOSED: C previous = domain.previous(endpoint); - return (previous == null) ? Cut.aboveAll() : new AboveValue(previous); + return (previous == null) ? Cut.aboveAll() : new AboveValue<>(previous); case OPEN: return this; } @@ -418,7 +418,7 @@ Cut withLowerBoundType(BoundType boundType, DiscreteDomain domain) { return this; case CLOSED: C next = domain.next(endpoint); - return (next == null) ? Cut.belowAll() : belowValue(next); + return (next == null) ? Cut.belowAll() : belowValue(next); } throw new AssertionError(); } @@ -428,7 +428,7 @@ Cut withUpperBoundType(BoundType boundType, DiscreteDomain domain) { switch (boundType) { case OPEN: C next = domain.next(endpoint); - return (next == null) ? Cut.aboveAll() : belowValue(next); + return (next == null) ? Cut.aboveAll() : belowValue(next); case CLOSED: return this; } @@ -458,7 +458,7 @@ C greatestValueBelow(DiscreteDomain domain) { @Override Cut canonical(DiscreteDomain domain) { C next = leastValueAbove(domain); - return (next != null) ? belowValue(next) : Cut.aboveAll(); + return (next != null) ? belowValue(next) : Cut.aboveAll(); } @Override diff --git a/android/guava/src/com/google/common/collect/FilteredEntryMultimap.java b/android/guava/src/com/google/common/collect/FilteredEntryMultimap.java index ba478b518b2a..9e83fff8fb25 100644 --- a/android/guava/src/com/google/common/collect/FilteredEntryMultimap.java +++ b/android/guava/src/com/google/common/collect/FilteredEntryMultimap.java @@ -21,6 +21,8 @@ import static com.google.common.base.Predicates.not; import static com.google.common.collect.CollectPreconditions.checkNonnegative; import static com.google.common.collect.Maps.immutableEntry; +import static java.util.Collections.emptyList; +import static java.util.Collections.emptySet; import static java.util.Collections.unmodifiableList; import static java.util.Collections.unmodifiableSet; @@ -31,7 +33,6 @@ import com.google.j2objc.annotations.WeakOuter; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; @@ -111,9 +112,7 @@ public Collection removeAll(@Nullable Object key) { @SuppressWarnings("EmptyList") // ImmutableList doesn't support nullable element types Collection unmodifiableEmptyCollection() { // These return false, rather than throwing a UOE, on remove calls. - return (unfiltered instanceof SetMultimap) - ? Collections.emptySet() - : Collections.emptyList(); + return (unfiltered instanceof SetMultimap) ? emptySet() : emptyList(); } @Override diff --git a/android/guava/src/com/google/common/collect/HashBiMap.java b/android/guava/src/com/google/common/collect/HashBiMap.java index be19fcf17bad..e936acd5ef90 100644 --- a/android/guava/src/com/google/common/collect/HashBiMap.java +++ b/android/guava/src/com/google/common/collect/HashBiMap.java @@ -947,7 +947,7 @@ public V setValue(@ParametricNullness V value) { @Override public BiMap inverse() { BiMap result = inverse; - return (result == null) ? inverse = new Inverse(this) : result; + return (result == null) ? inverse = new Inverse<>(this) : result; } private static final class Inverse diff --git a/android/guava/src/com/google/common/collect/ImmutableRangeSet.java b/android/guava/src/com/google/common/collect/ImmutableRangeSet.java index 7216989d9b6c..73dec88bb833 100644 --- a/android/guava/src/com/google/common/collect/ImmutableRangeSet.java +++ b/android/guava/src/com/google/common/collect/ImmutableRangeSet.java @@ -113,7 +113,7 @@ public static ImmutableRangeSet copyOf(RangeSet ran checkNotNull(rangeSet); if (rangeSet.isEmpty()) { return of(); - } else if (rangeSet.encloses(Range.all())) { + } else if (rangeSet.encloses(Range.all())) { return all(); } @@ -309,7 +309,7 @@ public ImmutableSet> asRanges() { if (ranges.isEmpty()) { return ImmutableSet.of(); } - return new RegularImmutableSortedSet<>(ranges, Range.rangeLexOrdering()); + return new RegularImmutableSortedSet<>(ranges, Range.rangeLexOrdering()); } @Override @@ -359,14 +359,14 @@ public Range get(int index) { Cut lowerBound; if (positiveBoundedBelow) { - lowerBound = (index == 0) ? Cut.belowAll() : ranges.get(index - 1).upperBound; + lowerBound = (index == 0) ? Cut.belowAll() : ranges.get(index - 1).upperBound; } else { lowerBound = ranges.get(index).upperBound; } Cut upperBound; if (positiveBoundedAbove && index == size - 1) { - upperBound = Cut.aboveAll(); + upperBound = Cut.aboveAll(); } else { upperBound = ranges.get(index + (positiveBoundedBelow ? 0 : 1)).lowerBound; } @@ -829,7 +829,7 @@ Builder combine(Builder builder) { public ImmutableRangeSet build() { ImmutableList.Builder> mergedRangesBuilder = new ImmutableList.Builder<>(ranges.size()); - sort(ranges, Range.rangeLexOrdering()); + sort(ranges, Range.rangeLexOrdering()); PeekingIterator> peekingItr = Iterators.peekingIterator(ranges.iterator()); while (peekingItr.hasNext()) { Range range = peekingItr.next(); diff --git a/android/guava/src/com/google/common/collect/MapMakerInternalMap.java b/android/guava/src/com/google/common/collect/MapMakerInternalMap.java index d91c992c5c2b..1d12d409f09b 100644 --- a/android/guava/src/com/google/common/collect/MapMakerInternalMap.java +++ b/android/guava/src/com/google/common/collect/MapMakerInternalMap.java @@ -1088,9 +1088,9 @@ static int rehash(int h) { // using variant of single-word Wang/Jenkins hash. // TODO(kevinb): use Hashing/move this to Hashing? h += (h << 15) ^ 0xffffcd7d; - h ^= (h >>> 10); - h += (h << 3); - h ^= (h >>> 6); + h ^= h >>> 10; + h += h << 3; + h ^= h >>> 6; h += (h << 2) + (h << 14); return h ^ (h >>> 16); } diff --git a/android/guava/src/com/google/common/collect/RegularImmutableBiMap.java b/android/guava/src/com/google/common/collect/RegularImmutableBiMap.java index bd6613230a16..15e1a60bdddd 100644 --- a/android/guava/src/com/google/common/collect/RegularImmutableBiMap.java +++ b/android/guava/src/com/google/common/collect/RegularImmutableBiMap.java @@ -16,6 +16,8 @@ package com.google.common.collect; +import static com.google.common.collect.RegularImmutableMap.createHashTableOrThrow; + import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; @@ -54,12 +56,10 @@ private RegularImmutableBiMap() { this.size = size; this.keyOffset = 0; int tableSize = (size >= 2) ? ImmutableSet.chooseTableSize(size) : 0; - this.keyHashTable = - RegularImmutableMap.createHashTableOrThrow(alternatingKeysAndValues, size, tableSize, 0); - Object valueHashTable = - RegularImmutableMap.createHashTableOrThrow(alternatingKeysAndValues, size, tableSize, 1); + this.keyHashTable = createHashTableOrThrow(alternatingKeysAndValues, size, tableSize, 0); + Object valueHashTable = createHashTableOrThrow(alternatingKeysAndValues, size, tableSize, 1); this.inverse = - new RegularImmutableBiMap(valueHashTable, alternatingKeysAndValues, size, this); + new RegularImmutableBiMap<>(valueHashTable, alternatingKeysAndValues, size, this); } /** V-to-K constructor. */ diff --git a/android/guava/src/com/google/common/collect/TreeRangeSet.java b/android/guava/src/com/google/common/collect/TreeRangeSet.java index 11f585c35ef3..59bc7f57d589 100644 --- a/android/guava/src/com/google/common/collect/TreeRangeSet.java +++ b/android/guava/src/com/google/common/collect/TreeRangeSet.java @@ -14,6 +14,7 @@ package com.google.common.collect; +import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.Iterators.emptyIterator; @@ -21,7 +22,6 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.MoreObjects; import com.google.errorprone.annotations.concurrent.LazyInit; import java.io.Serializable; import java.util.Collection; @@ -526,7 +526,7 @@ Iterator, Range>> entryIterator() { } PeekingIterator> positiveItr = Iterators.peekingIterator(positiveRanges.iterator()); Cut firstComplementRangeLowerBound; - if (complementLowerBoundWindow.contains(Cut.belowAll()) + if (complementLowerBoundWindow.contains(Cut.belowAll()) && (!positiveItr.hasNext() || positiveItr.peek().lowerBound != Cut.belowAll())) { firstComplementRangeLowerBound = Cut.belowAll(); } else if (positiveItr.hasNext()) { @@ -549,7 +549,7 @@ Iterator, Range>> entryIterator() { negativeRange = Range.create(nextComplementRangeLowerBound, positiveRange.lowerBound); nextComplementRangeLowerBound = positiveRange.upperBound; } else { - negativeRange = Range.create(nextComplementRangeLowerBound, Cut.aboveAll()); + negativeRange = Range.create(nextComplementRangeLowerBound, Cut.aboveAll()); nextComplementRangeLowerBound = Cut.aboveAll(); } return immutableEntry(negativeRange.lowerBound, negativeRange); @@ -570,7 +570,7 @@ Iterator, Range>> descendingEntryIterator() { Cut startingPoint = complementLowerBoundWindow.hasUpperBound() ? complementLowerBoundWindow.upperEndpoint() - : Cut.aboveAll(); + : Cut.aboveAll(); boolean inclusive = complementLowerBoundWindow.hasUpperBound() && complementLowerBoundWindow.upperBoundType() == BoundType.CLOSED; @@ -587,13 +587,13 @@ Iterator, Range>> descendingEntryIterator() { (positiveItr.peek().upperBound == Cut.aboveAll()) ? positiveItr.next().lowerBound : positiveRangesByLowerBound.higherKey(positiveItr.peek().upperBound); - } else if (!complementLowerBoundWindow.contains(Cut.belowAll()) + } else if (!complementLowerBoundWindow.contains(Cut.belowAll()) || positiveRangesByLowerBound.containsKey(Cut.belowAll())) { return emptyIterator(); } else { - cut = positiveRangesByLowerBound.higherKey(Cut.belowAll()); + cut = positiveRangesByLowerBound.higherKey(Cut.belowAll()); } - Cut firstComplementRangeUpperBound = MoreObjects.firstNonNull(cut, Cut.aboveAll()); + Cut firstComplementRangeUpperBound = firstNonNull(cut, Cut.aboveAll()); return new AbstractIterator, Range>>() { Cut nextComplementRangeUpperBound = firstComplementRangeUpperBound; @@ -609,10 +609,10 @@ Iterator, Range>> descendingEntryIterator() { if (complementLowerBoundWindow.lowerBound.isLessThan(negativeRange.lowerBound)) { return immutableEntry(negativeRange.lowerBound, negativeRange); } - } else if (complementLowerBoundWindow.lowerBound.isLessThan(Cut.belowAll())) { - Range negativeRange = Range.create(Cut.belowAll(), nextComplementRangeUpperBound); + } else if (complementLowerBoundWindow.lowerBound.isLessThan(Cut.belowAll())) { + Range negativeRange = Range.create(Cut.belowAll(), nextComplementRangeUpperBound); nextComplementRangeUpperBound = Cut.belowAll(); - return immutableEntry(Cut.belowAll(), negativeRange); + return immutableEntry(Cut.belowAll(), negativeRange); } return endOfData(); } @@ -856,7 +856,7 @@ public int size() { @Override public RangeSet subRangeSet(Range view) { - return view.equals(Range.all()) ? this : new SubRangeSet(view); + return view.equals(Range.all()) ? this : new SubRangeSet(view); } private final class SubRangeSet extends TreeRangeSet { diff --git a/android/guava/src/com/google/common/graph/EdgesConnecting.java b/android/guava/src/com/google/common/graph/EdgesConnecting.java index 234c9bb3ee6c..1accefcca232 100644 --- a/android/guava/src/com/google/common/graph/EdgesConnecting.java +++ b/android/guava/src/com/google/common/graph/EdgesConnecting.java @@ -60,7 +60,7 @@ public int size() { @Override public boolean contains(@Nullable Object edge) { E connectingEdge = getConnectingEdge(); - return (connectingEdge != null && connectingEdge.equals(edge)); + return connectingEdge != null && connectingEdge.equals(edge); } private @Nullable E getConnectingEdge() { diff --git a/android/guava/src/com/google/common/hash/FarmHashFingerprint64.java b/android/guava/src/com/google/common/hash/FarmHashFingerprint64.java index 3785093f0924..b908772d128a 100644 --- a/android/guava/src/com/google/common/hash/FarmHashFingerprint64.java +++ b/android/guava/src/com/google/common/hash/FarmHashFingerprint64.java @@ -85,9 +85,9 @@ private static long shiftMix(long val) { private static long hashLength16(long u, long v, long mul) { long a = (u ^ v) * mul; - a ^= (a >>> 47); + a ^= a >>> 47; long b = (v ^ a) * mul; - b ^= (b >>> 47); + b ^= b >>> 47; b *= mul; return b; } @@ -198,7 +198,7 @@ private static long hashLength65Plus(byte[] bytes, int offset, int length) { long mul = K1 + ((z & 0xFF) << 1); // Operate on the last 64 bytes of input. offset = last64offset; - w[0] += ((length - 1) & 63); + w[0] += (length - 1) & 63; v[0] += w[0]; w[0] += v[0]; x = rotateRight(x + y + v[0] + load64(bytes, offset + 8), 37) * mul; diff --git a/android/guava/src/com/google/common/hash/Fingerprint2011.java b/android/guava/src/com/google/common/hash/Fingerprint2011.java index f54232bc482f..74fac1230e88 100644 --- a/android/guava/src/com/google/common/hash/Fingerprint2011.java +++ b/android/guava/src/com/google/common/hash/Fingerprint2011.java @@ -81,9 +81,9 @@ private static long shiftMix(long val) { @VisibleForTesting static long hash128to64(long high, long low) { long a = (low ^ high) * K3; - a ^= (a >>> 47); + a ^= a >>> 47; long b = (high ^ a) * K3; - b ^= (b >>> 47); + b ^= b >>> 47; b *= K3; return b; } diff --git a/android/guava/src/com/google/common/hash/HashCode.java b/android/guava/src/com/google/common/hash/HashCode.java index 6d5d9adc5565..c80832508b12 100644 --- a/android/guava/src/com/google/common/hash/HashCode.java +++ b/android/guava/src/com/google/common/hash/HashCode.java @@ -287,7 +287,7 @@ public long asLong() { @Override public long padToLong() { - long retVal = (bytes[0] & 0xFF); + long retVal = bytes[0] & 0xFF; for (int i = 1; i < min(bytes.length, 8); i++) { retVal |= (bytes[i] & 0xFFL) << (i * 8); } @@ -314,7 +314,7 @@ boolean equalsSameBits(HashCode that) { boolean areEqual = true; for (int i = 0; i < this.bytes.length; i++) { - areEqual &= (this.bytes[i] == that.getBytesInternal()[i]); + areEqual &= this.bytes[i] == that.getBytesInternal()[i]; } return areEqual; } @@ -389,9 +389,9 @@ public final int hashCode() { } // If we have less than 4 bytes, use them all. byte[] bytes = getBytesInternal(); - int val = (bytes[0] & 0xFF); + int val = bytes[0] & 0xFF; for (int i = 1; i < bytes.length; i++) { - val |= ((bytes[i] & 0xFF) << (i * 8)); + val |= (bytes[i] & 0xFF) << (i * 8); } return val; } diff --git a/android/guava/src/com/google/common/math/LinearTransformation.java b/android/guava/src/com/google/common/math/LinearTransformation.java index 379898d51842..2560d5cd71d0 100644 --- a/android/guava/src/com/google/common/math/LinearTransformation.java +++ b/android/guava/src/com/google/common/math/LinearTransformation.java @@ -190,7 +190,7 @@ public boolean isVertical() { @Override public boolean isHorizontal() { - return (slope == 0.0); + return slope == 0.0; } @Override diff --git a/android/guava/src/com/google/common/net/HostAndPort.java b/android/guava/src/com/google/common/net/HostAndPort.java index 3a553b722c01..2fded49be32f 100644 --- a/android/guava/src/com/google/common/net/HostAndPort.java +++ b/android/guava/src/com/google/common/net/HostAndPort.java @@ -184,7 +184,7 @@ public static HostAndPort fromString(String hostPortString) { } else { // 0 or 2+ colons. Bare hostname or IPv6 literal. host = hostPortString; - hasBracketlessColons = (colonPos >= 0); + hasBracketlessColons = colonPos >= 0; } } diff --git a/android/guava/src/com/google/common/primitives/UnsignedLongs.java b/android/guava/src/com/google/common/primitives/UnsignedLongs.java index 405d49f4c776..e8bb2566abdb 100644 --- a/android/guava/src/com/google/common/primitives/UnsignedLongs.java +++ b/android/guava/src/com/google/common/primitives/UnsignedLongs.java @@ -428,7 +428,7 @@ static boolean overflowInParse(long current, int digit, int radix) { return true; } // current == maxValueDivs[radix] - return (digit > maxValueMods[radix]); + return digit > maxValueMods[radix]; } // current < 0: high bit is set diff --git a/guava-gwt/src-super/com/google/common/cache/super/com/google/common/cache/LocalCache.java b/guava-gwt/src-super/com/google/common/cache/super/com/google/common/cache/LocalCache.java index 2b14dbb36b1d..ed78068582cd 100644 --- a/guava-gwt/src-super/com/google/common/cache/super/com/google/common/cache/LocalCache.java +++ b/guava-gwt/src-super/com/google/common/cache/super/com/google/common/cache/LocalCache.java @@ -240,8 +240,8 @@ private boolean isExpired(Timestamped stamped) { return false; } - boolean expireWrite = (stamped.getWriteTimestamp() + expireAfterWrite <= currentTimeNanos()); - boolean expireAccess = (stamped.getAccessTimestamp() + expireAfterAccess <= currentTimeNanos()); + boolean expireWrite = stamped.getWriteTimestamp() + expireAfterWrite <= currentTimeNanos(); + boolean expireAccess = stamped.getAccessTimestamp() + expireAfterAccess <= currentTimeNanos(); if (expireAfterAccess == UNSET_INT) { return expireWrite; diff --git a/guava-testlib/src/com/google/common/collect/testing/MapInterfaceTest.java b/guava-testlib/src/com/google/common/collect/testing/MapInterfaceTest.java index a872bd0d31a8..f62bcadc668a 100644 --- a/guava-testlib/src/com/google/common/collect/testing/MapInterfaceTest.java +++ b/guava-testlib/src/com/google/common/collect/testing/MapInterfaceTest.java @@ -687,7 +687,7 @@ public void testEntrySetRetainAll() { Set> entriesToRetain = singleton(mapEntry(originalEntry.getKey(), originalEntry.getValue())); if (supportsRemove) { - boolean shouldRemove = (entrySet.size() > entriesToRetain.size()); + boolean shouldRemove = entrySet.size() > entriesToRetain.size(); boolean didRemove = entrySet.retainAll(entriesToRetain); assertEquals(shouldRemove, didRemove); assertEquals(entriesToRetain.size(), map.size()); diff --git a/guava-testlib/src/com/google/common/collect/testing/google/SortedMultisetTestSuiteBuilder.java b/guava-testlib/src/com/google/common/collect/testing/google/SortedMultisetTestSuiteBuilder.java index ddadb82f4b40..3fb03bb55dcd 100644 --- a/guava-testlib/src/com/google/common/collect/testing/google/SortedMultisetTestSuiteBuilder.java +++ b/guava-testlib/src/com/google/common/collect/testing/google/SortedMultisetTestSuiteBuilder.java @@ -274,7 +274,7 @@ private TestSuite createReserializedSuite(SortedMultisetTestSuiteBuilder pare new ForwardingTestMultisetGenerator(delegate) { @Override public SortedMultiset create(Object... entries) { - return SerializableTester.reserialize(((SortedMultiset) super.create(entries))); + return SerializableTester.reserialize((SortedMultiset) super.create(entries)); } }) .named(parentBuilder.getName() + " reserialized") diff --git a/guava-testlib/src/com/google/common/collect/testing/testers/SetHashCodeTester.java b/guava-testlib/src/com/google/common/collect/testing/testers/SetHashCodeTester.java index 36034167734e..c462a2c41021 100644 --- a/guava-testlib/src/com/google/common/collect/testing/testers/SetHashCodeTester.java +++ b/guava-testlib/src/com/google/common/collect/testing/testers/SetHashCodeTester.java @@ -41,7 +41,7 @@ public class SetHashCodeTester extends AbstractSetTester { public void testHashCode() { int expectedHashCode = 0; for (E element : getSampleElements()) { - expectedHashCode += ((element == null) ? 0 : element.hashCode()); + expectedHashCode += (element == null) ? 0 : element.hashCode(); } assertEquals( "A Set's hashCode() should be the sum of those of its elements.", @@ -55,7 +55,7 @@ public void testHashCode_containingNull() { Collection elements = getSampleElements(getNumElements() - 1); int expectedHashCode = 0; for (E element : elements) { - expectedHashCode += ((element == null) ? 0 : element.hashCode()); + expectedHashCode += (element == null) ? 0 : element.hashCode(); } elements.add(null); diff --git a/guava-tests/benchmark/com/google/common/base/StopwatchBenchmark.java b/guava-tests/benchmark/com/google/common/base/StopwatchBenchmark.java index 21e71774391e..34ea0992b4bf 100644 --- a/guava-tests/benchmark/com/google/common/base/StopwatchBenchmark.java +++ b/guava-tests/benchmark/com/google/common/base/StopwatchBenchmark.java @@ -46,7 +46,7 @@ long manual(int reps) { for (int i = 0; i < reps; i++) { long start = System.nanoTime(); // here is where you would do something - total += (System.nanoTime() - start); + total += System.nanoTime() - start; } return total; } diff --git a/guava-tests/benchmark/com/google/common/hash/HashCodeBenchmark.java b/guava-tests/benchmark/com/google/common/hash/HashCodeBenchmark.java index d7b6eb110454..17a1e86d7b45 100644 --- a/guava-tests/benchmark/com/google/common/hash/HashCodeBenchmark.java +++ b/guava-tests/benchmark/com/google/common/hash/HashCodeBenchmark.java @@ -70,7 +70,7 @@ boolean doEquals(byte[] a, byte[] b) { } boolean areEqual = true; for (int i = 0; i < a.length; i++) { - areEqual &= (a[i] == b[i]); + areEqual &= a[i] == b[i]; } return areEqual; } @@ -85,7 +85,7 @@ boolean doEquals(byte[] a, byte[] b) { for (int i = 0; i < a.length; i++) { result = (byte) (result | a[i] ^ b[i]); } - return (result == 0); + return result == 0; } }, XORING_TO_INT { @@ -98,7 +98,7 @@ boolean doEquals(byte[] a, byte[] b) { for (int i = 0; i < a.length; i++) { result |= a[i] ^ b[i]; } - return (result == 0); + return result == 0; } }, MESSAGE_DIGEST_IS_EQUAL { diff --git a/guava-tests/benchmark/com/google/common/util/concurrent/MonitorBenchmark.java b/guava-tests/benchmark/com/google/common/util/concurrent/MonitorBenchmark.java index 2513d861776b..adef4f5cd42b 100644 --- a/guava-tests/benchmark/com/google/common/util/concurrent/MonitorBenchmark.java +++ b/guava-tests/benchmark/com/google/common/util/concurrent/MonitorBenchmark.java @@ -46,7 +46,7 @@ public class MonitorBenchmark { @SuppressWarnings("unchecked") void setUp() throws Exception { String prefix = - (useMonitor ? "com.google.common.util.concurrent.MonitorBased" : "java.util.concurrent."); + useMonitor ? "com.google.common.util.concurrent.MonitorBased" : "java.util.concurrent."; String className = prefix + queueType + "BlockingQueue"; Constructor constructor = Class.forName(className).getConstructor(int.class); queue = (BlockingQueue) constructor.newInstance(capacity); diff --git a/guava-tests/test/com/google/common/cache/CacheLoadingTest.java b/guava-tests/test/com/google/common/cache/CacheLoadingTest.java index a3c03424a5c2..a2e3883d95b9 100644 --- a/guava-tests/test/com/google/common/cache/CacheLoadingTest.java +++ b/guava-tests/test/com/google/common/cache/CacheLoadingTest.java @@ -1941,7 +1941,7 @@ public String load(String key) throws InterruptedException { // doConcurrentGet alternates between calling getUnchecked and calling get, but an unchecked // exception thrown by the loader is always wrapped as an UncheckedExecutionException. assertThat(result.get(i)).isInstanceOf(UncheckedExecutionException.class); - assertThat(((UncheckedExecutionException) result.get(i))).hasCauseThat().isSameInstanceAs(e); + assertThat((UncheckedExecutionException) result.get(i)).hasCauseThat().isSameInstanceAs(e); } // subsequent calls should call the loader again, not get the old exception diff --git a/guava-tests/test/com/google/common/cache/CacheTesting.java b/guava-tests/test/com/google/common/cache/CacheTesting.java index ffabf140498a..eae92c1cc29b 100644 --- a/guava-tests/test/com/google/common/cache/CacheTesting.java +++ b/guava-tests/test/com/google/common/cache/CacheTesting.java @@ -128,7 +128,7 @@ static LocalCache toLocalCache(Cache cache) { * without throwing an exception. */ static boolean hasLocalCache(Cache cache) { - return (checkNotNull(cache) instanceof LocalLoadingCache); + return checkNotNull(cache) instanceof LocalLoadingCache; } static void drainRecencyQueues(Cache cache) { diff --git a/guava-tests/test/com/google/common/cache/LocalCacheTest.java b/guava-tests/test/com/google/common/cache/LocalCacheTest.java index 0f0993925c5a..789536226b48 100644 --- a/guava-tests/test/com/google/common/cache/LocalCacheTest.java +++ b/guava-tests/test/com/google/common/cache/LocalCacheTest.java @@ -3107,7 +3107,7 @@ public int hashCode() { @Override public boolean equals(@Nullable Object o) { - return (o instanceof SerializableCacheLoader); + return o instanceof SerializableCacheLoader; } } @@ -3123,7 +3123,7 @@ public int hashCode() { @Override public boolean equals(@Nullable Object o) { - return (o instanceof SerializableRemovalListener); + return o instanceof SerializableRemovalListener; } } @@ -3140,7 +3140,7 @@ public int hashCode() { @Override public boolean equals(@Nullable Object o) { - return (o instanceof SerializableTicker); + return o instanceof SerializableTicker; } } @@ -3157,7 +3157,7 @@ public int hashCode() { @Override public boolean equals(@Nullable Object o) { - return (o instanceof SerializableWeigher); + return o instanceof SerializableWeigher; } } } diff --git a/guava-tests/test/com/google/common/collect/ConcurrentHashMultisetBasherTest.java b/guava-tests/test/com/google/common/collect/ConcurrentHashMultisetBasherTest.java index 321b71142410..325aa4d7b14f 100644 --- a/guava-tests/test/com/google/common/collect/ConcurrentHashMultisetBasherTest.java +++ b/guava-tests/test/com/google/common/collect/ConcurrentHashMultisetBasherTest.java @@ -138,7 +138,7 @@ public int[] call() throws Exception { { int newValue = random.nextInt(3); int oldValue = multiset.setCount(key, newValue); - deltas[keyIndex] += (newValue - oldValue); + deltas[keyIndex] += newValue - oldValue; break; } case SET_COUNT_IF: @@ -146,7 +146,7 @@ public int[] call() throws Exception { int newValue = random.nextInt(3); int oldValue = multiset.count(key); if (multiset.setCount(key, oldValue, newValue)) { - deltas[keyIndex] += (newValue - oldValue); + deltas[keyIndex] += newValue - oldValue; } break; } diff --git a/guava-tests/test/com/google/common/collect/MapsTest.java b/guava-tests/test/com/google/common/collect/MapsTest.java index 0779b4b4a853..6816a0896336 100644 --- a/guava-tests/test/com/google/common/collect/MapsTest.java +++ b/guava-tests/test/com/google/common/collect/MapsTest.java @@ -1180,7 +1180,7 @@ public void testUnmodifiableBiMap() { assertThrows(UnsupportedOperationException.class, () -> unmod.replace(3, "three", "four")); assertThrows(UnsupportedOperationException.class, () -> unmod.replace(3, "four")); assertThrows( - UnsupportedOperationException.class, () -> unmod.computeIfAbsent(3, (k) -> k + "three")); + UnsupportedOperationException.class, () -> unmod.computeIfAbsent(3, k -> k + "three")); assertThrows(UnsupportedOperationException.class, () -> unmod.computeIfPresent(4, (k, v) -> v)); assertThrows(UnsupportedOperationException.class, () -> unmod.compute(4, (k, v) -> v)); assertThrows(UnsupportedOperationException.class, () -> unmod.merge(4, "four", (k, v) -> v)); @@ -1515,7 +1515,7 @@ void ensureNotDirectlyModifiable(NavigableMap unmod) { } catch (UnsupportedOperationException expected) { } try { - unmod.computeIfAbsent(3, (k) -> k + "three"); + unmod.computeIfAbsent(3, k -> k + "three"); fail("UnsupportedOperationException expected"); } catch (UnsupportedOperationException expected) { } diff --git a/guava-tests/test/com/google/common/hash/BloomFilterTest.java b/guava-tests/test/com/google/common/hash/BloomFilterTest.java index f58d2b785430..acb8370f142d 100644 --- a/guava-tests/test/com/google/common/hash/BloomFilterTest.java +++ b/guava-tests/test/com/google/common/hash/BloomFilterTest.java @@ -411,7 +411,7 @@ public void funnel(Long value, PrimitiveSink into) { @Override public boolean equals(@Nullable Object object) { - return (object instanceof CustomFunnel); + return object instanceof CustomFunnel; } @Override diff --git a/guava-tests/test/com/google/common/hash/Crc32cHashFunctionTest.java b/guava-tests/test/com/google/common/hash/Crc32cHashFunctionTest.java index 2d63f46b20ca..9f19b70a6da5 100644 --- a/guava-tests/test/com/google/common/hash/Crc32cHashFunctionTest.java +++ b/guava-tests/test/com/google/common/hash/Crc32cHashFunctionTest.java @@ -164,7 +164,7 @@ public void testCrc32cByteTable() { int crc = i; for (int j = 7; j >= 0; j--) { int mask = -(crc & 1); - crc = ((crc >>> 1) ^ (CRC32C_GENERATOR_FLIPPED & mask)); + crc = (crc >>> 1) ^ (CRC32C_GENERATOR_FLIPPED & mask); } expected[i] = crc; } diff --git a/guava-tests/test/com/google/common/hash/HashTestUtils.java b/guava-tests/test/com/google/common/hash/HashTestUtils.java index 85096df34df9..189450bde9ca 100644 --- a/guava-tests/test/com/google/common/hash/HashTestUtils.java +++ b/guava-tests/test/com/google/common/hash/HashTestUtils.java @@ -306,7 +306,7 @@ static void checkNoFunnels(HashFunction function) { // test whether the hash values have same output bits same |= ~(hash1 ^ hash2); // test whether the hash values have different output bits - diff |= (hash1 ^ hash2); + diff |= hash1 ^ hash2; count++; // check whether we've exceeded the probabilistically diff --git a/guava-tests/test/com/google/common/math/IntMathTest.java b/guava-tests/test/com/google/common/math/IntMathTest.java index ab48bcaa43ca..e07bb0deae9c 100644 --- a/guava-tests/test/com/google/common/math/IntMathTest.java +++ b/guava-tests/test/com/google/common/math/IntMathTest.java @@ -299,7 +299,7 @@ public void testSqrtExactMatchesFloorOrThrows() { for (int x : POSITIVE_INTEGER_CANDIDATES) { int floor = IntMath.sqrt(x, FLOOR); // We only expect an exception if x was not a perfect square. - boolean isPerfectSquare = (floor * floor == x); + boolean isPerfectSquare = floor * floor == x; try { assertEquals(floor, IntMath.sqrt(x, UNNECESSARY)); assertTrue(isPerfectSquare); diff --git a/guava-tests/test/com/google/common/math/LongMathTest.java b/guava-tests/test/com/google/common/math/LongMathTest.java index 070bb2e4bb9d..eb7a48227b4b 100644 --- a/guava-tests/test/com/google/common/math/LongMathTest.java +++ b/guava-tests/test/com/google/common/math/LongMathTest.java @@ -338,7 +338,7 @@ public void testSqrtExactMatchesFloorOrThrows() { for (long x : POSITIVE_LONG_CANDIDATES) { long sqrtFloor = LongMath.sqrt(x, FLOOR); // We only expect an exception if x was not a perfect square. - boolean isPerfectSquare = (sqrtFloor * sqrtFloor == x); + boolean isPerfectSquare = sqrtFloor * sqrtFloor == x; try { assertEquals(sqrtFloor, LongMath.sqrt(x, UNNECESSARY)); assertTrue(isPerfectSquare); diff --git a/guava-tests/test/com/google/common/net/HostAndPortTest.java b/guava-tests/test/com/google/common/net/HostAndPortTest.java index 13dd26097b8d..87174562b757 100644 --- a/guava-tests/test/com/google/common/net/HostAndPortTest.java +++ b/guava-tests/test/com/google/common/net/HostAndPortTest.java @@ -128,7 +128,7 @@ private static void checkFromStringCase( assertNotNull(expectHost); // Apply withDefaultPort(), yielding hp2. - boolean badDefaultPort = (defaultPort < 0 || defaultPort > 65535); + boolean badDefaultPort = defaultPort < 0 || defaultPort > 65535; HostAndPort hp2 = null; try { hp2 = hp.withDefaultPort(defaultPort); diff --git a/guava-tests/test/com/google/common/util/concurrent/GeneratedMonitorTest.java b/guava-tests/test/com/google/common/util/concurrent/GeneratedMonitorTest.java index 1af71f11dc60..d2ac234b2e73 100644 --- a/guava-tests/test/com/google/common/util/concurrent/GeneratedMonitorTest.java +++ b/guava-tests/test/com/google/common/util/concurrent/GeneratedMonitorTest.java @@ -424,7 +424,7 @@ private static void addTests( suite.addTest(new GeneratedMonitorTest(method, scenario, fair, timeout, expectedOutcome)); } } else { - Timeout implicitTimeout = (isTryEnter(method) ? Timeout.ZERO : Timeout.MAX); + Timeout implicitTimeout = isTryEnter(method) ? Timeout.ZERO : Timeout.MAX; if (timeoutsToUse.timeouts.contains(implicitTimeout)) { suite.addTest(new GeneratedMonitorTest(method, scenario, fair, null, expectedOutcome)); } diff --git a/guava-tests/test/com/google/common/util/concurrent/RateLimiterTest.java b/guava-tests/test/com/google/common/util/concurrent/RateLimiterTest.java index 1c0f07e58503..e9b0b1d5c080 100644 --- a/guava-tests/test/com/google/common/util/concurrent/RateLimiterTest.java +++ b/guava-tests/test/com/google/common/util/concurrent/RateLimiterTest.java @@ -509,7 +509,7 @@ void sleepMillis(int millis) { void sleepMicros(String caption, long micros) { instant += MICROSECONDS.toNanos(micros); - events.add(caption + String.format(Locale.ROOT, "%3.2f", (micros / 1000000.0))); + events.add(caption + String.format(Locale.ROOT, "%3.2f", micros / 1000000.0)); } @Override diff --git a/guava/src/com/google/common/base/Utf8.java b/guava/src/com/google/common/base/Utf8.java index 17102e9bd9a7..0a54460cddec 100644 --- a/guava/src/com/google/common/base/Utf8.java +++ b/guava/src/com/google/common/base/Utf8.java @@ -60,7 +60,7 @@ public static int encodedLength(CharSequence sequence) { for (; i < utf16Length; i++) { char c = sequence.charAt(i); if (c < 0x800) { - utf8Length += ((0x7f - c) >>> 31); // branch free! + utf8Length += (0x7f - c) >>> 31; // branch free! } else { utf8Length += encodedLengthGeneral(sequence, i); break; diff --git a/guava/src/com/google/common/cache/LocalCache.java b/guava/src/com/google/common/cache/LocalCache.java index b222d5b3e73e..40a5f9bc6c1a 100644 --- a/guava/src/com/google/common/cache/LocalCache.java +++ b/guava/src/com/google/common/cache/LocalCache.java @@ -1683,9 +1683,9 @@ static int rehash(int h) { // using variant of single-word Wang/Jenkins hash. // TODO(kevinb): use Hashing/move this to Hashing? h += (h << 15) ^ 0xffffcd7d; - h ^= (h >>> 10); - h += (h << 3); - h ^= (h >>> 6); + h ^= h >>> 10; + h += h << 3; + h ^= h >>> 6; h += (h << 2) + (h << 14); return h ^ (h >>> 16); } diff --git a/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java b/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java index 3e6a3b773988..83e46cabbd46 100644 --- a/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java +++ b/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java @@ -523,7 +523,7 @@ public boolean addAll(Collection collection) { boolean changed = delegate.addAll(collection); if (changed) { int newSize = delegate.size(); - totalSize += (newSize - oldSize); + totalSize += newSize - oldSize; if (oldSize == 0) { addToMap(); } @@ -574,7 +574,7 @@ public boolean removeAll(Collection c) { boolean changed = delegate.removeAll(c); if (changed) { int newSize = delegate.size(); - totalSize += (newSize - oldSize); + totalSize += newSize - oldSize; removeIfEmpty(); } return changed; @@ -587,7 +587,7 @@ public boolean retainAll(Collection c) { boolean changed = delegate.retainAll(c); if (changed) { int newSize = delegate.size(); - totalSize += (newSize - oldSize); + totalSize += newSize - oldSize; removeIfEmpty(); } return changed; @@ -621,7 +621,7 @@ public boolean removeAll(Collection c) { boolean changed = Sets.removeAllImpl((Set) delegate, c); if (changed) { int newSize = delegate.size(); - totalSize += (newSize - oldSize); + totalSize += newSize - oldSize; removeIfEmpty(); } return changed; @@ -784,7 +784,7 @@ public boolean addAll(int index, Collection c) { boolean changed = getListDelegate().addAll(index, c); if (changed) { int newSize = getDelegate().size(); - totalSize += (newSize - oldSize); + totalSize += newSize - oldSize; if (oldSize == 0) { addToMap(); } diff --git a/guava/src/com/google/common/collect/AbstractMapBasedMultiset.java b/guava/src/com/google/common/collect/AbstractMapBasedMultiset.java index f722b5885ac3..448b6abf2ed6 100644 --- a/guava/src/com/google/common/collect/AbstractMapBasedMultiset.java +++ b/guava/src/com/google/common/collect/AbstractMapBasedMultiset.java @@ -330,7 +330,7 @@ public int setCount(@ParametricNullness E element, int count) { } } - size += (count - oldCount); + size += count - oldCount; return oldCount; } diff --git a/guava/src/com/google/common/collect/CompactHashing.java b/guava/src/com/google/common/collect/CompactHashing.java index 7c9320a022fd..55dc414c868a 100644 --- a/guava/src/com/google/common/collect/CompactHashing.java +++ b/guava/src/com/google/common/collect/CompactHashing.java @@ -40,7 +40,7 @@ private CompactHashing() {} private static final int HASH_TABLE_BITS_MAX_BITS = 5; /** Use high bits of metadata for modification count. */ - static final int MODIFICATION_COUNT_INCREMENT = (1 << HASH_TABLE_BITS_MAX_BITS); + static final int MODIFICATION_COUNT_INCREMENT = 1 << HASH_TABLE_BITS_MAX_BITS; /** Bitmask that selects the low bits of metadata to get hashTableBits. */ static final int HASH_TABLE_BITS_MASK = (1 << HASH_TABLE_BITS_MAX_BITS) - 1; diff --git a/guava/src/com/google/common/collect/Cut.java b/guava/src/com/google/common/collect/Cut.java index 4d682aee35d4..dffa6676e7c6 100644 --- a/guava/src/com/google/common/collect/Cut.java +++ b/guava/src/com/google/common/collect/Cut.java @@ -337,7 +337,7 @@ Cut withLowerBoundType(BoundType boundType, DiscreteDomain domain) { return this; case OPEN: C previous = domain.previous(endpoint); - return (previous == null) ? Cut.belowAll() : new AboveValue(previous); + return (previous == null) ? Cut.belowAll() : new AboveValue<>(previous); } throw new AssertionError(); } @@ -347,7 +347,7 @@ Cut withUpperBoundType(BoundType boundType, DiscreteDomain domain) { switch (boundType) { case CLOSED: C previous = domain.previous(endpoint); - return (previous == null) ? Cut.aboveAll() : new AboveValue(previous); + return (previous == null) ? Cut.aboveAll() : new AboveValue<>(previous); case OPEN: return this; } @@ -418,7 +418,7 @@ Cut withLowerBoundType(BoundType boundType, DiscreteDomain domain) { return this; case CLOSED: C next = domain.next(endpoint); - return (next == null) ? Cut.belowAll() : belowValue(next); + return (next == null) ? Cut.belowAll() : belowValue(next); } throw new AssertionError(); } @@ -428,7 +428,7 @@ Cut withUpperBoundType(BoundType boundType, DiscreteDomain domain) { switch (boundType) { case OPEN: C next = domain.next(endpoint); - return (next == null) ? Cut.aboveAll() : belowValue(next); + return (next == null) ? Cut.aboveAll() : belowValue(next); case CLOSED: return this; } @@ -458,7 +458,7 @@ C greatestValueBelow(DiscreteDomain domain) { @Override Cut canonical(DiscreteDomain domain) { C next = leastValueAbove(domain); - return (next != null) ? belowValue(next) : Cut.aboveAll(); + return (next != null) ? belowValue(next) : Cut.aboveAll(); } @Override diff --git a/guava/src/com/google/common/collect/FilteredEntryMultimap.java b/guava/src/com/google/common/collect/FilteredEntryMultimap.java index ba478b518b2a..9e83fff8fb25 100644 --- a/guava/src/com/google/common/collect/FilteredEntryMultimap.java +++ b/guava/src/com/google/common/collect/FilteredEntryMultimap.java @@ -21,6 +21,8 @@ import static com.google.common.base.Predicates.not; import static com.google.common.collect.CollectPreconditions.checkNonnegative; import static com.google.common.collect.Maps.immutableEntry; +import static java.util.Collections.emptyList; +import static java.util.Collections.emptySet; import static java.util.Collections.unmodifiableList; import static java.util.Collections.unmodifiableSet; @@ -31,7 +33,6 @@ import com.google.j2objc.annotations.WeakOuter; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; @@ -111,9 +112,7 @@ public Collection removeAll(@Nullable Object key) { @SuppressWarnings("EmptyList") // ImmutableList doesn't support nullable element types Collection unmodifiableEmptyCollection() { // These return false, rather than throwing a UOE, on remove calls. - return (unfiltered instanceof SetMultimap) - ? Collections.emptySet() - : Collections.emptyList(); + return (unfiltered instanceof SetMultimap) ? emptySet() : emptyList(); } @Override diff --git a/guava/src/com/google/common/collect/ImmutableRangeSet.java b/guava/src/com/google/common/collect/ImmutableRangeSet.java index 2a3e1a0cd909..ceda70d45f76 100644 --- a/guava/src/com/google/common/collect/ImmutableRangeSet.java +++ b/guava/src/com/google/common/collect/ImmutableRangeSet.java @@ -112,7 +112,7 @@ public static ImmutableRangeSet copyOf(RangeSet ran checkNotNull(rangeSet); if (rangeSet.isEmpty()) { return of(); - } else if (rangeSet.encloses(Range.all())) { + } else if (rangeSet.encloses(Range.all())) { return all(); } @@ -308,7 +308,7 @@ public ImmutableSet> asRanges() { if (ranges.isEmpty()) { return ImmutableSet.of(); } - return new RegularImmutableSortedSet<>(ranges, Range.rangeLexOrdering()); + return new RegularImmutableSortedSet<>(ranges, Range.rangeLexOrdering()); } @Override @@ -358,14 +358,14 @@ public Range get(int index) { Cut lowerBound; if (positiveBoundedBelow) { - lowerBound = (index == 0) ? Cut.belowAll() : ranges.get(index - 1).upperBound; + lowerBound = (index == 0) ? Cut.belowAll() : ranges.get(index - 1).upperBound; } else { lowerBound = ranges.get(index).upperBound; } Cut upperBound; if (positiveBoundedAbove && index == size - 1) { - upperBound = Cut.aboveAll(); + upperBound = Cut.aboveAll(); } else { upperBound = ranges.get(index + (positiveBoundedBelow ? 0 : 1)).lowerBound; } @@ -828,7 +828,7 @@ Builder combine(Builder builder) { public ImmutableRangeSet build() { ImmutableList.Builder> mergedRangesBuilder = new ImmutableList.Builder<>(ranges.size()); - sort(ranges, Range.rangeLexOrdering()); + sort(ranges, Range.rangeLexOrdering()); PeekingIterator> peekingItr = Iterators.peekingIterator(ranges.iterator()); while (peekingItr.hasNext()) { Range range = peekingItr.next(); diff --git a/guava/src/com/google/common/collect/MapMakerInternalMap.java b/guava/src/com/google/common/collect/MapMakerInternalMap.java index d91c992c5c2b..1d12d409f09b 100644 --- a/guava/src/com/google/common/collect/MapMakerInternalMap.java +++ b/guava/src/com/google/common/collect/MapMakerInternalMap.java @@ -1088,9 +1088,9 @@ static int rehash(int h) { // using variant of single-word Wang/Jenkins hash. // TODO(kevinb): use Hashing/move this to Hashing? h += (h << 15) ^ 0xffffcd7d; - h ^= (h >>> 10); - h += (h << 3); - h ^= (h >>> 6); + h ^= h >>> 10; + h += h << 3; + h ^= h >>> 6; h += (h << 2) + (h << 14); return h ^ (h >>> 16); } diff --git a/guava/src/com/google/common/collect/TreeRangeSet.java b/guava/src/com/google/common/collect/TreeRangeSet.java index 11f585c35ef3..59bc7f57d589 100644 --- a/guava/src/com/google/common/collect/TreeRangeSet.java +++ b/guava/src/com/google/common/collect/TreeRangeSet.java @@ -14,6 +14,7 @@ package com.google.common.collect; +import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.Iterators.emptyIterator; @@ -21,7 +22,6 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.MoreObjects; import com.google.errorprone.annotations.concurrent.LazyInit; import java.io.Serializable; import java.util.Collection; @@ -526,7 +526,7 @@ Iterator, Range>> entryIterator() { } PeekingIterator> positiveItr = Iterators.peekingIterator(positiveRanges.iterator()); Cut firstComplementRangeLowerBound; - if (complementLowerBoundWindow.contains(Cut.belowAll()) + if (complementLowerBoundWindow.contains(Cut.belowAll()) && (!positiveItr.hasNext() || positiveItr.peek().lowerBound != Cut.belowAll())) { firstComplementRangeLowerBound = Cut.belowAll(); } else if (positiveItr.hasNext()) { @@ -549,7 +549,7 @@ Iterator, Range>> entryIterator() { negativeRange = Range.create(nextComplementRangeLowerBound, positiveRange.lowerBound); nextComplementRangeLowerBound = positiveRange.upperBound; } else { - negativeRange = Range.create(nextComplementRangeLowerBound, Cut.aboveAll()); + negativeRange = Range.create(nextComplementRangeLowerBound, Cut.aboveAll()); nextComplementRangeLowerBound = Cut.aboveAll(); } return immutableEntry(negativeRange.lowerBound, negativeRange); @@ -570,7 +570,7 @@ Iterator, Range>> descendingEntryIterator() { Cut startingPoint = complementLowerBoundWindow.hasUpperBound() ? complementLowerBoundWindow.upperEndpoint() - : Cut.aboveAll(); + : Cut.aboveAll(); boolean inclusive = complementLowerBoundWindow.hasUpperBound() && complementLowerBoundWindow.upperBoundType() == BoundType.CLOSED; @@ -587,13 +587,13 @@ Iterator, Range>> descendingEntryIterator() { (positiveItr.peek().upperBound == Cut.aboveAll()) ? positiveItr.next().lowerBound : positiveRangesByLowerBound.higherKey(positiveItr.peek().upperBound); - } else if (!complementLowerBoundWindow.contains(Cut.belowAll()) + } else if (!complementLowerBoundWindow.contains(Cut.belowAll()) || positiveRangesByLowerBound.containsKey(Cut.belowAll())) { return emptyIterator(); } else { - cut = positiveRangesByLowerBound.higherKey(Cut.belowAll()); + cut = positiveRangesByLowerBound.higherKey(Cut.belowAll()); } - Cut firstComplementRangeUpperBound = MoreObjects.firstNonNull(cut, Cut.aboveAll()); + Cut firstComplementRangeUpperBound = firstNonNull(cut, Cut.aboveAll()); return new AbstractIterator, Range>>() { Cut nextComplementRangeUpperBound = firstComplementRangeUpperBound; @@ -609,10 +609,10 @@ Iterator, Range>> descendingEntryIterator() { if (complementLowerBoundWindow.lowerBound.isLessThan(negativeRange.lowerBound)) { return immutableEntry(negativeRange.lowerBound, negativeRange); } - } else if (complementLowerBoundWindow.lowerBound.isLessThan(Cut.belowAll())) { - Range negativeRange = Range.create(Cut.belowAll(), nextComplementRangeUpperBound); + } else if (complementLowerBoundWindow.lowerBound.isLessThan(Cut.belowAll())) { + Range negativeRange = Range.create(Cut.belowAll(), nextComplementRangeUpperBound); nextComplementRangeUpperBound = Cut.belowAll(); - return immutableEntry(Cut.belowAll(), negativeRange); + return immutableEntry(Cut.belowAll(), negativeRange); } return endOfData(); } @@ -856,7 +856,7 @@ public int size() { @Override public RangeSet subRangeSet(Range view) { - return view.equals(Range.all()) ? this : new SubRangeSet(view); + return view.equals(Range.all()) ? this : new SubRangeSet(view); } private final class SubRangeSet extends TreeRangeSet { diff --git a/guava/src/com/google/common/graph/EdgesConnecting.java b/guava/src/com/google/common/graph/EdgesConnecting.java index 234c9bb3ee6c..1accefcca232 100644 --- a/guava/src/com/google/common/graph/EdgesConnecting.java +++ b/guava/src/com/google/common/graph/EdgesConnecting.java @@ -60,7 +60,7 @@ public int size() { @Override public boolean contains(@Nullable Object edge) { E connectingEdge = getConnectingEdge(); - return (connectingEdge != null && connectingEdge.equals(edge)); + return connectingEdge != null && connectingEdge.equals(edge); } private @Nullable E getConnectingEdge() { diff --git a/guava/src/com/google/common/hash/FarmHashFingerprint64.java b/guava/src/com/google/common/hash/FarmHashFingerprint64.java index 3785093f0924..b908772d128a 100644 --- a/guava/src/com/google/common/hash/FarmHashFingerprint64.java +++ b/guava/src/com/google/common/hash/FarmHashFingerprint64.java @@ -85,9 +85,9 @@ private static long shiftMix(long val) { private static long hashLength16(long u, long v, long mul) { long a = (u ^ v) * mul; - a ^= (a >>> 47); + a ^= a >>> 47; long b = (v ^ a) * mul; - b ^= (b >>> 47); + b ^= b >>> 47; b *= mul; return b; } @@ -198,7 +198,7 @@ private static long hashLength65Plus(byte[] bytes, int offset, int length) { long mul = K1 + ((z & 0xFF) << 1); // Operate on the last 64 bytes of input. offset = last64offset; - w[0] += ((length - 1) & 63); + w[0] += (length - 1) & 63; v[0] += w[0]; w[0] += v[0]; x = rotateRight(x + y + v[0] + load64(bytes, offset + 8), 37) * mul; diff --git a/guava/src/com/google/common/hash/Fingerprint2011.java b/guava/src/com/google/common/hash/Fingerprint2011.java index f54232bc482f..74fac1230e88 100644 --- a/guava/src/com/google/common/hash/Fingerprint2011.java +++ b/guava/src/com/google/common/hash/Fingerprint2011.java @@ -81,9 +81,9 @@ private static long shiftMix(long val) { @VisibleForTesting static long hash128to64(long high, long low) { long a = (low ^ high) * K3; - a ^= (a >>> 47); + a ^= a >>> 47; long b = (high ^ a) * K3; - b ^= (b >>> 47); + b ^= b >>> 47; b *= K3; return b; } diff --git a/guava/src/com/google/common/hash/HashCode.java b/guava/src/com/google/common/hash/HashCode.java index 6d5d9adc5565..c80832508b12 100644 --- a/guava/src/com/google/common/hash/HashCode.java +++ b/guava/src/com/google/common/hash/HashCode.java @@ -287,7 +287,7 @@ public long asLong() { @Override public long padToLong() { - long retVal = (bytes[0] & 0xFF); + long retVal = bytes[0] & 0xFF; for (int i = 1; i < min(bytes.length, 8); i++) { retVal |= (bytes[i] & 0xFFL) << (i * 8); } @@ -314,7 +314,7 @@ boolean equalsSameBits(HashCode that) { boolean areEqual = true; for (int i = 0; i < this.bytes.length; i++) { - areEqual &= (this.bytes[i] == that.getBytesInternal()[i]); + areEqual &= this.bytes[i] == that.getBytesInternal()[i]; } return areEqual; } @@ -389,9 +389,9 @@ public final int hashCode() { } // If we have less than 4 bytes, use them all. byte[] bytes = getBytesInternal(); - int val = (bytes[0] & 0xFF); + int val = bytes[0] & 0xFF; for (int i = 1; i < bytes.length; i++) { - val |= ((bytes[i] & 0xFF) << (i * 8)); + val |= (bytes[i] & 0xFF) << (i * 8); } return val; } diff --git a/guava/src/com/google/common/math/LinearTransformation.java b/guava/src/com/google/common/math/LinearTransformation.java index 379898d51842..2560d5cd71d0 100644 --- a/guava/src/com/google/common/math/LinearTransformation.java +++ b/guava/src/com/google/common/math/LinearTransformation.java @@ -190,7 +190,7 @@ public boolean isVertical() { @Override public boolean isHorizontal() { - return (slope == 0.0); + return slope == 0.0; } @Override diff --git a/guava/src/com/google/common/net/HostAndPort.java b/guava/src/com/google/common/net/HostAndPort.java index 3a553b722c01..2fded49be32f 100644 --- a/guava/src/com/google/common/net/HostAndPort.java +++ b/guava/src/com/google/common/net/HostAndPort.java @@ -184,7 +184,7 @@ public static HostAndPort fromString(String hostPortString) { } else { // 0 or 2+ colons. Bare hostname or IPv6 literal. host = hostPortString; - hasBracketlessColons = (colonPos >= 0); + hasBracketlessColons = colonPos >= 0; } } diff --git a/guava/src/com/google/common/primitives/UnsignedLongs.java b/guava/src/com/google/common/primitives/UnsignedLongs.java index 405d49f4c776..e8bb2566abdb 100644 --- a/guava/src/com/google/common/primitives/UnsignedLongs.java +++ b/guava/src/com/google/common/primitives/UnsignedLongs.java @@ -428,7 +428,7 @@ static boolean overflowInParse(long current, int digit, int radix) { return true; } // current == maxValueDivs[radix] - return (digit > maxValueMods[radix]); + return digit > maxValueMods[radix]; } // current < 0: high bit is set diff --git a/guava/src/com/google/common/util/concurrent/AtomicLongMap.java b/guava/src/com/google/common/util/concurrent/AtomicLongMap.java index 9523ba8dbe55..a51f3975e673 100644 --- a/guava/src/com/google/common/util/concurrent/AtomicLongMap.java +++ b/guava/src/com/google/common/util/concurrent/AtomicLongMap.java @@ -147,8 +147,7 @@ public long updateAndGet(K key, LongUnaryOperator updaterFunction) { checkNotNull(updaterFunction); Long result = map.compute( - key, - (k, value) -> updaterFunction.applyAsLong((value == null) ? 0L : value.longValue())); + key, (k, value) -> updaterFunction.applyAsLong(value == null ? 0L : value.longValue())); return requireNonNull(result); }