AbstractMap inner classes should be marked as Serializable

Unmodifiable types in Collections as well.
niloc132 · Aug 23, 2023 · 7e32721 · 7e32721
1 parent 9b9e888
commit 7e32721
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/user/super/com/google/gwt/emul/java/util/AbstractMap.java b/user/super/com/google/gwt/emul/java/util/AbstractMap.java
@@ -19,6 +19,8 @@
 
 import jsinterop.annotations.JsNonNull;
 
+import java.io.Serializable;
+
 /**
  * Skeletal implementation of the Map interface. <a
  * href="http://java.sun.com/j2se/1.5.0/docs/api/java/util/AbstractMap.html">[Sun
@@ -32,7 +34,7 @@ public abstract class AbstractMap<K, V> implements Map<K, V> {
   /**
    * A mutable {@link Map.Entry} shared by several {@link Map} implementations.
    */
-  public static class SimpleEntry<K, V> extends AbstractEntry<K, V> {
+  public static class SimpleEntry<K, V> extends AbstractEntry<K, V> implements Serializable {
     public SimpleEntry(K key, V value) {
       super(key, value);
     }
@@ -45,7 +47,8 @@ public SimpleEntry(Entry<? extends K, ? extends V> entry) {
   /**
    * An immutable {@link Map.Entry} shared by several {@link Map} implementations.
    */
-  public static class SimpleImmutableEntry<K, V> extends AbstractEntry<K, V> {
+  public static class SimpleImmutableEntry<K, V> extends AbstractEntry<K, V> implements
+      Serializable {
     public SimpleImmutableEntry(K key, V value) {
       super(key, value);
     }

diff --git a/user/super/com/google/gwt/emul/java/util/Collections.java b/user/super/com/google/gwt/emul/java/util/Collections.java
@@ -354,7 +354,7 @@ public static <T> SortedSet<T> synchronizedSortedSet(SortedSet<T> s) {
    * TODO: make the unmodifiable collections serializable.
    */
 
-  static class UnmodifiableCollection<T> implements Collection<T> {
+  static class UnmodifiableCollection<T> implements Collection<T>, Serializable {
     protected final Collection<? extends T> coll;
 
     public UnmodifiableCollection(Collection<? extends T> coll) {
@@ -523,7 +523,7 @@ public List<T> subList(int fromIndex, int toIndex) {
     }
   }
 
-  static class UnmodifiableMap<K, V> implements Map<K, V> {
+  static class UnmodifiableMap<K, V> implements Map<K, V>, Serializable {
 
     static class UnmodifiableEntrySet<K, V> extends
         UnmodifiableSet<Map.Entry<K, V>> {