Add exception-throwing readObject to classes using the serial-proxy pattern.

See _Effective Java_, 3rd edition, Item 90.

RELNOTES=Classes with "serial proxies" acquire exception-throwing `readObject` methods, in accordance with best practice.
PiperOrigin-RevId: 451001736

Author: eamonnmcmanus

android/guava/src/com/google/common/cache/LocalCache.java

@@ -54,6 +54,7 @@
 import com.google.j2objc.annotations.RetainedWith;
 import com.google.j2objc.annotations.Weak;
 import java.io.IOException;
+import java.io.InvalidObjectException;
 import java.io.ObjectInputStream;
 import java.io.Serializable;
 import java.lang.ref.Reference;
@@ -4748,6 +4749,10 @@ public void cleanUp() {
     Object writeReplace() {
       return new ManualSerializationProxy<>(localCache);
     }
+
+    private void readObject(ObjectInputStream in) throws InvalidObjectException {
+      throw new InvalidObjectException("Use ManualSerializationProxy");
+    }
   }
 
   static class LocalLoadingCache<K, V> extends LocalManualCache<K, V>
@@ -4797,5 +4802,9 @@ public final V apply(K key) {
     Object writeReplace() {
       return new LoadingSerializationProxy<>(localCache);
     }
+
+    private void readObject(ObjectInputStream in) throws InvalidObjectException {
+      throw new InvalidObjectException("Use LoadingSerializationProxy");
+    }
   }
 }

android/guava/src/com/google/common/collect/EmptyContiguousSet.java

@@ -15,6 +15,8 @@
 
 import com.google.common.annotations.GwtCompatible;
 import com.google.common.annotations.GwtIncompatible;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
 import java.io.Serializable;
 import java.util.NoSuchElementException;
 import java.util.Set;
@@ -162,6 +164,11 @@ Object writeReplace() {
     return new SerializedForm<>(domain);
   }
 
