diff --git a/android/guava-testlib/src/com/google/common/collect/testing/Helpers.java b/android/guava-testlib/src/com/google/common/collect/testing/Helpers.java index 8bc912c6fde3..b2d61e57f361 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/Helpers.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/Helpers.java @@ -262,7 +262,7 @@ private static final class EntryComparator a, Entry b) { - return (keyComparator == null) + return keyComparator == null ? ((Comparable) a.getKey()).compareTo(b.getKey()) : keyComparator.compare(a.getKey(), b.getKey()); } @@ -440,7 +440,7 @@ public boolean equals(@Nullable Object o) { public int hashCode() { K k = getKey(); V v = getValue(); - return ((k == null) ? 0 : k.hashCode()) ^ ((v == null) ? 0 : v.hashCode()); + return (k == null ? 0 : k.hashCode()) ^ (v == null ? 0 : v.hashCode()); } @Override 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/MinimalSet.java b/android/guava-testlib/src/com/google/common/collect/testing/MinimalSet.java index db09a4edd544..b26c6a3a9586 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/MinimalSet.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/MinimalSet.java @@ -80,7 +80,7 @@ public boolean equals(@Nullable Object object) { public int hashCode() { int hashCodeSum = 0; for (Object o : this) { - hashCodeSum += (o == null) ? 0 : o.hashCode(); + hashCodeSum += o == null ? 0 : o.hashCode(); } return hashCodeSum; } diff --git a/android/guava-testlib/src/com/google/common/collect/testing/TestsForSetsInJavaUtil.java b/android/guava-testlib/src/com/google/common/collect/testing/TestsForSetsInJavaUtil.java index 9179df9cbc9b..8ec7813c0d37 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/TestsForSetsInJavaUtil.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/TestsForSetsInJavaUtil.java @@ -206,7 +206,7 @@ public Test testsForEnumSet() { new TestEnumSetGenerator() { @Override public Set create(AnEnum[] elements) { - return (elements.length == 0) + return elements.length == 0 ? EnumSet.noneOf(AnEnum.class) : EnumSet.copyOf(MinimalCollection.of(elements)); } 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/ListHashCodeTester.java b/android/guava-testlib/src/com/google/common/collect/testing/testers/ListHashCodeTester.java index f31ab39ad2c6..8068c2987883 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/testers/ListHashCodeTester.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/testers/ListHashCodeTester.java @@ -37,7 +37,7 @@ public class ListHashCodeTester extends AbstractListTester { public void testHashCode() { int expectedHashCode = 1; for (E element : getOrderedElements()) { - expectedHashCode = 31 * expectedHashCode + ((element == null) ? 0 : element.hashCode()); + expectedHashCode = 31 * expectedHashCode + (element == null ? 0 : element.hashCode()); } assertEquals( "A List's hashCode() should be computed from those of its elements.", 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..ce3814e6e446 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-testlib/src/com/google/common/testing/ArbitraryInstances.java b/android/guava-testlib/src/com/google/common/testing/ArbitraryInstances.java index bc7aea37832f..21c62d738c6c 100644 --- a/android/guava-testlib/src/com/google/common/testing/ArbitraryInstances.java +++ b/android/guava-testlib/src/com/google/common/testing/ArbitraryInstances.java @@ -353,7 +353,7 @@ private static void setImplementation(Class type, Class impl } if (type.isEnum()) { T[] enumConstants = type.getEnumConstants(); - return (enumConstants == null || enumConstants.length == 0) ? null : enumConstants[0]; + return enumConstants == null || enumConstants.length == 0 ? null : enumConstants[0]; } if (type.isArray()) { return createEmptyArray(type); 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/collect/ConcurrentHashMultisetBenchmark.java b/android/guava-tests/benchmark/com/google/common/collect/ConcurrentHashMultisetBenchmark.java index c94673a67996..bcd5e952d320 100644 --- a/android/guava-tests/benchmark/com/google/common/collect/ConcurrentHashMultisetBenchmark.java +++ b/android/guava-tests/benchmark/com/google/common/collect/ConcurrentHashMultisetBenchmark.java @@ -387,7 +387,7 @@ boolean removeExactly(@Nullable Object element, int occurrences) { @Override public int setCount(E element, int count) { checkNonnegative(count, "count"); - return (count == 0) ? removeAllOccurrences(element) : unbox(countMap.put(element, count)); + return count == 0 ? removeAllOccurrences(element) : unbox(countMap.put(element, count)); } /** @@ -546,7 +546,7 @@ public int hashCode() { /** We use a special form of unboxing that treats null as zero. */ private static int unbox(@Nullable Integer i) { - return (i == null) ? 0 : i; + return i == null ? 0 : i; } } } 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/math/LessThanBenchmark.java b/android/guava-tests/benchmark/com/google/common/math/LessThanBenchmark.java index de7a3e55c247..5019cb1c0506 100644 --- a/android/guava-tests/benchmark/com/google/common/math/LessThanBenchmark.java +++ b/android/guava-tests/benchmark/com/google/common/math/LessThanBenchmark.java @@ -96,7 +96,7 @@ int ternaryLtIntAddOutsideTernary(int reps) { int x = xInts[j]; int y = yInts[j]; int z = constant[j]; - tmp += z + ((x < y) ? 1 : 0); + tmp += z + (x < y ? 1 : 0); } return tmp; } @@ -109,7 +109,7 @@ int ternaryLtIntAddInsideTernary(int reps) { int x = xInts[j]; int y = yInts[j]; int z = constant[j]; - tmp += (x < y) ? z + 1 : z; + tmp += x < y ? z + 1 : z; } return tmp; } @@ -148,7 +148,7 @@ int ternaryLtLongAddOutsideTernary(int reps) { long x = xLongs[j]; long y = yLongs[j]; int z = constant[j]; - tmp += z + ((x < y) ? 1 : 0); + tmp += z + (x < y ? 1 : 0); } return tmp; } @@ -161,7 +161,7 @@ int ternaryLtLongAddInsideTernary(int reps) { long x = xLongs[j]; long y = yLongs[j]; int z = constant[j]; - tmp += (x < y) ? z + 1 : z; + tmp += x < y ? z + 1 : z; } return tmp; } diff --git a/android/guava-tests/benchmark/com/google/common/util/concurrent/MonitorBasedArrayBlockingQueue.java b/android/guava-tests/benchmark/com/google/common/util/concurrent/MonitorBasedArrayBlockingQueue.java index 65ac14a286b5..78c973ba5270 100644 --- a/android/guava-tests/benchmark/com/google/common/util/concurrent/MonitorBasedArrayBlockingQueue.java +++ b/android/guava-tests/benchmark/com/google/common/util/concurrent/MonitorBasedArrayBlockingQueue.java @@ -90,7 +90,7 @@ public class MonitorBasedArrayBlockingQueue extends AbstractQueue /** Circularly increment i. */ final int inc(int i) { - return (++i == items.length) ? 0 : i; + return ++i == items.length ? 0 : i; } /** @@ -629,7 +629,7 @@ public int drainTo(Collection c, int maxElements) { try { int i = takeIndex; int n = 0; - int max = (maxElements < count) ? maxElements : count; + int max = maxElements < count ? maxElements : count; while (n < max) { c.add(items[i]); items[i] = null; @@ -746,7 +746,7 @@ public void remove() { int ti = takeIndex; removeAt(i); // back up cursor (reset to front if was first element) - nextIndex = (i == ti) ? takeIndex : i; + nextIndex = i == ti ? takeIndex : i; checkNext(); } finally { monitor.leave(); 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/base/FunctionsTest.java b/android/guava-tests/test/com/google/common/base/FunctionsTest.java index c808f15e0bae..cb028fd8bf28 100644 --- a/android/guava-tests/test/com/google/common/base/FunctionsTest.java +++ b/android/guava-tests/test/com/google/common/base/FunctionsTest.java @@ -274,7 +274,7 @@ public void testCompositionWildcard() { private static class HashCodeFunction implements Function<@Nullable Object, Integer> { @Override public Integer apply(@Nullable Object o) { - return (o == null) ? 0 : o.hashCode(); + return o == null ? 0 : o.hashCode(); } } 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..c84a93119e56 100644 --- a/android/guava-tests/test/com/google/common/cache/LocalCacheTest.java +++ b/android/guava-tests/test/com/google/common/cache/LocalCacheTest.java @@ -1819,7 +1819,7 @@ public void testExpand_cleanup() { ReferenceEntry entry = null; for (int i = 0; i < originalCount; i++) { Object key = new Object(); - Object value = (i % 3 == 0) ? null : new Object(); + Object value = i % 3 == 0 ? null : new Object(); int hash = map.hash(key); if (i % 3 == 1) { key = null; @@ -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/AbstractMapsTransformValuesTest.java b/android/guava-tests/test/com/google/common/collect/AbstractMapsTransformValuesTest.java index e5abace0fd27..9e8bec13864f 100644 --- a/android/guava-tests/test/com/google/common/collect/AbstractMapsTransformValuesTest.java +++ b/android/guava-tests/test/com/google/common/collect/AbstractMapsTransformValuesTest.java @@ -239,7 +239,7 @@ public void testTransformEntrySetContains() { new Function<@Nullable Boolean, @Nullable Boolean>() { @Override public @Nullable Boolean apply(@Nullable Boolean from) { - return (from == null) ? true : null; + return from == null ? true : null; } }); diff --git a/android/guava-tests/test/com/google/common/collect/AbstractSequentialIteratorTest.java b/android/guava-tests/test/com/google/common/collect/AbstractSequentialIteratorTest.java index bc3cc85bbc73..9a2872766d33 100644 --- a/android/guava-tests/test/com/google/common/collect/AbstractSequentialIteratorTest.java +++ b/android/guava-tests/test/com/google/common/collect/AbstractSequentialIteratorTest.java @@ -66,7 +66,7 @@ public Iterator iterator() { new AbstractSequentialIterator(1) { @Override protected @Nullable Integer computeNext(Integer previous) { - return (previous == 1 << 30) ? null : previous * 2; + return previous == 1 << 30 ? null : previous * 2; } }; return powersOfTwo; @@ -128,7 +128,7 @@ private static Iterator newDoubler(int first, int last) { return new AbstractSequentialIterator(first) { @Override protected @Nullable Integer computeNext(Integer previous) { - return (previous == last) ? null : previous * 2; + return previous == last ? null : previous * 2; } }; } diff --git a/android/guava-tests/test/com/google/common/collect/Collections2Test.java b/android/guava-tests/test/com/google/common/collect/Collections2Test.java index 4f93a718b255..2a37e3366894 100644 --- a/android/guava-tests/test/com/google/common/collect/Collections2Test.java +++ b/android/guava-tests/test/com/google/common/collect/Collections2Test.java @@ -208,7 +208,7 @@ private static Test testsForTransform() { public Collection<@Nullable String> create(@Nullable String[] elements) { List<@Nullable String> list = new ArrayList<>(); for (String element : elements) { - list.add((element == null) ? null : "q" + element); + list.add(element == null ? null : "q" + element); } return Collections2.transform( list, from -> isNullOrEmpty(from) ? null : from.substring(1)); 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/collect/EnumMultisetTest.java b/android/guava-tests/test/com/google/common/collect/EnumMultisetTest.java index d81a68f1bbaa..b765c26eeaa2 100644 --- a/android/guava-tests/test/com/google/common/collect/EnumMultisetTest.java +++ b/android/guava-tests/test/com/google/common/collect/EnumMultisetTest.java @@ -75,7 +75,7 @@ private static TestEnumMultisetGenerator enumMultisetGenerator() { return new TestEnumMultisetGenerator() { @Override protected Multiset create(AnEnum[] elements) { - return (elements.length == 0) + return elements.length == 0 ? EnumMultiset.create(AnEnum.class) : EnumMultiset.create(asList(elements)); } diff --git a/android/guava-tests/test/com/google/common/collect/FluentIterableTest.java b/android/guava-tests/test/com/google/common/collect/FluentIterableTest.java index 79bdbceaadc0..8252cd4ea722 100644 --- a/android/guava-tests/test/com/google/common/collect/FluentIterableTest.java +++ b/android/guava-tests/test/com/google/common/collect/FluentIterableTest.java @@ -282,7 +282,7 @@ public void testCycle() { int howManyChecked = 0; for (String string : cycle) { - String expected = (howManyChecked % 2 == 0) ? "a" : "b"; + String expected = howManyChecked % 2 == 0 ? "a" : "b"; assertEquals(expected, string); if (howManyChecked++ == 5) { break; diff --git a/android/guava-tests/test/com/google/common/collect/IterablesTest.java b/android/guava-tests/test/com/google/common/collect/IterablesTest.java index d2a6de43f7b5..095b86656146 100644 --- a/android/guava-tests/test/com/google/common/collect/IterablesTest.java +++ b/android/guava-tests/test/com/google/common/collect/IterablesTest.java @@ -345,7 +345,7 @@ public void testCycle() { int howManyChecked = 0; for (String string : cycle) { - String expected = (howManyChecked % 2 == 0) ? "a" : "b"; + String expected = howManyChecked % 2 == 0 ? "a" : "b"; assertEquals(expected, string); if (howManyChecked++ == 5) { break; diff --git a/android/guava-tests/test/com/google/common/collect/ListsTest.java b/android/guava-tests/test/com/google/common/collect/ListsTest.java index fe80cafc6f30..6813033387a0 100644 --- a/android/guava-tests/test/com/google/common/collect/ListsTest.java +++ b/android/guava-tests/test/com/google/common/collect/ListsTest.java @@ -81,7 +81,7 @@ public class ListsTest extends TestCase { private static final class RemoveFirstFunction implements Function, Serializable { @Override public String apply(String from) { - return (from.length() == 0) ? from : from.substring(1); + return from.length() == 0 ? from : from.substring(1); } } diff --git a/android/guava-tests/test/com/google/common/collect/MapMakerInternalMapTest.java b/android/guava-tests/test/com/google/common/collect/MapMakerInternalMapTest.java index 7bc01a7dc2e0..84aaa958d35d 100644 --- a/android/guava-tests/test/com/google/common/collect/MapMakerInternalMapTest.java +++ b/android/guava-tests/test/com/google/common/collect/MapMakerInternalMapTest.java @@ -671,7 +671,7 @@ public void testExpand_cleanup() { InternalEntry entry = null; for (int i = 0; i < originalCount; i++) { Object key = new Object(); - Object value = (i % 3 == 0) ? null : new Object(); + Object value = i % 3 == 0 ? null : new Object(); int hash = map.hash(key); if (i % 3 == 1) { key = null; diff --git a/android/guava-tests/test/com/google/common/collect/MapsTransformValuesUnmodifiableIteratorTest.java b/android/guava-tests/test/com/google/common/collect/MapsTransformValuesUnmodifiableIteratorTest.java index fd82e524603d..192a2f1d2d94 100644 --- a/android/guava-tests/test/com/google/common/collect/MapsTransformValuesUnmodifiableIteratorTest.java +++ b/android/guava-tests/test/com/google/common/collect/MapsTransformValuesUnmodifiableIteratorTest.java @@ -348,7 +348,7 @@ public void testTransformEntrySetContains() { new Function<@Nullable Boolean, @Nullable Boolean>() { @Override public @Nullable Boolean apply(@Nullable Boolean from) { - return (from == null) ? true : null; + return from == null ? true : null; } }); diff --git a/android/guava-tests/test/com/google/common/collect/MultimapsTest.java b/android/guava-tests/test/com/google/common/collect/MultimapsTest.java index 23934f8a54d9..f82b9231885d 100644 --- a/android/guava-tests/test/com/google/common/collect/MultimapsTest.java +++ b/android/guava-tests/test/com/google/common/collect/MultimapsTest.java @@ -881,7 +881,7 @@ public void testTransformEntries() { new EntryTransformer() { @Override public String transformEntry(String key, Integer value) { - return (value >= 0) ? key : "no" + key; + return value >= 0 ? key : "no" + key; } }; Multimap transformed = Multimaps.transformEntries(multimap, transformer); diff --git a/android/guava-tests/test/com/google/common/collect/SimpleAbstractMultisetTest.java b/android/guava-tests/test/com/google/common/collect/SimpleAbstractMultisetTest.java index 02080fa085c0..76213bc71bce 100644 --- a/android/guava-tests/test/com/google/common/collect/SimpleAbstractMultisetTest.java +++ b/android/guava-tests/test/com/google/common/collect/SimpleAbstractMultisetTest.java @@ -158,7 +158,7 @@ public E getElement() { @Override public int getCount() { Integer frequency = backingMap.get(getElement()); - return (frequency == null) ? 0 : frequency; + return frequency == null ? 0 : frequency; } }; } diff --git a/android/guava-tests/test/com/google/common/collect/SpecialRandom.java b/android/guava-tests/test/com/google/common/collect/SpecialRandom.java index 571a061f74ae..819eb9b42af8 100644 --- a/android/guava-tests/test/com/google/common/collect/SpecialRandom.java +++ b/android/guava-tests/test/com/google/common/collect/SpecialRandom.java @@ -30,7 +30,7 @@ @NullUnmarked public final class SpecialRandom extends Random { public static SpecialRandom valueOf(String s) { - return (s.length() == 0) ? new SpecialRandom() : new SpecialRandom(Long.parseLong(s)); + return s.length() == 0 ? new SpecialRandom() : new SpecialRandom(Long.parseLong(s)); } private final boolean hasSeed; diff --git a/android/guava-tests/test/com/google/common/collect/TableCollectionTest.java b/android/guava-tests/test/com/google/common/collect/TableCollectionTest.java index 32038b8d7839..b4faaea053c9 100644 --- a/android/guava-tests/test/com/google/common/collect/TableCollectionTest.java +++ b/android/guava-tests/test/com/google/common/collect/TableCollectionTest.java @@ -786,7 +786,7 @@ protected Map makePopulatedMap() { new Function<@Nullable Integer, @Nullable Integer>() { @Override public @Nullable Integer apply(@Nullable Integer input) { - return (input == null) ? null : input / 2; + return input == null ? null : input / 2; } }; diff --git a/android/guava-tests/test/com/google/common/collect/TablesTransformValuesTest.java b/android/guava-tests/test/com/google/common/collect/TablesTransformValuesTest.java index 379eaa076070..595d6e33db8f 100644 --- a/android/guava-tests/test/com/google/common/collect/TablesTransformValuesTest.java +++ b/android/guava-tests/test/com/google/common/collect/TablesTransformValuesTest.java @@ -49,7 +49,7 @@ protected Table create(@Nullable Object... data) { Table table = HashBasedTable.create(); checkArgument(data.length % 3 == 0); for (int i = 0; i < data.length; i += 3) { - String value = (data[i + 2] == null) ? null : (data[i + 2] + "transformed"); + String value = data[i + 2] == null ? null : (data[i + 2] + "transformed"); table.put((String) data[i], (Integer) data[i + 1], value); } return transformValues(table, FIRST_CHARACTER); diff --git a/android/guava-tests/test/com/google/common/escape/UnicodeEscaperTest.java b/android/guava-tests/test/com/google/common/escape/UnicodeEscaperTest.java index b2038013c0d5..9953cd84c0b8 100644 --- a/android/guava-tests/test/com/google/common/escape/UnicodeEscaperTest.java +++ b/android/guava-tests/test/com/google/common/escape/UnicodeEscaperTest.java @@ -150,7 +150,7 @@ public void testFalsePositivesForNextEscapedIndex() { // Canonical escaper method that only escapes lower case ASCII letters. @Override protected char @Nullable [] escape(int cp) { - return ('a' <= cp && cp <= 'z') ? new char[] {Character.toUpperCase((char) cp)} : null; + return 'a' <= cp && cp <= 'z' ? new char[] {Character.toUpperCase((char) cp)} : null; } // Inefficient implementation that defines all letters as escapable. diff --git a/android/guava-tests/test/com/google/common/graph/DefaultNetworkImplementationsTest.java b/android/guava-tests/test/com/google/common/graph/DefaultNetworkImplementationsTest.java index bf5a387b0290..f23c0dda9f76 100644 --- a/android/guava-tests/test/com/google/common/graph/DefaultNetworkImplementationsTest.java +++ b/android/guava-tests/test/com/google/common/graph/DefaultNetworkImplementationsTest.java @@ -72,7 +72,7 @@ public DefaultNetworkImplementationsTest(EdgeType edgeType) { @Before public void setUp() throws Exception { NetworkBuilder builder = - (edgeType == EdgeType.DIRECTED) ? NetworkBuilder.directed() : NetworkBuilder.undirected(); + edgeType == EdgeType.DIRECTED ? NetworkBuilder.directed() : NetworkBuilder.undirected(); network = builder.allowsSelfLoops(true).allowsParallelEdges(true).build(); networkForTest = NetworkForTest.from(network); 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/io/ByteSourceTest.java b/android/guava-tests/test/com/google/common/io/ByteSourceTest.java index 903f0c170181..36687a8e49c7 100644 --- a/android/guava-tests/test/com/google/common/io/ByteSourceTest.java +++ b/android/guava-tests/test/com/google/common/io/ByteSourceTest.java @@ -388,7 +388,7 @@ public void testCopyExceptions() { assertEquals(0, suppressed); suppressed = runSuppressionFailureTest(in, BROKEN_CLOSE_SINK); - assertEquals((in == BROKEN_OPEN_SOURCE) ? 0 : 1, suppressed); + assertEquals(in == BROKEN_OPEN_SOURCE ? 0 : 1, suppressed); } for (ByteSink out : BROKEN_SINKS) { diff --git a/android/guava-tests/test/com/google/common/io/CharSourceTest.java b/android/guava-tests/test/com/google/common/io/CharSourceTest.java index 018097c03602..99448316d2ce 100644 --- a/android/guava-tests/test/com/google/common/io/CharSourceTest.java +++ b/android/guava-tests/test/com/google/common/io/CharSourceTest.java @@ -286,7 +286,7 @@ public void testCopyExceptions() { assertEquals(0, suppressed); suppressed = runSuppressionFailureTest(in, BROKEN_CLOSE_SINK); - assertEquals((in == BROKEN_OPEN_SOURCE) ? 0 : 1, suppressed); + assertEquals(in == BROKEN_OPEN_SOURCE ? 0 : 1, suppressed); } for (CharSink out : BROKEN_SINKS) { 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..133f8300015e 100644 --- a/android/guava-tests/test/com/google/common/math/IntMathTest.java +++ b/android/guava-tests/test/com/google/common/math/IntMathTest.java @@ -158,7 +158,7 @@ public void testLessThanBranchFree() { for (int x : ALL_INTEGER_CANDIDATES) { for (int y : ALL_INTEGER_CANDIDATES) { if (LongMath.fitsInInt((long) x - y)) { - int expected = (x < y) ? 1 : 0; + int expected = x < y ? 1 : 0; int actual = IntMath.lessThanBranchFree(x, y); assertEquals(expected, actual); } @@ -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..8504e246040f 100644 --- a/android/guava-tests/test/com/google/common/math/LongMathTest.java +++ b/android/guava-tests/test/com/google/common/math/LongMathTest.java @@ -193,7 +193,7 @@ public void testLessThanBranchFree() { for (long y : ALL_LONG_CANDIDATES) { BigInteger difference = BigInteger.valueOf(x).subtract(BigInteger.valueOf(y)); if (fitsInLong(difference)) { - int expected = (x < y) ? 1 : 0; + int expected = x < y ? 1 : 0; int actual = LongMath.lessThanBranchFree(x, y); assertEquals(expected, actual); } @@ -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/primitives/UnsignedLongTest.java b/android/guava-tests/test/com/google/common/primitives/UnsignedLongTest.java index 3893d66ab4bc..74f90f12c5ea 100644 --- a/android/guava-tests/test/com/google/common/primitives/UnsignedLongTest.java +++ b/android/guava-tests/test/com/google/common/primitives/UnsignedLongTest.java @@ -85,7 +85,7 @@ public void testAsUnsignedAndLongValueAreInverses() { public void testAsUnsignedBigIntegerValue() { for (long value : TEST_LONGS) { BigInteger expected = - (value >= 0) + value >= 0 ? BigInteger.valueOf(value) : BigInteger.valueOf(value).add(BigInteger.ZERO.setBit(64)); assertWithMessage(UnsignedLongs.toString(value)) @@ -265,7 +265,7 @@ public void testEquals() { EqualsTester equalsTester = new EqualsTester(); for (long a : TEST_LONGS) { BigInteger big = - (a >= 0) ? BigInteger.valueOf(a) : BigInteger.valueOf(a).add(BigInteger.ZERO.setBit(64)); + a >= 0 ? BigInteger.valueOf(a) : BigInteger.valueOf(a).add(BigInteger.ZERO.setBit(64)); equalsTester.addEqualityGroup( UnsignedLong.fromLongBits(a), UnsignedLong.valueOf(big), diff --git a/android/guava-tests/test/com/google/common/util/concurrent/AbstractFutureBenchmarks.java b/android/guava-tests/test/com/google/common/util/concurrent/AbstractFutureBenchmarks.java index 1dd4986b6a3c..81fa128002d9 100644 --- a/android/guava-tests/test/com/google/common/util/concurrent/AbstractFutureBenchmarks.java +++ b/android/guava-tests/test/com/google/common/util/concurrent/AbstractFutureBenchmarks.java @@ -395,7 +395,7 @@ private boolean complete(@Nullable V v, @Nullable Throwable t, int finalState) { this.value = v; // Don't actually construct a CancellationException until necessary. this.exception = - ((finalState & (CANCELLED | INTERRUPTED)) != 0) + (finalState & (CANCELLED | INTERRUPTED)) != 0 ? new CancellationException("Future.cancel() was called.") : t; releaseShared(finalState); 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..fbb527fc8682 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)); } @@ -486,7 +486,7 @@ private static String nameFor( "%s%s(%s)/%s->%s", method.getName(), fair ? "(fair)" : "(nonfair)", - (timeout == null) ? "untimed" : timeout, + timeout == null ? "untimed" : timeout, scenario, expectedOutcome); } @@ -510,7 +510,7 @@ public void run() { }); awaitUninterruptibly(doingCallLatch); long hangDelayMillis = - (expectedOutcome == Outcome.HANG) + expectedOutcome == Outcome.HANG ? EXPECTED_HANG_DELAY_MILLIS : UNEXPECTED_HANG_DELAY_MILLIS; boolean hung = 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/CaseFormat.java b/android/guava/src/com/google/common/base/CaseFormat.java index d5041f3e8b72..6a082f84e133 100644 --- a/android/guava/src/com/google/common/base/CaseFormat.java +++ b/android/guava/src/com/google/common/base/CaseFormat.java @@ -129,7 +129,7 @@ String convert(CaseFormat format, String s) { public final String to(CaseFormat format, String str) { checkNotNull(format); checkNotNull(str); - return (format == this) ? str : convert(format, str); + return format == this ? str : convert(format, str); } /** Enum values can override for performance reasons. */ @@ -149,7 +149,7 @@ String convert(CaseFormat format, String s) { out.append(format.wordSeparator); i = j + wordSeparator.length(); } - return (i == 0) + return i == 0 ? format.normalizeFirstWord(s) : requireNonNull(out).append(format.normalizeWord(s.substring(i))).toString(); } diff --git a/android/guava/src/com/google/common/base/Functions.java b/android/guava/src/com/google/common/base/Functions.java index 3120e35e0d4f..bb834e8492c1 100644 --- a/android/guava/src/com/google/common/base/Functions.java +++ b/android/guava/src/com/google/common/base/Functions.java @@ -205,7 +205,7 @@ private static final class ForMapWithDefault< public V apply(@ParametricNullness K key) { V result = map.get(key); // The unchecked cast is safe because of the containsKey check. - return (result != null || map.containsKey(key)) + return result != null || map.containsKey(key) ? uncheckedCastNullableTToT(result) : defaultValue; } @@ -384,7 +384,7 @@ public boolean equals(@Nullable Object obj) { @Override public int hashCode() { - return (value == null) ? 0 : value.hashCode(); + return value == null ? 0 : value.hashCode(); } @Override diff --git a/android/guava/src/com/google/common/base/Suppliers.java b/android/guava/src/com/google/common/base/Suppliers.java index 7426d71b01da..9afc7fc41303 100644 --- a/android/guava/src/com/google/common/base/Suppliers.java +++ b/android/guava/src/com/google/common/base/Suppliers.java @@ -319,7 +319,7 @@ public T get() { nanos = now + durationNanos; // In the very unlikely event that nanos is 0, set it to 1; // no one will notice 1 ns of tardiness. - expirationNanos = (nanos == 0) ? 1 : nanos; + expirationNanos = nanos == 0 ? 1 : nanos; return t; } } diff --git a/android/guava/src/com/google/common/base/Throwables.java b/android/guava/src/com/google/common/base/Throwables.java index f8b4ae47f00c..0ecce2619e43 100644 --- a/android/guava/src/com/google/common/base/Throwables.java +++ b/android/guava/src/com/google/common/base/Throwables.java @@ -462,7 +462,7 @@ private static Object invokeAccessibleNonThrowingMethod( */ @J2ktIncompatible @GwtIncompatible // java.lang.reflect private static final @Nullable Method getStackTraceElementMethod = - (jla == null) ? null : getGetMethod(); + jla == null ? null : getGetMethod(); /** * The "getStackTraceDepth" method, only available on some JDKs so we use reflection to find it @@ -470,7 +470,7 @@ private static Object invokeAccessibleNonThrowingMethod( */ @J2ktIncompatible @GwtIncompatible // java.lang.reflect private static final @Nullable Method getStackTraceDepthMethod = - (jla == null) ? null : getSizeMethod(jla); + jla == null ? null : getSizeMethod(jla); /** * Returns the JavaLangAccess class that is present in all Sun JDKs. It is not allowed in 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/base/internal/Finalizer.java b/android/guava/src/com/google/common/base/internal/Finalizer.java index 8a1a942b54ea..65279ede05b8 100644 --- a/android/guava/src/com/google/common/base/internal/Finalizer.java +++ b/android/guava/src/com/google/common/base/internal/Finalizer.java @@ -120,7 +120,7 @@ public static void startFinalizer( getBigThreadConstructor(); private static final @Nullable Field inheritableThreadLocals = - (bigThreadConstructor == null) ? getInheritableThreadLocalsField() : null; + bigThreadConstructor == null ? getInheritableThreadLocalsField() : null; /** Constructs a new finalizer thread. */ private Finalizer( diff --git a/android/guava/src/com/google/common/cache/AbstractCache.java b/android/guava/src/com/google/common/cache/AbstractCache.java index e42745122b21..206a93c764b6 100644 --- a/android/guava/src/com/google/common/cache/AbstractCache.java +++ b/android/guava/src/com/google/common/cache/AbstractCache.java @@ -265,7 +265,7 @@ public CacheStats snapshot() { /** Returns {@code value}, if non-negative. Otherwise, returns {@link Long#MAX_VALUE}. */ private static long negativeToMaxValue(long value) { - return (value >= 0) ? value : Long.MAX_VALUE; + return value >= 0 ? value : Long.MAX_VALUE; } /** Increments all counters by the values in {@code other}. */ diff --git a/android/guava/src/com/google/common/cache/CacheBuilderSpec.java b/android/guava/src/com/google/common/cache/CacheBuilderSpec.java index afcb23e36381..411c79be22ab 100644 --- a/android/guava/src/com/google/common/cache/CacheBuilderSpec.java +++ b/android/guava/src/com/google/common/cache/CacheBuilderSpec.java @@ -285,7 +285,7 @@ public boolean equals(@Nullable Object obj) { * nanos to match CacheBuilder implementation. */ private static @Nullable Long durationInNanos(long duration, @Nullable TimeUnit unit) { - return (unit == null) ? null : unit.toNanos(duration); + return unit == null ? null : unit.toNanos(duration); } /** Base class for parsing integers. */ diff --git a/android/guava/src/com/google/common/cache/CacheStats.java b/android/guava/src/com/google/common/cache/CacheStats.java index b9b5c861b51e..ad9bd3ed37e0 100644 --- a/android/guava/src/com/google/common/cache/CacheStats.java +++ b/android/guava/src/com/google/common/cache/CacheStats.java @@ -122,7 +122,7 @@ public long hitCount() { */ public double hitRate() { long requestCount = requestCount(); - return (requestCount == 0) ? 1.0 : (double) hitCount / requestCount; + return requestCount == 0 ? 1.0 : (double) hitCount / requestCount; } /** @@ -146,7 +146,7 @@ public long missCount() { */ public double missRate() { long requestCount = requestCount(); - return (requestCount == 0) ? 0.0 : (double) missCount / requestCount; + return requestCount == 0 ? 0.0 : (double) missCount / requestCount; } /** @@ -201,7 +201,7 @@ public long loadExceptionCount() { */ public double loadExceptionRate() { long totalLoadCount = saturatedAdd(loadSuccessCount, loadExceptionCount); - return (totalLoadCount == 0) ? 0.0 : (double) loadExceptionCount / totalLoadCount; + return totalLoadCount == 0 ? 0.0 : (double) loadExceptionCount / totalLoadCount; } /** @@ -224,7 +224,7 @@ public long totalLoadTime() { */ public double averageLoadPenalty() { long totalLoadCount = saturatedAdd(loadSuccessCount, loadExceptionCount); - return (totalLoadCount == 0) ? 0.0 : (double) totalLoadTime / totalLoadCount; + return totalLoadCount == 0 ? 0.0 : (double) totalLoadTime / totalLoadCount; } /** diff --git a/android/guava/src/com/google/common/cache/LocalCache.java b/android/guava/src/com/google/common/cache/LocalCache.java index 934fef433148..8a813ed147d8 100644 --- a/android/guava/src/com/google/common/cache/LocalCache.java +++ b/android/guava/src/com/google/common/cache/LocalCache.java @@ -257,7 +257,7 @@ final class LocalCache extends AbstractMap implements ConcurrentMap< removalListener = builder.getRemovalListener(); removalNotificationQueue = - (removalListener == NullListener.INSTANCE) + removalListener == NullListener.INSTANCE ? LocalCache.discardingQueue() : new ConcurrentLinkedQueue<>(); @@ -387,7 +387,7 @@ enum Strength { @Override ValueReference referenceValue( Segment segment, ReferenceEntry entry, V value, int weight) { - return (weight == 1) + return weight == 1 ? new StrongValueReference(value) : new WeightedStrongValueReference(value, weight); } @@ -401,7 +401,7 @@ Equivalence defaultEquivalence() { @Override ValueReference referenceValue( Segment segment, ReferenceEntry entry, V value, int weight) { - return (weight == 1) + return weight == 1 ? new SoftValueReference(segment.valueReferenceQueue, value, entry) : new WeightedSoftValueReference( segment.valueReferenceQueue, value, entry, weight); @@ -416,7 +416,7 @@ Equivalence defaultEquivalence() { @Override ValueReference referenceValue( Segment segment, ReferenceEntry entry, V value, int weight) { - return (weight == 1) + return weight == 1 ? new WeakValueReference(segment.valueReferenceQueue, value, entry) : new WeightedWeakValueReference( segment.valueReferenceQueue, value, entry, weight); @@ -588,7 +588,7 @@ ReferenceEntry copyEntry( static EntryFactory getFactory( Strength keyStrength, boolean usesAccessQueue, boolean usesWriteQueue) { int flags = - ((keyStrength == Strength.WEAK) ? WEAK_MASK : 0) + (keyStrength == Strength.WEAK ? WEAK_MASK : 0) | (usesAccessQueue ? ACCESS_MASK : 0) | (usesWriteQueue ? WRITE_MASK : 0); return factories[flags]; @@ -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); } @@ -3041,7 +3041,7 @@ boolean remove(Object key, int hash, Object value) { newCount = this.count - 1; table.set(index, newFirst); this.count = newCount; // write-volatile - return (cause == RemovalCause.EXPLICIT); + return cause == RemovalCause.EXPLICIT; } } @@ -3084,7 +3084,7 @@ boolean storeLoadedValue( ++modCount; if (oldValueReference.isActive()) { RemovalCause cause = - (entryValue == null) ? RemovalCause.COLLECTED : RemovalCause.REPLACED; + entryValue == null ? RemovalCause.COLLECTED : RemovalCause.REPLACED; enqueueNotification(key, hash, entryValue, oldValueReference.getWeight(), cause); newCount--; } @@ -3128,7 +3128,7 @@ void clear() { K key = e.getKey(); V value = e.getValueReference().get(); RemovalCause cause = - (key == null || value == null) ? RemovalCause.COLLECTED : RemovalCause.EXPLICIT; + key == null || value == null ? RemovalCause.COLLECTED : RemovalCause.EXPLICIT; enqueueNotification( key, e.getHash(), value, e.getValueReference().getWeight(), cause); } @@ -3590,7 +3590,7 @@ public boolean offer(ReferenceEntry entry) { @Override public @Nullable ReferenceEntry peek() { ReferenceEntry next = head.getNextInWriteQueue(); - return (next == head) ? null : next; + return next == head ? null : next; } @Override @@ -3659,7 +3659,7 @@ public Iterator> iterator() { @Override protected @Nullable ReferenceEntry computeNext(ReferenceEntry previous) { ReferenceEntry next = previous.getNextInWriteQueue(); - return (next == head) ? null : next; + return next == head ? null : next; } }; } @@ -3730,7 +3730,7 @@ public boolean offer(ReferenceEntry entry) { @Override public @Nullable ReferenceEntry peek() { ReferenceEntry next = head.getNextInAccessQueue(); - return (next == head) ? null : next; + return next == head ? null : next; } @Override @@ -3799,7 +3799,7 @@ public Iterator> iterator() { @Override protected @Nullable ReferenceEntry computeNext(ReferenceEntry previous) { ReferenceEntry next = previous.getNextInAccessQueue(); - return (next == head) ? null : next; + return next == head ? null : next; } }; } @@ -3889,7 +3889,7 @@ V get(K key, CacheLoader loader) throws ExecutionException { @Override public @Nullable V getOrDefault(@Nullable Object key, @Nullable V defaultValue) { V result = get(key); - return (result != null) ? result : defaultValue; + return result != null ? result : defaultValue; } V getOrLoad(K key) throws ExecutionException { @@ -4179,7 +4179,7 @@ void invalidateAll(Iterable keys) { public Set keySet() { // does not impact recency ordering Set ks = keySet; - return (ks != null) ? ks : (keySet = new KeySet()); + return ks != null ? ks : (keySet = new KeySet()); } @LazyInit @RetainedWith @Nullable Collection values; @@ -4188,7 +4188,7 @@ public Set keySet() { public Collection values() { // does not impact recency ordering Collection vs = values; - return (vs != null) ? vs : (values = new Values()); + return vs != null ? vs : (values = new Values()); } @LazyInit @RetainedWith @Nullable Set> entrySet; @@ -4198,7 +4198,7 @@ public Collection values() { public Set> entrySet() { // does not impact recency ordering Set> es = entrySet; - return (es != null) ? es : (entrySet = new EntrySet()); + return es != null ? es : (entrySet = new EntrySet()); } // Iterator Support @@ -4551,7 +4551,7 @@ private ManualSerializationProxy( this.weigher = weigher; this.concurrencyLevel = concurrencyLevel; this.removalListener = removalListener; - this.ticker = (ticker == Ticker.systemTicker() || ticker == NULL_TICKER) ? null : ticker; + this.ticker = ticker == Ticker.systemTicker() || ticker == NULL_TICKER ? null : ticker; this.loader = loader; } diff --git a/android/guava/src/com/google/common/cache/Striped64.java b/android/guava/src/com/google/common/cache/Striped64.java index a5241528f035..c1d86b4b44a9 100644 --- a/android/guava/src/com/google/common/cache/Striped64.java +++ b/android/guava/src/com/google/common/cache/Striped64.java @@ -188,7 +188,7 @@ final void retryUpdate(long x, int @Nullable [] hc, boolean wasUncontended) { if (hc == null) { threadHashCode.set(hc = new int[1]); // Initialize randomly int r = rng.nextInt(); // Avoid zero to allow xorShift rehash - h = hc[0] = (r == 0) ? 1 : r; + h = hc[0] = r == 0 ? 1 : r; } else h = hc[0]; boolean collide = false; // True if last slot nonempty for (; ; ) { diff --git a/android/guava/src/com/google/common/collect/AbstractBiMap.java b/android/guava/src/com/google/common/collect/AbstractBiMap.java index e871fd1ca66e..d89bcc5f927e 100644 --- a/android/guava/src/com/google/common/collect/AbstractBiMap.java +++ b/android/guava/src/com/google/common/collect/AbstractBiMap.java @@ -208,7 +208,7 @@ public BiMap inverse() { @Override public Set keySet() { Set result = keySet; - return (result == null) ? keySet = new KeySet() : result; + return result == null ? keySet = new KeySet() : result; } @WeakOuter @@ -257,7 +257,7 @@ public Set values() { * iteration order so that it is consistent with the forward map. */ Set result = valueSet; - return (result == null) ? valueSet = new ValueSet() : result; + return result == null ? valueSet = new ValueSet() : result; } @WeakOuter @@ -296,7 +296,7 @@ public String toString() { @Override public Set> entrySet() { Set> result = entrySet; - return (result == null) ? entrySet = new EntrySet() : result; + return result == null ? entrySet = new EntrySet() : result; } private final class BiMapEntry extends ForwardingMapEntry { diff --git a/android/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java b/android/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java index 1a2c95409e8a..e959f07a990f 100644 --- a/android/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java +++ b/android/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java @@ -306,7 +306,7 @@ Collection wrapCollection(@ParametricNullness K key, Collection collection final List wrapList( @ParametricNullness K key, List list, @Nullable WrappedCollection ancestor) { - return (list instanceof RandomAccess) + return list instanceof RandomAccess ? new RandomAccessWrappedList(key, list, ancestor) : new WrappedList(key, list, ancestor); } @@ -338,7 +338,7 @@ class WrappedCollection extends AbstractCollection { this.key = key; this.delegate = delegate; this.ancestor = ancestor; - this.ancestorDelegate = (ancestor == null) ? null : ancestor.getDelegate(); + this.ancestorDelegate = ancestor == null ? null : ancestor.getDelegate(); } /** @@ -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; @@ -588,7 +588,7 @@ public boolean retainAll(Collection c) { private static Iterator iteratorOrListIterator( Collection collection) { - return (collection instanceof List) + return collection instanceof List ? ((List) collection).listIterator() : collection.iterator(); } @@ -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; @@ -657,7 +657,7 @@ public SortedSet headSet(@ParametricNullness V toElement) { return new WrappedSortedSet( getKey(), getSortedSetDelegate().headSet(toElement), - (getAncestor() == null) ? this : getAncestor()); + getAncestor() == null ? this : getAncestor()); } @Override @@ -666,7 +666,7 @@ public SortedSet subSet(@ParametricNullness V fromElement, @ParametricNullnes return new WrappedSortedSet( getKey(), getSortedSetDelegate().subSet(fromElement, toElement), - (getAncestor() == null) ? this : getAncestor()); + getAncestor() == null ? this : getAncestor()); } @Override @@ -675,7 +675,7 @@ public SortedSet tailSet(@ParametricNullness V fromElement) { return new WrappedSortedSet( getKey(), getSortedSetDelegate().tailSet(fromElement), - (getAncestor() == null) ? this : getAncestor()); + getAncestor() == null ? this : getAncestor()); } } @@ -722,7 +722,7 @@ NavigableSet getSortedSetDelegate() { } private NavigableSet wrap(NavigableSet wrapped) { - return new WrappedNavigableSet(key, wrapped, (getAncestor() == null) ? this : getAncestor()); + return new WrappedNavigableSet(key, wrapped, getAncestor() == null ? this : getAncestor()); } @Override @@ -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(); } @@ -849,7 +849,7 @@ public List subList(int fromIndex, int toIndex) { return wrapList( getKey(), getListDelegate().subList(fromIndex, toIndex), - (getAncestor() == null) ? this : getAncestor()); + getAncestor() == null ? this : getAncestor()); } /** ListIterator decorator. */ @@ -1483,7 +1483,7 @@ public SortedMap> tailMap(@ParametricNullness K fromKey) { @Override public SortedSet keySet() { SortedSet result = sortedKeySet; - return (result == null) ? sortedKeySet = createKeySet() : result; + return result == null ? sortedKeySet = createKeySet() : result; } @Override @@ -1506,7 +1506,7 @@ NavigableMap> sortedMap() { @Override public @Nullable Entry> lowerEntry(@ParametricNullness K key) { Entry> entry = sortedMap().lowerEntry(key); - return (entry == null) ? null : wrapEntry(entry); + return entry == null ? null : wrapEntry(entry); } @Override @@ -1517,7 +1517,7 @@ NavigableMap> sortedMap() { @Override public @Nullable Entry> floorEntry(@ParametricNullness K key) { Entry> entry = sortedMap().floorEntry(key); - return (entry == null) ? null : wrapEntry(entry); + return entry == null ? null : wrapEntry(entry); } @Override @@ -1528,7 +1528,7 @@ NavigableMap> sortedMap() { @Override public @Nullable Entry> ceilingEntry(@ParametricNullness K key) { Entry> entry = sortedMap().ceilingEntry(key); - return (entry == null) ? null : wrapEntry(entry); + return entry == null ? null : wrapEntry(entry); } @Override @@ -1539,7 +1539,7 @@ NavigableMap> sortedMap() { @Override public @Nullable Entry> higherEntry(@ParametricNullness K key) { Entry> entry = sortedMap().higherEntry(key); - return (entry == null) ? null : wrapEntry(entry); + return entry == null ? null : wrapEntry(entry); } @Override @@ -1550,13 +1550,13 @@ NavigableMap> sortedMap() { @Override public @Nullable Entry> firstEntry() { Entry> entry = sortedMap().firstEntry(); - return (entry == null) ? null : wrapEntry(entry); + return entry == null ? null : wrapEntry(entry); } @Override public @Nullable Entry> lastEntry() { Entry> entry = sortedMap().lastEntry(); - return (entry == null) ? null : wrapEntry(entry); + return entry == null ? null : wrapEntry(entry); } @Override diff --git a/android/guava/src/com/google/common/collect/AbstractMapBasedMultiset.java b/android/guava/src/com/google/common/collect/AbstractMapBasedMultiset.java index 885dfbfb229a..23fe02998571 100644 --- a/android/guava/src/com/google/common/collect/AbstractMapBasedMultiset.java +++ b/android/guava/src/com/google/common/collect/AbstractMapBasedMultiset.java @@ -118,8 +118,8 @@ public final int remove(@Nullable Object element, int occurrences) { @Override public final int setCount(@ParametricNullness E element, int count) { checkNonnegative(count, "count"); - int oldCount = (count == 0) ? backingMap.remove(element) : backingMap.put(element, count); - size += (count - oldCount); + int oldCount = count == 0 ? backingMap.remove(element) : backingMap.put(element, count); + size += count - oldCount; return oldCount; } diff --git a/android/guava/src/com/google/common/collect/AbstractMapEntry.java b/android/guava/src/com/google/common/collect/AbstractMapEntry.java index aa8be1e87a15..4fcb22ea803f 100644 --- a/android/guava/src/com/google/common/collect/AbstractMapEntry.java +++ b/android/guava/src/com/google/common/collect/AbstractMapEntry.java @@ -59,7 +59,7 @@ public boolean equals(@Nullable Object object) { public int hashCode() { K k = getKey(); V v = getValue(); - return ((k == null) ? 0 : k.hashCode()) ^ ((v == null) ? 0 : v.hashCode()); + return (k == null ? 0 : k.hashCode()) ^ (v == null ? 0 : v.hashCode()); } /** Returns a string representation of the form {@code {key}={value}}. */ diff --git a/android/guava/src/com/google/common/collect/AbstractMultimap.java b/android/guava/src/com/google/common/collect/AbstractMultimap.java index 086b8c73aaa8..e41af6d5fa1d 100644 --- a/android/guava/src/com/google/common/collect/AbstractMultimap.java +++ b/android/guava/src/com/google/common/collect/AbstractMultimap.java @@ -112,7 +112,7 @@ public Collection replaceValues(@ParametricNullness K key, Iterable> entries() { Collection> result = entries; - return (result == null) ? entries = createEntries() : result; + return result == null ? entries = createEntries() : result; } abstract Collection> createEntries(); @@ -150,7 +150,7 @@ public boolean equals(@Nullable Object obj) { @Override public Set keySet() { Set result = keySet; - return (result == null) ? keySet = createKeySet() : result; + return result == null ? keySet = createKeySet() : result; } abstract Set createKeySet(); @@ -160,7 +160,7 @@ public Set keySet() { @Override public Multiset keys() { Multiset result = keys; - return (result == null) ? keys = createKeys() : result; + return result == null ? keys = createKeys() : result; } abstract Multiset createKeys(); @@ -170,7 +170,7 @@ public Multiset keys() { @Override public Collection values() { Collection result = values; - return (result == null) ? values = createValues() : result; + return result == null ? values = createValues() : result; } abstract Collection createValues(); @@ -207,7 +207,7 @@ Iterator valueIterator() { @Override public Map> asMap() { Map> result = asMap; - return (result == null) ? asMap = createAsMap() : result; + return result == null ? asMap = createAsMap() : result; } abstract Map> createAsMap(); diff --git a/android/guava/src/com/google/common/collect/AbstractSortedMultiset.java b/android/guava/src/com/google/common/collect/AbstractSortedMultiset.java index aae18799738a..1b87728ddfa8 100644 --- a/android/guava/src/com/google/common/collect/AbstractSortedMultiset.java +++ b/android/guava/src/com/google/common/collect/AbstractSortedMultiset.java @@ -122,7 +122,7 @@ Iterator descendingIterator() { @Override public SortedMultiset descendingMultiset() { SortedMultiset result = descendingMultiset; - return (result == null) ? descendingMultiset = createDescendingMultiset() : result; + return result == null ? descendingMultiset = createDescendingMultiset() : result; } SortedMultiset createDescendingMultiset() { diff --git a/android/guava/src/com/google/common/collect/AbstractTable.java b/android/guava/src/com/google/common/collect/AbstractTable.java index 0b82add873a6..771c4a3342fa 100644 --- a/android/guava/src/com/google/common/collect/AbstractTable.java +++ b/android/guava/src/com/google/common/collect/AbstractTable.java @@ -78,7 +78,7 @@ public boolean contains(@Nullable Object rowKey, @Nullable Object columnKey) { @Override public @Nullable V get(@Nullable Object rowKey, @Nullable Object columnKey) { Map row = safeGet(rowMap(), rowKey); - return (row == null) ? null : safeGet(row, columnKey); + return row == null ? null : safeGet(row, columnKey); } @Override @@ -95,7 +95,7 @@ public void clear() { @Override public @Nullable V remove(@Nullable Object rowKey, @Nullable Object columnKey) { Map row = safeGet(rowMap(), rowKey); - return (row == null) ? null : Maps.safeRemove(row, columnKey); + return row == null ? null : Maps.safeRemove(row, columnKey); } @CanIgnoreReturnValue @@ -117,7 +117,7 @@ public void putAll(Table table) { @Override public Set> cellSet() { Set> result = cellSet; - return (result == null) ? cellSet = createCellSet() : result; + return result == null ? cellSet = createCellSet() : result; } Set> createCellSet() { @@ -173,7 +173,7 @@ public int size() { @Override public Collection values() { Collection result = values; - return (result == null) ? values = createValues() : result; + return result == null ? values = createValues() : result; } Collection createValues() { diff --git a/android/guava/src/com/google/common/collect/ArrayListMultimap.java b/android/guava/src/com/google/common/collect/ArrayListMultimap.java index b5681ddb48b4..8b7ab1acede9 100644 --- a/android/guava/src/com/google/common/collect/ArrayListMultimap.java +++ b/android/guava/src/com/google/common/collect/ArrayListMultimap.java @@ -124,7 +124,7 @@ private ArrayListMultimap(int expectedKeys, int expectedValuesPerKey) { private ArrayListMultimap(Multimap multimap) { this( multimap.keySet().size(), - (multimap instanceof ArrayListMultimap) + multimap instanceof ArrayListMultimap ? ((ArrayListMultimap) multimap).expectedValuesPerKey : DEFAULT_VALUES_PER_KEY); putAll(multimap); diff --git a/android/guava/src/com/google/common/collect/CollectCollectors.java b/android/guava/src/com/google/common/collect/CollectCollectors.java index c0dc823cd54c..7195d257769e 100644 --- a/android/guava/src/com/google/common/collect/CollectCollectors.java +++ b/android/guava/src/com/google/common/collect/CollectCollectors.java @@ -339,7 +339,7 @@ EnumMapAccumulator combine(EnumMapAccumulator other) { } ImmutableMap toImmutableMap() { - return (map == null) ? ImmutableMap.of() : ImmutableEnumMap.asImmutable(map); + return map == null ? ImmutableMap.of() : ImmutableEnumMap.asImmutable(map); } } diff --git a/android/guava/src/com/google/common/collect/CollectSpliterators.java b/android/guava/src/com/google/common/collect/CollectSpliterators.java index cd5890dbd4fd..cd2ff83c0cc3 100644 --- a/android/guava/src/com/google/common/collect/CollectSpliterators.java +++ b/android/guava/src/com/google/common/collect/CollectSpliterators.java @@ -80,7 +80,7 @@ public void forEachRemaining(Consumer action) { @Override public @Nullable Spliterator trySplit() { Spliterator.OfInt split = delegate.trySplit(); - return (split == null) ? null : new WithCharacteristics(split); + return split == null ? null : new WithCharacteristics(split); } @Override @@ -134,7 +134,7 @@ public void forEachRemaining(Consumer action) { @Override public @Nullable Spliterator trySplit() { Spliterator fromSplit = fromSpliterator.trySplit(); - return (fromSplit != null) ? map(fromSplit, function) : null; + return fromSplit != null ? map(fromSplit, function) : null; } @Override @@ -184,7 +184,7 @@ public boolean tryAdvance(Consumer action) { @Override public @Nullable Spliterator trySplit() { Spliterator fromSplit = fromSpliterator.trySplit(); - return (fromSplit == null) ? null : filter(fromSplit, predicate); + return fromSplit == null ? null : filter(fromSplit, predicate); } @Override diff --git a/android/guava/src/com/google/common/collect/CompactHashMap.java b/android/guava/src/com/google/common/collect/CompactHashMap.java index f05dfcfd327f..313cc76ebc03 100644 --- a/android/guava/src/com/google/common/collect/CompactHashMap.java +++ b/android/guava/src/com/google/common/collect/CompactHashMap.java @@ -498,7 +498,7 @@ private int indexOf(@Nullable Object key) { @Override public boolean containsKey(@Nullable Object key) { Map delegate = delegateOrNull(); - return (delegate != null) ? delegate.containsKey(key) : indexOf(key) != -1; + return delegate != null ? delegate.containsKey(key) : indexOf(key) != -1; } @Override @@ -524,7 +524,7 @@ public boolean containsKey(@Nullable Object key) { return delegate.remove(key); } Object oldValue = removeHelper(key); - return (oldValue == NOT_FOUND) ? null : (V) oldValue; + return oldValue == NOT_FOUND ? null : (V) oldValue; } private @Nullable Object removeHelper(@Nullable Object key) { @@ -606,7 +606,7 @@ int firstEntryIndex() { } int getSuccessor(int entryIndex) { - return (entryIndex + 1 < size) ? entryIndex + 1 : -1; + return entryIndex + 1 < size ? entryIndex + 1 : -1; } /** @@ -669,7 +669,7 @@ private void checkForConcurrentModification() { @Override public Set keySet() { - return (keySetView == null) ? keySetView = createKeySet() : keySetView; + return keySetView == null ? keySetView = createKeySet() : keySetView; } Set createKeySet() { @@ -691,7 +691,7 @@ public boolean contains(@Nullable Object o) { @Override public boolean remove(@Nullable Object o) { Map delegate = delegateOrNull(); - return (delegate != null) + return delegate != null ? delegate.keySet().remove(o) : CompactHashMap.this.removeHelper(o) != NOT_FOUND; } @@ -725,7 +725,7 @@ K getOutput(int entry) { @Override public Set> entrySet() { - return (entrySetView == null) ? entrySetView = createEntrySet() : entrySetView; + return entrySetView == null ? entrySetView = createEntrySet() : entrySetView; } Set> createEntrySet() { @@ -853,7 +853,7 @@ public V getValue() { * permits us to throw IllegalStateException. Maybe we should have done that, but we probably * shouldn't change now for fear of breaking people.) */ - return (lastKnownIndex == -1) ? unsafeNull() : value(lastKnownIndex); + return lastKnownIndex == -1 ? unsafeNull() : value(lastKnownIndex); } @Override @@ -878,7 +878,7 @@ public V setValue(@ParametricNullness V value) { @Override public int size() { Map delegate = delegateOrNull(); - return (delegate != null) ? delegate.size() : size; + return delegate != null ? delegate.size() : size; } @Override @@ -904,7 +904,7 @@ public boolean containsValue(@Nullable Object value) { @Override public Collection values() { - return (valuesView == null) ? valuesView = createValues() : valuesView; + return valuesView == null ? valuesView = createValues() : valuesView; } Collection createValues() { diff --git a/android/guava/src/com/google/common/collect/CompactHashSet.java b/android/guava/src/com/google/common/collect/CompactHashSet.java index 49d0f37a00b5..c3d368be2b26 100644 --- a/android/guava/src/com/google/common/collect/CompactHashSet.java +++ b/android/guava/src/com/google/common/collect/CompactHashSet.java @@ -520,7 +520,7 @@ int firstEntryIndex() { } int getSuccessor(int entryIndex) { - return (entryIndex + 1 < size) ? entryIndex + 1 : -1; + return entryIndex + 1 < size ? entryIndex + 1 : -1; } /** @@ -586,7 +586,7 @@ private void checkForConcurrentModification() { @Override public int size() { Set delegate = delegateOrNull(); - return (delegate != null) ? delegate.size() : size; + return delegate != null ? delegate.size() : size; } @Override @@ -600,7 +600,7 @@ public boolean isEmpty() { return new Object[0]; } Set delegate = delegateOrNull(); - return (delegate != null) ? delegate.toArray() : Arrays.copyOf(requireElements(), size); + return delegate != null ? delegate.toArray() : Arrays.copyOf(requireElements(), size); } @CanIgnoreReturnValue @@ -614,7 +614,7 @@ public boolean isEmpty() { return a; } Set delegate = delegateOrNull(); - return (delegate != null) + return delegate != null ? delegate.toArray(a) : ObjectArrays.toArrayImpl(requireElements(), 0, size, a); } diff --git a/android/guava/src/com/google/common/collect/CompactHashing.java b/android/guava/src/com/google/common/collect/CompactHashing.java index 7c9320a022fd..85c3b9f57ee3 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; @@ -138,7 +138,7 @@ static void tableSet(Object table, int index, int entry) { * current hashtable size. */ static int newCapacity(int mask) { - return ((mask < 32) ? 4 : 2) * (mask + 1); + return (mask < 32 ? 4 : 2) * (mask + 1); } /** Returns the hash prefix given the current mask. */ diff --git a/android/guava/src/com/google/common/collect/CompactLinkedHashMap.java b/android/guava/src/com/google/common/collect/CompactLinkedHashMap.java index 0ca015475aa1..9af11ab7203d 100644 --- a/android/guava/src/com/google/common/collect/CompactLinkedHashMap.java +++ b/android/guava/src/com/google/common/collect/CompactLinkedHashMap.java @@ -219,7 +219,7 @@ int firstEntryIndex() { @Override int adjustAfterRemove(int indexBeforeRemove, int indexRemoved) { - return (indexBeforeRemove >= size()) ? indexRemoved : indexBeforeRemove; + return indexBeforeRemove >= size() ? indexRemoved : indexBeforeRemove; } @Override diff --git a/android/guava/src/com/google/common/collect/CompactLinkedHashSet.java b/android/guava/src/com/google/common/collect/CompactLinkedHashSet.java index 049067372261..c5904781548f 100644 --- a/android/guava/src/com/google/common/collect/CompactLinkedHashSet.java +++ b/android/guava/src/com/google/common/collect/CompactLinkedHashSet.java @@ -223,7 +223,7 @@ int firstEntryIndex() { @Override int adjustAfterRemove(int indexBeforeRemove, int indexRemoved) { - return (indexBeforeRemove >= size()) ? indexRemoved : indexBeforeRemove; + return indexBeforeRemove >= size() ? indexRemoved : indexBeforeRemove; } @Override diff --git a/android/guava/src/com/google/common/collect/ConcurrentHashMultiset.java b/android/guava/src/com/google/common/collect/ConcurrentHashMultiset.java index ac1d0e66f8ed..2c737d3981c8 100644 --- a/android/guava/src/com/google/common/collect/ConcurrentHashMultiset.java +++ b/android/guava/src/com/google/common/collect/ConcurrentHashMultiset.java @@ -142,7 +142,7 @@ public static ConcurrentHashMultiset create(ConcurrentMap> canonical(DiscreteDomain> domain) { @Override public int compareTo(Cut> o) { - return (o == this) ? 0 : -1; + return o == this ? 0 : -1; } @Override @@ -286,7 +286,7 @@ Comparable greatestValueBelow(DiscreteDomain> domain) { @Override public int compareTo(Cut> o) { - return (o == this) ? 0 : 1; + return o == this ? 0 : 1; } @Override @@ -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/DescendingMultiset.java b/android/guava/src/com/google/common/collect/DescendingMultiset.java index a4d98f1cd36e..dc4a0f592313 100644 --- a/android/guava/src/com/google/common/collect/DescendingMultiset.java +++ b/android/guava/src/com/google/common/collect/DescendingMultiset.java @@ -116,7 +116,7 @@ public SortedMultiset descendingMultiset() { @Override public Set> entrySet() { Set> result = entrySet; - return (result == null) ? entrySet = createEntrySet() : result; + return result == null ? entrySet = createEntrySet() : result; } Set> createEntrySet() { diff --git a/android/guava/src/com/google/common/collect/DiscreteDomain.java b/android/guava/src/com/google/common/collect/DiscreteDomain.java index 13e7be404726..8a0fdc395b0f 100644 --- a/android/guava/src/com/google/common/collect/DiscreteDomain.java +++ b/android/guava/src/com/google/common/collect/DiscreteDomain.java @@ -71,13 +71,13 @@ private static final class IntegerDomain extends DiscreteDomain impleme @Override public @Nullable Integer next(Integer value) { int i = value; - return (i == Integer.MAX_VALUE) ? null : i + 1; + return i == Integer.MAX_VALUE ? null : i + 1; } @Override public @Nullable Integer previous(Integer value) { int i = value; - return (i == Integer.MIN_VALUE) ? null : i - 1; + return i == Integer.MIN_VALUE ? null : i - 1; } @Override @@ -135,13 +135,13 @@ private static final class LongDomain extends DiscreteDomain implements Se @Override public @Nullable Long next(Long value) { long l = value; - return (l == Long.MAX_VALUE) ? null : l + 1; + return l == Long.MAX_VALUE ? null : l + 1; } @Override public @Nullable Long previous(Long value) { long l = value; - return (l == Long.MIN_VALUE) ? null : l - 1; + return l == Long.MIN_VALUE ? null : l - 1; } @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..563724b32035 100644 --- a/android/guava/src/com/google/common/collect/FilteredEntryMultimap.java +++ b/android/guava/src/com/google/common/collect/FilteredEntryMultimap.java @@ -111,7 +111,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) + return unfiltered instanceof SetMultimap ? Collections.emptySet() : Collections.emptyList(); } diff --git a/android/guava/src/com/google/common/collect/ForwardingMapEntry.java b/android/guava/src/com/google/common/collect/ForwardingMapEntry.java index 660da5f7bbe0..99f85fe8d91c 100644 --- a/android/guava/src/com/google/common/collect/ForwardingMapEntry.java +++ b/android/guava/src/com/google/common/collect/ForwardingMapEntry.java @@ -112,7 +112,7 @@ protected boolean standardEquals(@Nullable Object object) { protected int standardHashCode() { K k = getKey(); V v = getValue(); - return ((k == null) ? 0 : k.hashCode()) ^ ((v == null) ? 0 : v.hashCode()); + return (k == null ? 0 : k.hashCode()) ^ (v == null ? 0 : v.hashCode()); } /** diff --git a/android/guava/src/com/google/common/collect/HashBiMap.java b/android/guava/src/com/google/common/collect/HashBiMap.java index be19fcf17bad..76ff0d38c648 100644 --- a/android/guava/src/com/google/common/collect/HashBiMap.java +++ b/android/guava/src/com/google/common/collect/HashBiMap.java @@ -269,12 +269,12 @@ public boolean containsValue(@Nullable Object value) { @Override public @Nullable V get(@Nullable Object key) { int entry = findEntryByKey(key); - return (entry == ABSENT) ? null : values[entry]; + return entry == ABSENT ? null : values[entry]; } @Nullable K getInverse(@Nullable Object value) { int entry = findEntryByValue(value); - return (entry == ABSENT) ? null : keys[entry]; + return entry == ABSENT ? null : keys[entry]; } @Override @@ -364,7 +364,7 @@ public boolean containsValue(@Nullable Object value) { insertIntoTableVToK(size, valueHash); int successor = - (predecessor == ENDPOINT) ? firstInInsertionOrder : nextInInsertionOrder[predecessor]; + predecessor == ENDPOINT ? firstInInsertionOrder : nextInInsertionOrder[predecessor]; setSucceeds(predecessor, size); setSucceeds(size, successor); size++; @@ -754,7 +754,7 @@ public void clear() { @Override public Set keySet() { Set result = keySet; - return (result == null) ? keySet = new KeySet() : result; + return result == null ? keySet = new KeySet() : result; } final class KeySet extends View { @@ -792,7 +792,7 @@ public boolean remove(@Nullable Object o) { @Override public Set values() { Set result = valueSet; - return (result == null) ? valueSet = new ValueSet() : result; + return result == null ? valueSet = new ValueSet() : result; } final class ValueSet extends View { @@ -830,7 +830,7 @@ public boolean remove(@Nullable Object o) { @Override public Set> entrySet() { Set> result = entrySet; - return (result == null) ? entrySet = new EntrySet() : result; + return result == null ? entrySet = new EntrySet() : result; } final class EntrySet extends View> { @@ -917,7 +917,7 @@ public V getValue() { * If the entry is still in the map, then updateIndex ensured that `index` points to the right * element. Because that element is present, uncheckedCastNullableTToT is safe. */ - return (index == ABSENT) ? unsafeNull() : uncheckedCastNullableTToT(values[index]); + return index == ABSENT ? unsafeNull() : uncheckedCastNullableTToT(values[index]); } @Override @@ -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 @@ -1021,7 +1021,7 @@ public Set values() { @Override public Set> entrySet() { Set> result = inverseEntrySet; - return (result == null) ? inverseEntrySet = new InverseEntrySet(forward) : result; + return result == null ? inverseEntrySet = new InverseEntrySet(forward) : result; } @GwtIncompatible("serialization") @@ -1106,7 +1106,7 @@ public V getKey() { public K getValue() { updateIndex(); // For discussion of unsafeNull() and uncheckedCastNullableTToT(), see EntryForKey.getValue(). - return (index == ABSENT) ? unsafeNull() : uncheckedCastNullableTToT(biMap.keys[index]); + return index == ABSENT ? unsafeNull() : uncheckedCastNullableTToT(biMap.keys[index]); } @Override diff --git a/android/guava/src/com/google/common/collect/Hashing.java b/android/guava/src/com/google/common/collect/Hashing.java index 1ea3af1c91d8..0f7781462cca 100644 --- a/android/guava/src/com/google/common/collect/Hashing.java +++ b/android/guava/src/com/google/common/collect/Hashing.java @@ -53,7 +53,7 @@ static int smear(int hashCode) { } static int smearedHash(@Nullable Object o) { - return smear((o == null) ? 0 : o.hashCode()); + return smear(o == null ? 0 : o.hashCode()); } private static final int MAX_TABLE_SIZE = Ints.MAX_POWER_OF_TWO; @@ -66,7 +66,7 @@ static int closedTableSize(int expectedEntries, double loadFactor) { // Check to make sure that we will not exceed the maximum load factor. if (expectedEntries > (int) (loadFactor * tableSize)) { tableSize <<= 1; - return (tableSize > 0) ? tableSize : MAX_TABLE_SIZE; + return tableSize > 0 ? tableSize : MAX_TABLE_SIZE; } return tableSize; } diff --git a/android/guava/src/com/google/common/collect/ImmutableEnumSet.java b/android/guava/src/com/google/common/collect/ImmutableEnumSet.java index 21439ac5b148..82c03a4e09cd 100644 --- a/android/guava/src/com/google/common/collect/ImmutableEnumSet.java +++ b/android/guava/src/com/google/common/collect/ImmutableEnumSet.java @@ -116,7 +116,7 @@ boolean isHashCodeFast() { @Override public int hashCode() { int result = hashCode; - return (result == 0) ? hashCode = delegate.hashCode() : result; + return result == 0 ? hashCode = delegate.hashCode() : result; } @Override diff --git a/android/guava/src/com/google/common/collect/ImmutableRangeSet.java b/android/guava/src/com/google/common/collect/ImmutableRangeSet.java index 7216989d9b6c..739530bad0ff 100644 --- a/android/guava/src/com/google/common/collect/ImmutableRangeSet.java +++ b/android/guava/src/com/google/common/collect/ImmutableRangeSet.java @@ -359,7 +359,7 @@ 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; } diff --git a/android/guava/src/com/google/common/collect/MapMakerInternalMap.java b/android/guava/src/com/google/common/collect/MapMakerInternalMap.java index d91c992c5c2b..fa45e3a81b16 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); } @@ -2498,7 +2498,7 @@ public void clear() { @Override public Set keySet() { Set ks = keySet; - return (ks != null) ? ks : (keySet = new KeySet()); + return ks != null ? ks : (keySet = new KeySet()); } @LazyInit transient @Nullable Collection values; @@ -2506,7 +2506,7 @@ public Set keySet() { @Override public Collection values() { Collection vs = values; - return (vs != null) ? vs : (values = new Values()); + return vs != null ? vs : (values = new Values()); } @LazyInit transient @Nullable Set> entrySet; @@ -2514,7 +2514,7 @@ public Collection values() { @Override public Set> entrySet() { Set> es = entrySet; - return (es != null) ? es : (entrySet = new EntrySet()); + return es != null ? es : (entrySet = new EntrySet()); } // Iterator Support diff --git a/android/guava/src/com/google/common/collect/MoreCollectors.java b/android/guava/src/com/google/common/collect/MoreCollectors.java index 467aca395eed..8a3290012212 100644 --- a/android/guava/src/com/google/common/collect/MoreCollectors.java +++ b/android/guava/src/com/google/common/collect/MoreCollectors.java @@ -68,11 +68,11 @@ public final class MoreCollectors { private static final Collector<@Nullable Object, ?, @Nullable Object> ONLY_ELEMENT = Collector.<@Nullable Object, ToOptionalState, @Nullable Object>of( ToOptionalState::new, - (state, o) -> state.add((o == null) ? NULL_PLACEHOLDER : o), + (state, o) -> state.add(o == null ? NULL_PLACEHOLDER : o), ToOptionalState::combine, state -> { Object result = state.getElement(); - return (result == NULL_PLACEHOLDER) ? null : result; + return result == NULL_PLACEHOLDER ? null : result; }, Collector.Characteristics.UNORDERED); diff --git a/android/guava/src/com/google/common/collect/ObjectCountHashMap.java b/android/guava/src/com/google/common/collect/ObjectCountHashMap.java index 7a716afc06d5..9108520e8962 100644 --- a/android/guava/src/com/google/common/collect/ObjectCountHashMap.java +++ b/android/guava/src/com/google/common/collect/ObjectCountHashMap.java @@ -171,11 +171,11 @@ private int hashTableMask() { } int firstIndex() { - return (size == 0) ? -1 : 0; + return size == 0 ? -1 : 0; } int nextIndex(int index) { - return (index + 1 < size) ? index + 1 : -1; + return index + 1 < size ? index + 1 : -1; } int nextIndexAfterRemove(int oldNextIndex, @SuppressWarnings("unused") int removedIndex) { @@ -236,7 +236,7 @@ void updateLastKnownIndex() { @Override public int getCount() { updateLastKnownIndex(); - return (lastKnownIndex == -1) ? 0 : values[lastKnownIndex]; + return lastKnownIndex == -1 ? 0 : values[lastKnownIndex]; } } @@ -390,7 +390,7 @@ public boolean containsKey(@Nullable Object key) { public int get(@Nullable Object key) { int index = indexOf(key); - return (index == -1) ? 0 : values[index]; + return index == -1 ? 0 : values[index]; } @CanIgnoreReturnValue diff --git a/android/guava/src/com/google/common/collect/ObjectCountLinkedHashMap.java b/android/guava/src/com/google/common/collect/ObjectCountLinkedHashMap.java index 4ac27e510e4c..e81edf728c53 100644 --- a/android/guava/src/com/google/common/collect/ObjectCountLinkedHashMap.java +++ b/android/guava/src/com/google/common/collect/ObjectCountLinkedHashMap.java @@ -104,18 +104,18 @@ void init(int expectedSize, float loadFactor) { @Override int firstIndex() { - return (firstEntry == ENDPOINT) ? -1 : firstEntry; + return firstEntry == ENDPOINT ? -1 : firstEntry; } @Override int nextIndex(int index) { int result = getSuccessor(index); - return (result == ENDPOINT) ? -1 : result; + return result == ENDPOINT ? -1 : result; } @Override int nextIndexAfterRemove(int oldNextIndex, int removedIndex) { - return (oldNextIndex == size()) ? removedIndex : oldNextIndex; + return oldNextIndex == size() ? removedIndex : oldNextIndex; } private int getPredecessor(int entry) { diff --git a/android/guava/src/com/google/common/collect/Range.java b/android/guava/src/com/google/common/collect/Range.java index 829a23c6b945..2367f95bdbcd 100644 --- a/android/guava/src/com/google/common/collect/Range.java +++ b/android/guava/src/com/google/common/collect/Range.java @@ -196,9 +196,9 @@ public static > Range range( checkNotNull(upperType); Cut lowerBound = - (lowerType == BoundType.OPEN) ? Cut.aboveValue(lower) : Cut.belowValue(lower); + lowerType == BoundType.OPEN ? Cut.aboveValue(lower) : Cut.belowValue(lower); Cut upperBound = - (upperType == BoundType.OPEN) ? Cut.belowValue(upper) : Cut.aboveValue(upper); + upperType == BoundType.OPEN ? Cut.belowValue(upper) : Cut.aboveValue(upper); return create(lowerBound, upperBound); } @@ -529,8 +529,8 @@ public Range intersection(Range connectedRange) { } else if (lowerCmp <= 0 && upperCmp >= 0) { return connectedRange; } else { - Cut newLower = (lowerCmp >= 0) ? lowerBound : connectedRange.lowerBound; - Cut newUpper = (upperCmp <= 0) ? upperBound : connectedRange.upperBound; + Cut newLower = lowerCmp >= 0 ? lowerBound : connectedRange.lowerBound; + Cut newUpper = upperCmp <= 0 ? upperBound : connectedRange.upperBound; // create() would catch this, but give a confusing error message checkArgument( @@ -603,8 +603,8 @@ public Range span(Range other) { } else if (lowerCmp >= 0 && upperCmp <= 0) { return other; } else { - Cut newLower = (lowerCmp <= 0) ? lowerBound : other.lowerBound; - Cut newUpper = (upperCmp >= 0) ? upperBound : other.upperBound; + Cut newLower = lowerCmp <= 0 ? lowerBound : other.lowerBound; + Cut newUpper = upperCmp >= 0 ? upperBound : other.upperBound; return create(newLower, newUpper); } } @@ -637,7 +637,7 @@ public Range canonical(DiscreteDomain domain) { checkNotNull(domain); Cut lower = lowerBound.canonical(domain); Cut upper = upperBound.canonical(domain); - return (lower == lowerBound && upper == upperBound) ? this : create(lower, upper); + return lower == lowerBound && upper == upperBound ? this : create(lower, upper); } /** diff --git a/android/guava/src/com/google/common/collect/RegularContiguousSet.java b/android/guava/src/com/google/common/collect/RegularContiguousSet.java index 2d25773825e8..f64688ff705f 100644 --- a/android/guava/src/com/google/common/collect/RegularContiguousSet.java +++ b/android/guava/src/com/google/common/collect/RegularContiguousSet.java @@ -165,7 +165,7 @@ Object writeReplace() { @Override public int size() { long distance = domain.distance(first(), last()); - return (distance >= Integer.MAX_VALUE) ? Integer.MAX_VALUE : (int) distance + 1; + return distance >= Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) distance + 1; } @Override @@ -202,7 +202,7 @@ public ContiguousSet intersection(ContiguousSet other) { } else { C lowerEndpoint = Ordering.natural().max(this.first(), other.first()); C upperEndpoint = Ordering.natural().min(this.last(), other.last()); - return (lowerEndpoint.compareTo(upperEndpoint) <= 0) + return lowerEndpoint.compareTo(upperEndpoint) <= 0 ? ContiguousSet.create(Range.closed(lowerEndpoint, upperEndpoint), domain) : new EmptyContiguousSet(domain); } diff --git a/android/guava/src/com/google/common/collect/RegularImmutableBiMap.java b/android/guava/src/com/google/common/collect/RegularImmutableBiMap.java index bd6613230a16..81939a4840c5 100644 --- a/android/guava/src/com/google/common/collect/RegularImmutableBiMap.java +++ b/android/guava/src/com/google/common/collect/RegularImmutableBiMap.java @@ -53,7 +53,7 @@ private RegularImmutableBiMap() { this.alternatingKeysAndValues = alternatingKeysAndValues; this.size = size; this.keyOffset = 0; - int tableSize = (size >= 2) ? ImmutableSet.chooseTableSize(size) : 0; + int tableSize = size >= 2 ? ImmutableSet.chooseTableSize(size) : 0; this.keyHashTable = RegularImmutableMap.createHashTableOrThrow(alternatingKeysAndValues, size, tableSize, 0); Object valueHashTable = diff --git a/android/guava/src/com/google/common/collect/RegularImmutableMultiset.java b/android/guava/src/com/google/common/collect/RegularImmutableMultiset.java index d4827bb479bd..3f573ce6e28f 100644 --- a/android/guava/src/com/google/common/collect/RegularImmutableMultiset.java +++ b/android/guava/src/com/google/common/collect/RegularImmutableMultiset.java @@ -68,7 +68,7 @@ public int size() { @Override public ImmutableSet elementSet() { ImmutableSet result = elementSet; - return (result == null) ? elementSet = new ElementSet() : result; + return result == null ? elementSet = new ElementSet() : result; } @WeakOuter diff --git a/android/guava/src/com/google/common/collect/RegularImmutableSortedMultiset.java b/android/guava/src/com/google/common/collect/RegularImmutableSortedMultiset.java index c5fa21534e88..905962406073 100644 --- a/android/guava/src/com/google/common/collect/RegularImmutableSortedMultiset.java +++ b/android/guava/src/com/google/common/collect/RegularImmutableSortedMultiset.java @@ -80,7 +80,7 @@ Entry getEntry(int index) { @Override public int count(@Nullable Object element) { int index = elementSet.indexOf(element); - return (index >= 0) ? getCount(index) : 0; + return index >= 0 ? getCount(index) : 0; } @Override diff --git a/android/guava/src/com/google/common/collect/RegularImmutableSortedSet.java b/android/guava/src/com/google/common/collect/RegularImmutableSortedSet.java index 9a6efa62df81..dfb37753fe26 100644 --- a/android/guava/src/com/google/common/collect/RegularImmutableSortedSet.java +++ b/android/guava/src/com/google/common/collect/RegularImmutableSortedSet.java @@ -212,25 +212,25 @@ public E last() { @Override public @Nullable E lower(E element) { int index = headIndex(element, false) - 1; - return (index == -1) ? null : elements.get(index); + return index == -1 ? null : elements.get(index); } @Override public @Nullable E floor(E element) { int index = headIndex(element, true) - 1; - return (index == -1) ? null : elements.get(index); + return index == -1 ? null : elements.get(index); } @Override public @Nullable E ceiling(E element) { int index = tailIndex(element, true); - return (index == size()) ? null : elements.get(index); + return index == size() ? null : elements.get(index); } @Override public @Nullable E higher(E element) { int index = tailIndex(element, false); - return (index == size()) ? null : elements.get(index); + return index == size() ? null : elements.get(index); } @Override @@ -297,7 +297,7 @@ int indexOf(@Nullable Object target) { } catch (ClassCastException e) { return -1; } - return (position >= 0) ? position : -1; + return position >= 0 ? position : -1; } @Override diff --git a/android/guava/src/com/google/common/collect/RegularImmutableTable.java b/android/guava/src/com/google/common/collect/RegularImmutableTable.java index fba4256396c5..4072b7df2484 100644 --- a/android/guava/src/com/google/common/collect/RegularImmutableTable.java +++ b/android/guava/src/com/google/common/collect/RegularImmutableTable.java @@ -131,13 +131,13 @@ static RegularImmutableTable forCells( Comparator> comparator = (Cell cell1, Cell cell2) -> { int rowCompare = - (rowComparator == null) + rowComparator == null ? 0 : rowComparator.compare(cell1.getRowKey(), cell2.getRowKey()); if (rowCompare != 0) { return rowCompare; } - return (columnComparator == null) + return columnComparator == null ? 0 : columnComparator.compare(cell1.getColumnKey(), cell2.getColumnKey()); }; @@ -163,11 +163,11 @@ private static RegularImmutableTable forCellsInternal( } ImmutableSet rowSpace = - (rowComparator == null) + rowComparator == null ? ImmutableSet.copyOf(rowSpaceBuilder) : ImmutableSet.copyOf(ImmutableList.sortedCopyOf(rowComparator, rowSpaceBuilder)); ImmutableSet columnSpace = - (columnComparator == null) + columnComparator == null ? ImmutableSet.copyOf(columnSpaceBuilder) : ImmutableSet.copyOf(ImmutableList.sortedCopyOf(columnComparator, columnSpaceBuilder)); @@ -181,7 +181,7 @@ static RegularImmutableTable forOrderedComponents( ImmutableSet columnSpace) { // use a dense table if more than half of the cells have values // TODO(gak): tune this condition based on empirical evidence - return (cellList.size() > (((long) rowSpace.size() * columnSpace.size()) / 2)) + return cellList.size() > (((long) rowSpace.size() * columnSpace.size()) / 2) ? new DenseImmutableTable(cellList, rowSpace, columnSpace) : new SparseImmutableTable(cellList, rowSpace, columnSpace); } diff --git a/android/guava/src/com/google/common/collect/SortedMultisets.java b/android/guava/src/com/google/common/collect/SortedMultisets.java index 2b4aee3c39c1..807f629fd2d2 100644 --- a/android/guava/src/com/google/common/collect/SortedMultisets.java +++ b/android/guava/src/com/google/common/collect/SortedMultisets.java @@ -175,6 +175,6 @@ public NavigableSet tailSet(@ParametricNullness E fromElement, boolean inclus private static @Nullable E getElementOrNull( @Nullable Entry entry) { - return (entry == null) ? null : entry.getElement(); + return entry == null ? null : entry.getElement(); } } diff --git a/android/guava/src/com/google/common/collect/StandardTable.java b/android/guava/src/com/google/common/collect/StandardTable.java index 490f8fefa7c5..0a71b3d74369 100644 --- a/android/guava/src/com/google/common/collect/StandardTable.java +++ b/android/guava/src/com/google/common/collect/StandardTable.java @@ -111,7 +111,7 @@ public boolean containsValue(@Nullable Object value) { @Override public @Nullable V get(@Nullable Object rowKey, @Nullable Object columnKey) { - return (rowKey == null || columnKey == null) ? null : super.get(rowKey, columnKey); + return rowKey == null || columnKey == null ? null : super.get(rowKey, columnKey); } @Override @@ -336,7 +336,7 @@ public boolean containsKey(@Nullable Object key) { @Override public @Nullable V get(@Nullable Object key) { updateBackingRowMapField(); - return (key != null && backingRowMap != null) ? safeGet(backingRowMap, key) : null; + return key != null && backingRowMap != null ? safeGet(backingRowMap, key) : null; } @Override @@ -372,7 +372,7 @@ public void clear() { @Override public int size() { updateBackingRowMapField(); - return (backingRowMap == null) ? 0 : backingRowMap.size(); + return backingRowMap == null ? 0 : backingRowMap.size(); } @Override @@ -656,7 +656,7 @@ public Set rowKeySet() { @Override public Set columnKeySet() { Set result = columnKeySet; - return (result == null) ? columnKeySet = new ColumnKeySet() : result; + return result == null ? columnKeySet = new ColumnKeySet() : result; } @WeakOuter @@ -778,7 +778,7 @@ public Collection values() { @Override public Map> rowMap() { Map> result = rowMap; - return (result == null) ? rowMap = createRowMap() : result; + return result == null ? rowMap = createRowMap() : result; } Map> createRowMap() { @@ -802,7 +802,7 @@ public boolean containsKey(@Nullable Object key) { @Override public @Nullable Map remove(@Nullable Object key) { - return (key == null) ? null : backingMap.remove(key); + return key == null ? null : backingMap.remove(key); } @Override @@ -851,7 +851,7 @@ public boolean remove(@Nullable Object obj) { @Override public Map> columnMap() { ColumnMap result = columnMap; - return (result == null) ? columnMap = new ColumnMap() : result; + return result == null ? columnMap = new ColumnMap() : result; } @WeakOuter diff --git a/android/guava/src/com/google/common/collect/Synchronized.java b/android/guava/src/com/google/common/collect/Synchronized.java index dad78c1ed16c..67cbd7b6b47f 100644 --- a/android/guava/src/com/google/common/collect/Synchronized.java +++ b/android/guava/src/com/google/common/collect/Synchronized.java @@ -75,7 +75,7 @@ private static class SynchronizedObject implements Serializable { SynchronizedObject(Object delegate, @Nullable Object mutex) { this.delegate = checkNotNull(delegate); - this.mutex = (mutex == null) ? this : mutex; + this.mutex = mutex == null ? this : mutex; } Object delegate() { @@ -317,7 +317,7 @@ public E last() { } private static List list(List list, @Nullable Object mutex) { - return (list instanceof RandomAccess) + return list instanceof RandomAccess ? new SynchronizedRandomAccessList(list, mutex) : new SynchronizedList(list, mutex); } @@ -1253,7 +1253,7 @@ static final class SynchronizedAsMap get(@Nullable Object key) { synchronized (mutex) { Collection collection = super.get(key); - return (collection == null) ? null : typePreservingCollection(collection, mutex); + return collection == null ? null : typePreservingCollection(collection, mutex); } } @@ -1689,7 +1689,7 @@ public V setValue(V value) { } static Queue queue(Queue queue, @Nullable Object mutex) { - return (queue instanceof SynchronizedQueue) ? queue : new SynchronizedQueue(queue, mutex); + return queue instanceof SynchronizedQueue ? queue : new SynchronizedQueue(queue, mutex); } private static class SynchronizedQueue diff --git a/android/guava/src/com/google/common/collect/TreeMultiset.java b/android/guava/src/com/google/common/collect/TreeMultiset.java index b359159dbb39..fc5d1909129f 100644 --- a/android/guava/src/com/google/common/collect/TreeMultiset.java +++ b/android/guava/src/com/google/common/collect/TreeMultiset.java @@ -91,7 +91,7 @@ public static TreeMultiset create() { @SuppressWarnings("unchecked") public static TreeMultiset create( @Nullable Comparator comparator) { - return (comparator == null) + return comparator == null ? new TreeMultiset((Comparator) Ordering.natural()) : new TreeMultiset(comparator); } @@ -141,7 +141,7 @@ int nodeAggregate(AvlNode node) { @Override long treeAggregate(@Nullable AvlNode root) { - return (root == null) ? 0 : root.totalCount; + return root == null ? 0 : root.totalCount; } }, DISTINCT { @@ -152,7 +152,7 @@ int nodeAggregate(AvlNode node) { @Override long treeAggregate(@Nullable AvlNode root) { - return (root == null) ? 0 : root.distinctElements; + return root == null ? 0 : root.distinctElements; } }; @@ -234,7 +234,7 @@ int distinctElements() { } static int distinctElements(@Nullable AvlNode node) { - return (node == null) ? 0 : node.distinctElements; + return node == null ? 0 : node.distinctElements; } @Override @@ -409,7 +409,7 @@ && comparator().compare(endpoint, node.getElement()) == 0) { } else { node = header.succ(); } - return (node == header || !range.contains(node.getElement())) ? null : node; + return node == header || !range.contains(node.getElement()) ? null : node; } private @Nullable AvlNode lastNode() { @@ -432,7 +432,7 @@ && comparator().compare(endpoint, node.getElement()) == 0) { } else { node = header.pred(); } - return (node == header || !range.contains(node.getElement())) ? null : node; + return node == header || !range.contains(node.getElement()) ? null : node; } @Override @@ -632,9 +632,9 @@ private AvlNode succ() { int count(Comparator comparator, @ParametricNullness E e) { int cmp = comparator.compare(e, getElement()); if (cmp < 0) { - return (left == null) ? 0 : left.count(comparator, e); + return left == null ? 0 : left.count(comparator, e); } else if (cmp > 0) { - return (right == null) ? 0 : right.count(comparator, e); + return right == null ? 0 : right.count(comparator, e); } else { return elemCount; } @@ -680,7 +680,7 @@ AvlNode add( distinctElements++; } this.totalCount += count; - return (left.height == initHeight) ? this : rebalance(); + return left.height == initHeight ? this : rebalance(); } else if (cmp > 0) { AvlNode initRight = right; if (initRight == null) { @@ -694,7 +694,7 @@ AvlNode add( distinctElements++; } this.totalCount += count; - return (right.height == initHeight) ? this : rebalance(); + return right.height == initHeight ? this : rebalance(); } // adding count to me! No rebalance possible. @@ -726,7 +726,7 @@ AvlNode add( this.totalCount -= count; } } - return (result[0] == 0) ? this : rebalance(); + return result[0] == 0 ? this : rebalance(); } else if (cmp > 0) { AvlNode initRight = right; if (initRight == null) { @@ -765,7 +765,7 @@ AvlNode add( AvlNode initLeft = left; if (initLeft == null) { result[0] = 0; - return (count > 0) ? addLeftChild(e, count) : this; + return count > 0 ? addLeftChild(e, count) : this; } left = initLeft.setCount(comparator, e, count, result); @@ -782,7 +782,7 @@ AvlNode add( AvlNode initRight = right; if (initRight == null) { result[0] = 0; - return (count > 0) ? addRightChild(e, count) : this; + return count > 0 ? addRightChild(e, count) : this; } right = initRight.setCount(comparator, e, count, result); @@ -986,33 +986,33 @@ private AvlNode rotateRight() { } private static long totalCount(@Nullable AvlNode node) { - return (node == null) ? 0 : node.totalCount; + return node == null ? 0 : node.totalCount; } private static int height(@Nullable AvlNode node) { - return (node == null) ? 0 : node.height; + return node == null ? 0 : node.height; } private @Nullable AvlNode ceiling( Comparator comparator, @ParametricNullness E e) { int cmp = comparator.compare(e, getElement()); if (cmp < 0) { - return (left == null) ? this : MoreObjects.firstNonNull(left.ceiling(comparator, e), this); + return left == null ? this : MoreObjects.firstNonNull(left.ceiling(comparator, e), this); } else if (cmp == 0) { return this; } else { - return (right == null) ? null : right.ceiling(comparator, e); + return right == null ? null : right.ceiling(comparator, e); } } private @Nullable AvlNode floor(Comparator comparator, @ParametricNullness E e) { int cmp = comparator.compare(e, getElement()); if (cmp > 0) { - return (right == null) ? this : MoreObjects.firstNonNull(right.floor(comparator, e), this); + return right == null ? this : MoreObjects.firstNonNull(right.floor(comparator, e), this); } else if (cmp == 0) { return this; } else { - return (left == null) ? null : left.floor(comparator, e); + return left == null ? null : left.floor(comparator, e); } } diff --git a/android/guava/src/com/google/common/collect/TreeRangeMap.java b/android/guava/src/com/google/common/collect/TreeRangeMap.java index f21b7f436575..bda6b4dd1fe5 100644 --- a/android/guava/src/com/google/common/collect/TreeRangeMap.java +++ b/android/guava/src/com/google/common/collect/TreeRangeMap.java @@ -119,7 +119,7 @@ Cut getUpperBound() { @Override public @Nullable V get(K key) { Entry, V> entry = getEntry(key); - return (entry == null) ? null : entry.getValue(); + return entry == null ? null : entry.getValue(); } @Override diff --git a/android/guava/src/com/google/common/collect/TreeRangeSet.java b/android/guava/src/com/google/common/collect/TreeRangeSet.java index 11f585c35ef3..dce2fedd925b 100644 --- a/android/guava/src/com/google/common/collect/TreeRangeSet.java +++ b/android/guava/src/com/google/common/collect/TreeRangeSet.java @@ -83,13 +83,13 @@ private TreeRangeSet(NavigableMap, Range> rangesByLowerCut) { @Override public Set> asRanges() { Set> result = asRanges; - return (result == null) ? asRanges = new AsRanges(rangesByLowerBound.values()) : result; + return result == null ? asRanges = new AsRanges(rangesByLowerBound.values()) : result; } @Override public Set> asDescendingSetOfRanges() { Set> result = asDescendingSetOfRanges; - return (result == null) + return result == null ? asDescendingSetOfRanges = new AsRanges(rangesByLowerBound.descendingMap().values()) : result; } @@ -155,7 +155,7 @@ public boolean encloses(Range range) { private @Nullable Range rangeEnclosing(Range range) { checkNotNull(range); Entry, Range> floorEntry = rangesByLowerBound.floorEntry(range.lowerBound); - return (floorEntry != null && floorEntry.getValue().encloses(range)) + return floorEntry != null && floorEntry.getValue().encloses(range) ? floorEntry.getValue() : null; } @@ -277,7 +277,7 @@ private void replaceRangeWithSameLowerBound(Range range) { @Override public RangeSet complement() { RangeSet result = complement; - return (result == null) ? complement = new Complement() : result; + return result == null ? complement = new Complement() : result; } @VisibleForTesting @@ -584,7 +584,7 @@ Iterator, Range>> descendingEntryIterator() { Cut cut; if (positiveItr.hasNext()) { cut = - (positiveItr.peek().upperBound == Cut.aboveAll()) + positiveItr.peek().upperBound == Cut.aboveAll() ? positiveItr.next().lowerBound : positiveRangesByLowerBound.higherKey(positiveItr.peek().upperBound); } else if (!complementLowerBoundWindow.contains(Cut.belowAll()) @@ -884,7 +884,7 @@ public boolean encloses(Range range) { return null; } Range result = TreeRangeSet.this.rangeContaining(value); - return (result == null) ? null : result.intersection(restriction); + return result == null ? null : result.intersection(restriction); } @Override diff --git a/android/guava/src/com/google/common/escape/Escapers.java b/android/guava/src/com/google/common/escape/Escapers.java index c5f2bd026fdb..b7df3b0344cc 100644 --- a/android/guava/src/com/google/common/escape/Escapers.java +++ b/android/guava/src/com/google/common/escape/Escapers.java @@ -186,6 +186,6 @@ public Escaper build() { } private static @Nullable String stringOrNull(char @Nullable [] in) { - return (in == null) ? null : new String(in); + return in == null ? null : new String(in); } } diff --git a/android/guava/src/com/google/common/graph/AbstractBaseGraph.java b/android/guava/src/com/google/common/graph/AbstractBaseGraph.java index 9ce3838947b8..975ce245d903 100644 --- a/android/guava/src/com/google/common/graph/AbstractBaseGraph.java +++ b/android/guava/src/com/google/common/graph/AbstractBaseGraph.java @@ -139,7 +139,7 @@ public int degree(N node) { return IntMath.saturatedAdd(predecessors(node).size(), successors(node).size()); } else { Set neighbors = adjacentNodes(node); - int selfLoopCount = (allowsSelfLoops() && neighbors.contains(node)) ? 1 : 0; + int selfLoopCount = allowsSelfLoops() && neighbors.contains(node) ? 1 : 0; return IntMath.saturatedAdd(neighbors.size(), selfLoopCount); } } diff --git a/android/guava/src/com/google/common/graph/AbstractDirectedNetworkConnections.java b/android/guava/src/com/google/common/graph/AbstractDirectedNetworkConnections.java index 92b203872e5f..000ff66963e0 100644 --- a/android/guava/src/com/google/common/graph/AbstractDirectedNetworkConnections.java +++ b/android/guava/src/com/google/common/graph/AbstractDirectedNetworkConnections.java @@ -67,7 +67,7 @@ public Set incidentEdges() { @Override public UnmodifiableIterator iterator() { Iterable incidentEdges = - (selfLoopCount == 0) + selfLoopCount == 0 ? Iterables.concat(inEdgeMap.keySet(), outEdgeMap.keySet()) : Sets.union(inEdgeMap.keySet(), outEdgeMap.keySet()); return Iterators.unmodifiableIterator(incidentEdges.iterator()); diff --git a/android/guava/src/com/google/common/graph/DirectedMultiNetworkConnections.java b/android/guava/src/com/google/common/graph/DirectedMultiNetworkConnections.java index b21a63a48d99..8e68b88a8b96 100644 --- a/android/guava/src/com/google/common/graph/DirectedMultiNetworkConnections.java +++ b/android/guava/src/com/google/common/graph/DirectedMultiNetworkConnections.java @@ -140,6 +140,6 @@ public void addOutEdge(E edge, N node) { } private static @Nullable T getReference(@Nullable Reference reference) { - return (reference == null) ? null : reference.get(); + return reference == null ? null : reference.get(); } } diff --git a/android/guava/src/com/google/common/graph/EdgesConnecting.java b/android/guava/src/com/google/common/graph/EdgesConnecting.java index 234c9bb3ee6c..560fb9980fef 100644 --- a/android/guava/src/com/google/common/graph/EdgesConnecting.java +++ b/android/guava/src/com/google/common/graph/EdgesConnecting.java @@ -47,7 +47,7 @@ final class EdgesConnecting extends AbstractSet { @Override public UnmodifiableIterator iterator() { E connectingEdge = getConnectingEdge(); - return (connectingEdge == null) + return connectingEdge == null ? ImmutableSet.of().iterator() : Iterators.singletonIterator(connectingEdge); } @@ -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/graph/Graphs.java b/android/guava/src/com/google/common/graph/Graphs.java index bca410aaa209..4eed92196d70 100644 --- a/android/guava/src/com/google/common/graph/Graphs.java +++ b/android/guava/src/com/google/common/graph/Graphs.java @@ -503,7 +503,7 @@ public boolean hasEdgeConnecting(EndpointPair endpoints) { */ public static MutableGraph inducedSubgraph(Graph graph, Iterable nodes) { MutableGraph subgraph = - (nodes instanceof Collection) + nodes instanceof Collection ? GraphBuilder.from(graph).expectedNodeCount(((Collection) nodes).size()).build() : GraphBuilder.from(graph).build(); for (N node : nodes) { @@ -530,7 +530,7 @@ public static MutableGraph inducedSubgraph(Graph graph, Iterable MutableValueGraph inducedSubgraph( ValueGraph graph, Iterable nodes) { MutableValueGraph subgraph = - (nodes instanceof Collection) + nodes instanceof Collection ? ValueGraphBuilder.from(graph).expectedNodeCount(((Collection) nodes).size()).build() : ValueGraphBuilder.from(graph).build(); for (N node : nodes) { @@ -561,7 +561,7 @@ public static MutableValueGraph inducedSubgraph( public static MutableNetwork inducedSubgraph( Network network, Iterable nodes) { MutableNetwork subgraph = - (nodes instanceof Collection) + nodes instanceof Collection ? NetworkBuilder.from(network).expectedNodeCount(((Collection) nodes).size()).build() : NetworkBuilder.from(network).build(); for (N node : nodes) { diff --git a/android/guava/src/com/google/common/graph/StandardNetwork.java b/android/guava/src/com/google/common/graph/StandardNetwork.java index 19f9e47887ff..5060e621d04c 100644 --- a/android/guava/src/com/google/common/graph/StandardNetwork.java +++ b/android/guava/src/com/google/common/graph/StandardNetwork.java @@ -86,7 +86,7 @@ class StandardNetwork extends AbstractNetwork { // Prefer the heavier "MapRetrievalCache" for nodes if lookup is expensive. This optimizes // methods that access the same node(s) repeatedly, such as Graphs.removeEdgesConnecting(). this.nodeConnections = - (nodeConnections instanceof TreeMap) + nodeConnections instanceof TreeMap ? new MapRetrievalCache>(nodeConnections) : new MapIteratorCache>(nodeConnections); this.edgeToReferenceNode = new MapIteratorCache<>(edgeToReferenceNode); diff --git a/android/guava/src/com/google/common/graph/StandardValueGraph.java b/android/guava/src/com/google/common/graph/StandardValueGraph.java index 568f0f63274d..6797a6e2d750 100644 --- a/android/guava/src/com/google/common/graph/StandardValueGraph.java +++ b/android/guava/src/com/google/common/graph/StandardValueGraph.java @@ -74,7 +74,7 @@ class StandardValueGraph extends AbstractValueGraph { this.nodeOrder = builder.nodeOrder.cast(); // Prefer the heavier "MapRetrievalCache" for nodes if lookup is expensive. this.nodeConnections = - (nodeConnections instanceof TreeMap) + nodeConnections instanceof TreeMap ? new MapRetrievalCache>(nodeConnections) : new MapIteratorCache>(nodeConnections); this.edgeCount = checkNonNegative(edgeCount); @@ -176,7 +176,7 @@ private final boolean hasEdgeConnectingInternal(N nodeU, N nodeV) { private final @Nullable V edgeValueOrDefaultInternal(N nodeU, N nodeV, @Nullable V defaultValue) { GraphConnections connectionsU = nodeConnections.get(nodeU); - V value = (connectionsU == null) ? null : connectionsU.value(nodeV); + V value = connectionsU == null ? null : connectionsU.value(nodeV); // TODO(b/192579700): Use a ternary once it no longer confuses our nullness checker. if (value == null) { return defaultValue; diff --git a/android/guava/src/com/google/common/graph/UndirectedMultiNetworkConnections.java b/android/guava/src/com/google/common/graph/UndirectedMultiNetworkConnections.java index a93d04d8faab..c5d285a73354 100644 --- a/android/guava/src/com/google/common/graph/UndirectedMultiNetworkConnections.java +++ b/android/guava/src/com/google/common/graph/UndirectedMultiNetworkConnections.java @@ -116,6 +116,6 @@ public void addOutEdge(E edge, N node) { } private static @Nullable T getReference(@Nullable Reference reference) { - return (reference == null) ? null : reference.get(); + return reference == null ? null : reference.get(); } } 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/hash/MessageDigestHashFunction.java b/android/guava/src/com/google/common/hash/MessageDigestHashFunction.java index 9a435b9edc13..1d2423bfd3d5 100644 --- a/android/guava/src/com/google/common/hash/MessageDigestHashFunction.java +++ b/android/guava/src/com/google/common/hash/MessageDigestHashFunction.java @@ -162,7 +162,7 @@ private void checkNotDone() { public HashCode hash() { checkNotDone(); done = true; - return (bytes == digest.getDigestLength()) + return bytes == digest.getDigestLength() ? HashCode.fromBytesNoCopy(digest.digest()) : HashCode.fromBytesNoCopy(Arrays.copyOf(digest.digest(), bytes)); } diff --git a/android/guava/src/com/google/common/hash/Striped64.java b/android/guava/src/com/google/common/hash/Striped64.java index aa7185509f13..b6695150d4de 100644 --- a/android/guava/src/com/google/common/hash/Striped64.java +++ b/android/guava/src/com/google/common/hash/Striped64.java @@ -188,7 +188,7 @@ final void retryUpdate(long x, int @Nullable [] hc, boolean wasUncontended) { if (hc == null) { threadHashCode.set(hc = new int[1]); // Initialize randomly int r = rng.nextInt(); // Avoid zero to allow xorShift rehash - h = hc[0] = (r == 0) ? 1 : r; + h = hc[0] = r == 0 ? 1 : r; } else h = hc[0]; boolean collide = false; // True if last slot nonempty for (; ; ) { diff --git a/android/guava/src/com/google/common/io/ByteSink.java b/android/guava/src/com/google/common/io/ByteSink.java index d3013cb1ffb3..63d13b648ffc 100644 --- a/android/guava/src/com/google/common/io/ByteSink.java +++ b/android/guava/src/com/google/common/io/ByteSink.java @@ -85,7 +85,7 @@ public CharSink asCharSink(Charset charset) { */ public OutputStream openBufferedStream() throws IOException { OutputStream out = openStream(); - return (out instanceof BufferedOutputStream) + return out instanceof BufferedOutputStream ? (BufferedOutputStream) out : new BufferedOutputStream(out); } diff --git a/android/guava/src/com/google/common/io/ByteSource.java b/android/guava/src/com/google/common/io/ByteSource.java index d64960816ef9..d3e02fad0b97 100644 --- a/android/guava/src/com/google/common/io/ByteSource.java +++ b/android/guava/src/com/google/common/io/ByteSource.java @@ -117,7 +117,7 @@ public CharSource asCharSource(Charset charset) { */ public InputStream openBufferedStream() throws IOException { InputStream in = openStream(); - return (in instanceof BufferedInputStream) + return in instanceof BufferedInputStream ? (BufferedInputStream) in : new BufferedInputStream(in); } diff --git a/android/guava/src/com/google/common/io/CharSink.java b/android/guava/src/com/google/common/io/CharSink.java index a0ce2263b5e2..a90c9e0bbd5c 100644 --- a/android/guava/src/com/google/common/io/CharSink.java +++ b/android/guava/src/com/google/common/io/CharSink.java @@ -81,7 +81,7 @@ protected CharSink() {} */ public Writer openBufferedStream() throws IOException { Writer writer = openStream(); - return (writer instanceof BufferedWriter) + return writer instanceof BufferedWriter ? (BufferedWriter) writer : new BufferedWriter(writer); } diff --git a/android/guava/src/com/google/common/io/Files.java b/android/guava/src/com/google/common/io/Files.java index 0e87a2ac3040..8df4a0a44ea7 100644 --- a/android/guava/src/com/google/common/io/Files.java +++ b/android/guava/src/com/google/common/io/Files.java @@ -797,7 +797,7 @@ public static String getFileExtension(String fullName) { checkNotNull(fullName); String fileName = new File(fullName).getName(); int dotIndex = fileName.lastIndexOf('.'); - return (dotIndex == -1) ? "" : fileName.substring(dotIndex + 1); + return dotIndex == -1 ? "" : fileName.substring(dotIndex + 1); } /** @@ -814,7 +814,7 @@ public static String getNameWithoutExtension(String file) { checkNotNull(file); String fileName = new File(file).getName(); int dotIndex = fileName.lastIndexOf('.'); - return (dotIndex == -1) ? fileName : fileName.substring(0, dotIndex); + return dotIndex == -1 ? fileName : fileName.substring(0, dotIndex); } /** diff --git a/android/guava/src/com/google/common/io/LineReader.java b/android/guava/src/com/google/common/io/LineReader.java index b313a8c9880e..d7f4cc31b7c9 100644 --- a/android/guava/src/com/google/common/io/LineReader.java +++ b/android/guava/src/com/google/common/io/LineReader.java @@ -55,7 +55,7 @@ protected void handleLine(String line, String end) { /** Creates a new instance that will read lines from the given {@code Readable} object. */ public LineReader(Readable readable) { this.readable = checkNotNull(readable); - this.reader = (readable instanceof Reader) ? (Reader) readable : null; + this.reader = readable instanceof Reader ? (Reader) readable : null; } /** @@ -73,7 +73,7 @@ public LineReader(Readable readable) { Java8Compatibility.clear(cbuf); // The default implementation of Reader#read(CharBuffer) allocates a // temporary char[], so we call Reader#read(char[], int, int) instead. - int read = (reader != null) ? reader.read(buf, 0, buf.length) : readable.read(cbuf); + int read = reader != null ? reader.read(buf, 0, buf.length) : readable.read(cbuf); if (read == -1) { lineBuf.finish(); break; diff --git a/android/guava/src/com/google/common/io/ReaderInputStream.java b/android/guava/src/com/google/common/io/ReaderInputStream.java index 8ee90b9350c9..b65e8fe418cf 100644 --- a/android/guava/src/com/google/common/io/ReaderInputStream.java +++ b/android/guava/src/com/google/common/io/ReaderInputStream.java @@ -121,7 +121,7 @@ public void close() throws IOException { @Override public int read() throws IOException { - return (read(singleByte) == 1) ? toUnsignedInt(singleByte[0]) : -1; + return read(singleByte) == 1 ? toUnsignedInt(singleByte[0]) : -1; } // TODO(chrisn): Consider trying to encode/flush directly to the argument byte @@ -145,7 +145,7 @@ public int read(byte[] b, int off, int len) throws IOException { if (draining) { totalBytesRead += drain(b, off + totalBytesRead, len - totalBytesRead); if (totalBytesRead == len || doneFlushing) { - return (totalBytesRead > 0) ? totalBytesRead : -1; + return totalBytesRead > 0 ? totalBytesRead : -1; } draining = false; Java8Compatibility.clear(byteBuffer); diff --git a/android/guava/src/com/google/common/math/BigIntegerMath.java b/android/guava/src/com/google/common/math/BigIntegerMath.java index abf630ff3aaf..8f778dc4bd9c 100644 --- a/android/guava/src/com/google/common/math/BigIntegerMath.java +++ b/android/guava/src/com/google/common/math/BigIntegerMath.java @@ -115,7 +115,7 @@ public static int log2(BigInteger x, RoundingMode mode) { // we compare x^2 to 2^(2 * logFloor + 1). BigInteger x2 = x.pow(2); int logX2Floor = x2.bitLength() - 1; - return (logX2Floor < 2 * logFloor + 1) ? logFloor : logFloor + 1; + return logX2Floor < 2 * logFloor + 1 ? logFloor : logFloor + 1; } throw new AssertionError(); } @@ -200,7 +200,7 @@ public static int log10(BigInteger x, RoundingMode mode) { // Since sqrt(10) is irrational, log10(x) - floorLog can never be exactly 0.5 BigInteger x2 = x.pow(2); BigInteger halfPowerSquared = floorPow.pow(2).multiply(BigInteger.TEN); - return (x2.compareTo(halfPowerSquared) <= 0) ? floorLog : floorLog + 1; + return x2.compareTo(halfPowerSquared) <= 0 ? floorLog : floorLog + 1; } throw new AssertionError(); } @@ -245,7 +245,7 @@ public static BigInteger sqrt(BigInteger x, RoundingMode mode) { * and halfSquare are integers, this is equivalent to testing whether or not x <= * halfSquare. */ - return (halfSquare.compareTo(x) >= 0) ? sqrtFloor : sqrtFloor.add(BigInteger.ONE); + return halfSquare.compareTo(x) >= 0 ? sqrtFloor : sqrtFloor.add(BigInteger.ONE); } throw new AssertionError(); } diff --git a/android/guava/src/com/google/common/math/DoubleMath.java b/android/guava/src/com/google/common/math/DoubleMath.java index c4e8dc8dfec2..a5aea9dfc07c 100644 --- a/android/guava/src/com/google/common/math/DoubleMath.java +++ b/android/guava/src/com/google/common/math/DoubleMath.java @@ -191,7 +191,7 @@ public static BigInteger roundToBigInteger(double x, RoundingMode mode) { int exponent = getExponent(x); long significand = getSignificand(x); BigInteger result = BigInteger.valueOf(significand).shiftLeft(exponent - SIGNIFICAND_BITS); - return (x < 0) ? result.negate() : result; + return x < 0 ? result.negate() : result; } /** diff --git a/android/guava/src/com/google/common/math/DoubleUtils.java b/android/guava/src/com/google/common/math/DoubleUtils.java index e2331a71c624..6e6cbd7b47ca 100644 --- a/android/guava/src/com/google/common/math/DoubleUtils.java +++ b/android/guava/src/com/google/common/math/DoubleUtils.java @@ -65,7 +65,7 @@ static long getSignificand(double d) { int exponent = getExponent(d); long bits = doubleToRawLongBits(d); bits &= SIGNIFICAND_MASK; - return (exponent == MIN_EXPONENT - 1) ? bits << 1 : bits | IMPLICIT_BIT; + return exponent == MIN_EXPONENT - 1 ? bits << 1 : bits | IMPLICIT_BIT; } static boolean isFinite(double d) { diff --git a/android/guava/src/com/google/common/math/LinearTransformation.java b/android/guava/src/com/google/common/math/LinearTransformation.java index 379898d51842..720325eaea52 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 @@ -206,7 +206,7 @@ public double transform(double x) { @Override public LinearTransformation inverse() { LinearTransformation result = inverse; - return (result == null) ? inverse = createInverse() : result; + return result == null ? inverse = createInverse() : result; } @Override @@ -262,7 +262,7 @@ public double transform(double x) { @Override public LinearTransformation inverse() { LinearTransformation result = inverse; - return (result == null) ? inverse = createInverse() : result; + return result == null ? inverse = createInverse() : result; } @Override diff --git a/android/guava/src/com/google/common/math/ToDoubleRounder.java b/android/guava/src/com/google/common/math/ToDoubleRounder.java index 7525e3f990f1..37cf5f6818b9 100644 --- a/android/guava/src/com/google/common/math/ToDoubleRounder.java +++ b/android/guava/src/com/google/common/math/ToDoubleRounder.java @@ -54,11 +54,11 @@ final double roundToDouble(X x, RoundingMode mode) { case HALF_UP: return Double.MAX_VALUE * sign(x); case FLOOR: - return (roundArbitrarily == Double.POSITIVE_INFINITY) + return roundArbitrarily == Double.POSITIVE_INFINITY ? Double.MAX_VALUE : Double.NEGATIVE_INFINITY; case CEILING: - return (roundArbitrarily == Double.POSITIVE_INFINITY) + return roundArbitrarily == Double.POSITIVE_INFINITY ? Double.POSITIVE_INFINITY : -Double.MAX_VALUE; case UP: @@ -74,24 +74,24 @@ final double roundToDouble(X x, RoundingMode mode) { checkRoundingUnnecessary(cmpXToRoundArbitrarily == 0); return roundArbitrarily; case FLOOR: - return (cmpXToRoundArbitrarily >= 0) + return cmpXToRoundArbitrarily >= 0 ? roundArbitrarily : DoubleUtils.nextDown(roundArbitrarily); case CEILING: - return (cmpXToRoundArbitrarily <= 0) ? roundArbitrarily : Math.nextUp(roundArbitrarily); + return cmpXToRoundArbitrarily <= 0 ? roundArbitrarily : Math.nextUp(roundArbitrarily); case DOWN: if (sign(x) >= 0) { - return (cmpXToRoundArbitrarily >= 0) + return cmpXToRoundArbitrarily >= 0 ? roundArbitrarily : DoubleUtils.nextDown(roundArbitrarily); } else { - return (cmpXToRoundArbitrarily <= 0) ? roundArbitrarily : Math.nextUp(roundArbitrarily); + return cmpXToRoundArbitrarily <= 0 ? roundArbitrarily : Math.nextUp(roundArbitrarily); } case UP: if (sign(x) >= 0) { - return (cmpXToRoundArbitrarily <= 0) ? roundArbitrarily : Math.nextUp(roundArbitrarily); + return cmpXToRoundArbitrarily <= 0 ? roundArbitrarily : Math.nextUp(roundArbitrarily); } else { - return (cmpXToRoundArbitrarily >= 0) + return cmpXToRoundArbitrarily >= 0 ? roundArbitrarily : DoubleUtils.nextDown(roundArbitrarily); } @@ -135,13 +135,13 @@ final double roundToDouble(X x, RoundingMode mode) { case HALF_EVEN: // roundFloorAsDouble and roundCeilingAsDouble are neighbors, so precisely // one of them should have an even long representation - return ((Double.doubleToRawLongBits(roundFloorAsDouble) & 1L) == 0) + return (Double.doubleToRawLongBits(roundFloorAsDouble) & 1L) == 0 ? roundFloorAsDouble : roundCeilingAsDouble; case HALF_DOWN: - return (sign(x) >= 0) ? roundFloorAsDouble : roundCeilingAsDouble; + return sign(x) >= 0 ? roundFloorAsDouble : roundCeilingAsDouble; case HALF_UP: - return (sign(x) >= 0) ? roundCeilingAsDouble : roundFloorAsDouble; + return sign(x) >= 0 ? roundCeilingAsDouble : roundFloorAsDouble; default: throw new AssertionError("impossible"); } 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/net/InetAddresses.java b/android/guava/src/com/google/common/net/InetAddresses.java index c8cdda10c435..ae70ddf4e051 100644 --- a/android/guava/src/com/google/common/net/InetAddresses.java +++ b/android/guava/src/com/google/common/net/InetAddresses.java @@ -635,7 +635,7 @@ public static InetAddress forUriString(String hostAddr) { return null; } - return bytesToInetAddress(addr, (scope != null) ? scope.scope : null); + return bytesToInetAddress(addr, scope != null ? scope.scope : null); } /** diff --git a/android/guava/src/com/google/common/primitives/Booleans.java b/android/guava/src/com/google/common/primitives/Booleans.java index dae0f3b028eb..06041226647d 100644 --- a/android/guava/src/com/google/common/primitives/Booleans.java +++ b/android/guava/src/com/google/common/primitives/Booleans.java @@ -272,7 +272,7 @@ private static int checkNoOverflow(long result) { public static boolean[] ensureCapacity(boolean[] array, int minLength, int padding) { checkArgument(minLength >= 0, "Invalid minLength: %s", minLength); checkArgument(padding >= 0, "Invalid padding: %s", padding); - return (array.length < minLength) ? Arrays.copyOf(array, minLength + padding) : array; + return array.length < minLength ? Arrays.copyOf(array, minLength + padding) : array; } /** @@ -599,7 +599,7 @@ public static void rotate(boolean[] array, int distance, int fromIndex, int toIn // Obtain m = (-distance mod length), a non-negative value less than "length". This is how many // places left to rotate. int m = -distance % length; - m = (m < 0) ? m + length : m; + m = m < 0 ? m + length : m; // The current index of what will become the first element of the rotated section. int newFirstIndex = m + fromIndex; if (newFirstIndex == fromIndex) { diff --git a/android/guava/src/com/google/common/primitives/Bytes.java b/android/guava/src/com/google/common/primitives/Bytes.java index b5545e28817a..66289a1522a8 100644 --- a/android/guava/src/com/google/common/primitives/Bytes.java +++ b/android/guava/src/com/google/common/primitives/Bytes.java @@ -201,7 +201,7 @@ private static int checkNoOverflow(long result) { public static byte[] ensureCapacity(byte[] array, int minLength, int padding) { checkArgument(minLength >= 0, "Invalid minLength: %s", minLength); checkArgument(padding >= 0, "Invalid padding: %s", padding); - return (array.length < minLength) ? Arrays.copyOf(array, minLength + padding) : array; + return array.length < minLength ? Arrays.copyOf(array, minLength + padding) : array; } /** @@ -450,7 +450,7 @@ public static void rotate(byte[] array, int distance, int fromIndex, int toIndex // Obtain m = (-distance mod length), a non-negative value less than "length". This is how many // places left to rotate. int m = -distance % length; - m = (m < 0) ? m + length : m; + m = m < 0 ? m + length : m; // The current index of what will become the first element of the rotated section. int newFirstIndex = m + fromIndex; if (newFirstIndex == fromIndex) { diff --git a/android/guava/src/com/google/common/primitives/Chars.java b/android/guava/src/com/google/common/primitives/Chars.java index 4a078a6ba389..e089f067ad6f 100644 --- a/android/guava/src/com/google/common/primitives/Chars.java +++ b/android/guava/src/com/google/common/primitives/Chars.java @@ -356,7 +356,7 @@ public static char fromBytes(byte b1, byte b2) { public static char[] ensureCapacity(char[] array, int minLength, int padding) { checkArgument(minLength >= 0, "Invalid minLength: %s", minLength); checkArgument(padding >= 0, "Invalid padding: %s", padding); - return (array.length < minLength) ? Arrays.copyOf(array, minLength + padding) : array; + return array.length < minLength ? Arrays.copyOf(array, minLength + padding) : array; } /** @@ -540,7 +540,7 @@ public static void rotate(char[] array, int distance, int fromIndex, int toIndex // Obtain m = (-distance mod length), a non-negative value less than "length". This is how many // places left to rotate. int m = -distance % length; - m = (m < 0) ? m + length : m; + m = m < 0 ? m + length : m; // The current index of what will become the first element of the rotated section. int newFirstIndex = m + fromIndex; if (newFirstIndex == fromIndex) { diff --git a/android/guava/src/com/google/common/primitives/Doubles.java b/android/guava/src/com/google/common/primitives/Doubles.java index ce43ea648910..975bba1e6618 100644 --- a/android/guava/src/com/google/common/primitives/Doubles.java +++ b/android/guava/src/com/google/common/primitives/Doubles.java @@ -348,7 +348,7 @@ public static Converter stringConverter() { public static double[] ensureCapacity(double[] array, int minLength, int padding) { checkArgument(minLength >= 0, "Invalid minLength: %s", minLength); checkArgument(padding >= 0, "Invalid padding: %s", padding); - return (array.length < minLength) ? Arrays.copyOf(array, minLength + padding) : array; + return array.length < minLength ? Arrays.copyOf(array, minLength + padding) : array; } /** @@ -514,7 +514,7 @@ public static void rotate(double[] array, int distance, int fromIndex, int toInd // Obtain m = (-distance mod length), a non-negative value less than "length". This is how many // places left to rotate. int m = -distance % length; - m = (m < 0) ? m + length : m; + m = m < 0 ? m + length : m; // The current index of what will become the first element of the rotated section. int newFirstIndex = m + fromIndex; if (newFirstIndex == fromIndex) { diff --git a/android/guava/src/com/google/common/primitives/Floats.java b/android/guava/src/com/google/common/primitives/Floats.java index de0b7abda209..36aebe6a7fec 100644 --- a/android/guava/src/com/google/common/primitives/Floats.java +++ b/android/guava/src/com/google/common/primitives/Floats.java @@ -345,7 +345,7 @@ public static Converter stringConverter() { public static float[] ensureCapacity(float[] array, int minLength, int padding) { checkArgument(minLength >= 0, "Invalid minLength: %s", minLength); checkArgument(padding >= 0, "Invalid padding: %s", padding); - return (array.length < minLength) ? Arrays.copyOf(array, minLength + padding) : array; + return array.length < minLength ? Arrays.copyOf(array, minLength + padding) : array; } /** @@ -511,7 +511,7 @@ public static void rotate(float[] array, int distance, int fromIndex, int toInde // Obtain m = (-distance mod length), a non-negative value less than "length". This is how many // places left to rotate. int m = -distance % length; - m = (m < 0) ? m + length : m; + m = m < 0 ? m + length : m; // The current index of what will become the first element of the rotated section. int newFirstIndex = m + fromIndex; if (newFirstIndex == fromIndex) { diff --git a/android/guava/src/com/google/common/primitives/ImmutableDoubleArray.java b/android/guava/src/com/google/common/primitives/ImmutableDoubleArray.java index c179ad6e6516..f08886f56801 100644 --- a/android/guava/src/com/google/common/primitives/ImmutableDoubleArray.java +++ b/android/guava/src/com/google/common/primitives/ImmutableDoubleArray.java @@ -177,7 +177,7 @@ public static ImmutableDoubleArray copyOf(Iterable values) { public static ImmutableDoubleArray copyOf(DoubleStream stream) { // Note this uses very different growth behavior from copyOf(Iterable) and the builder. double[] array = stream.toArray(); - return (array.length == 0) ? EMPTY : new ImmutableDoubleArray(array); + return array.length == 0 ? EMPTY : new ImmutableDoubleArray(array); } /** diff --git a/android/guava/src/com/google/common/primitives/ImmutableIntArray.java b/android/guava/src/com/google/common/primitives/ImmutableIntArray.java index d6cda61b4a93..3c84fcfd136b 100644 --- a/android/guava/src/com/google/common/primitives/ImmutableIntArray.java +++ b/android/guava/src/com/google/common/primitives/ImmutableIntArray.java @@ -174,7 +174,7 @@ public static ImmutableIntArray copyOf(Iterable values) { public static ImmutableIntArray copyOf(IntStream stream) { // Note this uses very different growth behavior from copyOf(Iterable) and the builder. int[] array = stream.toArray(); - return (array.length == 0) ? EMPTY : new ImmutableIntArray(array); + return array.length == 0 ? EMPTY : new ImmutableIntArray(array); } /** diff --git a/android/guava/src/com/google/common/primitives/ImmutableLongArray.java b/android/guava/src/com/google/common/primitives/ImmutableLongArray.java index 34a4f48be882..fa04111fa6fb 100644 --- a/android/guava/src/com/google/common/primitives/ImmutableLongArray.java +++ b/android/guava/src/com/google/common/primitives/ImmutableLongArray.java @@ -176,7 +176,7 @@ public static ImmutableLongArray copyOf(Iterable values) { public static ImmutableLongArray copyOf(LongStream stream) { // Note this uses very different growth behavior from copyOf(Iterable) and the builder. long[] array = stream.toArray(); - return (array.length == 0) ? EMPTY : new ImmutableLongArray(array); + return array.length == 0 ? EMPTY : new ImmutableLongArray(array); } /** diff --git a/android/guava/src/com/google/common/primitives/Ints.java b/android/guava/src/com/google/common/primitives/Ints.java index 9fd547e29197..63f611cfa98f 100644 --- a/android/guava/src/com/google/common/primitives/Ints.java +++ b/android/guava/src/com/google/common/primitives/Ints.java @@ -416,7 +416,7 @@ public static Converter stringConverter() { public static int[] ensureCapacity(int[] array, int minLength, int padding) { checkArgument(minLength >= 0, "Invalid minLength: %s", minLength); checkArgument(padding >= 0, "Invalid padding: %s", padding); - return (array.length < minLength) ? Arrays.copyOf(array, minLength + padding) : array; + return array.length < minLength ? Arrays.copyOf(array, minLength + padding) : array; } /** @@ -599,7 +599,7 @@ public static void rotate(int[] array, int distance, int fromIndex, int toIndex) // Obtain m = (-distance mod length), a non-negative value less than "length". This is how many // places left to rotate. int m = -distance % length; - m = (m < 0) ? m + length : m; + m = m < 0 ? m + length : m; // The current index of what will become the first element of the rotated section. int newFirstIndex = m + fromIndex; if (newFirstIndex == fromIndex) { diff --git a/android/guava/src/com/google/common/primitives/Longs.java b/android/guava/src/com/google/common/primitives/Longs.java index 49aa2ce338f5..e591e1275e35 100644 --- a/android/guava/src/com/google/common/primitives/Longs.java +++ b/android/guava/src/com/google/common/primitives/Longs.java @@ -352,7 +352,7 @@ private AsciiDigits() {} } static int digit(char c) { - return (c < 128) ? asciiDigits[c] : -1; + return c < 128 ? asciiDigits[c] : -1; } } @@ -495,7 +495,7 @@ public static Converter stringConverter() { public static long[] ensureCapacity(long[] array, int minLength, int padding) { checkArgument(minLength >= 0, "Invalid minLength: %s", minLength); checkArgument(padding >= 0, "Invalid padding: %s", padding); - return (array.length < minLength) ? Arrays.copyOf(array, minLength + padding) : array; + return array.length < minLength ? Arrays.copyOf(array, minLength + padding) : array; } /** @@ -651,7 +651,7 @@ public static void rotate(long[] array, int distance, int fromIndex, int toIndex // Obtain m = (-distance mod length), a non-negative value less than "length". This is how many // places left to rotate. int m = -distance % length; - m = (m < 0) ? m + length : m; + m = m < 0 ? m + length : m; // The current index of what will become the first element of the rotated section. int newFirstIndex = m + fromIndex; if (newFirstIndex == fromIndex) { diff --git a/android/guava/src/com/google/common/primitives/Primitives.java b/android/guava/src/com/google/common/primitives/Primitives.java index 9e2f71093b06..5915c7519ebb 100644 --- a/android/guava/src/com/google/common/primitives/Primitives.java +++ b/android/guava/src/com/google/common/primitives/Primitives.java @@ -118,7 +118,7 @@ public static Class wrap(Class type) { // cast is safe: long.class and Long.class are both of type Class @SuppressWarnings("unchecked") Class wrapped = (Class) PRIMITIVE_TO_WRAPPER_TYPE.get(type); - return (wrapped == null) ? type : wrapped; + return wrapped == null ? type : wrapped; } /** @@ -137,6 +137,6 @@ public static Class unwrap(Class type) { // cast is safe: long.class and Long.class are both of type Class @SuppressWarnings("unchecked") Class unwrapped = (Class) WRAPPER_TO_PRIMITIVE_TYPE.get(type); - return (unwrapped == null) ? type : unwrapped; + return unwrapped == null ? type : unwrapped; } } diff --git a/android/guava/src/com/google/common/primitives/Shorts.java b/android/guava/src/com/google/common/primitives/Shorts.java index 3a54130d8169..495cba540d65 100644 --- a/android/guava/src/com/google/common/primitives/Shorts.java +++ b/android/guava/src/com/google/common/primitives/Shorts.java @@ -406,7 +406,7 @@ public static Converter stringConverter() { public static short[] ensureCapacity(short[] array, int minLength, int padding) { checkArgument(minLength >= 0, "Invalid minLength: %s", minLength); checkArgument(padding >= 0, "Invalid padding: %s", padding); - return (array.length < minLength) ? Arrays.copyOf(array, minLength + padding) : array; + return array.length < minLength ? Arrays.copyOf(array, minLength + padding) : array; } /** @@ -563,7 +563,7 @@ public static void rotate(short[] array, int distance, int fromIndex, int toInde // Obtain m = (-distance mod length), a non-negative value less than "length". This is how many // places left to rotate. int m = -distance % length; - m = (m < 0) ? m + length : m; + m = m < 0 ? m + length : m; // The current index of what will become the first element of the rotated section. int newFirstIndex = m + fromIndex; if (newFirstIndex == fromIndex) { 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/android/guava/src/com/google/common/reflect/Reflection.java b/android/guava/src/com/google/common/reflect/Reflection.java index 3cc06250c344..d7164ebd1980 100644 --- a/android/guava/src/com/google/common/reflect/Reflection.java +++ b/android/guava/src/com/google/common/reflect/Reflection.java @@ -43,7 +43,7 @@ public static String getPackageName(Class clazz) { */ public static String getPackageName(String classFullName) { int lastDot = classFullName.lastIndexOf('.'); - return (lastDot < 0) ? "" : classFullName.substring(0, lastDot); + return lastDot < 0 ? "" : classFullName.substring(0, lastDot); } /** diff --git a/android/guava/src/com/google/common/reflect/TypeResolver.java b/android/guava/src/com/google/common/reflect/TypeResolver.java index f348362f1c03..56676df9667f 100644 --- a/android/guava/src/com/google/common/reflect/TypeResolver.java +++ b/android/guava/src/com/google/common/reflect/TypeResolver.java @@ -256,7 +256,7 @@ private Type resolveGenericArrayType(GenericArrayType type) { private ParameterizedType resolveParameterizedType(ParameterizedType type) { Type owner = type.getOwnerType(); - Type resolvedOwner = (owner == null) ? null : resolveType(owner); + Type resolvedOwner = owner == null ? null : resolveType(owner); Type resolvedRawType = resolveType(type.getRawType()); Type[] args = type.getActualTypeArguments(); diff --git a/android/guava/src/com/google/common/reflect/Types.java b/android/guava/src/com/google/common/reflect/Types.java index e45ac4639fce..2ca1d888b9e4 100644 --- a/android/guava/src/com/google/common/reflect/Types.java +++ b/android/guava/src/com/google/common/reflect/Types.java @@ -140,7 +140,7 @@ class LocalClass {} static TypeVariable newArtificialTypeVariable( D declaration, String name, Type... bounds) { return newTypeVariableImpl( - declaration, name, (bounds.length == 0) ? new Type[] {Object.class} : bounds); + declaration, name, bounds.length == 0 ? new Type[] {Object.class} : bounds); } /** Returns a new {@link WildcardType} with {@code upperBound}. */ @@ -161,7 +161,7 @@ static WildcardType supertypeOf(Type lowerBound) { *

The format is subject to change. */ static String toString(Type type) { - return (type instanceof Class) ? ((Class) type).getName() : type.toString(); + return type instanceof Class ? ((Class) type).getName() : type.toString(); } static @Nullable Type getComponentType(Type type) { diff --git a/android/guava/src/com/google/common/util/concurrent/AggregateFuture.java b/android/guava/src/com/google/common/util/concurrent/AggregateFuture.java index 9647758bdc66..68dc9c924de7 100644 --- a/android/guava/src/com/google/common/util/concurrent/AggregateFuture.java +++ b/android/guava/src/com/google/common/util/concurrent/AggregateFuture.java @@ -242,7 +242,7 @@ private void handleException(Throwable throwable) { private static void log(Throwable throwable) { String message = - (throwable instanceof Error) + throwable instanceof Error ? "Input Future failed with Error" : "Got more than one input Future failure. Logging failures after the first"; logger.get().log(SEVERE, message, throwable); diff --git a/android/guava/src/com/google/common/util/concurrent/AtomicLongMap.java b/android/guava/src/com/google/common/util/concurrent/AtomicLongMap.java index 6a9db7f65cda..deed6138a56e 100644 --- a/android/guava/src/com/google/common/util/concurrent/AtomicLongMap.java +++ b/android/guava/src/com/google/common/util/concurrent/AtomicLongMap.java @@ -331,7 +331,7 @@ public long sum() { /** Returns a live, read-only view of the map backing this {@code AtomicLongMap}. */ public Map asMap() { Map result = asMap; - return (result == null) ? asMap = createAsMap() : result; + return result == null ? asMap = createAsMap() : result; } private Map createAsMap() { @@ -444,7 +444,7 @@ boolean replace(K key, long expectedOldValue, long newValue) { return putIfAbsent(key, newValue) == 0L; } else { AtomicLong atomic = map.get(key); - return (atomic == null) ? false : atomic.compareAndSet(expectedOldValue, newValue); + return atomic == null ? false : atomic.compareAndSet(expectedOldValue, newValue); } } } diff --git a/android/guava/src/com/google/common/util/concurrent/SmoothRateLimiter.java b/android/guava/src/com/google/common/util/concurrent/SmoothRateLimiter.java index 7e68f42a0f6b..d172e6c2e695 100644 --- a/android/guava/src/com/google/common/util/concurrent/SmoothRateLimiter.java +++ b/android/guava/src/com/google/common/util/concurrent/SmoothRateLimiter.java @@ -235,7 +235,7 @@ void doSetRate(double permitsPerSecond, double stableIntervalMicros) { storedPermits = 0.0; } else { storedPermits = - (oldMaxPermits == 0.0) + oldMaxPermits == 0.0 ? maxPermits // initial state is cold : storedPermits * maxPermits / oldMaxPermits; } @@ -294,7 +294,7 @@ void doSetRate(double permitsPerSecond, double stableIntervalMicros) { storedPermits = maxPermits; } else { storedPermits = - (oldMaxPermits == 0.0) + oldMaxPermits == 0.0 ? 0.0 // initial state : storedPermits * maxPermits / oldMaxPermits; } diff --git a/android/guava/src/com/google/common/util/concurrent/Striped.java b/android/guava/src/com/google/common/util/concurrent/Striped.java index 2e4fe684ecc1..f0ff346de912 100644 --- a/android/guava/src/com/google/common/util/concurrent/Striped.java +++ b/android/guava/src/com/google/common/util/concurrent/Striped.java @@ -408,7 +408,7 @@ static final class SmallLazyStriped extends PowerOfTwoStriped { SmallLazyStriped(int stripes, Supplier supplier) { super(stripes); - this.size = (mask == ALL_SET) ? Integer.MAX_VALUE : mask + 1; + this.size = mask == ALL_SET ? Integer.MAX_VALUE : mask + 1; this.locks = new AtomicReferenceArray<>(size); this.supplier = supplier; } @@ -479,7 +479,7 @@ static final class LargeLazyStriped extends PowerOfTwoStriped { LargeLazyStriped(int stripes, Supplier supplier) { super(stripes); - this.size = (mask == ALL_SET) ? Integer.MAX_VALUE : mask + 1; + this.size = mask == ALL_SET ? Integer.MAX_VALUE : mask + 1; this.supplier = supplier; this.locks = new MapMaker().weakValues().makeMap(); } diff --git a/android/guava/src/com/google/common/util/concurrent/ThreadFactoryBuilder.java b/android/guava/src/com/google/common/util/concurrent/ThreadFactoryBuilder.java index c204313083b4..db41a84e2ee2 100644 --- a/android/guava/src/com/google/common/util/concurrent/ThreadFactoryBuilder.java +++ b/android/guava/src/com/google/common/util/concurrent/ThreadFactoryBuilder.java @@ -189,10 +189,10 @@ private static ThreadFactory doBuild(ThreadFactoryBuilder builder) { Integer priority = builder.priority; UncaughtExceptionHandler uncaughtExceptionHandler = builder.uncaughtExceptionHandler; ThreadFactory backingThreadFactory = - (builder.backingThreadFactory != null) + builder.backingThreadFactory != null ? builder.backingThreadFactory : defaultThreadFactory(); - AtomicLong count = (nameFormat != null) ? new AtomicLong(0) : null; + AtomicLong count = nameFormat != null ? new AtomicLong(0) : null; return new ThreadFactory() { @Override public Thread newThread(Runnable runnable) { 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..8533d39b02e1 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; @@ -506,7 +506,7 @@ public CapacityEnforcingLinkedHashMap( @Override protected boolean removeEldestEntry(Entry> ignored) { - boolean removal = (maximumSize == UNSET_INT) ? false : (size() > maximumSize); + boolean removal = maximumSize == UNSET_INT ? false : (size() > maximumSize); if ((removalListener != null) && removal) { removalListener.onRemoval( RemovalNotification.create( @@ -658,7 +658,7 @@ public void remove() { public Set keySet() { // does not impact recency ordering Set ks = keySet; - return (ks != null) ? ks : (keySet = new KeySet(this)); + return ks != null ? ks : (keySet = new KeySet(this)); } Collection values; @@ -667,7 +667,7 @@ public Set keySet() { public Collection values() { // does not impact recency ordering Collection vs = values; - return (vs != null) ? vs : (values = new Values(this)); + return vs != null ? vs : (values = new Values(this)); } Set> entrySet; @@ -676,7 +676,7 @@ public Collection values() { public Set> entrySet() { // does not impact recency ordering Set> es = entrySet; - return (es != null) ? es : (entrySet = new EntrySet(this)); + return es != null ? es : (entrySet = new EntrySet(this)); } /** diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/AbstractSortedMultiset.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/AbstractSortedMultiset.java index d9c6da171a5e..ce6b6faf7bee 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/AbstractSortedMultiset.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/AbstractSortedMultiset.java @@ -117,7 +117,7 @@ Iterator descendingIterator() { @Override public SortedMultiset descendingMultiset() { SortedMultiset result = descendingMultiset; - return (result == null) ? descendingMultiset = createDescendingMultiset() : result; + return result == null ? descendingMultiset = createDescendingMultiset() : result; } SortedMultiset createDescendingMultiset() { diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/DescendingMultiset.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/DescendingMultiset.java index 9c7fd8528324..a075a1f31c42 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/DescendingMultiset.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/DescendingMultiset.java @@ -111,7 +111,7 @@ public SortedMultiset descendingMultiset() { @Override public Set> entrySet() { Set> result = entrySet; - return (result == null) ? entrySet = createEntrySet() : result; + return result == null ? entrySet = createEntrySet() : result; } Set> createEntrySet() { diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ForwardingImmutableMap.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ForwardingImmutableMap.java index 68ff90ad2b31..3759ded6c2cb 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ForwardingImmutableMap.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ForwardingImmutableMap.java @@ -71,7 +71,7 @@ public final boolean containsValue(@Nullable Object value) { @Override public @Nullable V get(@Nullable Object key) { - return (key == null) ? null : Maps.safeGet(delegate, key); + return key == null ? null : Maps.safeGet(delegate, key); } @Override diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableCollection.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableCollection.java index 7321b00d1960..4d26aacdf828 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableCollection.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableCollection.java @@ -86,7 +86,7 @@ public final void clear() { public ImmutableList asList() { ImmutableList list = asList; - return (list == null) ? (asList = createAsList()) : list; + return list == null ? (asList = createAsList()) : list; } ImmutableList createAsList() { diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableList.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableList.java index a3176d14a12c..fbc04e455ef9 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableList.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableList.java @@ -125,7 +125,7 @@ static ImmutableList jsOf(E... elements) { public static ImmutableList copyOf(Iterable elements) { checkNotNull(elements); // for GWT - return (elements instanceof Collection) + return elements instanceof Collection ? copyOf((Collection) elements) : copyOf(elements.iterator()); } @@ -223,12 +223,12 @@ private static List nullCheckedList(Object... array) { @Override public int indexOf(@Nullable Object object) { - return (object == null) ? -1 : Lists.indexOfImpl(this, object); + return object == null ? -1 : Lists.indexOfImpl(this, object); } @Override public int lastIndexOf(@Nullable Object object) { - return (object == null) ? -1 : Lists.lastIndexOfImpl(this, object); + return object == null ? -1 : Lists.lastIndexOfImpl(this, object); } @Override diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableMap.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableMap.java index a474a915011d..fad353579cbd 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableMap.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableMap.java @@ -497,7 +497,7 @@ public ImmutableCollection values() { public ImmutableSetMultimap asMultimap() { ImmutableSetMultimap result = multimapView; - return (result == null) + return result == null ? (multimapView = new ImmutableSetMultimap(new MapViewOfValuesAsSingletonSets(), size(), null)) : result; @@ -523,7 +523,7 @@ public boolean containsKey(@Nullable Object key) { @Override public @Nullable ImmutableSet get(@Nullable Object key) { V outerValue = ImmutableMap.this.get(key); - return (outerValue == null) ? null : ImmutableSet.of(outerValue); + return outerValue == null ? null : ImmutableSet.of(outerValue); } @Override diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableSortedMap.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableSortedMap.java index 0a7ad60dfc46..c3178464f054 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableSortedMap.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableSortedMap.java @@ -277,7 +277,7 @@ public static ImmutableSortedMap copyOfSorted(SortedMap comparator = - (map.comparator() == null) ? (Comparator) NATURAL_ORDER : map.comparator(); + map.comparator() == null ? (Comparator) NATURAL_ORDER : map.comparator(); return copyOfInternal(map, comparator); } @@ -291,7 +291,7 @@ private static ImmutableSortedMap copyOfInternal( ImmutableSortedMap kvMap = (ImmutableSortedMap) map; Comparator comparator2 = kvMap.comparator(); boolean sameComparator = - (comparator2 == null) ? comparator == NATURAL_ORDER : comparator.equals(comparator2); + comparator2 == null ? comparator == NATURAL_ORDER : comparator.equals(comparator2); if (sameComparator) { return kvMap; } @@ -404,7 +404,7 @@ public ImmutableSortedMap buildOrThrow() { @Override public ImmutableSortedSet keySet() { ImmutableSortedSet ks = keySet; - return (ks == null) ? (keySet = createKeySet()) : ks; + return ks == null ? (keySet = createKeySet()) : ks; } @Override diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableSortedSet.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableSortedSet.java index 56ab76289e17..f43dcfdf310a 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableSortedSet.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableSortedSet.java @@ -219,7 +219,7 @@ private static boolean hasSameComparator(Iterable elements, Comparator com if (elements instanceof SortedSet) { SortedSet sortedSet = (SortedSet) elements; Comparator comparator2 = sortedSet.comparator(); - return (comparator2 == null) + return comparator2 == null ? comparator == Ordering.natural() : comparator.equals(comparator2); } diff --git a/guava-testlib/src/com/google/common/collect/testing/Helpers.java b/guava-testlib/src/com/google/common/collect/testing/Helpers.java index 8bc912c6fde3..b2d61e57f361 100644 --- a/guava-testlib/src/com/google/common/collect/testing/Helpers.java +++ b/guava-testlib/src/com/google/common/collect/testing/Helpers.java @@ -262,7 +262,7 @@ private static final class EntryComparator a, Entry b) { - return (keyComparator == null) + return keyComparator == null ? ((Comparable) a.getKey()).compareTo(b.getKey()) : keyComparator.compare(a.getKey(), b.getKey()); } @@ -440,7 +440,7 @@ public boolean equals(@Nullable Object o) { public int hashCode() { K k = getKey(); V v = getValue(); - return ((k == null) ? 0 : k.hashCode()) ^ ((v == null) ? 0 : v.hashCode()); + return (k == null ? 0 : k.hashCode()) ^ (v == null ? 0 : v.hashCode()); } @Override 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/MinimalSet.java b/guava-testlib/src/com/google/common/collect/testing/MinimalSet.java index db09a4edd544..b26c6a3a9586 100644 --- a/guava-testlib/src/com/google/common/collect/testing/MinimalSet.java +++ b/guava-testlib/src/com/google/common/collect/testing/MinimalSet.java @@ -80,7 +80,7 @@ public boolean equals(@Nullable Object object) { public int hashCode() { int hashCodeSum = 0; for (Object o : this) { - hashCodeSum += (o == null) ? 0 : o.hashCode(); + hashCodeSum += o == null ? 0 : o.hashCode(); } return hashCodeSum; } diff --git a/guava-testlib/src/com/google/common/collect/testing/TestsForSetsInJavaUtil.java b/guava-testlib/src/com/google/common/collect/testing/TestsForSetsInJavaUtil.java index 6d5d8d8fbb6f..d72898704186 100644 --- a/guava-testlib/src/com/google/common/collect/testing/TestsForSetsInJavaUtil.java +++ b/guava-testlib/src/com/google/common/collect/testing/TestsForSetsInJavaUtil.java @@ -287,7 +287,7 @@ public Test testsForEnumSet() { new TestEnumSetGenerator() { @Override public Set create(AnEnum[] elements) { - return (elements.length == 0) + return elements.length == 0 ? EnumSet.noneOf(AnEnum.class) : EnumSet.copyOf(MinimalCollection.of(elements)); } 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/ListHashCodeTester.java b/guava-testlib/src/com/google/common/collect/testing/testers/ListHashCodeTester.java index f31ab39ad2c6..8068c2987883 100644 --- a/guava-testlib/src/com/google/common/collect/testing/testers/ListHashCodeTester.java +++ b/guava-testlib/src/com/google/common/collect/testing/testers/ListHashCodeTester.java @@ -37,7 +37,7 @@ public class ListHashCodeTester extends AbstractListTester { public void testHashCode() { int expectedHashCode = 1; for (E element : getOrderedElements()) { - expectedHashCode = 31 * expectedHashCode + ((element == null) ? 0 : element.hashCode()); + expectedHashCode = 31 * expectedHashCode + (element == null ? 0 : element.hashCode()); } assertEquals( "A List's hashCode() should be computed from those of its elements.", 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..ce3814e6e446 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-testlib/src/com/google/common/testing/ArbitraryInstances.java b/guava-testlib/src/com/google/common/testing/ArbitraryInstances.java index b7f684f568ba..93ebca67ac81 100644 --- a/guava-testlib/src/com/google/common/testing/ArbitraryInstances.java +++ b/guava-testlib/src/com/google/common/testing/ArbitraryInstances.java @@ -365,7 +365,7 @@ private static void setImplementation(Class type, Class impl } if (type.isEnum()) { T[] enumConstants = type.getEnumConstants(); - return (enumConstants == null || enumConstants.length == 0) ? null : enumConstants[0]; + return enumConstants == null || enumConstants.length == 0 ? null : enumConstants[0]; } if (type.isArray()) { return createEmptyArray(type); 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/collect/ConcurrentHashMultisetBenchmark.java b/guava-tests/benchmark/com/google/common/collect/ConcurrentHashMultisetBenchmark.java index c94673a67996..bcd5e952d320 100644 --- a/guava-tests/benchmark/com/google/common/collect/ConcurrentHashMultisetBenchmark.java +++ b/guava-tests/benchmark/com/google/common/collect/ConcurrentHashMultisetBenchmark.java @@ -387,7 +387,7 @@ boolean removeExactly(@Nullable Object element, int occurrences) { @Override public int setCount(E element, int count) { checkNonnegative(count, "count"); - return (count == 0) ? removeAllOccurrences(element) : unbox(countMap.put(element, count)); + return count == 0 ? removeAllOccurrences(element) : unbox(countMap.put(element, count)); } /** @@ -546,7 +546,7 @@ public int hashCode() { /** We use a special form of unboxing that treats null as zero. */ private static int unbox(@Nullable Integer i) { - return (i == null) ? 0 : i; + return i == null ? 0 : i; } } } 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/math/LessThanBenchmark.java b/guava-tests/benchmark/com/google/common/math/LessThanBenchmark.java index de7a3e55c247..5019cb1c0506 100644 --- a/guava-tests/benchmark/com/google/common/math/LessThanBenchmark.java +++ b/guava-tests/benchmark/com/google/common/math/LessThanBenchmark.java @@ -96,7 +96,7 @@ int ternaryLtIntAddOutsideTernary(int reps) { int x = xInts[j]; int y = yInts[j]; int z = constant[j]; - tmp += z + ((x < y) ? 1 : 0); + tmp += z + (x < y ? 1 : 0); } return tmp; } @@ -109,7 +109,7 @@ int ternaryLtIntAddInsideTernary(int reps) { int x = xInts[j]; int y = yInts[j]; int z = constant[j]; - tmp += (x < y) ? z + 1 : z; + tmp += x < y ? z + 1 : z; } return tmp; } @@ -148,7 +148,7 @@ int ternaryLtLongAddOutsideTernary(int reps) { long x = xLongs[j]; long y = yLongs[j]; int z = constant[j]; - tmp += z + ((x < y) ? 1 : 0); + tmp += z + (x < y ? 1 : 0); } return tmp; } @@ -161,7 +161,7 @@ int ternaryLtLongAddInsideTernary(int reps) { long x = xLongs[j]; long y = yLongs[j]; int z = constant[j]; - tmp += (x < y) ? z + 1 : z; + tmp += x < y ? z + 1 : z; } return tmp; } diff --git a/guava-tests/benchmark/com/google/common/util/concurrent/MonitorBasedArrayBlockingQueue.java b/guava-tests/benchmark/com/google/common/util/concurrent/MonitorBasedArrayBlockingQueue.java index 65ac14a286b5..78c973ba5270 100644 --- a/guava-tests/benchmark/com/google/common/util/concurrent/MonitorBasedArrayBlockingQueue.java +++ b/guava-tests/benchmark/com/google/common/util/concurrent/MonitorBasedArrayBlockingQueue.java @@ -90,7 +90,7 @@ public class MonitorBasedArrayBlockingQueue extends AbstractQueue /** Circularly increment i. */ final int inc(int i) { - return (++i == items.length) ? 0 : i; + return ++i == items.length ? 0 : i; } /** @@ -629,7 +629,7 @@ public int drainTo(Collection c, int maxElements) { try { int i = takeIndex; int n = 0; - int max = (maxElements < count) ? maxElements : count; + int max = maxElements < count ? maxElements : count; while (n < max) { c.add(items[i]); items[i] = null; @@ -746,7 +746,7 @@ public void remove() { int ti = takeIndex; removeAt(i); // back up cursor (reset to front if was first element) - nextIndex = (i == ti) ? takeIndex : i; + nextIndex = i == ti ? takeIndex : i; checkNext(); } finally { monitor.leave(); 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/base/FunctionsTest.java b/guava-tests/test/com/google/common/base/FunctionsTest.java index c808f15e0bae..cb028fd8bf28 100644 --- a/guava-tests/test/com/google/common/base/FunctionsTest.java +++ b/guava-tests/test/com/google/common/base/FunctionsTest.java @@ -274,7 +274,7 @@ public void testCompositionWildcard() { private static class HashCodeFunction implements Function<@Nullable Object, Integer> { @Override public Integer apply(@Nullable Object o) { - return (o == null) ? 0 : o.hashCode(); + return o == null ? 0 : o.hashCode(); } } 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..8784cb2f9bb7 100644 --- a/guava-tests/test/com/google/common/cache/LocalCacheTest.java +++ b/guava-tests/test/com/google/common/cache/LocalCacheTest.java @@ -1835,7 +1835,7 @@ public void testExpand_cleanup() { ReferenceEntry entry = null; for (int i = 0; i < originalCount; i++) { Object key = new Object(); - Object value = (i % 3 == 0) ? null : new Object(); + Object value = i % 3 == 0 ? null : new Object(); int hash = map.hash(key); if (i % 3 == 1) { key = null; @@ -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/AbstractMapsTransformValuesTest.java b/guava-tests/test/com/google/common/collect/AbstractMapsTransformValuesTest.java index e5abace0fd27..9e8bec13864f 100644 --- a/guava-tests/test/com/google/common/collect/AbstractMapsTransformValuesTest.java +++ b/guava-tests/test/com/google/common/collect/AbstractMapsTransformValuesTest.java @@ -239,7 +239,7 @@ public void testTransformEntrySetContains() { new Function<@Nullable Boolean, @Nullable Boolean>() { @Override public @Nullable Boolean apply(@Nullable Boolean from) { - return (from == null) ? true : null; + return from == null ? true : null; } }); diff --git a/guava-tests/test/com/google/common/collect/AbstractSequentialIteratorTest.java b/guava-tests/test/com/google/common/collect/AbstractSequentialIteratorTest.java index bc3cc85bbc73..9a2872766d33 100644 --- a/guava-tests/test/com/google/common/collect/AbstractSequentialIteratorTest.java +++ b/guava-tests/test/com/google/common/collect/AbstractSequentialIteratorTest.java @@ -66,7 +66,7 @@ public Iterator iterator() { new AbstractSequentialIterator(1) { @Override protected @Nullable Integer computeNext(Integer previous) { - return (previous == 1 << 30) ? null : previous * 2; + return previous == 1 << 30 ? null : previous * 2; } }; return powersOfTwo; @@ -128,7 +128,7 @@ private static Iterator newDoubler(int first, int last) { return new AbstractSequentialIterator(first) { @Override protected @Nullable Integer computeNext(Integer previous) { - return (previous == last) ? null : previous * 2; + return previous == last ? null : previous * 2; } }; } diff --git a/guava-tests/test/com/google/common/collect/Collections2Test.java b/guava-tests/test/com/google/common/collect/Collections2Test.java index 4f93a718b255..2a37e3366894 100644 --- a/guava-tests/test/com/google/common/collect/Collections2Test.java +++ b/guava-tests/test/com/google/common/collect/Collections2Test.java @@ -208,7 +208,7 @@ private static Test testsForTransform() { public Collection<@Nullable String> create(@Nullable String[] elements) { List<@Nullable String> list = new ArrayList<>(); for (String element : elements) { - list.add((element == null) ? null : "q" + element); + list.add(element == null ? null : "q" + element); } return Collections2.transform( list, from -> isNullOrEmpty(from) ? null : from.substring(1)); 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/EnumMultisetTest.java b/guava-tests/test/com/google/common/collect/EnumMultisetTest.java index d81a68f1bbaa..b765c26eeaa2 100644 --- a/guava-tests/test/com/google/common/collect/EnumMultisetTest.java +++ b/guava-tests/test/com/google/common/collect/EnumMultisetTest.java @@ -75,7 +75,7 @@ private static TestEnumMultisetGenerator enumMultisetGenerator() { return new TestEnumMultisetGenerator() { @Override protected Multiset create(AnEnum[] elements) { - return (elements.length == 0) + return elements.length == 0 ? EnumMultiset.create(AnEnum.class) : EnumMultiset.create(asList(elements)); } diff --git a/guava-tests/test/com/google/common/collect/FluentIterableTest.java b/guava-tests/test/com/google/common/collect/FluentIterableTest.java index 6534b41635fb..bc1840d6b140 100644 --- a/guava-tests/test/com/google/common/collect/FluentIterableTest.java +++ b/guava-tests/test/com/google/common/collect/FluentIterableTest.java @@ -282,7 +282,7 @@ public void testCycle() { int howManyChecked = 0; for (String string : cycle) { - String expected = (howManyChecked % 2 == 0) ? "a" : "b"; + String expected = howManyChecked % 2 == 0 ? "a" : "b"; assertEquals(expected, string); if (howManyChecked++ == 5) { break; diff --git a/guava-tests/test/com/google/common/collect/IterablesTest.java b/guava-tests/test/com/google/common/collect/IterablesTest.java index 5a5b9ca55e73..296390abdb6c 100644 --- a/guava-tests/test/com/google/common/collect/IterablesTest.java +++ b/guava-tests/test/com/google/common/collect/IterablesTest.java @@ -374,7 +374,7 @@ public void testCycle() { int howManyChecked = 0; for (String string : cycle) { - String expected = (howManyChecked % 2 == 0) ? "a" : "b"; + String expected = howManyChecked % 2 == 0 ? "a" : "b"; assertEquals(expected, string); if (howManyChecked++ == 5) { break; diff --git a/guava-tests/test/com/google/common/collect/ListsTest.java b/guava-tests/test/com/google/common/collect/ListsTest.java index fe80cafc6f30..6813033387a0 100644 --- a/guava-tests/test/com/google/common/collect/ListsTest.java +++ b/guava-tests/test/com/google/common/collect/ListsTest.java @@ -81,7 +81,7 @@ public class ListsTest extends TestCase { private static final class RemoveFirstFunction implements Function, Serializable { @Override public String apply(String from) { - return (from.length() == 0) ? from : from.substring(1); + return from.length() == 0 ? from : from.substring(1); } } diff --git a/guava-tests/test/com/google/common/collect/MapMakerInternalMapTest.java b/guava-tests/test/com/google/common/collect/MapMakerInternalMapTest.java index 7bc01a7dc2e0..84aaa958d35d 100644 --- a/guava-tests/test/com/google/common/collect/MapMakerInternalMapTest.java +++ b/guava-tests/test/com/google/common/collect/MapMakerInternalMapTest.java @@ -671,7 +671,7 @@ public void testExpand_cleanup() { InternalEntry entry = null; for (int i = 0; i < originalCount; i++) { Object key = new Object(); - Object value = (i % 3 == 0) ? null : new Object(); + Object value = i % 3 == 0 ? null : new Object(); int hash = map.hash(key); if (i % 3 == 1) { key = null; 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/collect/MapsTransformValuesUnmodifiableIteratorTest.java b/guava-tests/test/com/google/common/collect/MapsTransformValuesUnmodifiableIteratorTest.java index fd82e524603d..192a2f1d2d94 100644 --- a/guava-tests/test/com/google/common/collect/MapsTransformValuesUnmodifiableIteratorTest.java +++ b/guava-tests/test/com/google/common/collect/MapsTransformValuesUnmodifiableIteratorTest.java @@ -348,7 +348,7 @@ public void testTransformEntrySetContains() { new Function<@Nullable Boolean, @Nullable Boolean>() { @Override public @Nullable Boolean apply(@Nullable Boolean from) { - return (from == null) ? true : null; + return from == null ? true : null; } }); diff --git a/guava-tests/test/com/google/common/collect/MultimapsTest.java b/guava-tests/test/com/google/common/collect/MultimapsTest.java index ac8e54b36b3e..71de430ba856 100644 --- a/guava-tests/test/com/google/common/collect/MultimapsTest.java +++ b/guava-tests/test/com/google/common/collect/MultimapsTest.java @@ -952,7 +952,7 @@ public void testTransformEntries() { new EntryTransformer() { @Override public String transformEntry(String key, Integer value) { - return (value >= 0) ? key : "no" + key; + return value >= 0 ? key : "no" + key; } }; Multimap transformed = Multimaps.transformEntries(multimap, transformer); diff --git a/guava-tests/test/com/google/common/collect/SimpleAbstractMultisetTest.java b/guava-tests/test/com/google/common/collect/SimpleAbstractMultisetTest.java index 02080fa085c0..76213bc71bce 100644 --- a/guava-tests/test/com/google/common/collect/SimpleAbstractMultisetTest.java +++ b/guava-tests/test/com/google/common/collect/SimpleAbstractMultisetTest.java @@ -158,7 +158,7 @@ public E getElement() { @Override public int getCount() { Integer frequency = backingMap.get(getElement()); - return (frequency == null) ? 0 : frequency; + return frequency == null ? 0 : frequency; } }; } diff --git a/guava-tests/test/com/google/common/collect/SpecialRandom.java b/guava-tests/test/com/google/common/collect/SpecialRandom.java index 571a061f74ae..819eb9b42af8 100644 --- a/guava-tests/test/com/google/common/collect/SpecialRandom.java +++ b/guava-tests/test/com/google/common/collect/SpecialRandom.java @@ -30,7 +30,7 @@ @NullUnmarked public final class SpecialRandom extends Random { public static SpecialRandom valueOf(String s) { - return (s.length() == 0) ? new SpecialRandom() : new SpecialRandom(Long.parseLong(s)); + return s.length() == 0 ? new SpecialRandom() : new SpecialRandom(Long.parseLong(s)); } private final boolean hasSeed; diff --git a/guava-tests/test/com/google/common/collect/TableCollectionTest.java b/guava-tests/test/com/google/common/collect/TableCollectionTest.java index 32038b8d7839..b4faaea053c9 100644 --- a/guava-tests/test/com/google/common/collect/TableCollectionTest.java +++ b/guava-tests/test/com/google/common/collect/TableCollectionTest.java @@ -786,7 +786,7 @@ protected Map makePopulatedMap() { new Function<@Nullable Integer, @Nullable Integer>() { @Override public @Nullable Integer apply(@Nullable Integer input) { - return (input == null) ? null : input / 2; + return input == null ? null : input / 2; } }; diff --git a/guava-tests/test/com/google/common/collect/TablesTransformValuesTest.java b/guava-tests/test/com/google/common/collect/TablesTransformValuesTest.java index 379eaa076070..595d6e33db8f 100644 --- a/guava-tests/test/com/google/common/collect/TablesTransformValuesTest.java +++ b/guava-tests/test/com/google/common/collect/TablesTransformValuesTest.java @@ -49,7 +49,7 @@ protected Table create(@Nullable Object... data) { Table table = HashBasedTable.create(); checkArgument(data.length % 3 == 0); for (int i = 0; i < data.length; i += 3) { - String value = (data[i + 2] == null) ? null : (data[i + 2] + "transformed"); + String value = data[i + 2] == null ? null : (data[i + 2] + "transformed"); table.put((String) data[i], (Integer) data[i + 1], value); } return transformValues(table, FIRST_CHARACTER); diff --git a/guava-tests/test/com/google/common/escape/UnicodeEscaperTest.java b/guava-tests/test/com/google/common/escape/UnicodeEscaperTest.java index b2038013c0d5..9953cd84c0b8 100644 --- a/guava-tests/test/com/google/common/escape/UnicodeEscaperTest.java +++ b/guava-tests/test/com/google/common/escape/UnicodeEscaperTest.java @@ -150,7 +150,7 @@ public void testFalsePositivesForNextEscapedIndex() { // Canonical escaper method that only escapes lower case ASCII letters. @Override protected char @Nullable [] escape(int cp) { - return ('a' <= cp && cp <= 'z') ? new char[] {Character.toUpperCase((char) cp)} : null; + return 'a' <= cp && cp <= 'z' ? new char[] {Character.toUpperCase((char) cp)} : null; } // Inefficient implementation that defines all letters as escapable. diff --git a/guava-tests/test/com/google/common/graph/DefaultNetworkImplementationsTest.java b/guava-tests/test/com/google/common/graph/DefaultNetworkImplementationsTest.java index bf5a387b0290..f23c0dda9f76 100644 --- a/guava-tests/test/com/google/common/graph/DefaultNetworkImplementationsTest.java +++ b/guava-tests/test/com/google/common/graph/DefaultNetworkImplementationsTest.java @@ -72,7 +72,7 @@ public DefaultNetworkImplementationsTest(EdgeType edgeType) { @Before public void setUp() throws Exception { NetworkBuilder builder = - (edgeType == EdgeType.DIRECTED) ? NetworkBuilder.directed() : NetworkBuilder.undirected(); + edgeType == EdgeType.DIRECTED ? NetworkBuilder.directed() : NetworkBuilder.undirected(); network = builder.allowsSelfLoops(true).allowsParallelEdges(true).build(); networkForTest = NetworkForTest.from(network); 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/io/ByteSourceTest.java b/guava-tests/test/com/google/common/io/ByteSourceTest.java index 903f0c170181..36687a8e49c7 100644 --- a/guava-tests/test/com/google/common/io/ByteSourceTest.java +++ b/guava-tests/test/com/google/common/io/ByteSourceTest.java @@ -388,7 +388,7 @@ public void testCopyExceptions() { assertEquals(0, suppressed); suppressed = runSuppressionFailureTest(in, BROKEN_CLOSE_SINK); - assertEquals((in == BROKEN_OPEN_SOURCE) ? 0 : 1, suppressed); + assertEquals(in == BROKEN_OPEN_SOURCE ? 0 : 1, suppressed); } for (ByteSink out : BROKEN_SINKS) { diff --git a/guava-tests/test/com/google/common/io/CharSourceTest.java b/guava-tests/test/com/google/common/io/CharSourceTest.java index 018097c03602..99448316d2ce 100644 --- a/guava-tests/test/com/google/common/io/CharSourceTest.java +++ b/guava-tests/test/com/google/common/io/CharSourceTest.java @@ -286,7 +286,7 @@ public void testCopyExceptions() { assertEquals(0, suppressed); suppressed = runSuppressionFailureTest(in, BROKEN_CLOSE_SINK); - assertEquals((in == BROKEN_OPEN_SOURCE) ? 0 : 1, suppressed); + assertEquals(in == BROKEN_OPEN_SOURCE ? 0 : 1, suppressed); } for (CharSink out : BROKEN_SINKS) { diff --git a/guava-tests/test/com/google/common/math/IntMathTest.java b/guava-tests/test/com/google/common/math/IntMathTest.java index ab48bcaa43ca..133f8300015e 100644 --- a/guava-tests/test/com/google/common/math/IntMathTest.java +++ b/guava-tests/test/com/google/common/math/IntMathTest.java @@ -158,7 +158,7 @@ public void testLessThanBranchFree() { for (int x : ALL_INTEGER_CANDIDATES) { for (int y : ALL_INTEGER_CANDIDATES) { if (LongMath.fitsInInt((long) x - y)) { - int expected = (x < y) ? 1 : 0; + int expected = x < y ? 1 : 0; int actual = IntMath.lessThanBranchFree(x, y); assertEquals(expected, actual); } @@ -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..8d6bf302e79b 100644 --- a/guava-tests/test/com/google/common/math/LongMathTest.java +++ b/guava-tests/test/com/google/common/math/LongMathTest.java @@ -193,7 +193,7 @@ public void testLessThanBranchFree() { for (long y : ALL_LONG_CANDIDATES) { BigInteger difference = BigInteger.valueOf(x).subtract(BigInteger.valueOf(y)); if (fitsInLong(difference)) { - int expected = (x < y) ? 1 : 0; + int expected = x < y ? 1 : 0; int actual = LongMath.lessThanBranchFree(x, y); assertEquals(expected, actual); } @@ -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/primitives/UnsignedLongTest.java b/guava-tests/test/com/google/common/primitives/UnsignedLongTest.java index 3893d66ab4bc..74f90f12c5ea 100644 --- a/guava-tests/test/com/google/common/primitives/UnsignedLongTest.java +++ b/guava-tests/test/com/google/common/primitives/UnsignedLongTest.java @@ -85,7 +85,7 @@ public void testAsUnsignedAndLongValueAreInverses() { public void testAsUnsignedBigIntegerValue() { for (long value : TEST_LONGS) { BigInteger expected = - (value >= 0) + value >= 0 ? BigInteger.valueOf(value) : BigInteger.valueOf(value).add(BigInteger.ZERO.setBit(64)); assertWithMessage(UnsignedLongs.toString(value)) @@ -265,7 +265,7 @@ public void testEquals() { EqualsTester equalsTester = new EqualsTester(); for (long a : TEST_LONGS) { BigInteger big = - (a >= 0) ? BigInteger.valueOf(a) : BigInteger.valueOf(a).add(BigInteger.ZERO.setBit(64)); + a >= 0 ? BigInteger.valueOf(a) : BigInteger.valueOf(a).add(BigInteger.ZERO.setBit(64)); equalsTester.addEqualityGroup( UnsignedLong.fromLongBits(a), UnsignedLong.valueOf(big), diff --git a/guava-tests/test/com/google/common/util/concurrent/AbstractFutureBenchmarks.java b/guava-tests/test/com/google/common/util/concurrent/AbstractFutureBenchmarks.java index 1dd4986b6a3c..81fa128002d9 100644 --- a/guava-tests/test/com/google/common/util/concurrent/AbstractFutureBenchmarks.java +++ b/guava-tests/test/com/google/common/util/concurrent/AbstractFutureBenchmarks.java @@ -395,7 +395,7 @@ private boolean complete(@Nullable V v, @Nullable Throwable t, int finalState) { this.value = v; // Don't actually construct a CancellationException until necessary. this.exception = - ((finalState & (CANCELLED | INTERRUPTED)) != 0) + (finalState & (CANCELLED | INTERRUPTED)) != 0 ? new CancellationException("Future.cancel() was called.") : t; releaseShared(finalState); 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..fbb527fc8682 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)); } @@ -486,7 +486,7 @@ private static String nameFor( "%s%s(%s)/%s->%s", method.getName(), fair ? "(fair)" : "(nonfair)", - (timeout == null) ? "untimed" : timeout, + timeout == null ? "untimed" : timeout, scenario, expectedOutcome); } @@ -510,7 +510,7 @@ public void run() { }); awaitUninterruptibly(doingCallLatch); long hangDelayMillis = - (expectedOutcome == Outcome.HANG) + expectedOutcome == Outcome.HANG ? EXPECTED_HANG_DELAY_MILLIS : UNEXPECTED_HANG_DELAY_MILLIS; boolean hung = 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/CaseFormat.java b/guava/src/com/google/common/base/CaseFormat.java index d5041f3e8b72..6a082f84e133 100644 --- a/guava/src/com/google/common/base/CaseFormat.java +++ b/guava/src/com/google/common/base/CaseFormat.java @@ -129,7 +129,7 @@ String convert(CaseFormat format, String s) { public final String to(CaseFormat format, String str) { checkNotNull(format); checkNotNull(str); - return (format == this) ? str : convert(format, str); + return format == this ? str : convert(format, str); } /** Enum values can override for performance reasons. */ @@ -149,7 +149,7 @@ String convert(CaseFormat format, String s) { out.append(format.wordSeparator); i = j + wordSeparator.length(); } - return (i == 0) + return i == 0 ? format.normalizeFirstWord(s) : requireNonNull(out).append(format.normalizeWord(s.substring(i))).toString(); } diff --git a/guava/src/com/google/common/base/Functions.java b/guava/src/com/google/common/base/Functions.java index 3120e35e0d4f..bb834e8492c1 100644 --- a/guava/src/com/google/common/base/Functions.java +++ b/guava/src/com/google/common/base/Functions.java @@ -205,7 +205,7 @@ private static final class ForMapWithDefault< public V apply(@ParametricNullness K key) { V result = map.get(key); // The unchecked cast is safe because of the containsKey check. - return (result != null || map.containsKey(key)) + return result != null || map.containsKey(key) ? uncheckedCastNullableTToT(result) : defaultValue; } @@ -384,7 +384,7 @@ public boolean equals(@Nullable Object obj) { @Override public int hashCode() { - return (value == null) ? 0 : value.hashCode(); + return value == null ? 0 : value.hashCode(); } @Override diff --git a/guava/src/com/google/common/base/Suppliers.java b/guava/src/com/google/common/base/Suppliers.java index 7426d71b01da..9afc7fc41303 100644 --- a/guava/src/com/google/common/base/Suppliers.java +++ b/guava/src/com/google/common/base/Suppliers.java @@ -319,7 +319,7 @@ public T get() { nanos = now + durationNanos; // In the very unlikely event that nanos is 0, set it to 1; // no one will notice 1 ns of tardiness. - expirationNanos = (nanos == 0) ? 1 : nanos; + expirationNanos = nanos == 0 ? 1 : nanos; return t; } } diff --git a/guava/src/com/google/common/base/Throwables.java b/guava/src/com/google/common/base/Throwables.java index f8b4ae47f00c..0ecce2619e43 100644 --- a/guava/src/com/google/common/base/Throwables.java +++ b/guava/src/com/google/common/base/Throwables.java @@ -462,7 +462,7 @@ private static Object invokeAccessibleNonThrowingMethod( */ @J2ktIncompatible @GwtIncompatible // java.lang.reflect private static final @Nullable Method getStackTraceElementMethod = - (jla == null) ? null : getGetMethod(); + jla == null ? null : getGetMethod(); /** * The "getStackTraceDepth" method, only available on some JDKs so we use reflection to find it @@ -470,7 +470,7 @@ private static Object invokeAccessibleNonThrowingMethod( */ @J2ktIncompatible @GwtIncompatible // java.lang.reflect private static final @Nullable Method getStackTraceDepthMethod = - (jla == null) ? null : getSizeMethod(jla); + jla == null ? null : getSizeMethod(jla); /** * Returns the JavaLangAccess class that is present in all Sun JDKs. It is not allowed in 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/base/internal/Finalizer.java b/guava/src/com/google/common/base/internal/Finalizer.java index 8a1a942b54ea..65279ede05b8 100644 --- a/guava/src/com/google/common/base/internal/Finalizer.java +++ b/guava/src/com/google/common/base/internal/Finalizer.java @@ -120,7 +120,7 @@ public static void startFinalizer( getBigThreadConstructor(); private static final @Nullable Field inheritableThreadLocals = - (bigThreadConstructor == null) ? getInheritableThreadLocalsField() : null; + bigThreadConstructor == null ? getInheritableThreadLocalsField() : null; /** Constructs a new finalizer thread. */ private Finalizer( diff --git a/guava/src/com/google/common/cache/AbstractCache.java b/guava/src/com/google/common/cache/AbstractCache.java index e42745122b21..206a93c764b6 100644 --- a/guava/src/com/google/common/cache/AbstractCache.java +++ b/guava/src/com/google/common/cache/AbstractCache.java @@ -265,7 +265,7 @@ public CacheStats snapshot() { /** Returns {@code value}, if non-negative. Otherwise, returns {@link Long#MAX_VALUE}. */ private static long negativeToMaxValue(long value) { - return (value >= 0) ? value : Long.MAX_VALUE; + return value >= 0 ? value : Long.MAX_VALUE; } /** Increments all counters by the values in {@code other}. */ diff --git a/guava/src/com/google/common/cache/CacheBuilderSpec.java b/guava/src/com/google/common/cache/CacheBuilderSpec.java index afcb23e36381..411c79be22ab 100644 --- a/guava/src/com/google/common/cache/CacheBuilderSpec.java +++ b/guava/src/com/google/common/cache/CacheBuilderSpec.java @@ -285,7 +285,7 @@ public boolean equals(@Nullable Object obj) { * nanos to match CacheBuilder implementation. */ private static @Nullable Long durationInNanos(long duration, @Nullable TimeUnit unit) { - return (unit == null) ? null : unit.toNanos(duration); + return unit == null ? null : unit.toNanos(duration); } /** Base class for parsing integers. */ diff --git a/guava/src/com/google/common/cache/CacheStats.java b/guava/src/com/google/common/cache/CacheStats.java index b9b5c861b51e..ad9bd3ed37e0 100644 --- a/guava/src/com/google/common/cache/CacheStats.java +++ b/guava/src/com/google/common/cache/CacheStats.java @@ -122,7 +122,7 @@ public long hitCount() { */ public double hitRate() { long requestCount = requestCount(); - return (requestCount == 0) ? 1.0 : (double) hitCount / requestCount; + return requestCount == 0 ? 1.0 : (double) hitCount / requestCount; } /** @@ -146,7 +146,7 @@ public long missCount() { */ public double missRate() { long requestCount = requestCount(); - return (requestCount == 0) ? 0.0 : (double) missCount / requestCount; + return requestCount == 0 ? 0.0 : (double) missCount / requestCount; } /** @@ -201,7 +201,7 @@ public long loadExceptionCount() { */ public double loadExceptionRate() { long totalLoadCount = saturatedAdd(loadSuccessCount, loadExceptionCount); - return (totalLoadCount == 0) ? 0.0 : (double) loadExceptionCount / totalLoadCount; + return totalLoadCount == 0 ? 0.0 : (double) loadExceptionCount / totalLoadCount; } /** @@ -224,7 +224,7 @@ public long totalLoadTime() { */ public double averageLoadPenalty() { long totalLoadCount = saturatedAdd(loadSuccessCount, loadExceptionCount); - return (totalLoadCount == 0) ? 0.0 : (double) totalLoadTime / totalLoadCount; + return totalLoadCount == 0 ? 0.0 : (double) totalLoadTime / totalLoadCount; } /** diff --git a/guava/src/com/google/common/cache/LocalCache.java b/guava/src/com/google/common/cache/LocalCache.java index b222d5b3e73e..9e35e5fdb4f3 100644 --- a/guava/src/com/google/common/cache/LocalCache.java +++ b/guava/src/com/google/common/cache/LocalCache.java @@ -261,7 +261,7 @@ final class LocalCache extends AbstractMap implements ConcurrentMap< removalListener = builder.getRemovalListener(); removalNotificationQueue = - (removalListener == NullListener.INSTANCE) + removalListener == NullListener.INSTANCE ? LocalCache.discardingQueue() : new ConcurrentLinkedQueue<>(); @@ -391,7 +391,7 @@ enum Strength { @Override ValueReference referenceValue( Segment segment, ReferenceEntry entry, V value, int weight) { - return (weight == 1) + return weight == 1 ? new StrongValueReference(value) : new WeightedStrongValueReference(value, weight); } @@ -405,7 +405,7 @@ Equivalence defaultEquivalence() { @Override ValueReference referenceValue( Segment segment, ReferenceEntry entry, V value, int weight) { - return (weight == 1) + return weight == 1 ? new SoftValueReference(segment.valueReferenceQueue, value, entry) : new WeightedSoftValueReference( segment.valueReferenceQueue, value, entry, weight); @@ -420,7 +420,7 @@ Equivalence defaultEquivalence() { @Override ValueReference referenceValue( Segment segment, ReferenceEntry entry, V value, int weight) { - return (weight == 1) + return weight == 1 ? new WeakValueReference(segment.valueReferenceQueue, value, entry) : new WeightedWeakValueReference( segment.valueReferenceQueue, value, entry, weight); @@ -592,7 +592,7 @@ ReferenceEntry copyEntry( static EntryFactory getFactory( Strength keyStrength, boolean usesAccessQueue, boolean usesWriteQueue) { int flags = - ((keyStrength == Strength.WEAK) ? WEAK_MASK : 0) + (keyStrength == Strength.WEAK ? WEAK_MASK : 0) | (usesAccessQueue ? ACCESS_MASK : 0) | (usesWriteQueue ? WRITE_MASK : 0); return factories[flags]; @@ -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); } @@ -3129,7 +3129,7 @@ boolean remove(Object key, int hash, Object value) { newCount = this.count - 1; table.set(index, newFirst); this.count = newCount; // write-volatile - return (cause == RemovalCause.EXPLICIT); + return cause == RemovalCause.EXPLICIT; } } @@ -3172,7 +3172,7 @@ boolean storeLoadedValue( ++modCount; if (oldValueReference.isActive()) { RemovalCause cause = - (entryValue == null) ? RemovalCause.COLLECTED : RemovalCause.REPLACED; + entryValue == null ? RemovalCause.COLLECTED : RemovalCause.REPLACED; enqueueNotification(key, hash, entryValue, oldValueReference.getWeight(), cause); newCount--; } @@ -3216,7 +3216,7 @@ void clear() { K key = e.getKey(); V value = e.getValueReference().get(); RemovalCause cause = - (key == null || value == null) ? RemovalCause.COLLECTED : RemovalCause.EXPLICIT; + key == null || value == null ? RemovalCause.COLLECTED : RemovalCause.EXPLICIT; enqueueNotification( key, e.getHash(), value, e.getValueReference().getWeight(), cause); } @@ -3500,7 +3500,7 @@ public LoadingValueReference() { } public LoadingValueReference(@Nullable ValueReference oldValue) { - this.oldValue = (oldValue == null) ? LocalCache.unset() : oldValue; + this.oldValue = oldValue == null ? LocalCache.unset() : oldValue; } @Override @@ -3704,7 +3704,7 @@ public boolean offer(ReferenceEntry entry) { @Override public @Nullable ReferenceEntry peek() { ReferenceEntry next = head.getNextInWriteQueue(); - return (next == head) ? null : next; + return next == head ? null : next; } @Override @@ -3773,7 +3773,7 @@ public Iterator> iterator() { @Override protected @Nullable ReferenceEntry computeNext(ReferenceEntry previous) { ReferenceEntry next = previous.getNextInWriteQueue(); - return (next == head) ? null : next; + return next == head ? null : next; } }; } @@ -3844,7 +3844,7 @@ public boolean offer(ReferenceEntry entry) { @Override public @Nullable ReferenceEntry peek() { ReferenceEntry next = head.getNextInAccessQueue(); - return (next == head) ? null : next; + return next == head ? null : next; } @Override @@ -3913,7 +3913,7 @@ public Iterator> iterator() { @Override protected @Nullable ReferenceEntry computeNext(ReferenceEntry previous) { ReferenceEntry next = previous.getNextInAccessQueue(); - return (next == head) ? null : next; + return next == head ? null : next; } }; } @@ -4003,7 +4003,7 @@ V get(K key, CacheLoader loader) throws ExecutionException { @Override public @Nullable V getOrDefault(@Nullable Object key, @Nullable V defaultValue) { V result = get(key); - return (result != null) ? result : defaultValue; + return result != null ? result : defaultValue; } V getOrLoad(K key) throws ExecutionException { @@ -4238,7 +4238,7 @@ public boolean containsValue(@Nullable Object value) { public V computeIfAbsent(K key, Function function) { checkNotNull(key); checkNotNull(function); - return compute(key, (k, oldValue) -> (oldValue == null) ? function.apply(key) : oldValue); + return compute(key, (k, oldValue) -> oldValue == null ? function.apply(key) : oldValue); } @Override @@ -4246,7 +4246,7 @@ public V computeIfAbsent(K key, Function function) { K key, BiFunction function) { checkNotNull(key); checkNotNull(function); - return compute(key, (k, oldValue) -> (oldValue == null) ? null : function.apply(k, oldValue)); + return compute(key, (k, oldValue) -> oldValue == null ? null : function.apply(k, oldValue)); } @Override @@ -4256,7 +4256,7 @@ public V computeIfAbsent(K key, Function function) { checkNotNull(newValue); checkNotNull(function); return compute( - key, (k, oldValue) -> (oldValue == null) ? newValue : function.apply(oldValue, newValue)); + key, (k, oldValue) -> oldValue == null ? newValue : function.apply(oldValue, newValue)); } @Override @@ -4327,7 +4327,7 @@ void invalidateAll(Iterable keys) { public Set keySet() { // does not impact recency ordering Set ks = keySet; - return (ks != null) ? ks : (keySet = new KeySet()); + return ks != null ? ks : (keySet = new KeySet()); } @LazyInit @RetainedWith @Nullable Collection values; @@ -4336,7 +4336,7 @@ public Set keySet() { public Collection values() { // does not impact recency ordering Collection vs = values; - return (vs != null) ? vs : (values = new Values()); + return vs != null ? vs : (values = new Values()); } @LazyInit @RetainedWith @Nullable Set> entrySet; @@ -4346,7 +4346,7 @@ public Collection values() { public Set> entrySet() { // does not impact recency ordering Set> es = entrySet; - return (es != null) ? es : (entrySet = new EntrySet()); + return es != null ? es : (entrySet = new EntrySet()); } // Iterator Support @@ -4728,7 +4728,7 @@ private ManualSerializationProxy( this.weigher = weigher; this.concurrencyLevel = concurrencyLevel; this.removalListener = removalListener; - this.ticker = (ticker == Ticker.systemTicker() || ticker == NULL_TICKER) ? null : ticker; + this.ticker = ticker == Ticker.systemTicker() || ticker == NULL_TICKER ? null : ticker; this.loader = loader; } diff --git a/guava/src/com/google/common/collect/AbstractBiMap.java b/guava/src/com/google/common/collect/AbstractBiMap.java index c9395dc79596..8a8617223754 100644 --- a/guava/src/com/google/common/collect/AbstractBiMap.java +++ b/guava/src/com/google/common/collect/AbstractBiMap.java @@ -232,7 +232,7 @@ public BiMap inverse() { @Override public Set keySet() { Set result = keySet; - return (result == null) ? keySet = new KeySet() : result; + return result == null ? keySet = new KeySet() : result; } @WeakOuter @@ -281,7 +281,7 @@ public Set values() { * iteration order so that it is consistent with the forward map. */ Set result = valueSet; - return (result == null) ? valueSet = new ValueSet() : result; + return result == null ? valueSet = new ValueSet() : result; } @WeakOuter @@ -320,7 +320,7 @@ public String toString() { @Override public Set> entrySet() { Set> result = entrySet; - return (result == null) ? entrySet = new EntrySet() : result; + return result == null ? entrySet = new EntrySet() : result; } private final class BiMapEntry extends ForwardingMapEntry { diff --git a/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java b/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java index 3e6a3b773988..fd0996e9ca60 100644 --- a/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java +++ b/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java @@ -308,7 +308,7 @@ Collection wrapCollection(@ParametricNullness K key, Collection collection final List wrapList( @ParametricNullness K key, List list, @Nullable WrappedCollection ancestor) { - return (list instanceof RandomAccess) + return list instanceof RandomAccess ? new RandomAccessWrappedList(key, list, ancestor) : new WrappedList(key, list, ancestor); } @@ -340,7 +340,7 @@ class WrappedCollection extends AbstractCollection { this.key = key; this.delegate = delegate; this.ancestor = ancestor; - this.ancestorDelegate = (ancestor == null) ? null : ancestor.getDelegate(); + this.ancestorDelegate = ancestor == null ? null : ancestor.getDelegate(); } /** @@ -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; @@ -596,7 +596,7 @@ public boolean retainAll(Collection c) { private static Iterator iteratorOrListIterator( Collection collection) { - return (collection instanceof List) + return collection instanceof List ? ((List) collection).listIterator() : collection.iterator(); } @@ -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; @@ -665,7 +665,7 @@ public SortedSet headSet(@ParametricNullness V toElement) { return new WrappedSortedSet( getKey(), getSortedSetDelegate().headSet(toElement), - (getAncestor() == null) ? this : getAncestor()); + getAncestor() == null ? this : getAncestor()); } @Override @@ -674,7 +674,7 @@ public SortedSet subSet(@ParametricNullness V fromElement, @ParametricNullnes return new WrappedSortedSet( getKey(), getSortedSetDelegate().subSet(fromElement, toElement), - (getAncestor() == null) ? this : getAncestor()); + getAncestor() == null ? this : getAncestor()); } @Override @@ -683,7 +683,7 @@ public SortedSet tailSet(@ParametricNullness V fromElement) { return new WrappedSortedSet( getKey(), getSortedSetDelegate().tailSet(fromElement), - (getAncestor() == null) ? this : getAncestor()); + getAncestor() == null ? this : getAncestor()); } } @@ -730,7 +730,7 @@ NavigableSet getSortedSetDelegate() { } private NavigableSet wrap(NavigableSet wrapped) { - return new WrappedNavigableSet(key, wrapped, (getAncestor() == null) ? this : getAncestor()); + return new WrappedNavigableSet(key, wrapped, getAncestor() == null ? this : getAncestor()); } @Override @@ -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(); } @@ -857,7 +857,7 @@ public List subList(int fromIndex, int toIndex) { return wrapList( getKey(), getListDelegate().subList(fromIndex, toIndex), - (getAncestor() == null) ? this : getAncestor()); + getAncestor() == null ? this : getAncestor()); } /** ListIterator decorator. */ @@ -1528,7 +1528,7 @@ public SortedMap> tailMap(@ParametricNullness K fromKey) { @Override public SortedSet keySet() { SortedSet result = sortedKeySet; - return (result == null) ? sortedKeySet = createKeySet() : result; + return result == null ? sortedKeySet = createKeySet() : result; } @Override @@ -1551,7 +1551,7 @@ NavigableMap> sortedMap() { @Override public @Nullable Entry> lowerEntry(@ParametricNullness K key) { Entry> entry = sortedMap().lowerEntry(key); - return (entry == null) ? null : wrapEntry(entry); + return entry == null ? null : wrapEntry(entry); } @Override @@ -1562,7 +1562,7 @@ NavigableMap> sortedMap() { @Override public @Nullable Entry> floorEntry(@ParametricNullness K key) { Entry> entry = sortedMap().floorEntry(key); - return (entry == null) ? null : wrapEntry(entry); + return entry == null ? null : wrapEntry(entry); } @Override @@ -1573,7 +1573,7 @@ NavigableMap> sortedMap() { @Override public @Nullable Entry> ceilingEntry(@ParametricNullness K key) { Entry> entry = sortedMap().ceilingEntry(key); - return (entry == null) ? null : wrapEntry(entry); + return entry == null ? null : wrapEntry(entry); } @Override @@ -1584,7 +1584,7 @@ NavigableMap> sortedMap() { @Override public @Nullable Entry> higherEntry(@ParametricNullness K key) { Entry> entry = sortedMap().higherEntry(key); - return (entry == null) ? null : wrapEntry(entry); + return entry == null ? null : wrapEntry(entry); } @Override @@ -1595,13 +1595,13 @@ NavigableMap> sortedMap() { @Override public @Nullable Entry> firstEntry() { Entry> entry = sortedMap().firstEntry(); - return (entry == null) ? null : wrapEntry(entry); + return entry == null ? null : wrapEntry(entry); } @Override public @Nullable Entry> lastEntry() { Entry> entry = sortedMap().lastEntry(); - return (entry == null) ? null : wrapEntry(entry); + return entry == null ? null : wrapEntry(entry); } @Override diff --git a/guava/src/com/google/common/collect/AbstractMapBasedMultiset.java b/guava/src/com/google/common/collect/AbstractMapBasedMultiset.java index f722b5885ac3..8310af28e33e 100644 --- a/guava/src/com/google/common/collect/AbstractMapBasedMultiset.java +++ b/guava/src/com/google/common/collect/AbstractMapBasedMultiset.java @@ -145,7 +145,7 @@ public int getCount() { return frequency.get(); } } - return (count == null) ? 0 : count.get(); + return count == null ? 0 : count.get(); } }; } @@ -250,7 +250,7 @@ public void remove() { @Override public int count(@Nullable Object element) { Count frequency = safeGet(backingMap, element); - return (frequency == null) ? 0 : frequency.get(); + return frequency == null ? 0 : frequency.get(); } // Optional Operations - Modification Operations @@ -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/AbstractMapEntry.java b/guava/src/com/google/common/collect/AbstractMapEntry.java index aa8be1e87a15..4fcb22ea803f 100644 --- a/guava/src/com/google/common/collect/AbstractMapEntry.java +++ b/guava/src/com/google/common/collect/AbstractMapEntry.java @@ -59,7 +59,7 @@ public boolean equals(@Nullable Object object) { public int hashCode() { K k = getKey(); V v = getValue(); - return ((k == null) ? 0 : k.hashCode()) ^ ((v == null) ? 0 : v.hashCode()); + return (k == null ? 0 : k.hashCode()) ^ (v == null ? 0 : v.hashCode()); } /** Returns a string representation of the form {@code {key}={value}}. */ diff --git a/guava/src/com/google/common/collect/AbstractMultimap.java b/guava/src/com/google/common/collect/AbstractMultimap.java index c361eea3b009..4db2cf8afc8e 100644 --- a/guava/src/com/google/common/collect/AbstractMultimap.java +++ b/guava/src/com/google/common/collect/AbstractMultimap.java @@ -114,7 +114,7 @@ public Collection replaceValues(@ParametricNullness K key, Iterable> entries() { Collection> result = entries; - return (result == null) ? entries = createEntries() : result; + return result == null ? entries = createEntries() : result; } abstract Collection> createEntries(); @@ -154,7 +154,7 @@ public boolean equals(@Nullable Object obj) { Spliterator> entrySpliterator() { return Spliterators.spliterator( - entryIterator(), size(), (this instanceof SetMultimap) ? Spliterator.DISTINCT : 0); + entryIterator(), size(), this instanceof SetMultimap ? Spliterator.DISTINCT : 0); } @LazyInit private transient @Nullable Set keySet; @@ -162,7 +162,7 @@ Spliterator> entrySpliterator() { @Override public Set keySet() { Set result = keySet; - return (result == null) ? keySet = createKeySet() : result; + return result == null ? keySet = createKeySet() : result; } abstract Set createKeySet(); @@ -172,7 +172,7 @@ public Set keySet() { @Override public Multiset keys() { Multiset result = keys; - return (result == null) ? keys = createKeys() : result; + return result == null ? keys = createKeys() : result; } abstract Multiset createKeys(); @@ -182,7 +182,7 @@ public Multiset keys() { @Override public Collection values() { Collection result = values; - return (result == null) ? values = createValues() : result; + return result == null ? values = createValues() : result; } abstract Collection createValues(); @@ -228,7 +228,7 @@ Spliterator valueSpliterator() { @Override public Map> asMap() { Map> result = asMap; - return (result == null) ? asMap = createAsMap() : result; + return result == null ? asMap = createAsMap() : result; } abstract Map> createAsMap(); diff --git a/guava/src/com/google/common/collect/AbstractSortedMultiset.java b/guava/src/com/google/common/collect/AbstractSortedMultiset.java index aae18799738a..1b87728ddfa8 100644 --- a/guava/src/com/google/common/collect/AbstractSortedMultiset.java +++ b/guava/src/com/google/common/collect/AbstractSortedMultiset.java @@ -122,7 +122,7 @@ Iterator descendingIterator() { @Override public SortedMultiset descendingMultiset() { SortedMultiset result = descendingMultiset; - return (result == null) ? descendingMultiset = createDescendingMultiset() : result; + return result == null ? descendingMultiset = createDescendingMultiset() : result; } SortedMultiset createDescendingMultiset() { diff --git a/guava/src/com/google/common/collect/AbstractTable.java b/guava/src/com/google/common/collect/AbstractTable.java index 211479c9f7aa..9a6da62ce146 100644 --- a/guava/src/com/google/common/collect/AbstractTable.java +++ b/guava/src/com/google/common/collect/AbstractTable.java @@ -79,7 +79,7 @@ public boolean contains(@Nullable Object rowKey, @Nullable Object columnKey) { @Override public @Nullable V get(@Nullable Object rowKey, @Nullable Object columnKey) { Map row = safeGet(rowMap(), rowKey); - return (row == null) ? null : safeGet(row, columnKey); + return row == null ? null : safeGet(row, columnKey); } @Override @@ -96,7 +96,7 @@ public void clear() { @Override public @Nullable V remove(@Nullable Object rowKey, @Nullable Object columnKey) { Map row = safeGet(rowMap(), rowKey); - return (row == null) ? null : Maps.safeRemove(row, columnKey); + return row == null ? null : Maps.safeRemove(row, columnKey); } @CanIgnoreReturnValue @@ -118,7 +118,7 @@ public void putAll(Table table) { @Override public Set> cellSet() { Set> result = cellSet; - return (result == null) ? cellSet = createCellSet() : result; + return result == null ? cellSet = createCellSet() : result; } Set> createCellSet() { @@ -181,7 +181,7 @@ public int size() { @Override public Collection values() { Collection result = values; - return (result == null) ? values = createValues() : result; + return result == null ? values = createValues() : result; } Collection createValues() { diff --git a/guava/src/com/google/common/collect/ArrayListMultimap.java b/guava/src/com/google/common/collect/ArrayListMultimap.java index 9a9cc617c6c9..624eed6ca1fb 100644 --- a/guava/src/com/google/common/collect/ArrayListMultimap.java +++ b/guava/src/com/google/common/collect/ArrayListMultimap.java @@ -124,7 +124,7 @@ private ArrayListMultimap(int expectedKeys, int expectedValuesPerKey) { private ArrayListMultimap(Multimap multimap) { this( multimap.keySet().size(), - (multimap instanceof ArrayListMultimap) + multimap instanceof ArrayListMultimap ? ((ArrayListMultimap) multimap).expectedValuesPerKey : DEFAULT_VALUES_PER_KEY); putAll(multimap); diff --git a/guava/src/com/google/common/collect/CollectCollectors.java b/guava/src/com/google/common/collect/CollectCollectors.java index a2723348606d..a5b8cfc15f87 100644 --- a/guava/src/com/google/common/collect/CollectCollectors.java +++ b/guava/src/com/google/common/collect/CollectCollectors.java @@ -336,7 +336,7 @@ EnumMapAccumulator combine(EnumMapAccumulator other) { } ImmutableMap toImmutableMap() { - return (map == null) ? ImmutableMap.of() : ImmutableEnumMap.asImmutable(map); + return map == null ? ImmutableMap.of() : ImmutableEnumMap.asImmutable(map); } } diff --git a/guava/src/com/google/common/collect/CollectSpliterators.java b/guava/src/com/google/common/collect/CollectSpliterators.java index c511022e5fd3..92d11d9f97b7 100644 --- a/guava/src/com/google/common/collect/CollectSpliterators.java +++ b/guava/src/com/google/common/collect/CollectSpliterators.java @@ -73,7 +73,7 @@ public void forEachRemaining(Consumer action) { @Override public @Nullable Spliterator trySplit() { Spliterator.OfInt split = delegate.trySplit(); - return (split == null) ? null : new WithCharacteristics(split); + return split == null ? null : new WithCharacteristics(split); } @Override @@ -127,7 +127,7 @@ public void forEachRemaining(Consumer action) { @Override public @Nullable Spliterator trySplit() { Spliterator fromSplit = fromSpliterator.trySplit(); - return (fromSplit != null) ? map(fromSplit, function) : null; + return fromSplit != null ? map(fromSplit, function) : null; } @Override @@ -176,7 +176,7 @@ public boolean tryAdvance(Consumer action) { @Override public @Nullable Spliterator trySplit() { Spliterator fromSplit = fromSpliterator.trySplit(); - return (fromSplit == null) ? null : filter(fromSplit, predicate); + return fromSplit == null ? null : filter(fromSplit, predicate); } @Override diff --git a/guava/src/com/google/common/collect/CompactHashMap.java b/guava/src/com/google/common/collect/CompactHashMap.java index a1cbd1489b56..0ca518a1d9e5 100644 --- a/guava/src/com/google/common/collect/CompactHashMap.java +++ b/guava/src/com/google/common/collect/CompactHashMap.java @@ -502,7 +502,7 @@ private int indexOf(@Nullable Object key) { @Override public boolean containsKey(@Nullable Object key) { Map delegate = delegateOrNull(); - return (delegate != null) ? delegate.containsKey(key) : indexOf(key) != -1; + return delegate != null ? delegate.containsKey(key) : indexOf(key) != -1; } @Override @@ -528,7 +528,7 @@ public boolean containsKey(@Nullable Object key) { return delegate.remove(key); } Object oldValue = removeHelper(key); - return (oldValue == NOT_FOUND) ? null : (V) oldValue; + return oldValue == NOT_FOUND ? null : (V) oldValue; } private @Nullable Object removeHelper(@Nullable Object key) { @@ -610,7 +610,7 @@ int firstEntryIndex() { } int getSuccessor(int entryIndex) { - return (entryIndex + 1 < size) ? entryIndex + 1 : -1; + return entryIndex + 1 < size ? entryIndex + 1 : -1; } /** @@ -686,7 +686,7 @@ public void replaceAll(BiFunction function) { @Override public Set keySet() { - return (keySetView == null) ? keySetView = createKeySet() : keySetView; + return keySetView == null ? keySetView = createKeySet() : keySetView; } Set createKeySet() { @@ -705,7 +705,7 @@ class KeySetView extends Maps.KeySet { return new Object[0]; } Map delegate = delegateOrNull(); - return (delegate != null) + return delegate != null ? delegate.keySet().toArray() : ObjectArrays.copyAsObjectArray(requireKeys(), 0, size); } @@ -721,7 +721,7 @@ class KeySetView extends Maps.KeySet { return a; } Map delegate = delegateOrNull(); - return (delegate != null) + return delegate != null ? delegate.keySet().toArray(a) : ObjectArrays.toArrayImpl(requireKeys(), 0, size, a); } @@ -729,7 +729,7 @@ class KeySetView extends Maps.KeySet { @Override public boolean remove(@Nullable Object o) { Map delegate = delegateOrNull(); - return (delegate != null) + return delegate != null ? delegate.keySet().remove(o) : CompactHashMap.this.removeHelper(o) != NOT_FOUND; } @@ -745,7 +745,7 @@ public Spliterator spliterator() { return Spliterators.spliterator(new Object[0], Spliterator.DISTINCT | Spliterator.ORDERED); } Map delegate = delegateOrNull(); - return (delegate != null) + return delegate != null ? delegate.keySet().spliterator() : Spliterators.spliterator( requireKeys(), 0, size, Spliterator.DISTINCT | Spliterator.ORDERED); @@ -796,7 +796,7 @@ public void forEach(BiConsumer action) { @Override public Set> entrySet() { - return (entrySetView == null) ? entrySetView = createEntrySet() : entrySetView; + return entrySetView == null ? entrySetView = createEntrySet() : entrySetView; } Set> createEntrySet() { @@ -818,7 +818,7 @@ public Iterator> iterator() { @Override public Spliterator> spliterator() { Map delegate = delegateOrNull(); - return (delegate != null) + return delegate != null ? delegate.entrySet().spliterator() : CollectSpliterators.indexed( size, Spliterator.DISTINCT | Spliterator.ORDERED, MapEntry::new); @@ -928,7 +928,7 @@ public V getValue() { * permits us to throw IllegalStateException. Maybe we should have done that, but we probably * shouldn't change now for fear of breaking people.) */ - return (lastKnownIndex == -1) ? unsafeNull() : value(lastKnownIndex); + return lastKnownIndex == -1 ? unsafeNull() : value(lastKnownIndex); } @Override @@ -953,7 +953,7 @@ public V setValue(@ParametricNullness V value) { @Override public int size() { Map delegate = delegateOrNull(); - return (delegate != null) ? delegate.size() : size; + return delegate != null ? delegate.size() : size; } @Override @@ -979,7 +979,7 @@ public boolean containsValue(@Nullable Object value) { @Override public Collection values() { - return (valuesView == null) ? valuesView = createValues() : valuesView; + return valuesView == null ? valuesView = createValues() : valuesView; } Collection createValues() { @@ -1016,7 +1016,7 @@ public Spliterator spliterator() { return Spliterators.spliterator(new Object[0], Spliterator.ORDERED); } Map delegate = delegateOrNull(); - return (delegate != null) + return delegate != null ? delegate.values().spliterator() : Spliterators.spliterator(requireValues(), 0, size, Spliterator.ORDERED); } @@ -1027,7 +1027,7 @@ public Spliterator spliterator() { return new Object[0]; } Map delegate = delegateOrNull(); - return (delegate != null) + return delegate != null ? delegate.values().toArray() : ObjectArrays.copyAsObjectArray(requireValues(), 0, size); } @@ -1043,7 +1043,7 @@ public Spliterator spliterator() { return a; } Map delegate = delegateOrNull(); - return (delegate != null) + return delegate != null ? delegate.values().toArray(a) : ObjectArrays.toArrayImpl(requireValues(), 0, size, a); } diff --git a/guava/src/com/google/common/collect/CompactHashSet.java b/guava/src/com/google/common/collect/CompactHashSet.java index 7f0a7e6edeb7..44a914d75cd5 100644 --- a/guava/src/com/google/common/collect/CompactHashSet.java +++ b/guava/src/com/google/common/collect/CompactHashSet.java @@ -524,7 +524,7 @@ int firstEntryIndex() { } int getSuccessor(int entryIndex) { - return (entryIndex + 1 < size) ? entryIndex + 1 : -1; + return entryIndex + 1 < size ? entryIndex + 1 : -1; } /** @@ -593,7 +593,7 @@ public Spliterator spliterator() { return Spliterators.spliterator(new Object[0], Spliterator.DISTINCT | Spliterator.ORDERED); } Set delegate = delegateOrNull(); - return (delegate != null) + return delegate != null ? delegate.spliterator() : Spliterators.spliterator( requireElements(), 0, size, Spliterator.DISTINCT | Spliterator.ORDERED); @@ -615,7 +615,7 @@ public void forEach(Consumer action) { @Override public int size() { Set delegate = delegateOrNull(); - return (delegate != null) ? delegate.size() : size; + return delegate != null ? delegate.size() : size; } @Override @@ -629,7 +629,7 @@ public boolean isEmpty() { return new Object[0]; } Set delegate = delegateOrNull(); - return (delegate != null) ? delegate.toArray() : Arrays.copyOf(requireElements(), size); + return delegate != null ? delegate.toArray() : Arrays.copyOf(requireElements(), size); } @CanIgnoreReturnValue @@ -643,7 +643,7 @@ public boolean isEmpty() { return a; } Set delegate = delegateOrNull(); - return (delegate != null) + return delegate != null ? delegate.toArray(a) : ObjectArrays.toArrayImpl(requireElements(), 0, size, a); } diff --git a/guava/src/com/google/common/collect/CompactHashing.java b/guava/src/com/google/common/collect/CompactHashing.java index 7c9320a022fd..85c3b9f57ee3 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; @@ -138,7 +138,7 @@ static void tableSet(Object table, int index, int entry) { * current hashtable size. */ static int newCapacity(int mask) { - return ((mask < 32) ? 4 : 2) * (mask + 1); + return (mask < 32 ? 4 : 2) * (mask + 1); } /** Returns the hash prefix given the current mask. */ diff --git a/guava/src/com/google/common/collect/CompactLinkedHashMap.java b/guava/src/com/google/common/collect/CompactLinkedHashMap.java index 895e4902f664..f09f746a7cd4 100644 --- a/guava/src/com/google/common/collect/CompactLinkedHashMap.java +++ b/guava/src/com/google/common/collect/CompactLinkedHashMap.java @@ -224,7 +224,7 @@ int firstEntryIndex() { @Override int adjustAfterRemove(int indexBeforeRemove, int indexRemoved) { - return (indexBeforeRemove >= size()) ? indexRemoved : indexBeforeRemove; + return indexBeforeRemove >= size() ? indexRemoved : indexBeforeRemove; } @Override diff --git a/guava/src/com/google/common/collect/CompactLinkedHashSet.java b/guava/src/com/google/common/collect/CompactLinkedHashSet.java index 2c4874a2305b..30eb93195107 100644 --- a/guava/src/com/google/common/collect/CompactLinkedHashSet.java +++ b/guava/src/com/google/common/collect/CompactLinkedHashSet.java @@ -225,7 +225,7 @@ int firstEntryIndex() { @Override int adjustAfterRemove(int indexBeforeRemove, int indexRemoved) { - return (indexBeforeRemove >= size()) ? indexRemoved : indexBeforeRemove; + return indexBeforeRemove >= size() ? indexRemoved : indexBeforeRemove; } @Override diff --git a/guava/src/com/google/common/collect/ConcurrentHashMultiset.java b/guava/src/com/google/common/collect/ConcurrentHashMultiset.java index ac1d0e66f8ed..2c737d3981c8 100644 --- a/guava/src/com/google/common/collect/ConcurrentHashMultiset.java +++ b/guava/src/com/google/common/collect/ConcurrentHashMultiset.java @@ -142,7 +142,7 @@ public static ConcurrentHashMultiset create(ConcurrentMap> canonical(DiscreteDomain> domain) { @Override public int compareTo(Cut> o) { - return (o == this) ? 0 : -1; + return o == this ? 0 : -1; } @Override @@ -286,7 +286,7 @@ Comparable greatestValueBelow(DiscreteDomain> domain) { @Override public int compareTo(Cut> o) { - return (o == this) ? 0 : 1; + return o == this ? 0 : 1; } @Override @@ -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/DescendingMultiset.java b/guava/src/com/google/common/collect/DescendingMultiset.java index a4d98f1cd36e..dc4a0f592313 100644 --- a/guava/src/com/google/common/collect/DescendingMultiset.java +++ b/guava/src/com/google/common/collect/DescendingMultiset.java @@ -116,7 +116,7 @@ public SortedMultiset descendingMultiset() { @Override public Set> entrySet() { Set> result = entrySet; - return (result == null) ? entrySet = createEntrySet() : result; + return result == null ? entrySet = createEntrySet() : result; } Set> createEntrySet() { diff --git a/guava/src/com/google/common/collect/DiscreteDomain.java b/guava/src/com/google/common/collect/DiscreteDomain.java index 13e7be404726..8a0fdc395b0f 100644 --- a/guava/src/com/google/common/collect/DiscreteDomain.java +++ b/guava/src/com/google/common/collect/DiscreteDomain.java @@ -71,13 +71,13 @@ private static final class IntegerDomain extends DiscreteDomain impleme @Override public @Nullable Integer next(Integer value) { int i = value; - return (i == Integer.MAX_VALUE) ? null : i + 1; + return i == Integer.MAX_VALUE ? null : i + 1; } @Override public @Nullable Integer previous(Integer value) { int i = value; - return (i == Integer.MIN_VALUE) ? null : i - 1; + return i == Integer.MIN_VALUE ? null : i - 1; } @Override @@ -135,13 +135,13 @@ private static final class LongDomain extends DiscreteDomain implements Se @Override public @Nullable Long next(Long value) { long l = value; - return (l == Long.MAX_VALUE) ? null : l + 1; + return l == Long.MAX_VALUE ? null : l + 1; } @Override public @Nullable Long previous(Long value) { long l = value; - return (l == Long.MIN_VALUE) ? null : l - 1; + return l == Long.MIN_VALUE ? null : l - 1; } @Override diff --git a/guava/src/com/google/common/collect/FilteredEntryMultimap.java b/guava/src/com/google/common/collect/FilteredEntryMultimap.java index ba478b518b2a..563724b32035 100644 --- a/guava/src/com/google/common/collect/FilteredEntryMultimap.java +++ b/guava/src/com/google/common/collect/FilteredEntryMultimap.java @@ -111,7 +111,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) + return unfiltered instanceof SetMultimap ? Collections.emptySet() : Collections.emptyList(); } diff --git a/guava/src/com/google/common/collect/ForwardingMapEntry.java b/guava/src/com/google/common/collect/ForwardingMapEntry.java index 660da5f7bbe0..99f85fe8d91c 100644 --- a/guava/src/com/google/common/collect/ForwardingMapEntry.java +++ b/guava/src/com/google/common/collect/ForwardingMapEntry.java @@ -112,7 +112,7 @@ protected boolean standardEquals(@Nullable Object object) { protected int standardHashCode() { K k = getKey(); V v = getValue(); - return ((k == null) ? 0 : k.hashCode()) ^ ((v == null) ? 0 : v.hashCode()); + return (k == null ? 0 : k.hashCode()) ^ (v == null ? 0 : v.hashCode()); } /** diff --git a/guava/src/com/google/common/collect/HashBiMap.java b/guava/src/com/google/common/collect/HashBiMap.java index 620bdbfbb68b..9a5da6d4f0d8 100644 --- a/guava/src/com/google/common/collect/HashBiMap.java +++ b/guava/src/com/google/common/collect/HashBiMap.java @@ -592,7 +592,7 @@ public void replaceAll(BiFunction function) { @Override public BiMap inverse() { BiMap result = inverse; - return (result == null) ? inverse = new Inverse() : result; + return result == null ? inverse = new Inverse() : result; } private final class Inverse extends IteratorBasedAbstractMap diff --git a/guava/src/com/google/common/collect/Hashing.java b/guava/src/com/google/common/collect/Hashing.java index 1ea3af1c91d8..0f7781462cca 100644 --- a/guava/src/com/google/common/collect/Hashing.java +++ b/guava/src/com/google/common/collect/Hashing.java @@ -53,7 +53,7 @@ static int smear(int hashCode) { } static int smearedHash(@Nullable Object o) { - return smear((o == null) ? 0 : o.hashCode()); + return smear(o == null ? 0 : o.hashCode()); } private static final int MAX_TABLE_SIZE = Ints.MAX_POWER_OF_TWO; @@ -66,7 +66,7 @@ static int closedTableSize(int expectedEntries, double loadFactor) { // Check to make sure that we will not exceed the maximum load factor. if (expectedEntries > (int) (loadFactor * tableSize)) { tableSize <<= 1; - return (tableSize > 0) ? tableSize : MAX_TABLE_SIZE; + return tableSize > 0 ? tableSize : MAX_TABLE_SIZE; } return tableSize; } diff --git a/guava/src/com/google/common/collect/ImmutableEnumSet.java b/guava/src/com/google/common/collect/ImmutableEnumSet.java index ac671b9545ae..2db14d809038 100644 --- a/guava/src/com/google/common/collect/ImmutableEnumSet.java +++ b/guava/src/com/google/common/collect/ImmutableEnumSet.java @@ -128,7 +128,7 @@ boolean isHashCodeFast() { @Override public int hashCode() { int result = hashCode; - return (result == 0) ? hashCode = delegate.hashCode() : result; + return result == 0 ? hashCode = delegate.hashCode() : result; } @Override diff --git a/guava/src/com/google/common/collect/ImmutableRangeSet.java b/guava/src/com/google/common/collect/ImmutableRangeSet.java index 2a3e1a0cd909..a92601b47ee9 100644 --- a/guava/src/com/google/common/collect/ImmutableRangeSet.java +++ b/guava/src/com/google/common/collect/ImmutableRangeSet.java @@ -358,7 +358,7 @@ 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; } diff --git a/guava/src/com/google/common/collect/ImmutableSortedAsList.java b/guava/src/com/google/common/collect/ImmutableSortedAsList.java index dd1b4b35a69a..6583342750d0 100644 --- a/guava/src/com/google/common/collect/ImmutableSortedAsList.java +++ b/guava/src/com/google/common/collect/ImmutableSortedAsList.java @@ -58,7 +58,7 @@ public int indexOf(@Nullable Object target) { // The equals() check is needed when the comparator isn't compatible with // equals(). - return (index >= 0 && get(index).equals(target)) ? index : -1; + return index >= 0 && get(index).equals(target) ? index : -1; } @GwtIncompatible // ImmutableSortedSet.indexOf diff --git a/guava/src/com/google/common/collect/JdkBackedImmutableMultiset.java b/guava/src/com/google/common/collect/JdkBackedImmutableMultiset.java index 4f9f9619e453..ac876a5bb20c 100644 --- a/guava/src/com/google/common/collect/JdkBackedImmutableMultiset.java +++ b/guava/src/com/google/common/collect/JdkBackedImmutableMultiset.java @@ -73,7 +73,7 @@ public int count(@Nullable Object element) { @Override public ImmutableSet elementSet() { ImmutableSet result = elementSet; - return (result == null) ? elementSet = new ElementSet<>(entries, this) : result; + return result == null ? elementSet = new ElementSet<>(entries, this) : result; } @Override diff --git a/guava/src/com/google/common/collect/MapMakerInternalMap.java b/guava/src/com/google/common/collect/MapMakerInternalMap.java index d91c992c5c2b..fa45e3a81b16 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); } @@ -2498,7 +2498,7 @@ public void clear() { @Override public Set keySet() { Set ks = keySet; - return (ks != null) ? ks : (keySet = new KeySet()); + return ks != null ? ks : (keySet = new KeySet()); } @LazyInit transient @Nullable Collection values; @@ -2506,7 +2506,7 @@ public Set keySet() { @Override public Collection values() { Collection vs = values; - return (vs != null) ? vs : (values = new Values()); + return vs != null ? vs : (values = new Values()); } @LazyInit transient @Nullable Set> entrySet; @@ -2514,7 +2514,7 @@ public Collection values() { @Override public Set> entrySet() { Set> es = entrySet; - return (es != null) ? es : (entrySet = new EntrySet()); + return es != null ? es : (entrySet = new EntrySet()); } // Iterator Support diff --git a/guava/src/com/google/common/collect/MoreCollectors.java b/guava/src/com/google/common/collect/MoreCollectors.java index bd859a2c207f..472a22ad50a9 100644 --- a/guava/src/com/google/common/collect/MoreCollectors.java +++ b/guava/src/com/google/common/collect/MoreCollectors.java @@ -67,11 +67,11 @@ public final class MoreCollectors { private static final Collector<@Nullable Object, ?, @Nullable Object> ONLY_ELEMENT = Collector.<@Nullable Object, ToOptionalState, @Nullable Object>of( ToOptionalState::new, - (state, o) -> state.add((o == null) ? NULL_PLACEHOLDER : o), + (state, o) -> state.add(o == null ? NULL_PLACEHOLDER : o), ToOptionalState::combine, state -> { Object result = state.getElement(); - return (result == NULL_PLACEHOLDER) ? null : result; + return result == NULL_PLACEHOLDER ? null : result; }, Collector.Characteristics.UNORDERED); diff --git a/guava/src/com/google/common/collect/Range.java b/guava/src/com/google/common/collect/Range.java index 81039551f922..197ffd4edbc9 100644 --- a/guava/src/com/google/common/collect/Range.java +++ b/guava/src/com/google/common/collect/Range.java @@ -196,9 +196,9 @@ public static > Range range( checkNotNull(upperType); Cut lowerBound = - (lowerType == BoundType.OPEN) ? Cut.aboveValue(lower) : Cut.belowValue(lower); + lowerType == BoundType.OPEN ? Cut.aboveValue(lower) : Cut.belowValue(lower); Cut upperBound = - (upperType == BoundType.OPEN) ? Cut.belowValue(upper) : Cut.aboveValue(upper); + upperType == BoundType.OPEN ? Cut.belowValue(upper) : Cut.aboveValue(upper); return create(lowerBound, upperBound); } @@ -541,8 +541,8 @@ public Range intersection(Range connectedRange) { } else if (lowerCmp <= 0 && upperCmp >= 0) { return connectedRange; } else { - Cut newLower = (lowerCmp >= 0) ? lowerBound : connectedRange.lowerBound; - Cut newUpper = (upperCmp <= 0) ? upperBound : connectedRange.upperBound; + Cut newLower = lowerCmp >= 0 ? lowerBound : connectedRange.lowerBound; + Cut newUpper = upperCmp <= 0 ? upperBound : connectedRange.upperBound; // create() would catch this, but give a confusing error message checkArgument( @@ -615,8 +615,8 @@ public Range span(Range other) { } else if (lowerCmp >= 0 && upperCmp <= 0) { return other; } else { - Cut newLower = (lowerCmp <= 0) ? lowerBound : other.lowerBound; - Cut newUpper = (upperCmp >= 0) ? upperBound : other.upperBound; + Cut newLower = lowerCmp <= 0 ? lowerBound : other.lowerBound; + Cut newUpper = upperCmp >= 0 ? upperBound : other.upperBound; return create(newLower, newUpper); } } @@ -649,7 +649,7 @@ public Range canonical(DiscreteDomain domain) { checkNotNull(domain); Cut lower = lowerBound.canonical(domain); Cut upper = upperBound.canonical(domain); - return (lower == lowerBound && upper == upperBound) ? this : create(lower, upper); + return lower == lowerBound && upper == upperBound ? this : create(lower, upper); } /** diff --git a/guava/src/com/google/common/collect/RegularContiguousSet.java b/guava/src/com/google/common/collect/RegularContiguousSet.java index 2d25773825e8..f64688ff705f 100644 --- a/guava/src/com/google/common/collect/RegularContiguousSet.java +++ b/guava/src/com/google/common/collect/RegularContiguousSet.java @@ -165,7 +165,7 @@ Object writeReplace() { @Override public int size() { long distance = domain.distance(first(), last()); - return (distance >= Integer.MAX_VALUE) ? Integer.MAX_VALUE : (int) distance + 1; + return distance >= Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) distance + 1; } @Override @@ -202,7 +202,7 @@ public ContiguousSet intersection(ContiguousSet other) { } else { C lowerEndpoint = Ordering.natural().max(this.first(), other.first()); C upperEndpoint = Ordering.natural().min(this.last(), other.last()); - return (lowerEndpoint.compareTo(upperEndpoint) <= 0) + return lowerEndpoint.compareTo(upperEndpoint) <= 0 ? ContiguousSet.create(Range.closed(lowerEndpoint, upperEndpoint), domain) : new EmptyContiguousSet(domain); } diff --git a/guava/src/com/google/common/collect/RegularImmutableBiMap.java b/guava/src/com/google/common/collect/RegularImmutableBiMap.java index c1911d052dfa..13f9907bcabe 100644 --- a/guava/src/com/google/common/collect/RegularImmutableBiMap.java +++ b/guava/src/com/google/common/collect/RegularImmutableBiMap.java @@ -78,7 +78,7 @@ static ImmutableBiMap fromEntryArray(int n, @Nullable Entry[] */ @SuppressWarnings("nullness") Entry[] entries = - (n == entryArray.length) ? (Entry[]) entryArray : createEntryArray(n); + n == entryArray.length ? (Entry[]) entryArray : createEntryArray(n); int hashCode = 0; for (int i = 0; i < n; i++) { @@ -101,7 +101,7 @@ static ImmutableBiMap fromEntryArray(int n, @Nullable Entry[] return JdkBackedImmutableBiMap.create(n, entryArray); } ImmutableMapEntry newEntry = - (nextInValueBucket == null && nextInKeyBucket == null) + nextInValueBucket == null && nextInKeyBucket == null ? RegularImmutableMap.makeImmutable(entry, key, value) : new NonTerminalImmutableBiMapEntry<>( key, value, nextInKeyBucket, nextInValueBucket); @@ -198,7 +198,7 @@ public ImmutableBiMap inverse() { return ImmutableBiMap.of(); } ImmutableBiMap result = inverse; - return (result == null) ? inverse = new Inverse() : result; + return result == null ? inverse = new Inverse() : result; } private final class Inverse extends ImmutableBiMap { diff --git a/guava/src/com/google/common/collect/RegularImmutableMap.java b/guava/src/com/google/common/collect/RegularImmutableMap.java index 5e7ea3871b5f..bb559f923ed4 100644 --- a/guava/src/com/google/common/collect/RegularImmutableMap.java +++ b/guava/src/com/google/common/collect/RegularImmutableMap.java @@ -111,7 +111,7 @@ private static ImmutableMap fromEntryArrayCheckingBucketOverflow( */ @SuppressWarnings("nullness") Entry[] entries = - (n == entryArray.length) ? (Entry[]) entryArray : createEntryArray(n); + n == entryArray.length ? (Entry[]) entryArray : createEntryArray(n); int tableSize = Hashing.closedTableSize(n, MAX_LOAD_FACTOR); @Nullable ImmutableMapEntry[] table = createEntryArray(tableSize); int mask = tableSize - 1; @@ -135,7 +135,7 @@ private static ImmutableMap fromEntryArrayCheckingBucketOverflow( if (effectiveEntry == null) { // prepend, not append, so the entries can be immutable effectiveEntry = - (keyBucketHead == null) + keyBucketHead == null ? makeImmutable(entry, key, value) : new NonTerminalImmutableMapEntry(key, value, keyBucketHead); table[tableIndex] = effectiveEntry; diff --git a/guava/src/com/google/common/collect/RegularImmutableMultiset.java b/guava/src/com/google/common/collect/RegularImmutableMultiset.java index 70a3d2ea9586..71bb6fabc483 100644 --- a/guava/src/com/google/common/collect/RegularImmutableMultiset.java +++ b/guava/src/com/google/common/collect/RegularImmutableMultiset.java @@ -181,7 +181,7 @@ public int size() { @Override public ImmutableSet elementSet() { ImmutableSet result = elementSet; - return (result == null) ? elementSet = new ElementSet<>(Arrays.asList(entries), this) : result; + return result == null ? elementSet = new ElementSet<>(Arrays.asList(entries), this) : result; } @Override diff --git a/guava/src/com/google/common/collect/RegularImmutableSet.java b/guava/src/com/google/common/collect/RegularImmutableSet.java index 49c911575458..1f6cd2e9f6a8 100644 --- a/guava/src/com/google/common/collect/RegularImmutableSet.java +++ b/guava/src/com/google/common/collect/RegularImmutableSet.java @@ -110,7 +110,7 @@ int copyIntoArray(@Nullable Object[] dst, int offset) { @Override ImmutableList createAsList() { - return (table.length == 0) + return table.length == 0 ? ImmutableList.of() : new RegularImmutableAsList(this, elements); } diff --git a/guava/src/com/google/common/collect/RegularImmutableSortedMultiset.java b/guava/src/com/google/common/collect/RegularImmutableSortedMultiset.java index 7b381b889aa7..6d8024b1553d 100644 --- a/guava/src/com/google/common/collect/RegularImmutableSortedMultiset.java +++ b/guava/src/com/google/common/collect/RegularImmutableSortedMultiset.java @@ -89,7 +89,7 @@ public void forEachEntry(ObjIntConsumer action) { @Override public int count(@Nullable Object element) { int index = elementSet.indexOf(element); - return (index >= 0) ? getCount(index) : 0; + return index >= 0 ? getCount(index) : 0; } @Override diff --git a/guava/src/com/google/common/collect/RegularImmutableSortedSet.java b/guava/src/com/google/common/collect/RegularImmutableSortedSet.java index 1f65e563bebb..30931ec4b549 100644 --- a/guava/src/com/google/common/collect/RegularImmutableSortedSet.java +++ b/guava/src/com/google/common/collect/RegularImmutableSortedSet.java @@ -223,25 +223,25 @@ public E last() { @Override public @Nullable E lower(E element) { int index = headIndex(element, false) - 1; - return (index == -1) ? null : elements.get(index); + return index == -1 ? null : elements.get(index); } @Override public @Nullable E floor(E element) { int index = headIndex(element, true) - 1; - return (index == -1) ? null : elements.get(index); + return index == -1 ? null : elements.get(index); } @Override public @Nullable E ceiling(E element) { int index = tailIndex(element, true); - return (index == size()) ? null : elements.get(index); + return index == size() ? null : elements.get(index); } @Override public @Nullable E higher(E element) { int index = tailIndex(element, false); - return (index == size()) ? null : elements.get(index); + return index == size() ? null : elements.get(index); } @Override @@ -308,12 +308,12 @@ int indexOf(@Nullable Object target) { } catch (ClassCastException e) { return -1; } - return (position >= 0) ? position : -1; + return position >= 0 ? position : -1; } @Override ImmutableList createAsList() { - return (size() <= 1) ? elements : new ImmutableSortedAsList(this, elements); + return size() <= 1 ? elements : new ImmutableSortedAsList(this, elements); } @Override diff --git a/guava/src/com/google/common/collect/RegularImmutableTable.java b/guava/src/com/google/common/collect/RegularImmutableTable.java index fba4256396c5..4072b7df2484 100644 --- a/guava/src/com/google/common/collect/RegularImmutableTable.java +++ b/guava/src/com/google/common/collect/RegularImmutableTable.java @@ -131,13 +131,13 @@ static RegularImmutableTable forCells( Comparator> comparator = (Cell cell1, Cell cell2) -> { int rowCompare = - (rowComparator == null) + rowComparator == null ? 0 : rowComparator.compare(cell1.getRowKey(), cell2.getRowKey()); if (rowCompare != 0) { return rowCompare; } - return (columnComparator == null) + return columnComparator == null ? 0 : columnComparator.compare(cell1.getColumnKey(), cell2.getColumnKey()); }; @@ -163,11 +163,11 @@ private static RegularImmutableTable forCellsInternal( } ImmutableSet rowSpace = - (rowComparator == null) + rowComparator == null ? ImmutableSet.copyOf(rowSpaceBuilder) : ImmutableSet.copyOf(ImmutableList.sortedCopyOf(rowComparator, rowSpaceBuilder)); ImmutableSet columnSpace = - (columnComparator == null) + columnComparator == null ? ImmutableSet.copyOf(columnSpaceBuilder) : ImmutableSet.copyOf(ImmutableList.sortedCopyOf(columnComparator, columnSpaceBuilder)); @@ -181,7 +181,7 @@ static RegularImmutableTable forOrderedComponents( ImmutableSet columnSpace) { // use a dense table if more than half of the cells have values // TODO(gak): tune this condition based on empirical evidence - return (cellList.size() > (((long) rowSpace.size() * columnSpace.size()) / 2)) + return cellList.size() > (((long) rowSpace.size() * columnSpace.size()) / 2) ? new DenseImmutableTable(cellList, rowSpace, columnSpace) : new SparseImmutableTable(cellList, rowSpace, columnSpace); } diff --git a/guava/src/com/google/common/collect/SingletonImmutableList.java b/guava/src/com/google/common/collect/SingletonImmutableList.java index c08d59af724c..339d62e8f2ba 100644 --- a/guava/src/com/google/common/collect/SingletonImmutableList.java +++ b/guava/src/com/google/common/collect/SingletonImmutableList.java @@ -65,7 +65,7 @@ public int size() { @Override public ImmutableList subList(int fromIndex, int toIndex) { Preconditions.checkPositionIndexes(fromIndex, toIndex, 1); - return (fromIndex == toIndex) ? ImmutableList.of() : this; + return fromIndex == toIndex ? ImmutableList.of() : this; } @Override diff --git a/guava/src/com/google/common/collect/SortedMultisets.java b/guava/src/com/google/common/collect/SortedMultisets.java index 2b4aee3c39c1..807f629fd2d2 100644 --- a/guava/src/com/google/common/collect/SortedMultisets.java +++ b/guava/src/com/google/common/collect/SortedMultisets.java @@ -175,6 +175,6 @@ public NavigableSet tailSet(@ParametricNullness E fromElement, boolean inclus private static @Nullable E getElementOrNull( @Nullable Entry entry) { - return (entry == null) ? null : entry.getElement(); + return entry == null ? null : entry.getElement(); } } diff --git a/guava/src/com/google/common/collect/StandardTable.java b/guava/src/com/google/common/collect/StandardTable.java index 7fb95348c447..70b146b07fc6 100644 --- a/guava/src/com/google/common/collect/StandardTable.java +++ b/guava/src/com/google/common/collect/StandardTable.java @@ -113,7 +113,7 @@ public boolean containsValue(@Nullable Object value) { @Override public @Nullable V get(@Nullable Object rowKey, @Nullable Object columnKey) { - return (rowKey == null || columnKey == null) ? null : super.get(rowKey, columnKey); + return rowKey == null || columnKey == null ? null : super.get(rowKey, columnKey); } @Override @@ -351,7 +351,7 @@ public boolean containsKey(@Nullable Object key) { @Override public @Nullable V get(@Nullable Object key) { updateBackingRowMapField(); - return (key != null && backingRowMap != null) ? safeGet(backingRowMap, key) : null; + return key != null && backingRowMap != null ? safeGet(backingRowMap, key) : null; } @Override @@ -387,7 +387,7 @@ public void clear() { @Override public int size() { updateBackingRowMapField(); - return (backingRowMap == null) ? 0 : backingRowMap.size(); + return backingRowMap == null ? 0 : backingRowMap.size(); } @Override @@ -680,7 +680,7 @@ public Set rowKeySet() { @Override public Set columnKeySet() { Set result = columnKeySet; - return (result == null) ? columnKeySet = new ColumnKeySet() : result; + return result == null ? columnKeySet = new ColumnKeySet() : result; } @WeakOuter @@ -802,7 +802,7 @@ public Collection values() { @Override public Map> rowMap() { Map> result = rowMap; - return (result == null) ? rowMap = createRowMap() : result; + return result == null ? rowMap = createRowMap() : result; } Map> createRowMap() { @@ -826,7 +826,7 @@ public boolean containsKey(@Nullable Object key) { @Override public @Nullable Map remove(@Nullable Object key) { - return (key == null) ? null : backingMap.remove(key); + return key == null ? null : backingMap.remove(key); } @Override @@ -875,7 +875,7 @@ public boolean remove(@Nullable Object obj) { @Override public Map> columnMap() { ColumnMap result = columnMap; - return (result == null) ? columnMap = new ColumnMap() : result; + return result == null ? columnMap = new ColumnMap() : result; } @WeakOuter diff --git a/guava/src/com/google/common/collect/Synchronized.java b/guava/src/com/google/common/collect/Synchronized.java index dc81e04262ef..5befa1d8da7c 100644 --- a/guava/src/com/google/common/collect/Synchronized.java +++ b/guava/src/com/google/common/collect/Synchronized.java @@ -84,7 +84,7 @@ private static class SynchronizedObject implements Serializable { SynchronizedObject(Object delegate, @Nullable Object mutex) { this.delegate = checkNotNull(delegate); - this.mutex = (mutex == null) ? this : mutex; + this.mutex = mutex == null ? this : mutex; } Object delegate() { @@ -361,7 +361,7 @@ public E last() { } private static List list(List list, @Nullable Object mutex) { - return (list instanceof RandomAccess) + return list instanceof RandomAccess ? new SynchronizedRandomAccessList(list, mutex) : new SynchronizedList(list, mutex); } @@ -1404,7 +1404,7 @@ static final class SynchronizedAsMap get(@Nullable Object key) { synchronized (mutex) { Collection collection = super.get(key); - return (collection == null) ? null : typePreservingCollection(collection, mutex); + return collection == null ? null : typePreservingCollection(collection, mutex); } } @@ -1840,7 +1840,7 @@ public V setValue(V value) { } static Queue queue(Queue queue, @Nullable Object mutex) { - return (queue instanceof SynchronizedQueue) ? queue : new SynchronizedQueue(queue, mutex); + return queue instanceof SynchronizedQueue ? queue : new SynchronizedQueue(queue, mutex); } private static class SynchronizedQueue diff --git a/guava/src/com/google/common/collect/TreeMultiset.java b/guava/src/com/google/common/collect/TreeMultiset.java index 71d95de9dc63..5575bbad8cf3 100644 --- a/guava/src/com/google/common/collect/TreeMultiset.java +++ b/guava/src/com/google/common/collect/TreeMultiset.java @@ -93,7 +93,7 @@ public static TreeMultiset create() { @SuppressWarnings("unchecked") public static TreeMultiset create( @Nullable Comparator comparator) { - return (comparator == null) + return comparator == null ? new TreeMultiset((Comparator) Ordering.natural()) : new TreeMultiset(comparator); } @@ -143,7 +143,7 @@ int nodeAggregate(AvlNode node) { @Override long treeAggregate(@Nullable AvlNode root) { - return (root == null) ? 0 : root.totalCount; + return root == null ? 0 : root.totalCount; } }, DISTINCT { @@ -154,7 +154,7 @@ int nodeAggregate(AvlNode node) { @Override long treeAggregate(@Nullable AvlNode root) { - return (root == null) ? 0 : root.distinctElements; + return root == null ? 0 : root.distinctElements; } }; @@ -236,7 +236,7 @@ int distinctElements() { } static int distinctElements(@Nullable AvlNode node) { - return (node == null) ? 0 : node.distinctElements; + return node == null ? 0 : node.distinctElements; } @Override @@ -411,7 +411,7 @@ && comparator().compare(endpoint, node.getElement()) == 0) { } else { node = header.succ(); } - return (node == header || !range.contains(node.getElement())) ? null : node; + return node == header || !range.contains(node.getElement()) ? null : node; } private @Nullable AvlNode lastNode() { @@ -434,7 +434,7 @@ && comparator().compare(endpoint, node.getElement()) == 0) { } else { node = header.pred(); } - return (node == header || !range.contains(node.getElement())) ? null : node; + return node == header || !range.contains(node.getElement()) ? null : node; } @Override @@ -644,9 +644,9 @@ private AvlNode succ() { int count(Comparator comparator, @ParametricNullness E e) { int cmp = comparator.compare(e, getElement()); if (cmp < 0) { - return (left == null) ? 0 : left.count(comparator, e); + return left == null ? 0 : left.count(comparator, e); } else if (cmp > 0) { - return (right == null) ? 0 : right.count(comparator, e); + return right == null ? 0 : right.count(comparator, e); } else { return elemCount; } @@ -692,7 +692,7 @@ AvlNode add( distinctElements++; } this.totalCount += count; - return (left.height == initHeight) ? this : rebalance(); + return left.height == initHeight ? this : rebalance(); } else if (cmp > 0) { AvlNode initRight = right; if (initRight == null) { @@ -706,7 +706,7 @@ AvlNode add( distinctElements++; } this.totalCount += count; - return (right.height == initHeight) ? this : rebalance(); + return right.height == initHeight ? this : rebalance(); } // adding count to me! No rebalance possible. @@ -738,7 +738,7 @@ AvlNode add( this.totalCount -= count; } } - return (result[0] == 0) ? this : rebalance(); + return result[0] == 0 ? this : rebalance(); } else if (cmp > 0) { AvlNode initRight = right; if (initRight == null) { @@ -777,7 +777,7 @@ AvlNode add( AvlNode initLeft = left; if (initLeft == null) { result[0] = 0; - return (count > 0) ? addLeftChild(e, count) : this; + return count > 0 ? addLeftChild(e, count) : this; } left = initLeft.setCount(comparator, e, count, result); @@ -794,7 +794,7 @@ AvlNode add( AvlNode initRight = right; if (initRight == null) { result[0] = 0; - return (count > 0) ? addRightChild(e, count) : this; + return count > 0 ? addRightChild(e, count) : this; } right = initRight.setCount(comparator, e, count, result); @@ -998,33 +998,33 @@ private AvlNode rotateRight() { } private static long totalCount(@Nullable AvlNode node) { - return (node == null) ? 0 : node.totalCount; + return node == null ? 0 : node.totalCount; } private static int height(@Nullable AvlNode node) { - return (node == null) ? 0 : node.height; + return node == null ? 0 : node.height; } private @Nullable AvlNode ceiling( Comparator comparator, @ParametricNullness E e) { int cmp = comparator.compare(e, getElement()); if (cmp < 0) { - return (left == null) ? this : MoreObjects.firstNonNull(left.ceiling(comparator, e), this); + return left == null ? this : MoreObjects.firstNonNull(left.ceiling(comparator, e), this); } else if (cmp == 0) { return this; } else { - return (right == null) ? null : right.ceiling(comparator, e); + return right == null ? null : right.ceiling(comparator, e); } } private @Nullable AvlNode floor(Comparator comparator, @ParametricNullness E e) { int cmp = comparator.compare(e, getElement()); if (cmp > 0) { - return (right == null) ? this : MoreObjects.firstNonNull(right.floor(comparator, e), this); + return right == null ? this : MoreObjects.firstNonNull(right.floor(comparator, e), this); } else if (cmp == 0) { return this; } else { - return (left == null) ? null : left.floor(comparator, e); + return left == null ? null : left.floor(comparator, e); } } diff --git a/guava/src/com/google/common/collect/TreeRangeMap.java b/guava/src/com/google/common/collect/TreeRangeMap.java index c40566c280e9..97b7191002e0 100644 --- a/guava/src/com/google/common/collect/TreeRangeMap.java +++ b/guava/src/com/google/common/collect/TreeRangeMap.java @@ -120,7 +120,7 @@ Cut getUpperBound() { @Override public @Nullable V get(K key) { Entry, V> entry = getEntry(key); - return (entry == null) ? null : entry.getValue(); + return entry == null ? null : entry.getValue(); } @Override diff --git a/guava/src/com/google/common/collect/TreeRangeSet.java b/guava/src/com/google/common/collect/TreeRangeSet.java index 11f585c35ef3..dce2fedd925b 100644 --- a/guava/src/com/google/common/collect/TreeRangeSet.java +++ b/guava/src/com/google/common/collect/TreeRangeSet.java @@ -83,13 +83,13 @@ private TreeRangeSet(NavigableMap, Range> rangesByLowerCut) { @Override public Set> asRanges() { Set> result = asRanges; - return (result == null) ? asRanges = new AsRanges(rangesByLowerBound.values()) : result; + return result == null ? asRanges = new AsRanges(rangesByLowerBound.values()) : result; } @Override public Set> asDescendingSetOfRanges() { Set> result = asDescendingSetOfRanges; - return (result == null) + return result == null ? asDescendingSetOfRanges = new AsRanges(rangesByLowerBound.descendingMap().values()) : result; } @@ -155,7 +155,7 @@ public boolean encloses(Range range) { private @Nullable Range rangeEnclosing(Range range) { checkNotNull(range); Entry, Range> floorEntry = rangesByLowerBound.floorEntry(range.lowerBound); - return (floorEntry != null && floorEntry.getValue().encloses(range)) + return floorEntry != null && floorEntry.getValue().encloses(range) ? floorEntry.getValue() : null; } @@ -277,7 +277,7 @@ private void replaceRangeWithSameLowerBound(Range range) { @Override public RangeSet complement() { RangeSet result = complement; - return (result == null) ? complement = new Complement() : result; + return result == null ? complement = new Complement() : result; } @VisibleForTesting @@ -584,7 +584,7 @@ Iterator, Range>> descendingEntryIterator() { Cut cut; if (positiveItr.hasNext()) { cut = - (positiveItr.peek().upperBound == Cut.aboveAll()) + positiveItr.peek().upperBound == Cut.aboveAll() ? positiveItr.next().lowerBound : positiveRangesByLowerBound.higherKey(positiveItr.peek().upperBound); } else if (!complementLowerBoundWindow.contains(Cut.belowAll()) @@ -884,7 +884,7 @@ public boolean encloses(Range range) { return null; } Range result = TreeRangeSet.this.rangeContaining(value); - return (result == null) ? null : result.intersection(restriction); + return result == null ? null : result.intersection(restriction); } @Override diff --git a/guava/src/com/google/common/escape/Escapers.java b/guava/src/com/google/common/escape/Escapers.java index c5f2bd026fdb..b7df3b0344cc 100644 --- a/guava/src/com/google/common/escape/Escapers.java +++ b/guava/src/com/google/common/escape/Escapers.java @@ -186,6 +186,6 @@ public Escaper build() { } private static @Nullable String stringOrNull(char @Nullable [] in) { - return (in == null) ? null : new String(in); + return in == null ? null : new String(in); } } diff --git a/guava/src/com/google/common/graph/AbstractBaseGraph.java b/guava/src/com/google/common/graph/AbstractBaseGraph.java index 9ce3838947b8..975ce245d903 100644 --- a/guava/src/com/google/common/graph/AbstractBaseGraph.java +++ b/guava/src/com/google/common/graph/AbstractBaseGraph.java @@ -139,7 +139,7 @@ public int degree(N node) { return IntMath.saturatedAdd(predecessors(node).size(), successors(node).size()); } else { Set neighbors = adjacentNodes(node); - int selfLoopCount = (allowsSelfLoops() && neighbors.contains(node)) ? 1 : 0; + int selfLoopCount = allowsSelfLoops() && neighbors.contains(node) ? 1 : 0; return IntMath.saturatedAdd(neighbors.size(), selfLoopCount); } } diff --git a/guava/src/com/google/common/graph/AbstractDirectedNetworkConnections.java b/guava/src/com/google/common/graph/AbstractDirectedNetworkConnections.java index 92b203872e5f..000ff66963e0 100644 --- a/guava/src/com/google/common/graph/AbstractDirectedNetworkConnections.java +++ b/guava/src/com/google/common/graph/AbstractDirectedNetworkConnections.java @@ -67,7 +67,7 @@ public Set incidentEdges() { @Override public UnmodifiableIterator iterator() { Iterable incidentEdges = - (selfLoopCount == 0) + selfLoopCount == 0 ? Iterables.concat(inEdgeMap.keySet(), outEdgeMap.keySet()) : Sets.union(inEdgeMap.keySet(), outEdgeMap.keySet()); return Iterators.unmodifiableIterator(incidentEdges.iterator()); diff --git a/guava/src/com/google/common/graph/DirectedMultiNetworkConnections.java b/guava/src/com/google/common/graph/DirectedMultiNetworkConnections.java index b21a63a48d99..8e68b88a8b96 100644 --- a/guava/src/com/google/common/graph/DirectedMultiNetworkConnections.java +++ b/guava/src/com/google/common/graph/DirectedMultiNetworkConnections.java @@ -140,6 +140,6 @@ public void addOutEdge(E edge, N node) { } private static @Nullable T getReference(@Nullable Reference reference) { - return (reference == null) ? null : reference.get(); + return reference == null ? null : reference.get(); } } diff --git a/guava/src/com/google/common/graph/EdgesConnecting.java b/guava/src/com/google/common/graph/EdgesConnecting.java index 234c9bb3ee6c..560fb9980fef 100644 --- a/guava/src/com/google/common/graph/EdgesConnecting.java +++ b/guava/src/com/google/common/graph/EdgesConnecting.java @@ -47,7 +47,7 @@ final class EdgesConnecting extends AbstractSet { @Override public UnmodifiableIterator iterator() { E connectingEdge = getConnectingEdge(); - return (connectingEdge == null) + return connectingEdge == null ? ImmutableSet.of().iterator() : Iterators.singletonIterator(connectingEdge); } @@ -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/graph/Graphs.java b/guava/src/com/google/common/graph/Graphs.java index 2b0e7eb83298..46cc2476cbb6 100644 --- a/guava/src/com/google/common/graph/Graphs.java +++ b/guava/src/com/google/common/graph/Graphs.java @@ -524,7 +524,7 @@ public boolean hasEdgeConnecting(EndpointPair endpoints) { */ public static MutableGraph inducedSubgraph(Graph graph, Iterable nodes) { MutableGraph subgraph = - (nodes instanceof Collection) + nodes instanceof Collection ? GraphBuilder.from(graph).expectedNodeCount(((Collection) nodes).size()).build() : GraphBuilder.from(graph).build(); for (N node : nodes) { @@ -551,7 +551,7 @@ public static MutableGraph inducedSubgraph(Graph graph, Iterable MutableValueGraph inducedSubgraph( ValueGraph graph, Iterable nodes) { MutableValueGraph subgraph = - (nodes instanceof Collection) + nodes instanceof Collection ? ValueGraphBuilder.from(graph).expectedNodeCount(((Collection) nodes).size()).build() : ValueGraphBuilder.from(graph).build(); for (N node : nodes) { @@ -582,7 +582,7 @@ public static MutableValueGraph inducedSubgraph( public static MutableNetwork inducedSubgraph( Network network, Iterable nodes) { MutableNetwork subgraph = - (nodes instanceof Collection) + nodes instanceof Collection ? NetworkBuilder.from(network).expectedNodeCount(((Collection) nodes).size()).build() : NetworkBuilder.from(network).build(); for (N node : nodes) { diff --git a/guava/src/com/google/common/graph/StandardNetwork.java b/guava/src/com/google/common/graph/StandardNetwork.java index 19f9e47887ff..5060e621d04c 100644 --- a/guava/src/com/google/common/graph/StandardNetwork.java +++ b/guava/src/com/google/common/graph/StandardNetwork.java @@ -86,7 +86,7 @@ class StandardNetwork extends AbstractNetwork { // Prefer the heavier "MapRetrievalCache" for nodes if lookup is expensive. This optimizes // methods that access the same node(s) repeatedly, such as Graphs.removeEdgesConnecting(). this.nodeConnections = - (nodeConnections instanceof TreeMap) + nodeConnections instanceof TreeMap ? new MapRetrievalCache>(nodeConnections) : new MapIteratorCache>(nodeConnections); this.edgeToReferenceNode = new MapIteratorCache<>(edgeToReferenceNode); diff --git a/guava/src/com/google/common/graph/StandardValueGraph.java b/guava/src/com/google/common/graph/StandardValueGraph.java index 568f0f63274d..6797a6e2d750 100644 --- a/guava/src/com/google/common/graph/StandardValueGraph.java +++ b/guava/src/com/google/common/graph/StandardValueGraph.java @@ -74,7 +74,7 @@ class StandardValueGraph extends AbstractValueGraph { this.nodeOrder = builder.nodeOrder.cast(); // Prefer the heavier "MapRetrievalCache" for nodes if lookup is expensive. this.nodeConnections = - (nodeConnections instanceof TreeMap) + nodeConnections instanceof TreeMap ? new MapRetrievalCache>(nodeConnections) : new MapIteratorCache>(nodeConnections); this.edgeCount = checkNonNegative(edgeCount); @@ -176,7 +176,7 @@ private final boolean hasEdgeConnectingInternal(N nodeU, N nodeV) { private final @Nullable V edgeValueOrDefaultInternal(N nodeU, N nodeV, @Nullable V defaultValue) { GraphConnections connectionsU = nodeConnections.get(nodeU); - V value = (connectionsU == null) ? null : connectionsU.value(nodeV); + V value = connectionsU == null ? null : connectionsU.value(nodeV); // TODO(b/192579700): Use a ternary once it no longer confuses our nullness checker. if (value == null) { return defaultValue; diff --git a/guava/src/com/google/common/graph/UndirectedMultiNetworkConnections.java b/guava/src/com/google/common/graph/UndirectedMultiNetworkConnections.java index a93d04d8faab..c5d285a73354 100644 --- a/guava/src/com/google/common/graph/UndirectedMultiNetworkConnections.java +++ b/guava/src/com/google/common/graph/UndirectedMultiNetworkConnections.java @@ -116,6 +116,6 @@ public void addOutEdge(E edge, N node) { } private static @Nullable T getReference(@Nullable Reference reference) { - return (reference == null) ? null : reference.get(); + return reference == null ? null : reference.get(); } } 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/hash/MessageDigestHashFunction.java b/guava/src/com/google/common/hash/MessageDigestHashFunction.java index 9a435b9edc13..1d2423bfd3d5 100644 --- a/guava/src/com/google/common/hash/MessageDigestHashFunction.java +++ b/guava/src/com/google/common/hash/MessageDigestHashFunction.java @@ -162,7 +162,7 @@ private void checkNotDone() { public HashCode hash() { checkNotDone(); done = true; - return (bytes == digest.getDigestLength()) + return bytes == digest.getDigestLength() ? HashCode.fromBytesNoCopy(digest.digest()) : HashCode.fromBytesNoCopy(Arrays.copyOf(digest.digest(), bytes)); } diff --git a/guava/src/com/google/common/io/ByteSink.java b/guava/src/com/google/common/io/ByteSink.java index d3013cb1ffb3..63d13b648ffc 100644 --- a/guava/src/com/google/common/io/ByteSink.java +++ b/guava/src/com/google/common/io/ByteSink.java @@ -85,7 +85,7 @@ public CharSink asCharSink(Charset charset) { */ public OutputStream openBufferedStream() throws IOException { OutputStream out = openStream(); - return (out instanceof BufferedOutputStream) + return out instanceof BufferedOutputStream ? (BufferedOutputStream) out : new BufferedOutputStream(out); } diff --git a/guava/src/com/google/common/io/ByteSource.java b/guava/src/com/google/common/io/ByteSource.java index d64960816ef9..d3e02fad0b97 100644 --- a/guava/src/com/google/common/io/ByteSource.java +++ b/guava/src/com/google/common/io/ByteSource.java @@ -117,7 +117,7 @@ public CharSource asCharSource(Charset charset) { */ public InputStream openBufferedStream() throws IOException { InputStream in = openStream(); - return (in instanceof BufferedInputStream) + return in instanceof BufferedInputStream ? (BufferedInputStream) in : new BufferedInputStream(in); } diff --git a/guava/src/com/google/common/io/CharSink.java b/guava/src/com/google/common/io/CharSink.java index 734b305357a8..dbe1b55279ef 100644 --- a/guava/src/com/google/common/io/CharSink.java +++ b/guava/src/com/google/common/io/CharSink.java @@ -81,7 +81,7 @@ protected CharSink() {} */ public Writer openBufferedStream() throws IOException { Writer writer = openStream(); - return (writer instanceof BufferedWriter) + return writer instanceof BufferedWriter ? (BufferedWriter) writer : new BufferedWriter(writer); } diff --git a/guava/src/com/google/common/io/Files.java b/guava/src/com/google/common/io/Files.java index 0e87a2ac3040..8df4a0a44ea7 100644 --- a/guava/src/com/google/common/io/Files.java +++ b/guava/src/com/google/common/io/Files.java @@ -797,7 +797,7 @@ public static String getFileExtension(String fullName) { checkNotNull(fullName); String fileName = new File(fullName).getName(); int dotIndex = fileName.lastIndexOf('.'); - return (dotIndex == -1) ? "" : fileName.substring(dotIndex + 1); + return dotIndex == -1 ? "" : fileName.substring(dotIndex + 1); } /** @@ -814,7 +814,7 @@ public static String getNameWithoutExtension(String file) { checkNotNull(file); String fileName = new File(file).getName(); int dotIndex = fileName.lastIndexOf('.'); - return (dotIndex == -1) ? fileName : fileName.substring(0, dotIndex); + return dotIndex == -1 ? fileName : fileName.substring(0, dotIndex); } /** diff --git a/guava/src/com/google/common/io/LineReader.java b/guava/src/com/google/common/io/LineReader.java index b313a8c9880e..d7f4cc31b7c9 100644 --- a/guava/src/com/google/common/io/LineReader.java +++ b/guava/src/com/google/common/io/LineReader.java @@ -55,7 +55,7 @@ protected void handleLine(String line, String end) { /** Creates a new instance that will read lines from the given {@code Readable} object. */ public LineReader(Readable readable) { this.readable = checkNotNull(readable); - this.reader = (readable instanceof Reader) ? (Reader) readable : null; + this.reader = readable instanceof Reader ? (Reader) readable : null; } /** @@ -73,7 +73,7 @@ public LineReader(Readable readable) { Java8Compatibility.clear(cbuf); // The default implementation of Reader#read(CharBuffer) allocates a // temporary char[], so we call Reader#read(char[], int, int) instead. - int read = (reader != null) ? reader.read(buf, 0, buf.length) : readable.read(cbuf); + int read = reader != null ? reader.read(buf, 0, buf.length) : readable.read(cbuf); if (read == -1) { lineBuf.finish(); break; diff --git a/guava/src/com/google/common/io/ReaderInputStream.java b/guava/src/com/google/common/io/ReaderInputStream.java index 8ee90b9350c9..b65e8fe418cf 100644 --- a/guava/src/com/google/common/io/ReaderInputStream.java +++ b/guava/src/com/google/common/io/ReaderInputStream.java @@ -121,7 +121,7 @@ public void close() throws IOException { @Override public int read() throws IOException { - return (read(singleByte) == 1) ? toUnsignedInt(singleByte[0]) : -1; + return read(singleByte) == 1 ? toUnsignedInt(singleByte[0]) : -1; } // TODO(chrisn): Consider trying to encode/flush directly to the argument byte @@ -145,7 +145,7 @@ public int read(byte[] b, int off, int len) throws IOException { if (draining) { totalBytesRead += drain(b, off + totalBytesRead, len - totalBytesRead); if (totalBytesRead == len || doneFlushing) { - return (totalBytesRead > 0) ? totalBytesRead : -1; + return totalBytesRead > 0 ? totalBytesRead : -1; } draining = false; Java8Compatibility.clear(byteBuffer); diff --git a/guava/src/com/google/common/math/BigIntegerMath.java b/guava/src/com/google/common/math/BigIntegerMath.java index abf630ff3aaf..8f778dc4bd9c 100644 --- a/guava/src/com/google/common/math/BigIntegerMath.java +++ b/guava/src/com/google/common/math/BigIntegerMath.java @@ -115,7 +115,7 @@ public static int log2(BigInteger x, RoundingMode mode) { // we compare x^2 to 2^(2 * logFloor + 1). BigInteger x2 = x.pow(2); int logX2Floor = x2.bitLength() - 1; - return (logX2Floor < 2 * logFloor + 1) ? logFloor : logFloor + 1; + return logX2Floor < 2 * logFloor + 1 ? logFloor : logFloor + 1; } throw new AssertionError(); } @@ -200,7 +200,7 @@ public static int log10(BigInteger x, RoundingMode mode) { // Since sqrt(10) is irrational, log10(x) - floorLog can never be exactly 0.5 BigInteger x2 = x.pow(2); BigInteger halfPowerSquared = floorPow.pow(2).multiply(BigInteger.TEN); - return (x2.compareTo(halfPowerSquared) <= 0) ? floorLog : floorLog + 1; + return x2.compareTo(halfPowerSquared) <= 0 ? floorLog : floorLog + 1; } throw new AssertionError(); } @@ -245,7 +245,7 @@ public static BigInteger sqrt(BigInteger x, RoundingMode mode) { * and halfSquare are integers, this is equivalent to testing whether or not x <= * halfSquare. */ - return (halfSquare.compareTo(x) >= 0) ? sqrtFloor : sqrtFloor.add(BigInteger.ONE); + return halfSquare.compareTo(x) >= 0 ? sqrtFloor : sqrtFloor.add(BigInteger.ONE); } throw new AssertionError(); } diff --git a/guava/src/com/google/common/math/DoubleMath.java b/guava/src/com/google/common/math/DoubleMath.java index c4e8dc8dfec2..a5aea9dfc07c 100644 --- a/guava/src/com/google/common/math/DoubleMath.java +++ b/guava/src/com/google/common/math/DoubleMath.java @@ -191,7 +191,7 @@ public static BigInteger roundToBigInteger(double x, RoundingMode mode) { int exponent = getExponent(x); long significand = getSignificand(x); BigInteger result = BigInteger.valueOf(significand).shiftLeft(exponent - SIGNIFICAND_BITS); - return (x < 0) ? result.negate() : result; + return x < 0 ? result.negate() : result; } /** diff --git a/guava/src/com/google/common/math/DoubleUtils.java b/guava/src/com/google/common/math/DoubleUtils.java index e2331a71c624..6e6cbd7b47ca 100644 --- a/guava/src/com/google/common/math/DoubleUtils.java +++ b/guava/src/com/google/common/math/DoubleUtils.java @@ -65,7 +65,7 @@ static long getSignificand(double d) { int exponent = getExponent(d); long bits = doubleToRawLongBits(d); bits &= SIGNIFICAND_MASK; - return (exponent == MIN_EXPONENT - 1) ? bits << 1 : bits | IMPLICIT_BIT; + return exponent == MIN_EXPONENT - 1 ? bits << 1 : bits | IMPLICIT_BIT; } static boolean isFinite(double d) { diff --git a/guava/src/com/google/common/math/LinearTransformation.java b/guava/src/com/google/common/math/LinearTransformation.java index 379898d51842..720325eaea52 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 @@ -206,7 +206,7 @@ public double transform(double x) { @Override public LinearTransformation inverse() { LinearTransformation result = inverse; - return (result == null) ? inverse = createInverse() : result; + return result == null ? inverse = createInverse() : result; } @Override @@ -262,7 +262,7 @@ public double transform(double x) { @Override public LinearTransformation inverse() { LinearTransformation result = inverse; - return (result == null) ? inverse = createInverse() : result; + return result == null ? inverse = createInverse() : result; } @Override diff --git a/guava/src/com/google/common/math/ToDoubleRounder.java b/guava/src/com/google/common/math/ToDoubleRounder.java index 7525e3f990f1..37cf5f6818b9 100644 --- a/guava/src/com/google/common/math/ToDoubleRounder.java +++ b/guava/src/com/google/common/math/ToDoubleRounder.java @@ -54,11 +54,11 @@ final double roundToDouble(X x, RoundingMode mode) { case HALF_UP: return Double.MAX_VALUE * sign(x); case FLOOR: - return (roundArbitrarily == Double.POSITIVE_INFINITY) + return roundArbitrarily == Double.POSITIVE_INFINITY ? Double.MAX_VALUE : Double.NEGATIVE_INFINITY; case CEILING: - return (roundArbitrarily == Double.POSITIVE_INFINITY) + return roundArbitrarily == Double.POSITIVE_INFINITY ? Double.POSITIVE_INFINITY : -Double.MAX_VALUE; case UP: @@ -74,24 +74,24 @@ final double roundToDouble(X x, RoundingMode mode) { checkRoundingUnnecessary(cmpXToRoundArbitrarily == 0); return roundArbitrarily; case FLOOR: - return (cmpXToRoundArbitrarily >= 0) + return cmpXToRoundArbitrarily >= 0 ? roundArbitrarily : DoubleUtils.nextDown(roundArbitrarily); case CEILING: - return (cmpXToRoundArbitrarily <= 0) ? roundArbitrarily : Math.nextUp(roundArbitrarily); + return cmpXToRoundArbitrarily <= 0 ? roundArbitrarily : Math.nextUp(roundArbitrarily); case DOWN: if (sign(x) >= 0) { - return (cmpXToRoundArbitrarily >= 0) + return cmpXToRoundArbitrarily >= 0 ? roundArbitrarily : DoubleUtils.nextDown(roundArbitrarily); } else { - return (cmpXToRoundArbitrarily <= 0) ? roundArbitrarily : Math.nextUp(roundArbitrarily); + return cmpXToRoundArbitrarily <= 0 ? roundArbitrarily : Math.nextUp(roundArbitrarily); } case UP: if (sign(x) >= 0) { - return (cmpXToRoundArbitrarily <= 0) ? roundArbitrarily : Math.nextUp(roundArbitrarily); + return cmpXToRoundArbitrarily <= 0 ? roundArbitrarily : Math.nextUp(roundArbitrarily); } else { - return (cmpXToRoundArbitrarily >= 0) + return cmpXToRoundArbitrarily >= 0 ? roundArbitrarily : DoubleUtils.nextDown(roundArbitrarily); } @@ -135,13 +135,13 @@ final double roundToDouble(X x, RoundingMode mode) { case HALF_EVEN: // roundFloorAsDouble and roundCeilingAsDouble are neighbors, so precisely // one of them should have an even long representation - return ((Double.doubleToRawLongBits(roundFloorAsDouble) & 1L) == 0) + return (Double.doubleToRawLongBits(roundFloorAsDouble) & 1L) == 0 ? roundFloorAsDouble : roundCeilingAsDouble; case HALF_DOWN: - return (sign(x) >= 0) ? roundFloorAsDouble : roundCeilingAsDouble; + return sign(x) >= 0 ? roundFloorAsDouble : roundCeilingAsDouble; case HALF_UP: - return (sign(x) >= 0) ? roundCeilingAsDouble : roundFloorAsDouble; + return sign(x) >= 0 ? roundCeilingAsDouble : roundFloorAsDouble; default: throw new AssertionError("impossible"); } 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/net/InetAddresses.java b/guava/src/com/google/common/net/InetAddresses.java index c8cdda10c435..ae70ddf4e051 100644 --- a/guava/src/com/google/common/net/InetAddresses.java +++ b/guava/src/com/google/common/net/InetAddresses.java @@ -635,7 +635,7 @@ public static InetAddress forUriString(String hostAddr) { return null; } - return bytesToInetAddress(addr, (scope != null) ? scope.scope : null); + return bytesToInetAddress(addr, scope != null ? scope.scope : null); } /** diff --git a/guava/src/com/google/common/primitives/Booleans.java b/guava/src/com/google/common/primitives/Booleans.java index dae0f3b028eb..06041226647d 100644 --- a/guava/src/com/google/common/primitives/Booleans.java +++ b/guava/src/com/google/common/primitives/Booleans.java @@ -272,7 +272,7 @@ private static int checkNoOverflow(long result) { public static boolean[] ensureCapacity(boolean[] array, int minLength, int padding) { checkArgument(minLength >= 0, "Invalid minLength: %s", minLength); checkArgument(padding >= 0, "Invalid padding: %s", padding); - return (array.length < minLength) ? Arrays.copyOf(array, minLength + padding) : array; + return array.length < minLength ? Arrays.copyOf(array, minLength + padding) : array; } /** @@ -599,7 +599,7 @@ public static void rotate(boolean[] array, int distance, int fromIndex, int toIn // Obtain m = (-distance mod length), a non-negative value less than "length". This is how many // places left to rotate. int m = -distance % length; - m = (m < 0) ? m + length : m; + m = m < 0 ? m + length : m; // The current index of what will become the first element of the rotated section. int newFirstIndex = m + fromIndex; if (newFirstIndex == fromIndex) { diff --git a/guava/src/com/google/common/primitives/Bytes.java b/guava/src/com/google/common/primitives/Bytes.java index b5545e28817a..66289a1522a8 100644 --- a/guava/src/com/google/common/primitives/Bytes.java +++ b/guava/src/com/google/common/primitives/Bytes.java @@ -201,7 +201,7 @@ private static int checkNoOverflow(long result) { public static byte[] ensureCapacity(byte[] array, int minLength, int padding) { checkArgument(minLength >= 0, "Invalid minLength: %s", minLength); checkArgument(padding >= 0, "Invalid padding: %s", padding); - return (array.length < minLength) ? Arrays.copyOf(array, minLength + padding) : array; + return array.length < minLength ? Arrays.copyOf(array, minLength + padding) : array; } /** @@ -450,7 +450,7 @@ public static void rotate(byte[] array, int distance, int fromIndex, int toIndex // Obtain m = (-distance mod length), a non-negative value less than "length". This is how many // places left to rotate. int m = -distance % length; - m = (m < 0) ? m + length : m; + m = m < 0 ? m + length : m; // The current index of what will become the first element of the rotated section. int newFirstIndex = m + fromIndex; if (newFirstIndex == fromIndex) { diff --git a/guava/src/com/google/common/primitives/Chars.java b/guava/src/com/google/common/primitives/Chars.java index 4a078a6ba389..e089f067ad6f 100644 --- a/guava/src/com/google/common/primitives/Chars.java +++ b/guava/src/com/google/common/primitives/Chars.java @@ -356,7 +356,7 @@ public static char fromBytes(byte b1, byte b2) { public static char[] ensureCapacity(char[] array, int minLength, int padding) { checkArgument(minLength >= 0, "Invalid minLength: %s", minLength); checkArgument(padding >= 0, "Invalid padding: %s", padding); - return (array.length < minLength) ? Arrays.copyOf(array, minLength + padding) : array; + return array.length < minLength ? Arrays.copyOf(array, minLength + padding) : array; } /** @@ -540,7 +540,7 @@ public static void rotate(char[] array, int distance, int fromIndex, int toIndex // Obtain m = (-distance mod length), a non-negative value less than "length". This is how many // places left to rotate. int m = -distance % length; - m = (m < 0) ? m + length : m; + m = m < 0 ? m + length : m; // The current index of what will become the first element of the rotated section. int newFirstIndex = m + fromIndex; if (newFirstIndex == fromIndex) { diff --git a/guava/src/com/google/common/primitives/Doubles.java b/guava/src/com/google/common/primitives/Doubles.java index 821832b96f31..159463f7e204 100644 --- a/guava/src/com/google/common/primitives/Doubles.java +++ b/guava/src/com/google/common/primitives/Doubles.java @@ -348,7 +348,7 @@ public static Converter stringConverter() { public static double[] ensureCapacity(double[] array, int minLength, int padding) { checkArgument(minLength >= 0, "Invalid minLength: %s", minLength); checkArgument(padding >= 0, "Invalid padding: %s", padding); - return (array.length < minLength) ? Arrays.copyOf(array, minLength + padding) : array; + return array.length < minLength ? Arrays.copyOf(array, minLength + padding) : array; } /** @@ -514,7 +514,7 @@ public static void rotate(double[] array, int distance, int fromIndex, int toInd // Obtain m = (-distance mod length), a non-negative value less than "length". This is how many // places left to rotate. int m = -distance % length; - m = (m < 0) ? m + length : m; + m = m < 0 ? m + length : m; // The current index of what will become the first element of the rotated section. int newFirstIndex = m + fromIndex; if (newFirstIndex == fromIndex) { diff --git a/guava/src/com/google/common/primitives/Floats.java b/guava/src/com/google/common/primitives/Floats.java index de0b7abda209..36aebe6a7fec 100644 --- a/guava/src/com/google/common/primitives/Floats.java +++ b/guava/src/com/google/common/primitives/Floats.java @@ -345,7 +345,7 @@ public static Converter stringConverter() { public static float[] ensureCapacity(float[] array, int minLength, int padding) { checkArgument(minLength >= 0, "Invalid minLength: %s", minLength); checkArgument(padding >= 0, "Invalid padding: %s", padding); - return (array.length < minLength) ? Arrays.copyOf(array, minLength + padding) : array; + return array.length < minLength ? Arrays.copyOf(array, minLength + padding) : array; } /** @@ -511,7 +511,7 @@ public static void rotate(float[] array, int distance, int fromIndex, int toInde // Obtain m = (-distance mod length), a non-negative value less than "length". This is how many // places left to rotate. int m = -distance % length; - m = (m < 0) ? m + length : m; + m = m < 0 ? m + length : m; // The current index of what will become the first element of the rotated section. int newFirstIndex = m + fromIndex; if (newFirstIndex == fromIndex) { diff --git a/guava/src/com/google/common/primitives/ImmutableDoubleArray.java b/guava/src/com/google/common/primitives/ImmutableDoubleArray.java index 96c0e6082de4..7f0a3157519c 100644 --- a/guava/src/com/google/common/primitives/ImmutableDoubleArray.java +++ b/guava/src/com/google/common/primitives/ImmutableDoubleArray.java @@ -176,7 +176,7 @@ public static ImmutableDoubleArray copyOf(Iterable values) { public static ImmutableDoubleArray copyOf(DoubleStream stream) { // Note this uses very different growth behavior from copyOf(Iterable) and the builder. double[] array = stream.toArray(); - return (array.length == 0) ? EMPTY : new ImmutableDoubleArray(array); + return array.length == 0 ? EMPTY : new ImmutableDoubleArray(array); } /** diff --git a/guava/src/com/google/common/primitives/ImmutableIntArray.java b/guava/src/com/google/common/primitives/ImmutableIntArray.java index e7605725344d..582403b690cd 100644 --- a/guava/src/com/google/common/primitives/ImmutableIntArray.java +++ b/guava/src/com/google/common/primitives/ImmutableIntArray.java @@ -173,7 +173,7 @@ public static ImmutableIntArray copyOf(Iterable values) { public static ImmutableIntArray copyOf(IntStream stream) { // Note this uses very different growth behavior from copyOf(Iterable) and the builder. int[] array = stream.toArray(); - return (array.length == 0) ? EMPTY : new ImmutableIntArray(array); + return array.length == 0 ? EMPTY : new ImmutableIntArray(array); } /** diff --git a/guava/src/com/google/common/primitives/ImmutableLongArray.java b/guava/src/com/google/common/primitives/ImmutableLongArray.java index b7fd9af08aef..a38b1e733cf0 100644 --- a/guava/src/com/google/common/primitives/ImmutableLongArray.java +++ b/guava/src/com/google/common/primitives/ImmutableLongArray.java @@ -175,7 +175,7 @@ public static ImmutableLongArray copyOf(Iterable values) { public static ImmutableLongArray copyOf(LongStream stream) { // Note this uses very different growth behavior from copyOf(Iterable) and the builder. long[] array = stream.toArray(); - return (array.length == 0) ? EMPTY : new ImmutableLongArray(array); + return array.length == 0 ? EMPTY : new ImmutableLongArray(array); } /** diff --git a/guava/src/com/google/common/primitives/Ints.java b/guava/src/com/google/common/primitives/Ints.java index 22da95e63389..13444b2c1ed9 100644 --- a/guava/src/com/google/common/primitives/Ints.java +++ b/guava/src/com/google/common/primitives/Ints.java @@ -416,7 +416,7 @@ public static Converter stringConverter() { public static int[] ensureCapacity(int[] array, int minLength, int padding) { checkArgument(minLength >= 0, "Invalid minLength: %s", minLength); checkArgument(padding >= 0, "Invalid padding: %s", padding); - return (array.length < minLength) ? Arrays.copyOf(array, minLength + padding) : array; + return array.length < minLength ? Arrays.copyOf(array, minLength + padding) : array; } /** @@ -599,7 +599,7 @@ public static void rotate(int[] array, int distance, int fromIndex, int toIndex) // Obtain m = (-distance mod length), a non-negative value less than "length". This is how many // places left to rotate. int m = -distance % length; - m = (m < 0) ? m + length : m; + m = m < 0 ? m + length : m; // The current index of what will become the first element of the rotated section. int newFirstIndex = m + fromIndex; if (newFirstIndex == fromIndex) { diff --git a/guava/src/com/google/common/primitives/Longs.java b/guava/src/com/google/common/primitives/Longs.java index f4ee31a73a4a..3f0b530321d4 100644 --- a/guava/src/com/google/common/primitives/Longs.java +++ b/guava/src/com/google/common/primitives/Longs.java @@ -352,7 +352,7 @@ private AsciiDigits() {} } static int digit(char c) { - return (c < 128) ? asciiDigits[c] : -1; + return c < 128 ? asciiDigits[c] : -1; } } @@ -495,7 +495,7 @@ public static Converter stringConverter() { public static long[] ensureCapacity(long[] array, int minLength, int padding) { checkArgument(minLength >= 0, "Invalid minLength: %s", minLength); checkArgument(padding >= 0, "Invalid padding: %s", padding); - return (array.length < minLength) ? Arrays.copyOf(array, minLength + padding) : array; + return array.length < minLength ? Arrays.copyOf(array, minLength + padding) : array; } /** @@ -651,7 +651,7 @@ public static void rotate(long[] array, int distance, int fromIndex, int toIndex // Obtain m = (-distance mod length), a non-negative value less than "length". This is how many // places left to rotate. int m = -distance % length; - m = (m < 0) ? m + length : m; + m = m < 0 ? m + length : m; // The current index of what will become the first element of the rotated section. int newFirstIndex = m + fromIndex; if (newFirstIndex == fromIndex) { diff --git a/guava/src/com/google/common/primitives/Primitives.java b/guava/src/com/google/common/primitives/Primitives.java index 9e2f71093b06..5915c7519ebb 100644 --- a/guava/src/com/google/common/primitives/Primitives.java +++ b/guava/src/com/google/common/primitives/Primitives.java @@ -118,7 +118,7 @@ public static Class wrap(Class type) { // cast is safe: long.class and Long.class are both of type Class @SuppressWarnings("unchecked") Class wrapped = (Class) PRIMITIVE_TO_WRAPPER_TYPE.get(type); - return (wrapped == null) ? type : wrapped; + return wrapped == null ? type : wrapped; } /** @@ -137,6 +137,6 @@ public static Class unwrap(Class type) { // cast is safe: long.class and Long.class are both of type Class @SuppressWarnings("unchecked") Class unwrapped = (Class) WRAPPER_TO_PRIMITIVE_TYPE.get(type); - return (unwrapped == null) ? type : unwrapped; + return unwrapped == null ? type : unwrapped; } } diff --git a/guava/src/com/google/common/primitives/Shorts.java b/guava/src/com/google/common/primitives/Shorts.java index 3a54130d8169..495cba540d65 100644 --- a/guava/src/com/google/common/primitives/Shorts.java +++ b/guava/src/com/google/common/primitives/Shorts.java @@ -406,7 +406,7 @@ public static Converter stringConverter() { public static short[] ensureCapacity(short[] array, int minLength, int padding) { checkArgument(minLength >= 0, "Invalid minLength: %s", minLength); checkArgument(padding >= 0, "Invalid padding: %s", padding); - return (array.length < minLength) ? Arrays.copyOf(array, minLength + padding) : array; + return array.length < minLength ? Arrays.copyOf(array, minLength + padding) : array; } /** @@ -563,7 +563,7 @@ public static void rotate(short[] array, int distance, int fromIndex, int toInde // Obtain m = (-distance mod length), a non-negative value less than "length". This is how many // places left to rotate. int m = -distance % length; - m = (m < 0) ? m + length : m; + m = m < 0 ? m + length : m; // The current index of what will become the first element of the rotated section. int newFirstIndex = m + fromIndex; if (newFirstIndex == fromIndex) { 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/reflect/Reflection.java b/guava/src/com/google/common/reflect/Reflection.java index 3cc06250c344..d7164ebd1980 100644 --- a/guava/src/com/google/common/reflect/Reflection.java +++ b/guava/src/com/google/common/reflect/Reflection.java @@ -43,7 +43,7 @@ public static String getPackageName(Class clazz) { */ public static String getPackageName(String classFullName) { int lastDot = classFullName.lastIndexOf('.'); - return (lastDot < 0) ? "" : classFullName.substring(0, lastDot); + return lastDot < 0 ? "" : classFullName.substring(0, lastDot); } /** diff --git a/guava/src/com/google/common/reflect/TypeResolver.java b/guava/src/com/google/common/reflect/TypeResolver.java index f348362f1c03..56676df9667f 100644 --- a/guava/src/com/google/common/reflect/TypeResolver.java +++ b/guava/src/com/google/common/reflect/TypeResolver.java @@ -256,7 +256,7 @@ private Type resolveGenericArrayType(GenericArrayType type) { private ParameterizedType resolveParameterizedType(ParameterizedType type) { Type owner = type.getOwnerType(); - Type resolvedOwner = (owner == null) ? null : resolveType(owner); + Type resolvedOwner = owner == null ? null : resolveType(owner); Type resolvedRawType = resolveType(type.getRawType()); Type[] args = type.getActualTypeArguments(); diff --git a/guava/src/com/google/common/reflect/Types.java b/guava/src/com/google/common/reflect/Types.java index e45ac4639fce..2ca1d888b9e4 100644 --- a/guava/src/com/google/common/reflect/Types.java +++ b/guava/src/com/google/common/reflect/Types.java @@ -140,7 +140,7 @@ class LocalClass {} static TypeVariable newArtificialTypeVariable( D declaration, String name, Type... bounds) { return newTypeVariableImpl( - declaration, name, (bounds.length == 0) ? new Type[] {Object.class} : bounds); + declaration, name, bounds.length == 0 ? new Type[] {Object.class} : bounds); } /** Returns a new {@link WildcardType} with {@code upperBound}. */ @@ -161,7 +161,7 @@ static WildcardType supertypeOf(Type lowerBound) { *

The format is subject to change. */ static String toString(Type type) { - return (type instanceof Class) ? ((Class) type).getName() : type.toString(); + return type instanceof Class ? ((Class) type).getName() : type.toString(); } static @Nullable Type getComponentType(Type type) { diff --git a/guava/src/com/google/common/util/concurrent/AggregateFuture.java b/guava/src/com/google/common/util/concurrent/AggregateFuture.java index 9647758bdc66..68dc9c924de7 100644 --- a/guava/src/com/google/common/util/concurrent/AggregateFuture.java +++ b/guava/src/com/google/common/util/concurrent/AggregateFuture.java @@ -242,7 +242,7 @@ private void handleException(Throwable throwable) { private static void log(Throwable throwable) { String message = - (throwable instanceof Error) + throwable instanceof Error ? "Input Future failed with Error" : "Got more than one input Future failure. Logging failures after the first"; logger.get().log(SEVERE, message, throwable); diff --git a/guava/src/com/google/common/util/concurrent/AtomicLongMap.java b/guava/src/com/google/common/util/concurrent/AtomicLongMap.java index 9523ba8dbe55..eaf052c0cfd1 100644 --- a/guava/src/com/google/common/util/concurrent/AtomicLongMap.java +++ b/guava/src/com/google/common/util/concurrent/AtomicLongMap.java @@ -148,7 +148,7 @@ public long updateAndGet(K key, LongUnaryOperator updaterFunction) { Long result = map.compute( key, - (k, value) -> updaterFunction.applyAsLong((value == null) ? 0L : value.longValue())); + (k, value) -> updaterFunction.applyAsLong(value == null ? 0L : value.longValue())); return requireNonNull(result); } @@ -166,7 +166,7 @@ public long getAndUpdate(K key, LongUnaryOperator updaterFunction) { map.compute( key, (k, value) -> { - long oldValue = (value == null) ? 0L : value.longValue(); + long oldValue = value == null ? 0L : value.longValue(); holder.set(oldValue); return updaterFunction.applyAsLong(oldValue); }); @@ -227,7 +227,7 @@ public void putAll(Map m) { @CanIgnoreReturnValue public long remove(K key) { Long result = map.remove(key); - return (result == null) ? 0L : result.longValue(); + return result == null ? 0L : result.longValue(); } /** @@ -272,7 +272,7 @@ public long sum() { /** Returns a live, read-only view of the map backing this {@code AtomicLongMap}. */ public Map asMap() { Map result = asMap; - return (result == null) ? asMap = createAsMap() : result; + return result == null ? asMap = createAsMap() : result; } private Map createAsMap() { diff --git a/guava/src/com/google/common/util/concurrent/SmoothRateLimiter.java b/guava/src/com/google/common/util/concurrent/SmoothRateLimiter.java index 7e68f42a0f6b..d172e6c2e695 100644 --- a/guava/src/com/google/common/util/concurrent/SmoothRateLimiter.java +++ b/guava/src/com/google/common/util/concurrent/SmoothRateLimiter.java @@ -235,7 +235,7 @@ void doSetRate(double permitsPerSecond, double stableIntervalMicros) { storedPermits = 0.0; } else { storedPermits = - (oldMaxPermits == 0.0) + oldMaxPermits == 0.0 ? maxPermits // initial state is cold : storedPermits * maxPermits / oldMaxPermits; } @@ -294,7 +294,7 @@ void doSetRate(double permitsPerSecond, double stableIntervalMicros) { storedPermits = maxPermits; } else { storedPermits = - (oldMaxPermits == 0.0) + oldMaxPermits == 0.0 ? 0.0 // initial state : storedPermits * maxPermits / oldMaxPermits; } diff --git a/guava/src/com/google/common/util/concurrent/Striped.java b/guava/src/com/google/common/util/concurrent/Striped.java index 2e4fe684ecc1..f0ff346de912 100644 --- a/guava/src/com/google/common/util/concurrent/Striped.java +++ b/guava/src/com/google/common/util/concurrent/Striped.java @@ -408,7 +408,7 @@ static final class SmallLazyStriped extends PowerOfTwoStriped { SmallLazyStriped(int stripes, Supplier supplier) { super(stripes); - this.size = (mask == ALL_SET) ? Integer.MAX_VALUE : mask + 1; + this.size = mask == ALL_SET ? Integer.MAX_VALUE : mask + 1; this.locks = new AtomicReferenceArray<>(size); this.supplier = supplier; } @@ -479,7 +479,7 @@ static final class LargeLazyStriped extends PowerOfTwoStriped { LargeLazyStriped(int stripes, Supplier supplier) { super(stripes); - this.size = (mask == ALL_SET) ? Integer.MAX_VALUE : mask + 1; + this.size = mask == ALL_SET ? Integer.MAX_VALUE : mask + 1; this.supplier = supplier; this.locks = new MapMaker().weakValues().makeMap(); } diff --git a/guava/src/com/google/common/util/concurrent/ThreadFactoryBuilder.java b/guava/src/com/google/common/util/concurrent/ThreadFactoryBuilder.java index c204313083b4..db41a84e2ee2 100644 --- a/guava/src/com/google/common/util/concurrent/ThreadFactoryBuilder.java +++ b/guava/src/com/google/common/util/concurrent/ThreadFactoryBuilder.java @@ -189,10 +189,10 @@ private static ThreadFactory doBuild(ThreadFactoryBuilder builder) { Integer priority = builder.priority; UncaughtExceptionHandler uncaughtExceptionHandler = builder.uncaughtExceptionHandler; ThreadFactory backingThreadFactory = - (builder.backingThreadFactory != null) + builder.backingThreadFactory != null ? builder.backingThreadFactory : defaultThreadFactory(); - AtomicLong count = (nameFormat != null) ? new AtomicLong(0) : null; + AtomicLong count = nameFormat != null ? new AtomicLong(0) : null; return new ThreadFactory() { @Override public Thread newThread(Runnable runnable) {