Address some https://errorprone.info/bugpattern/YodaCondition warnings.

It's kind of amazing how much this improves readability in some cases.

(Also, use `getOrDefault` in one place where we can, and suppress some suggestions to use it in places where we can't.)

RELNOTES=n/a
PiperOrigin-RevId: 725869779

Author: cpovirk

android/guava-tests/test/com/google/common/base/ObjectsTest.java

@@ -32,6 +32,7 @@
 @NullUnmarked
 public class ObjectsTest extends TestCase {
 
+  @SuppressWarnings("YodaCondition") // test of reversed call
   public void testEqual() throws Exception {
     assertTrue(Objects.equal(1, 1));
     assertTrue(Objects.equal(null, null));

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

@@ -37,6 +37,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
+import java.util.Objects;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
@@ -68,7 +69,7 @@ public static Test suite() {
   }
 
   static final Predicate<@Nullable String> NOT_YYY_ZZZ =
-      input -> !"yyy".equals(input) && !"zzz".equals(input);
+      input -> !Objects.equals(input, "yyy") && !Objects.equals(input, "zzz");
 
   static final Predicate<String> LENGTH_1 = input -> input.length() == 1;
 

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

@@ -23,6 +23,7 @@
 import com.google.common.annotations.GwtIncompatible;
 import com.google.common.base.Predicate;
 import java.util.Map.Entry;
+import java.util.Objects;
 import junit.framework.TestCase;
 import org.jspecify.annotations.NullUnmarked;
 
@@ -36,12 +37,8 @@
 public class FilteredMultimapTest extends TestCase {
 
   private static final Predicate<Entry<String, Integer>> ENTRY_PREDICATE =
-      new Predicate<Entry<String, Integer>>() {
-        @Override
-        public boolean apply(Entry<String, Integer> entry) {
-          return !"badkey".equals(entry.getKey()) && !((Integer) 55556).equals(entry.getValue());
-        }
-      };
+      entry ->
+          !Objects.equals(entry.getKey(), "badkey") && !Objects.equals(entry.getValue(), 55556);
 
   protected Multimap<String, Integer> create() {
     Multimap<String, Integer> unfiltered = HashMultimap.create();
@@ -50,13 +47,7 @@ protected Multimap<String, Integer> create() {
     return Multimaps.filterEntries(unfiltered, ENTRY_PREDICATE);
   }
 
-  private static final Predicate<String> KEY_PREDICATE =
-      new Predicate<String>() {
-        @Override
-        public boolean apply(String key) {
-          return !"badkey".equals(key);
-        }
-      };
+  private static final Predicate<String> KEY_PREDICATE = key -> !Objects.equals(key, "badkey");
 
   public void testFilterKeys() {
     Multimap<String, Integer> unfiltered = HashMultimap.create();
@@ -67,13 +58,7 @@ public void testFilterKeys() {
     assertTrue(filtered.containsEntry("foo", 55556));
   }
 
-  private static final Predicate<Integer> VALUE_PREDICATE =
-      new Predicate<Integer>() {
-        @Override
-        public boolean apply(Integer value) {
-          return !((Integer) 55556).equals(value);
-        }
-      };
+  private static final Predicate<Integer> VALUE_PREDICATE = value -> !Objects.equals(value, 55556);
 
   public void testFilterValues() {
     Multimap<String, Integer> unfiltered = HashMultimap.create();

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

@@ -46,6 +46,7 @@
 import java.util.Map.Entry;
 import java.util.NavigableMap;
 import java.util.NavigableSet;
+import java.util.Objects;
 import java.util.Set;
 import java.util.SortedMap;
 import java.util.SortedSet;
@@ -565,15 +566,15 @@ static void putEntries(Map<String, String> map, Entry<String, String>[] entries)
       new Predicate<String>() {
         @Override
         public boolean apply(@Nullable String string) {
-          return !"banana".equals(string) && !"eggplant".equals(string);
+          return !Objects.equals(string, "banana") && !Objects.equals(string, "eggplant");
         }
       };
 
   static final Predicate<String> FILTER_VALUES =
       new Predicate<String>() {
         @Override
         public boolean apply(@Nullable String string) {
-          return !"toast".equals(string) && !"spam".equals(string);
+          return !Objects.equals(string, "toast") && !Objects.equals(string, "spam");
         }
       };
 

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

@@ -21,6 +21,7 @@
 import java.util.Collection;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 import org.jspecify.annotations.NullUnmarked;
 
 /**
@@ -35,7 +36,7 @@ public class MultimapsFilterEntriesAsMapTest extends AbstractMultimapAsMapImplem
       new Predicate<Entry<String, Integer>>() {
         @Override
         public boolean apply(Entry<String, Integer> entry) {
-          return !"badkey".equals(entry.getKey()) && 55556 != entry.getValue();
+          return !Objects.equals(entry.getKey(), "badkey") && entry.getValue() != 55556;
         }
       };
 

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

@@ -122,10 +122,7 @@ public int count(@Nullable Object element) {
     @Override
     public int add(E element, int occurrences) {
       checkArgument(occurrences >= 0);
-      Integer frequency = backingMap.get(element);
-      if (frequency == null) {
-        frequency = 0;
-      }
+      Integer frequency = backingMap.getOrDefault(element, 0);
       if (occurrences == 0) {
         return frequency;
       }

android/guava-tests/test/com/google/common/util/concurrent/UninterruptiblesTest.java

@@ -16,6 +16,7 @@
 
 package com.google.common.util.concurrent;
 
+import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.util.concurrent.InterruptionUtil.repeatedlyInterruptTestThread;
 import static com.google.common.util.concurrent.Uninterruptibles.awaitTerminationUninterruptibly;
 import static com.google.common.util.concurrent.Uninterruptibles.awaitUninterruptibly;
@@ -783,7 +784,7 @@ void joinSuccessfully(long timeoutMillis) {
     void joinUnsuccessfully(long timeoutMillis) {
       Uninterruptibles.joinUninterruptibly(thread, timeoutMillis, MILLISECONDS);
       completed.assertCompletionNotExpected(timeoutMillis);
-      assertFalse(Thread.State.TERMINATED.equals(thread.getState()));
+      assertThat(thread.getState()).isNotEqualTo(Thread.State.TERMINATED);
     }
   }
 

android/guava/src/com/google/common/base/SmallCharMatcher.java

@@ -55,7 +55,7 @@ static int smear(int hashCode) {
   }
 
   private boolean checkFilter(int c) {
-    return 1 == (1 & (filter >> c));
+    return ((filter >> c) & 1) == 1;
   }
 
   // This is all essentially copied from ImmutableSet, but we have to duplicate because

android/guava/src/com/google/common/base/Utf8.java

@@ -164,7 +164,7 @@ private static boolean isWellFormedSlowPath(byte[] bytes, int off, int end) {
             // Overlong? 5 most significant bits must not all be zero.
             || (byte1 == (byte) 0xE0 && byte2 < (byte) 0xA0)
             // Check for illegal surrogate codepoints.
-            || (byte1 == (byte) 0xED && (byte) 0xA0 <= byte2)
+            || (byte1 == (byte) 0xED && byte2 >= (byte) 0xA0)
             // Third byte trailing-byte test.
             || bytes[index++] > (byte) 0xBF) {
           return false;

android/guava/src/com/google/common/hash/LittleEndianByteArray.java

@@ -23,6 +23,7 @@
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
+import java.util.Objects;
 import sun.misc.Unsafe;
 
 /**
@@ -267,7 +268,7 @@ static LittleEndianBytes makeGetter() {
        *
        */
       String arch = System.getProperty("os.arch");
-      if ("amd64".equals(arch)) {
+      if (Objects.equals(arch, "amd64")) {
         return ByteOrder.nativeOrder().equals(ByteOrder.LITTLE_ENDIAN)
             ? UnsafeByteArray.UNSAFE_LITTLE_ENDIAN
             : UnsafeByteArray.UNSAFE_BIG_ENDIAN;