Add staticanalysis.UnnecessaryParentheses

Author: Vincent Potucek

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

@@ -34,7 +34,7 @@
  *     parameterize the test.
  * @author George van den Driessche
  */
-@GwtCompatible(emulated = true)
+@GwtCompatible
 @NullMarked
 public class AbstractTester<G> extends TestCase {
   private G subjectGenerator;

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

@@ -64,7 +64,8 @@ protected List<TestSuite> createDerivedSuites(
     return derivedSuites;
   }
 
-  static class ReserializedCollectionGenerator<E> implements TestCollectionGenerator<E> {
+  private static final class ReserializedCollectionGenerator<E>
+      implements TestCollectionGenerator<E> {
     final OneSizeTestContainerGenerator<Collection<E>, E> gen;
 
     private ReserializedCollectionGenerator(OneSizeTestContainerGenerator<Collection<E>, E> gen) {

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

@@ -46,7 +46,7 @@
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
-@GwtCompatible(emulated = true)
+@GwtCompatible
 @NullMarked
 public class Helpers {
   // Clone of Objects.equals
@@ -262,7 +262,7 @@ private static final class EntryComparator<K extends @Nullable Object, V extends
     @Override
     @SuppressWarnings("unchecked") // no less safe than putting it in the map!
     public int compare(Entry<K, V> a, Entry<K, V> 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

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

@@ -121,7 +121,7 @@ protected List<TestSuite> createDerivedSuites(
     return derivedSuites;
   }
 
-  static class ReserializedListGenerator<E> implements TestListGenerator<E> {
+  private static final class ReserializedListGenerator<E> implements TestListGenerator<E> {
     final OneSizeTestContainerGenerator<Collection<E>, E> gen;
 
     private ReserializedListGenerator(OneSizeTestContainerGenerator<Collection<E>, E> gen) {

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

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

@@ -139,8 +139,8 @@ NavigableMapTestSuiteBuilder<K, V> subSuiteUsing(TestSortedMapGenerator<K, V> ge
     return using(generator);
   }
 
-  static class DescendingTestMapGenerator<K, V> extends ForwardingTestMapGenerator<K, V>
-      implements TestSortedMapGenerator<K, V> {
+  private static final class DescendingTestMapGenerator<K, V>
+      extends ForwardingTestMapGenerator<K, V> implements TestSortedMapGenerator<K, V> {
     DescendingTestMapGenerator(TestSortedMapGenerator<K, V> delegate) {
       super(delegate);
     }

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

@@ -35,7 +35,7 @@
 import org.jspecify.annotations.Nullable;
 
 /** Replacements for JUnit's {@code assertThrows} that work under GWT/J2CL. */
-@GwtCompatible(emulated = true)
+@GwtCompatible
 @NullMarked
 final class ReflectionFreeAssertThrows {
   interface ThrowingRunnable {

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

@@ -87,7 +87,7 @@ protected List<TestSuite> createDerivedSuites(
     return derivedSuites;
   }
 
-  static class ReserializedSetGenerator<E> implements TestSetGenerator<E> {
+  private static final class ReserializedSetGenerator<E> implements TestSetGenerator<E> {
     final OneSizeTestContainerGenerator<Collection<E>, E> gen;
 
     private ReserializedSetGenerator(OneSizeTestContainerGenerator<Collection<E>, E> gen) {

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

@@ -206,7 +206,7 @@ public Test testsForEnumSet() {
             new TestEnumSetGenerator() {
               @Override
               public Set<AnEnum> create(AnEnum[] elements) {
-                return (elements.length == 0)
+                return elements.length == 0
                     ? EnumSet.noneOf(AnEnum.class)
                     : EnumSet.copyOf(MinimalCollection.of(elements));
               }