+  @GwtIncompatible // serialization
+  private void readObject(ObjectInputStream stream) throws InvalidObjectException {
+    throw new InvalidObjectException("Use SerializedForm");
+  }
+
   @GwtIncompatible // NavigableSet
   @Override
   ImmutableSortedSet<C> createDescendingSet() {

android/guava/src/com/google/common/collect/ImmutableBiMap.java

@@ -23,6 +23,8 @@
 import com.google.common.annotations.GwtCompatible;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.errorprone.annotations.DoNotCall;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Comparator;
@@ -586,4 +588,8 @@ Builder<K, V> makeBuilder(int size) {
   Object writeReplace() {
     return new SerializedForm<>(this);
   }
+
+  private void readObject(ObjectInputStream stream) throws InvalidObjectException {
+    throw new InvalidObjectException("Use SerializedForm");
+  }
 }

android/guava/src/com/google/common/collect/ImmutableCollection.java

@@ -24,6 +24,8 @@
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.errorprone.annotations.DoNotCall;
 import com.google.errorprone.annotations.DoNotMock;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
 import java.io.Serializable;
 import java.util.AbstractCollection;
 import java.util.Arrays;
@@ -361,6 +363,10 @@ Object writeReplace() {
     return new ImmutableList.SerializedForm(toArray());
   }
 
+  private void readObject(ObjectInputStream stream) throws InvalidObjectException {
+    throw new InvalidObjectException("Use SerializedForm");
+  }
+
   /**
    * Abstract base class for builders of {@link ImmutableCollection} types.
    *

android/guava/src/com/google/common/collect/ImmutableEnumMap.java

@@ -20,6 +20,8 @@
 
 import com.google.common.annotations.GwtCompatible;
 import com.google.common.collect.ImmutableMap.IteratorBasedImmutableMap;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
 import java.io.Serializable;
 import java.util.EnumMap;
 import javax.annotation.CheckForNull;
@@ -100,6 +102,10 @@ Object writeReplace() {
     return new EnumSerializedForm<>(delegate);
   }
 
+  private void readObject(ObjectInputStream stream) throws InvalidObjectException {
+    throw new InvalidObjectException("Use EnumSerializedForm");
+  }
+
   /*
    * This class is used to serialize ImmutableEnumMap instances.
    */

android/guava/src/com/google/common/collect/ImmutableEnumSet.java

@@ -18,6 +18,8 @@
 
 import com.google.common.annotations.GwtCompatible;
 import com.google.errorprone.annotations.concurrent.LazyInit;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.EnumSet;
@@ -126,6 +128,10 @@ Object writeReplace() {
     return new EnumSerializedForm<E>(delegate);
   }
 
+  private void readObject(ObjectInputStream stream) throws InvalidObjectException {
+    throw new InvalidObjectException("Use SerializedForm");
+  }
+
   /*
    * This class is used to serialize ImmutableEnumSet instances.
    */

android/guava/src/com/google/common/collect/ImmutableMap.java

@@ -30,6 +30,8 @@
 import com.google.errorprone.annotations.concurrent.LazyInit;
 import com.google.j2objc.annotations.RetainedWith;
 import com.google.j2objc.annotations.WeakOuter;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
 import java.io.Serializable;
 import java.util.AbstractMap;
 import java.util.Arrays;
@@ -1128,4 +1130,8 @@ Builder<K, V> makeBuilder(int size) {
   Object writeReplace() {
     return new SerializedForm<>(this);
   }
+
+  private void readObject(ObjectInputStream stream) throws InvalidObjectException {
+    throw new InvalidObjectException("Use SerializedForm");
+  }
 }

android/guava/src/com/google/common/collect/ImmutableMapEntrySet.java

@@ -18,6 +18,8 @@
 
 import com.google.common.annotations.GwtCompatible;
 import com.google.common.annotations.GwtIncompatible;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
 import java.io.Serializable;
 import java.util.Map.Entry;
 import javax.annotation.CheckForNull;
@@ -108,6 +110,11 @@ Object writeReplace() {
     return new EntrySetSerializedForm<>(map());
   }
 
+  @GwtIncompatible // serialization
+  private void readObject(ObjectInputStream stream) throws InvalidObjectException {
+    throw new InvalidObjectException("Use EntrySetSerializedForm");
+  }
+
   @GwtIncompatible // serialization
   private static class EntrySetSerializedForm<K, V> implements Serializable {
     final ImmutableMap<K, V> map;

android/guava/src/com/google/common/collect/ImmutableMultimap.java

@@ -29,6 +29,8 @@
 import com.google.errorprone.annotations.DoNotMock;
 import com.google.j2objc.annotations.Weak;
 import com.google.j2objc.annotations.WeakOuter;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -662,6 +664,11 @@ boolean isPartialView() {
     Object writeReplace() {
       return new KeysSerializedForm(ImmutableMultimap.this);
     }
+
+    @GwtIncompatible
+    private void readObject(ObjectInputStream stream) throws InvalidObjectException {
+      throw new InvalidObjectException("Use KeysSerializedForm");
+    }
   }
 
   @GwtIncompatible

android/guava/src/com/google/common/collect/ImmutableMultiset.java

@@ -25,6 +25,8 @@
 import com.google.errorprone.annotations.DoNotCall;
 import com.google.errorprone.annotations.concurrent.LazyInit;
 import com.google.j2objc.annotations.WeakOuter;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Collection;
@@ -365,6 +367,11 @@ Object writeReplace() {
       return new EntrySetSerializedForm<E>(ImmutableMultiset.this);
     }
 
+    @GwtIncompatible
+    private void readObject(ObjectInputStream stream) throws InvalidObjectException {
+      throw new InvalidObjectException("Use EntrySetSerializedForm");
+    }
+
     private static final long serialVersionUID = 0;
   }
 
@@ -385,6 +392,11 @@ Object readResolve() {
   @Override
   abstract Object writeReplace();
 
+  @GwtIncompatible
+  private void readObject(ObjectInputStream stream) throws InvalidObjectException {
+    throw new InvalidObjectException("Use SerializedForm");
+  }
+
   /**
    * Returns a new builder. The generated builder is equivalent to the builder created by the {@link
    * Builder} constructor.