From 7dd94007fa5875340fbffd323f008b19f18eb3a7 Mon Sep 17 00:00:00 2001
From: cpovirk <cpovirk@google.com>
Date: Wed, 5 Jul 2023 13:58:46 -0700
Subject: [PATCH] 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](https://github.com/google/guava/issues/6510) data.

RELNOTES=n/a
PiperOrigin-RevId: 545778930
---
 guava/src/com/google/common/cache/LocalCache.java     | 4 +++-
 guava/src/com/google/common/collect/ImmutableMap.java | 3 ++-
 guava/src/com/google/common/collect/Maps.java         | 6 ++++--
 guava/src/com/google/common/collect/Synchronized.java | 3 ++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/guava/src/com/google/common/cache/LocalCache.java b/guava/src/com/google/common/cache/LocalCache.java
index 8206c8c8afbb..00fb435757b6 100644
--- 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
index d1b890a9de03..c370e52487e3 100644
--- 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
index 3c1e9c03f732..173447caff38 100644
--- 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
index 1274b04cdb09..b1422e31673f 100644
--- 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);
       }