Add explicit type arguments necessary for J2KT in common/collect.

RELNOTES=n/a PiperOrigin-RevId: 540634196
google · Jun 15, 2023 · 4b6460f · 4b6460f
1 parent 03e2792
commit 4b6460f
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/android/guava/src/com/google/common/collect/AbstractNavigableMap.java b/android/guava/src/com/google/common/collect/AbstractNavigableMap.java
@@ -44,13 +44,13 @@ abstract class AbstractNavigableMap<K extends @Nullable Object, V extends @Nulla
   @Override
   @CheckForNull
   public Entry<K, V> firstEntry() {
-    return Iterators.getNext(entryIterator(), null);
+    return Iterators.<@Nullable Entry<K, V>>getNext(entryIterator(), null);
   }
 
   @Override
   @CheckForNull
   public Entry<K, V> lastEntry() {
-    return Iterators.getNext(descendingEntryIterator(), null);
+    return Iterators.<@Nullable Entry<K, V>>getNext(descendingEntryIterator(), null);
   }
 
   @Override

diff --git a/android/guava/src/com/google/common/collect/ForwardingNavigableMap.java b/android/guava/src/com/google/common/collect/ForwardingNavigableMap.java
@@ -205,7 +205,7 @@ public Entry<K, V> firstEntry() {
    */
   @CheckForNull
   protected Entry<K, V> standardFirstEntry() {
-    return Iterables.getFirst(entrySet(), null);
+    return Iterables.<@Nullable Entry<K, V>>getFirst(entrySet(), null);
   }
 
   /**
@@ -235,7 +235,7 @@ public Entry<K, V> lastEntry() {
    */
   @CheckForNull
   protected Entry<K, V> standardLastEntry() {
-    return Iterables.getFirst(descendingMap().entrySet(), null);
+    return Iterables.<@Nullable Entry<K, V>>getFirst(descendingMap().entrySet(), null);
   }
 
   /**

diff --git a/android/guava/src/com/google/common/collect/ImmutableSortedSet.java b/android/guava/src/com/google/common/collect/ImmutableSortedSet.java
@@ -628,29 +628,29 @@ abstract ImmutableSortedSet<E> subSetImpl(
   @Override
   @CheckForNull
   public E lower(E e) {
-    return Iterators.getNext(headSet(e, false).descendingIterator(), null);
+    return Iterators.<@Nullable E>getNext(headSet(e, false).descendingIterator(), null);
   }
 
   /** @since 12.0 */
   @Override
   @CheckForNull
   public E floor(E e) {
-    return Iterators.getNext(headSet(e, true).descendingIterator(), null);
+    return Iterators.<@Nullable E>getNext(headSet(e, true).descendingIterator(), null);
   }
 
   /** @since 12.0 */
   @Override
   @CheckForNull
   public E ceiling(E e) {
-    return Iterables.getFirst(tailSet(e, true), null);
+    return Iterables.<@Nullable E>getFirst(tailSet(e, true), null);
   }
 
   /** @since 12.0 */
   @GwtIncompatible // NavigableSet
   @Override
   @CheckForNull
   public E higher(E e) {
-    return Iterables.getFirst(tailSet(e, false), null);
+    return Iterables.<@Nullable E>getFirst(tailSet(e, false), null);
   }
 
   @Override

diff --git a/guava/src/com/google/common/collect/AbstractNavigableMap.java b/guava/src/com/google/common/collect/AbstractNavigableMap.java
@@ -44,13 +44,13 @@ abstract class AbstractNavigableMap<K extends @Nullable Object, V extends @Nulla
   @Override
   @CheckForNull
   public Entry<K, V> firstEntry() {
-    return Iterators.getNext(entryIterator(), null);
+    return Iterators.<@Nullable Entry<K, V>>getNext(entryIterator(), null);
   }
 
   @Override
   @CheckForNull
   public Entry<K, V> lastEntry() {
-    return Iterators.getNext(descendingEntryIterator(), null);
+    return Iterators.<@Nullable Entry<K, V>>getNext(descendingEntryIterator(), null);
   }
 
   @Override

diff --git a/guava/src/com/google/common/collect/ForwardingNavigableMap.java b/guava/src/com/google/common/collect/ForwardingNavigableMap.java
@@ -206,7 +206,7 @@ public Entry<K, V> firstEntry() {
    */
   @CheckForNull
   protected Entry<K, V> standardFirstEntry() {
-    return Iterables.getFirst(entrySet(), null);
+    return Iterables.<@Nullable Entry<K, V>>getFirst(entrySet(), null);
   }
 
   /**
@@ -236,7 +236,7 @@ public Entry<K, V> lastEntry() {
    */
   @CheckForNull
   protected Entry<K, V> standardLastEntry() {
-    return Iterables.getFirst(descendingMap().entrySet(), null);
+    return Iterables.<@Nullable Entry<K, V>>getFirst(descendingMap().entrySet(), null);
   }
 
   /**

diff --git a/guava/src/com/google/common/collect/ImmutableSortedSet.java b/guava/src/com/google/common/collect/ImmutableSortedSet.java
@@ -696,29 +696,29 @@ abstract ImmutableSortedSet<E> subSetImpl(
   @Override
   @CheckForNull
   public E lower(E e) {
-    return Iterators.getNext(headSet(e, false).descendingIterator(), null);
+    return Iterators.<@Nullable E>getNext(headSet(e, false).descendingIterator(), null);
   }
 
   /** @since 12.0 */
   @Override
   @CheckForNull
   public E floor(E e) {
-    return Iterators.getNext(headSet(e, true).descendingIterator(), null);
+    return Iterators.<@Nullable E>getNext(headSet(e, true).descendingIterator(), null);
   }
 
   /** @since 12.0 */
   @Override
   @CheckForNull
   public E ceiling(E e) {
-    return Iterables.getFirst(tailSet(e, true), null);
+    return Iterables.<@Nullable E>getFirst(tailSet(e, true), null);
   }
 
   /** @since 12.0 */
   @GwtIncompatible // NavigableSet
   @Override
   @CheckForNull
   public E higher(E e) {
-    return Iterables.getFirst(tailSet(e, false), null);
+    return Iterables.<@Nullable E>getFirst(tailSet(e, false), null);
   }
 
   @Override