Apply UnnecessaryParentheses.

And sneak in a few other simplifications, mostly to remove explicit type arguments.

Fixes #7930

RELNOTES=n/a
PiperOrigin-RevId: 793670129

Author: Vincent Potucek

android/guava-testlib/src/com/google/common/collect/testing/MapInterfaceTest.java

@@ -687,7 +687,7 @@ public void testEntrySetRetainAll() {
     Set<Entry<K, V>> 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());

android/guava-testlib/src/com/google/common/collect/testing/google/SortedMultisetTestSuiteBuilder.java

@@ -274,7 +274,7 @@ private TestSuite createReserializedSuite(SortedMultisetTestSuiteBuilder<E> pare
             new ForwardingTestMultisetGenerator<E>(delegate) {
               @Override
               public SortedMultiset<E> create(Object... entries) {
-                return SerializableTester.reserialize(((SortedMultiset<E>) super.create(entries)));
+                return SerializableTester.reserialize((SortedMultiset<E>) super.create(entries));
               }
             })
         .named(parentBuilder.getName() + " reserialized")

android/guava-testlib/src/com/google/common/collect/testing/testers/SetHashCodeTester.java

@@ -41,7 +41,7 @@ public class SetHashCodeTester<E> extends AbstractSetTester<E> {
   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<E> 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);

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;
   }

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 {

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<String>) constructor.newInstance(capacity);

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

android/guava-tests/test/com/google/common/cache/CacheTesting.java

@@ -128,7 +128,7 @@ static <K, V> LocalCache<K, V> toLocalCache(Cache<K, V> 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) {

android/guava-tests/test/com/google/common/cache/LocalCacheTest.java

@@ -3055,7 +3055,7 @@ public int hashCode() {
 
     @Override
     public boolean equals(@Nullable Object o) {
-      return (o instanceof SerializableCacheLoader);
+      return o instanceof SerializableCacheLoader;
     }
   }
 
@@ -3071,7 +3071,7 @@ public int hashCode() {
 
     @Override
     public boolean equals(@Nullable Object o) {
-      return (o instanceof SerializableRemovalListener);
+      return o instanceof SerializableRemovalListener;
     }
   }
 
@@ -3088,7 +3088,7 @@ public int hashCode() {
 
     @Override
     public boolean equals(@Nullable Object o) {
-      return (o instanceof SerializableTicker);
+      return o instanceof SerializableTicker;
     }
   }
 
@@ -3105,7 +3105,7 @@ public int hashCode() {
 
     @Override
     public boolean equals(@Nullable Object o) {
-      return (o instanceof SerializableWeigher);
+      return o instanceof SerializableWeigher;
     }
   }
 }

android/guava-tests/test/com/google/common/collect/ConcurrentHashMultisetBasherTest.java

@@ -138,15 +138,15 @@ 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:
             {
               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;
             }