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 mappingFunction @Override @CheckForNull - @SuppressWarnings("nullness") // TODO(b/262880368): Remove once we see @NonNull in JDK APIs public V computeIfPresent( K key, BiFunction 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,