Manually annotate some more type arguments as @Nullable.

RELNOTES=n/a PiperOrigin-RevId: 524863563
google · Apr 17, 2023 · 3f039fc · 3f039fc
1 parent 378386b
commit 3f039fc
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/android/guava-tests/test/com/google/common/base/FunctionsTest.java b/android/guava-tests/test/com/google/common/base/FunctionsTest.java
@@ -274,7 +274,7 @@ public void testCompositionWildcard() {
         Functions.compose(numberToSpanish, japaneseToInteger);
   }
 
-  private static class HashCodeFunction implements Function<Object, Integer> {
+  private static class HashCodeFunction implements Function<@Nullable Object, Integer> {
     @Override
     public Integer apply(@Nullable Object o) {
       return (o == null) ? 0 : o.hashCode();

diff --git a/android/guava-tests/test/com/google/common/collect/MapsTest.java b/android/guava-tests/test/com/google/common/collect/MapsTest.java
@@ -1326,16 +1326,16 @@ public void testSynchronizedBiMap() {
     assertEquals(ImmutableSet.of(1, 2, 3), sync.inverse().keySet());
   }
 
-  static final Predicate<String> NOT_LENGTH_3 =
-      new Predicate<String>() {
+  static final Predicate<@Nullable String> NOT_LENGTH_3 =
+      new Predicate<@Nullable String>() {
         @Override
         public boolean apply(@Nullable String input) {
           return input == null || input.length() != 3;
         }
       };
 
-  static final Predicate<Integer> EVEN =
-      new Predicate<Integer>() {
+  static final Predicate<@Nullable Integer> EVEN =
+      new Predicate<@Nullable Integer>() {
         @Override
         public boolean apply(@Nullable Integer input) {
           return input == null || input % 2 == 0;

diff --git a/android/guava-tests/test/com/google/common/collect/TreeMultimapExplicitTest.java b/android/guava-tests/test/com/google/common/collect/TreeMultimapExplicitTest.java
@@ -42,7 +42,7 @@ public class TreeMultimapExplicitTest extends TestCase {
    * Compare strings lengths, and if the lengths are equal compare the strings. A {@code null} is
    * less than any non-null value.
    */
-  private enum StringLength implements Comparator<String> {
+  private enum StringLength implements Comparator<@Nullable String> {
     COMPARATOR;
 
     @Override

diff --git a/guava-tests/test/com/google/common/base/FunctionsTest.java b/guava-tests/test/com/google/common/base/FunctionsTest.java
@@ -274,7 +274,7 @@ public void testCompositionWildcard() {
         Functions.compose(numberToSpanish, japaneseToInteger);
   }
 
-  private static class HashCodeFunction implements Function<Object, Integer> {
+  private static class HashCodeFunction implements Function<@Nullable Object, Integer> {
     @Override
     public Integer apply(@Nullable Object o) {
       return (o == null) ? 0 : o.hashCode();

diff --git a/guava-tests/test/com/google/common/collect/MapsTest.java b/guava-tests/test/com/google/common/collect/MapsTest.java
@@ -1371,16 +1371,16 @@ public void testSynchronizedBiMap() {
     assertEquals(ImmutableSet.of(1, 2, 3), sync.inverse().keySet());
   }
 
-  static final Predicate<String> NOT_LENGTH_3 =
-      new Predicate<String>() {
+  static final Predicate<@Nullable String> NOT_LENGTH_3 =
+      new Predicate<@Nullable String>() {
         @Override
         public boolean apply(@Nullable String input) {
           return input == null || input.length() != 3;
         }
       };
 
-  static final Predicate<Integer> EVEN =
-      new Predicate<Integer>() {
+  static final Predicate<@Nullable Integer> EVEN =
+      new Predicate<@Nullable Integer>() {
         @Override
         public boolean apply(@Nullable Integer input) {
           return input == null || input % 2 == 0;

diff --git a/guava-tests/test/com/google/common/collect/TreeMultimapExplicitTest.java b/guava-tests/test/com/google/common/collect/TreeMultimapExplicitTest.java
@@ -42,7 +42,7 @@ public class TreeMultimapExplicitTest extends TestCase {
    * Compare strings lengths, and if the lengths are equal compare the strings. A {@code null} is
    * less than any non-null value.
    */
-  private enum StringLength implements Comparator<String> {
+  private enum StringLength implements Comparator<@Nullable String> {
     COMPARATOR;
 
     @Override