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 f } @Override - public V merge(K key, V newValue, BiFunction function) { + @CheckForNull + public V merge( + K key, V newValue, BiFunction 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 remappingFunction) { + K key, V value, BiFunction 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 remappingFunction) { + K key, V value, BiFunction function) { throw new UnsupportedOperationException(); } @@ -3656,8 +3657,9 @@ public V compute( } @Override + @CheckForNull public V merge( - K key, V value, BiFunction remappingFunction) { + K key, V value, BiFunction 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 remappingFunction) { + K key, V value, BiFunction remappingFunction) { synchronized (mutex) { return delegate().merge(key, value, remappingFunction); }