Use JDK alternatives to AbstractMapEntry in some places.

RELNOTES=n/a
PiperOrigin-RevId: 778480079

Author: cpovirk

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

@@ -31,6 +31,7 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
+import java.util.AbstractMap.SimpleEntry;
 import java.util.AbstractSequentialList;
 import java.util.Collection;
 import java.util.ConcurrentModificationException;
@@ -106,37 +107,14 @@ public class LinkedListMultimap<K extends @Nullable Object, V extends @Nullable
    */
 
   static final class Node<K extends @Nullable Object, V extends @Nullable Object>
-      extends AbstractMapEntry<K, V> {
-    @ParametricNullness final K key;
-    @ParametricNullness V value;
+      extends SimpleEntry<K, V> {
     @Nullable Node<K, V> next; // the next node (with any key)
     @Weak @Nullable Node<K, V> previous; // the previous node (with any key)
     @Nullable Node<K, V> nextSibling; // the next node with the same key
     @Weak @Nullable Node<K, V> previousSibling; // the previous node with the same key
 
     Node(@ParametricNullness K key, @ParametricNullness V value) {
-      this.key = key;
-      this.value = value;
-    }
-
-    @Override
-    @ParametricNullness
-    public K getKey() {
-      return key;
-    }
-
-    @Override
-    @ParametricNullness
-    public V getValue() {
-      return value;
-    }
-
-    @Override
-    @ParametricNullness
-    public V setValue(@ParametricNullness V newValue) {
-      V result = value;
-      this.value = newValue;
-      return result;
+      super(key, value);
     }
   }
 
@@ -288,12 +266,12 @@ private void removeNode(Node<K, V> node) {
        * Multimap. This should be the case (except in case of concurrent modification, when all bets
        * are off).
        */
-      KeyList<K, V> keyList = requireNonNull(keyToKeyList.remove(node.key));
+      KeyList<K, V> keyList = requireNonNull(keyToKeyList.remove(node.getKey()));
       keyList.count = 0;
       modCount++;
     } else {
       // requireNonNull is safe (under the conditions listed in the comment in the branch above).
-      KeyList<K, V> keyList = requireNonNull(keyToKeyList.get(node.key));
+      KeyList<K, V> keyList = requireNonNull(keyToKeyList.get(node.getKey()));
       keyList.count--;
 
       if (node.previousSibling == null) {
@@ -425,7 +403,7 @@ public void add(Entry<K, V> e) {
 
     void setValue(@ParametricNullness V value) {
       checkState(current != null);
-      current.value = value;
+      current.setValue(value);
     }
   }
 
@@ -456,18 +434,18 @@ public K next() {
         throw new NoSuchElementException();
       }
       current = next;
-      seenKeys.add(current.key);
+      seenKeys.add(current.getKey());
       do { // skip ahead to next unseen key
         next = next.next;
-      } while ((next != null) && !seenKeys.add(next.key));
-      return current.key;
+      } while ((next != null) && !seenKeys.add(next.getKey()));
+      return current.getKey();
     }
 
     @Override
     public void remove() {
       checkForConcurrentModification();
       checkState(current != null, "no calls to next() since the last call to remove()");
-      removeAllNodes(current.key);
+      removeAllNodes(current.getKey());
       current = null;
       expectedModCount = modCount;
     }
@@ -531,7 +509,7 @@ public V next() {
       previous = current = next;
       next = next.nextSibling;
       nextIndex++;
-      return current.value;
+      return current.getValue();
     }
 
     @Override
@@ -549,7 +527,7 @@ public V previous() {
       next = current = previous;
       previous = previous.previousSibling;
       nextIndex--;
-      return current.value;
+      return current.getValue();
     }
 
     @Override
@@ -578,7 +556,7 @@ public void remove() {
     @Override
     public void set(@ParametricNullness V value) {
       checkState(current != null);
-      current.value = value;
+      current.setValue(value);
     }
 
     @Override

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

@@ -39,6 +39,7 @@
 import java.lang.ref.WeakReference;
 import java.util.AbstractCollection;
 import java.util.AbstractMap;
+import java.util.AbstractMap.SimpleEntry;
 import java.util.AbstractSet;
 import java.util.Collection;
 import java.util.Iterator;
@@ -2646,46 +2647,20 @@ public V next() {
    * Custom Entry class used by EntryIterator.next(), that relays setValue changes to the underlying
    * map.
    */
-  final class WriteThroughEntry extends AbstractMapEntry<K, V> {
-    final K key; // non-null
-    V value; // non-null
-
+  final class WriteThroughEntry extends SimpleEntry<K, V> {
     WriteThroughEntry(K key, V value) {
-      this.key = key;
-      this.value = value;
-    }
-
-    @Override
-    public K getKey() {
-      return key;
-    }
-
-    @Override
-    public V getValue() {
-      return value;
+      super(key, value);
     }
 
-    @Override
-    public boolean equals(@Nullable Object object) {
-      // Cannot use key and value equivalence
-      if (object instanceof Entry) {
-        Entry<?, ?> that = (Entry<?, ?>) object;
-        return key.equals(that.getKey()) && value.equals(that.getValue());
-      }
-      return false;
-    }
-
-    @Override
-    public int hashCode() {
-      // Cannot use key and value equivalence
-      return key.hashCode() ^ value.hashCode();
-    }
+    /*
+     * We inherit equals() and hashCode() instead of overriding them to use keyEquivalence and
+     * valueEquivalence.
+     */
 
     @Override
     public V setValue(V newValue) {
-      V oldValue = put(key, newValue);
-      value = newValue; // only if put succeeds
-      return oldValue;
+      put(getKey(), newValue);
+      return super.setValue(newValue); // done after put() so that it happens only if put() succeeds
     }
   }
 

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

@@ -31,6 +31,7 @@
 import com.google.common.base.Predicate;
 import com.google.common.collect.Maps.IteratorBasedAbstractMap;
 import java.util.AbstractMap;
+import java.util.AbstractMap.SimpleImmutableEntry;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
@@ -93,39 +94,25 @@ private TreeRangeMap(NavigableMap<Cut<K>, RangeMapEntry<K, V>> entriesByLowerBou
   }
 
   private static final class RangeMapEntry<K extends Comparable, V>
-      extends AbstractMapEntry<Range<K>, V> {
-    private final Range<K> range;
-    private final V value;
-
+      extends SimpleImmutableEntry<Range<K>, V> {
     RangeMapEntry(Cut<K> lowerBound, Cut<K> upperBound, V value) {
       this(Range.create(lowerBound, upperBound), value);
     }
 
     RangeMapEntry(Range<K> range, V value) {
-      this.range = range;
-      this.value = value;
-    }
-
-    @Override
-    public Range<K> getKey() {
-      return range;
-    }
-
-    @Override
-    public V getValue() {
-      return value;
+      super(range, value);
     }
 
-    public boolean contains(K value) {
-      return range.contains(value);
+    boolean contains(K value) {
+      return getKey().contains(value);
     }
 
     Cut<K> getLowerBound() {
-      return range.lowerBound;
+      return getKey().lowerBound;
     }
 
     Cut<K> getUpperBound() {
-      return range.upperBound;
+      return getKey().upperBound;
     }
   }
 

guava/src/com/google/common/collect/LinkedListMultimap.java

@@ -32,6 +32,7 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
+import java.util.AbstractMap.SimpleEntry;
 import java.util.AbstractSequentialList;
 import java.util.Collection;
 import java.util.ConcurrentModificationException;
@@ -109,37 +110,14 @@ public class LinkedListMultimap<K extends @Nullable Object, V extends @Nullable
    */
 
   static final class Node<K extends @Nullable Object, V extends @Nullable Object>
-      extends AbstractMapEntry<K, V> {
-    @ParametricNullness final K key;
-    @ParametricNullness V value;
+      extends SimpleEntry<K, V> {
     @Nullable Node<K, V> next; // the next node (with any key)
     @Weak @Nullable Node<K, V> previous; // the previous node (with any key)
     @Nullable Node<K, V> nextSibling; // the next node with the same key
     @Weak @Nullable Node<K, V> previousSibling; // the previous node with the same key
 
     Node(@ParametricNullness K key, @ParametricNullness V value) {
-      this.key = key;
-      this.value = value;
-    }
-
-    @Override
-    @ParametricNullness
-    public K getKey() {
-      return key;
-    }
-
-    @Override
-    @ParametricNullness
-    public V getValue() {
-      return value;
-    }
-
-    @Override
-    @ParametricNullness
-    public V setValue(@ParametricNullness V newValue) {
-      V result = value;
-      this.value = newValue;
-      return result;
+      super(key, value);
     }
   }
 
@@ -291,12 +269,12 @@ private void removeNode(Node<K, V> node) {
        * Multimap. This should be the case (except in case of concurrent modification, when all bets
        * are off).
        */
-      KeyList<K, V> keyList = requireNonNull(keyToKeyList.remove(node.key));
+      KeyList<K, V> keyList = requireNonNull(keyToKeyList.remove(node.getKey()));
       keyList.count = 0;
       modCount++;
     } else {
       // requireNonNull is safe (under the conditions listed in the comment in the branch above).
-      KeyList<K, V> keyList = requireNonNull(keyToKeyList.get(node.key));
+      KeyList<K, V> keyList = requireNonNull(keyToKeyList.get(node.getKey()));
       keyList.count--;
 
       if (node.previousSibling == null) {
@@ -428,7 +406,7 @@ public void add(Entry<K, V> e) {
 
     void setValue(@ParametricNullness V value) {
       checkState(current != null);
-      current.value = value;
+      current.setValue(value);
     }
   }
 
@@ -459,18 +437,18 @@ public K next() {
         throw new NoSuchElementException();
       }
       current = next;
-      seenKeys.add(current.key);
+      seenKeys.add(current.getKey());
       do { // skip ahead to next unseen key
         next = next.next;
-      } while ((next != null) && !seenKeys.add(next.key));
-      return current.key;
+      } while ((next != null) && !seenKeys.add(next.getKey()));
+      return current.getKey();
     }
 
     @Override
     public void remove() {
       checkForConcurrentModification();
       checkState(current != null, "no calls to next() since the last call to remove()");
-      removeAllNodes(current.key);
+      removeAllNodes(current.getKey());
       current = null;
       expectedModCount = modCount;
     }
@@ -534,7 +512,7 @@ public V next() {
       previous = current = next;
       next = next.nextSibling;
       nextIndex++;
-      return current.value;
+      return current.getValue();
     }
 
     @Override
@@ -552,7 +530,7 @@ public V previous() {
       next = current = previous;
       previous = previous.previousSibling;
       nextIndex--;
-      return current.value;
+      return current.getValue();
     }
 
     @Override
@@ -581,7 +559,7 @@ public void remove() {
     @Override
     public void set(@ParametricNullness V value) {
       checkState(current != null);
-      current.value = value;
+      current.setValue(value);
     }
 
     @Override