Apply staticanalysis.UnnecessaryParentheses

Author: Vincent Potucek

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

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

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/ListHashCodeTester.java

@@ -37,7 +37,7 @@ public class ListHashCodeTester<E> extends AbstractListTester<E> {
   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.",

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-testlib/src/com/google/common/testing/ArbitraryInstances.java

@@ -353,7 +353,7 @@ private static <T> void setImplementation(Class<T> type, Class<? extends T> 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);

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