Roll back J2KT Map.merge nullness annotations to the more flexible …

…(if possibly less convenient) original version, updating Guava. This is another annotation from the [On Leveraging Tests to Infer Nullable Annotations](#6510) data. RELNOTES=n/a PiperOrigin-RevId: 546272042
google · Jul 7, 2023 · 74859eb · 74859eb
1 parent fa695a1
commit 74859eb
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/guava/src/com/google/common/cache/LocalCache.java b/guava/src/com/google/common/cache/LocalCache.java
@@ -4277,7 +4277,9 @@ public V computeIfPresent(K key, BiFunction<? super K, ? super V, ? extends V> f
   }
 
   @Override
-  public V merge(K key, V newValue, BiFunction<? super V, ? super V, ? extends V> function) {
+  @CheckForNull
+  public V merge(
+      K key, V newValue, BiFunction<? super V, ? super V, ? extends @Nullable V> function) {
     checkNotNull(key);
     checkNotNull(newValue);
     checkNotNull(function);

diff --git a/guava/src/com/google/common/collect/ImmutableMap.java b/guava/src/com/google/common/collect/ImmutableMap.java
@@ -873,8 +873,9 @@ public final V compute(
   @Deprecated
   @Override
   @DoNotCall("Always throws UnsupportedOperationException")
+  @CheckForNull
   public final V merge(
-      K key, V value, BiFunction<? super V, ? super V, ? extends V> remappingFunction) {
+      K key, V value, BiFunction<? super V, ? super V, ? extends @Nullable V> function) {
     throw new UnsupportedOperationException();
   }
 

diff --git a/guava/src/com/google/common/collect/Maps.java b/guava/src/com/google/common/collect/Maps.java
@@ -1750,8 +1750,9 @@ public V compute(
     }
 
     @Override
+    @CheckForNull
     public V merge(
-        K key, V value, BiFunction<? super V, ? super V, ? extends V> remappingFunction) {
+        K key, V value, BiFunction<? super V, ? super V, ? extends @Nullable V> function) {
       throw new UnsupportedOperationException();
     }
 
@@ -3656,8 +3657,9 @@ public V compute(
     }
 
     @Override
+    @CheckForNull
     public V merge(
-        K key, V value, BiFunction<? super V, ? super V, ? extends V> remappingFunction) {
+        K key, V value, BiFunction<? super V, ? super V, ? extends @Nullable V> function) {
       throw new UnsupportedOperationException();
     }
 

diff --git a/guava/src/com/google/common/collect/Synchronized.java b/guava/src/com/google/common/collect/Synchronized.java
@@ -1205,8 +1205,9 @@ public V compute(
     }
 
     @Override
+    @CheckForNull
     public V merge(
-        K key, V value, BiFunction<? super V, ? super V, ? extends V> remappingFunction) {
+        K key, V value, BiFunction<? super V, ? super V, ? extends @Nullable V> remappingFunction) {
       synchronized (mutex) {
         return delegate().merge(key, value, remappingFunction);
       }