From 6ee7e20128f1152e53e101ee210854a56a37d133 Mon Sep 17 00:00:00 2001
From: Chris Povirk <cpovirk@google.com>
Date: Thu, 5 Dec 2024 10:31:49 -0500
Subject: [PATCH] Address nullness diagnostic.

See
https://github.com/ben-manes/caffeine/actions/runs/12181931315/job/33979716621?pr=1806

```
Warning: /home/runner/work/caffeine/caffeine/caffeine/src/main/java/com/github/benmanes/caffeine/cache/CacheLoader.java:233: warning: [NullAway] method returns @Nullable, but superclass method com.github.benmanes.caffeine.cache.CacheLoader.load(K) returns @NonNull
      @Override public @Nullable V load(K key) {
                                   ^
    (see http://t.uber.com/nullaway )
  Did you mean '@SuppressWarnings("NullAway") @Override public @Nullable V load(K key) {'?
error: warnings found and -Werror specified
```
---
 .../benmanes/caffeine/cache/CacheLoader.java       | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/caffeine/src/main/java/com/github/benmanes/caffeine/cache/CacheLoader.java b/caffeine/src/main/java/com/github/benmanes/caffeine/cache/CacheLoader.java
index a8dff17fb4..b470946604 100644
--- a/caffeine/src/main/java/com/github/benmanes/caffeine/cache/CacheLoader.java
+++ b/caffeine/src/main/java/com/github/benmanes/caffeine/cache/CacheLoader.java
@@ -226,14 +226,20 @@ default CompletableFuture<? extends V> asyncReload(
    * @throws NullPointerException if the mappingFunction is null
    */
   @SuppressWarnings("FunctionalInterfaceClash")
-  static <K, V> CacheLoader<K, V> bulk(Function<? super Set<? extends K>,
-      ? extends Map<? extends K, ? extends V>> mappingFunction) {
+  static <K, V extends @Nullable Object> CacheLoader<K, V> bulk(Function<? super Set<? extends K>,
+      ? extends Map<? extends K, ? extends @NonNull V>> mappingFunction) {
     requireNonNull(mappingFunction);
     return new CacheLoader<>() {
-      @Override public @Nullable V load(K key) {
+      /*
+       * If the caller passes a mapping function that may ever return partial results, then calls to
+       * load() may return null. In that case, the caller should type the return value of bulk(...)
+       * as a CacheLoader<Foo, @Nullable Bar>, rather than a CacheLoader<Foo, Bar>.
+       */
+      @SuppressWarnings("NullAway")
+      @Override public V load(K key) {
         return loadAll(Set.of(key)).get(key);
       }
-      @Override public Map<? extends K, ? extends V> loadAll(Set<? extends K> keys) {
+      @Override public Map<? extends K, ? extends @NonNull V> loadAll(Set<? extends K> keys) {
         return mappingFunction.apply(keys);
       }
     };