Migrate from Guava's Object APIs to the JDK replacements.

RELNOTES=n/a
PiperOrigin-RevId: 780646928

Author: kluever

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

@@ -49,7 +49,7 @@
 @GwtCompatible(emulated = true)
 @NullMarked
 public class Helpers {
-  // Clone of Objects.equal
+  // Clone of Objects.equals
   static boolean equal(@Nullable Object a, @Nullable Object b) {
     return a == b || (a != null && a.equals(b));
   }

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

@@ -25,7 +25,6 @@
 import com.google.common.annotations.GwtIncompatible;
 import com.google.common.annotations.J2ktIncompatible;
 import com.google.common.base.Converter;
-import com.google.common.base.Objects;
 import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
@@ -48,6 +47,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.ConcurrentMap;
 import junit.framework.Assert;
 import org.jspecify.annotations.NullMarked;
@@ -365,7 +365,7 @@ public boolean equals(@Nullable Object obj) {
 
     @Override
     public int hashCode() {
-      return Objects.hashCode(name, parameterTypes);
+      return Objects.hash(name, parameterTypes);
     }
   }
 

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

@@ -16,7 +16,6 @@
 
 import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.cache.LocalCache.Strength;
@@ -26,6 +25,7 @@
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import org.jspecify.annotations.NullUnmarked;
@@ -221,7 +221,7 @@ public static DurationSpec of(long duration, TimeUnit unit) {
 
     @Override
     public int hashCode() {
-      return Objects.hashCode(duration, unit);
+      return Objects.hash(duration, unit);
     }
 
     @Override

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

@@ -22,9 +22,9 @@
 import com.google.common.annotations.GwtCompatible;
 import com.google.common.annotations.GwtIncompatible;
 import com.google.common.annotations.J2ktIncompatible;
-import com.google.common.base.Objects;
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.NullPointerTester;
+import java.util.Objects;
 import junit.framework.TestCase;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
@@ -142,9 +142,7 @@ public void testEquals() {
   public void testHashCode() {
     table = create("foo", 1, 'a', "bar", 1, 'b', "foo", 3, 'c');
     int expected =
-        Objects.hashCode("foo", 1, 'a')
-            + Objects.hashCode("bar", 1, 'b')
-            + Objects.hashCode("foo", 3, 'c');
+        Objects.hash("foo", 1, 'a') + Objects.hash("bar", 1, 'b') + Objects.hash("foo", 3, 'c');
     assertEquals(expected, table.hashCode());
   }
 

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

@@ -24,14 +24,14 @@
 import com.google.common.annotations.GwtCompatible;
 import com.google.common.annotations.GwtIncompatible;
 import com.google.common.annotations.J2ktIncompatible;
-import com.google.common.base.Objects;
 import com.google.common.collect.Table.Cell;
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.NullPointerTester;
 import com.google.common.testing.SerializableTester;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
@@ -156,10 +156,10 @@ public void testHashCode() {
     table.put("bar", 1, 'b');
     table.put("foo", 3, 'c');
     int expected =
-        Objects.hashCode("foo", 1, 'a')
-            + Objects.hashCode("bar", 1, 'b')
-            + Objects.hashCode("foo", 3, 'c')
-            + Objects.hashCode("bar", 3, 0);
+        Objects.hash("foo", 1, 'a')
+            + Objects.hash("bar", 1, 'b')
+            + Objects.hash("foo", 3, 'c')
+            + Objects.hash("bar", 3, 0);
     assertEquals(expected, table.hashCode());
   }
 

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

@@ -25,14 +25,14 @@
 
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
-import com.google.common.base.Objects;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import junit.framework.TestCase;
 import org.jspecify.annotations.NullUnmarked;
@@ -185,7 +185,7 @@ public boolean equals(@Nullable Object obj) {
 
     @Override
     public int hashCode() {
-      return Objects.hashCode(name, parameterTypes, typeSignature);
+      return Objects.hash(name, parameterTypes, typeSignature);
     }
 
     @Override

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

@@ -22,10 +22,10 @@
 import com.google.common.annotations.GwtCompatible;
 import com.google.common.annotations.GwtIncompatible;
 import com.google.common.annotations.J2ktIncompatible;
-import com.google.common.base.Objects;
 import com.google.common.testing.NullPointerTester;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import junit.framework.TestCase;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
@@ -84,7 +84,7 @@ public void testCreateSingletonRangeSucceeds() {
     for (Integer i : IN_ORDER_VALUES) {
       GeneralRange<@Nullable Integer> range = GeneralRange.range(ORDERING, i, CLOSED, i, CLOSED);
       for (Integer j : IN_ORDER_VALUES) {
-        assertEquals(Objects.equal(i, j), range.contains(j));
+        assertEquals(Objects.equals(i, j), range.contains(j));
       }
     }
   }

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

@@ -16,7 +16,6 @@
 
 package com.google.common.collect;
 
-import static com.google.common.base.Objects.equal;
 import static com.google.common.collect.Platform.reduceExponentIfGwt;
 import static com.google.common.collect.Platform.reduceIterationsIfGwt;
 import static com.google.common.collect.ReflectionFreeAssertThrows.assertThrows;
@@ -46,6 +45,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
+import java.util.Objects;
 import java.util.PriorityQueue;
 import java.util.Queue;
 import java.util.Random;
@@ -945,15 +945,15 @@ private static void assertIntactUsingStartedWith(
 
   private static void assertEqualsUsingSeed(
       long seed, @Nullable Object expected, @Nullable Object actual) {
-    if (!equal(actual, expected)) {
+    if (!Objects.equals(actual, expected)) {
       // fail(), but with the JUnit-supplied message.
       assertEquals("Using seed " + seed, expected, actual);
     }
   }
 
   private static void assertEqualsUsingStartedWith(
       Collection<?> startedWith, @Nullable Object expected, @Nullable Object actual) {
-    if (!equal(actual, expected)) {
+    if (!Objects.equals(actual, expected)) {
       // fail(), but with the JUnit-supplied message.
       assertEquals("Started with " + startedWith, expected, actual);
     }

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

@@ -26,7 +26,6 @@
 import static java.util.Collections.sort;
 
 import com.google.common.annotations.GwtIncompatible;
-import com.google.common.base.Objects;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.testing.features.CollectionFeature;
@@ -37,6 +36,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
@@ -199,7 +199,7 @@ protected Multiset<String> create(String[] elements) {
            * "add an extra item 0 to A and an extra item 1 to B" really means
            * "add an extra item 0 to A and B," which isn't what we want.
            */
-          if (!Objects.equal(elements[0], elements[1])) {
+          if (!Objects.equals(elements[0], elements[1])) {
             multiset2.add(elements[1], 2);
           }
         }

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

@@ -20,7 +20,6 @@
 import com.google.common.annotations.GwtCompatible;
 import com.google.common.annotations.GwtIncompatible;
 import com.google.common.annotations.J2ktIncompatible;
-import com.google.common.base.Objects;
 import com.google.common.collect.testing.features.CollectionFeature;
 import com.google.common.collect.testing.features.CollectionSize;
 import com.google.common.collect.testing.google.MultisetTestSuiteBuilder;
@@ -30,6 +29,7 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 import junit.framework.Test;
 import junit.framework.TestCase;
@@ -113,7 +113,7 @@ public void clear() {
     @Override
     public int count(@Nullable Object element) {
       for (Entry<E> entry : entrySet()) {
-        if (Objects.equal(entry.getElement(), element)) {
+        if (Objects.equals(entry.getElement(), element)) {
           return entry.getCount();
         }
       }