Update nullness annotations after cl/662127972, and prepare for the f…

…orthcoming version of our nullness checker. The headliner in this CL is the addition of missing annotations in `Immutable*.Builder` (though the annotations don't reveal any danger of NPE). This CL also works around a type-inference problem in `Multisets`. Finally, it has a simplification in `SortedLists` that used to work around a problem but that is no longer necessary. Still, a simplification is a simplification, so I've kept it as part of the CL anyway. RELNOTES=n/a PiperOrigin-RevId: 663810873
google · Aug 16, 2024 · a94ff8b · a94ff8b
1 parent a4a7f6b
commit a94ff8b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/android/guava/src/com/google/common/collect/ImmutableCollection.java b/android/guava/src/com/google/common/collect/ImmutableCollection.java
@@ -516,7 +516,7 @@ abstract static class ArrayBasedBuilder<E> extends ImmutableCollection.Builder<E
      * current array, create a new array.
      */
     private void ensureRoomFor(int newElements) {
-      Object[] contents = this.contents;
+      @Nullable Object[] contents = this.contents;
       int newCapacity = expandedCapacity(contents.length, size + newElements);
       // expandedCapacity handles the overflow case
       if (newCapacity > contents.length || forceCopy) {

diff --git a/android/guava/src/com/google/common/collect/SortedLists.java b/android/guava/src/com/google/common/collect/SortedLists.java
@@ -18,6 +18,7 @@
 
 import com.google.common.annotations.GwtCompatible;
 import com.google.common.base.Function;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -278,7 +279,7 @@ public static <E extends Comparable> int binarySearch(
     checkNotNull(presentBehavior);
     checkNotNull(absentBehavior);
     if (!(list instanceof RandomAccess)) {
-      list = Lists.newArrayList(list);
+      list = new ArrayList<>(list);
     }
     // TODO(lowasser): benchmark when it's best to do a linear search
 

diff --git a/guava/src/com/google/common/collect/ImmutableList.java b/guava/src/com/google/common/collect/ImmutableList.java
@@ -819,7 +819,7 @@ public Builder() {
     }
 
     private void ensureRoomFor(int newElements) {
-      Object[] contents = this.contents;
+      @Nullable Object[] contents = this.contents;
       int newCapacity = expandedCapacity(contents.length, size + newElements);
       // expandedCapacity handles the overflow case
       if (contents.length < newCapacity || copyOnWrite) {

diff --git a/guava/src/com/google/common/collect/Multisets.java b/guava/src/com/google/common/collect/Multisets.java
@@ -1131,7 +1131,7 @@ public void remove() {
     Spliterator<Entry<E>> entrySpliterator = multiset.entrySet().spliterator();
     return CollectSpliterators.flatMap(
         entrySpliterator,
-        entry -> Collections.nCopies(entry.getCount(), entry.getElement()).spliterator(),
+        (Entry<E> entry) -> Collections.nCopies(entry.getCount(), entry.getElement()).spliterator(),
         Spliterator.SIZED
             | (entrySpliterator.characteristics()
                 & (Spliterator.ORDERED | Spliterator.NONNULL | Spliterator.IMMUTABLE)),

diff --git a/guava/src/com/google/common/collect/SortedLists.java b/guava/src/com/google/common/collect/SortedLists.java
@@ -18,6 +18,7 @@
 
 import com.google.common.annotations.GwtCompatible;
 import com.google.common.base.Function;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -278,7 +279,7 @@ public static <E extends Comparable> int binarySearch(
     checkNotNull(presentBehavior);
     checkNotNull(absentBehavior);
     if (!(list instanceof RandomAccess)) {
-      list = Lists.newArrayList(list);
+      list = new ArrayList<>(list);
     }
     // TODO(lowasser): benchmark when it's best to do a linear search