From e549ba5c83438d1fd0b09d6367a0412b72707b32 Mon Sep 17 00:00:00 2001
From: cpovirk <cpovirk@google.com>
Date: Sun, 30 Jun 2024 09:20:14 -0700
Subject: [PATCH] Remove suppressions that are unnecessary now that our
 nullness checker sees `@NonNull` on JDK APIs.

RELNOTES=n/a
PiperOrigin-RevId: 648147707
---
 guava/src/com/google/common/collect/Maps.java         | 2 --
 guava/src/com/google/common/collect/Synchronized.java | 2 --
 2 files changed, 4 deletions(-)

diff --git a/guava/src/com/google/common/collect/Maps.java b/guava/src/com/google/common/collect/Maps.java
index acacb119d03c..575089924a5d 100644
--- a/guava/src/com/google/common/collect/Maps.java
+++ b/guava/src/com/google/common/collect/Maps.java
@@ -1770,7 +1770,6 @@ public V compute(
 
     @Override
     @CheckForNull
-    @SuppressWarnings("nullness") // TODO(b/262880368): Remove once we see @NonNull in JDK APIs
     public V merge(
         K key,
         @NonNull V value,
@@ -3693,7 +3692,6 @@ public V compute(
 
     @Override
     @CheckForNull
-    @SuppressWarnings("nullness") // TODO(b/262880368): Remove once we see @NonNull in JDK APIs
     public V merge(
         K key,
         @NonNull V value,
diff --git a/guava/src/com/google/common/collect/Synchronized.java b/guava/src/com/google/common/collect/Synchronized.java
index b3972cfd096f..f57b91e8b4b1 100644
--- a/guava/src/com/google/common/collect/Synchronized.java
+++ b/guava/src/com/google/common/collect/Synchronized.java
@@ -1191,7 +1191,6 @@ public V computeIfAbsent(K key, Function<? super K, ? extends V> mappingFunction
 
     @Override
     @CheckForNull
-    @SuppressWarnings("nullness") // TODO(b/262880368): Remove once we see @NonNull in JDK APIs
     public V computeIfPresent(
         K key, BiFunction<? super K, ? super @NonNull V, ? extends @Nullable V> remappingFunction) {
       synchronized (mutex) {
@@ -1211,7 +1210,6 @@ public V compute(
 
     @Override
     @CheckForNull
-    @SuppressWarnings("nullness") // TODO(b/262880368): Remove once we see @NonNull in JDK APIs
     public V merge(
         K key,
         @NonNull V value,