Prepare to make ImmutableMap.toImmutableMap available in guava-andr…

…oid (but don't do so yet). This CL also includes updates to avoid problems with reflection when Java 8+ APIs are not present. That means adding a `serialVersionUID` (so that Java/Android reflection doesn't try to compute one with reflection) and skipping `NullPointerTester` (compare cl/550872250) and some `FauxveridesTest` tests (compare cl/576629272) under Android. This CL is further progress toward #6567 RELNOTES=n/a PiperOrigin-RevId: 576830997
google · Oct 27, 2023 · cb9804c · cb9804c
1 parent 1723ddf
commit cb9804c
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 3 deletions.
diff --git a/android/guava-tests/test/com/google/common/collect/FauxveridesTest.java b/android/guava-tests/test/com/google/common/collect/FauxveridesTest.java
@@ -45,6 +45,7 @@
  * @author Chris Povirk
  */
 public class FauxveridesTest extends TestCase {
+  @AndroidIncompatible // similar to ImmutableTableTest.testNullPointerInstance
   public void testImmutableBiMap() {
     doHasAllFauxveridesTest(ImmutableBiMap.class, ImmutableMap.class);
   }
@@ -57,6 +58,7 @@ public void testImmutableSetMultimap() {
     doHasAllFauxveridesTest(ImmutableSetMultimap.class, ImmutableMultimap.class);
   }
 
+  @AndroidIncompatible // similar to ImmutableTableTest.testNullPointerInstance
   public void testImmutableSortedMap() {
     doHasAllFauxveridesTest(ImmutableSortedMap.class, ImmutableMap.class);
   }

diff --git a/android/guava-tests/test/com/google/common/collect/ImmutableMapTest.java b/android/guava-tests/test/com/google/common/collect/ImmutableMapTest.java
@@ -893,6 +893,7 @@ public void testAsMultimapCaches() {
   }
 
   @GwtIncompatible // NullPointerTester
+  @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
   public void testNullPointers() {
     NullPointerTester tester = new NullPointerTester();
     tester.testAllPublicStaticMethods(ImmutableMap.class);

diff --git a/android/guava/src/com/google/common/collect/ImmutableMap.java b/android/guava/src/com/google/common/collect/ImmutableMap.java
@@ -1133,4 +1133,6 @@ Object writeReplace() {
   private void readObject(ObjectInputStream stream) throws InvalidObjectException {
     throw new InvalidObjectException("Use SerializedForm");
   }
+
+  private static final long serialVersionUID = 0xdecaf;
 }
diff --git a/android/guava/src/com/google/common/collect/ImmutableSortedMap.java b/android/guava/src/com/google/common/collect/ImmutableSortedMap.java
@@ -1148,9 +1148,8 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException
   private static final long serialVersionUID = 0;
 
   /**
-   * Not supported. Use {@link ImmutableSortedMap#naturalOrder}, which offers better type-safety,
-   * instead. This method exists only to hide {@link ImmutableMap#builder} from consumers of {@code
-   * ImmutableSortedMap}.
+   * Not supported. Use {@link #naturalOrder}, which offers better type-safety, instead. This method
+   * exists only to hide {@link ImmutableMap#builder} from consumers of {@code ImmutableSortedMap}.
    *
    * @throws UnsupportedOperationException always
    * @deprecated Use {@link ImmutableSortedMap#naturalOrder}, which offers better type-safety.

diff --git a/guava-tests/test/com/google/common/collect/FauxveridesTest.java b/guava-tests/test/com/google/common/collect/FauxveridesTest.java
@@ -45,6 +45,7 @@
  * @author Chris Povirk
  */
 public class FauxveridesTest extends TestCase {
+  @AndroidIncompatible // similar to ImmutableTableTest.testNullPointerInstance
   public void testImmutableBiMap() {
     doHasAllFauxveridesTest(ImmutableBiMap.class, ImmutableMap.class);
   }
@@ -57,6 +58,7 @@ public void testImmutableSetMultimap() {
     doHasAllFauxveridesTest(ImmutableSetMultimap.class, ImmutableMultimap.class);
   }
 
+  @AndroidIncompatible // similar to ImmutableTableTest.testNullPointerInstance
   public void testImmutableSortedMap() {
     doHasAllFauxveridesTest(ImmutableSortedMap.class, ImmutableMap.class);
   }

diff --git a/guava-tests/test/com/google/common/collect/ImmutableMapTest.java b/guava-tests/test/com/google/common/collect/ImmutableMapTest.java
@@ -904,6 +904,7 @@ public void testAsMultimapCaches() {
   }
 
   @GwtIncompatible // NullPointerTester
+  @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
   public void testNullPointers() {
     NullPointerTester tester = new NullPointerTester();
     tester.testAllPublicStaticMethods(ImmutableMap.class);

diff --git a/guava/src/com/google/common/collect/ImmutableMap.java b/guava/src/com/google/common/collect/ImmutableMap.java
@@ -1284,4 +1284,6 @@ Object writeReplace() {
   private void readObject(ObjectInputStream stream) throws InvalidObjectException {
     throw new InvalidObjectException("Use SerializedForm");
   }
+
+  private static final long serialVersionUID = 0xcafebabe;
 }