From 4353240136606ce5d0535ca0cd061d6af1c746bc Mon Sep 17 00:00:00 2001
From: Chris Povirk <cpovirk@google.com>
Date: Thu, 5 Dec 2024 10:34:20 -0500
Subject: [PATCH] Allow `AsyncCacheLoader.bulk` to be used with nullable value
 types, too.

---
 .../benmanes/caffeine/cache/AsyncCacheLoader.java   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/caffeine/src/main/java/com/github/benmanes/caffeine/cache/AsyncCacheLoader.java b/caffeine/src/main/java/com/github/benmanes/caffeine/cache/AsyncCacheLoader.java
index d2ac373ad1..382f7b6c0b 100644
--- a/caffeine/src/main/java/com/github/benmanes/caffeine/cache/AsyncCacheLoader.java
+++ b/caffeine/src/main/java/com/github/benmanes/caffeine/cache/AsyncCacheLoader.java
@@ -139,8 +139,9 @@ default CompletableFuture<? extends V> asyncReload(
    * @return an asynchronous cache loader that delegates to the supplied {@code mappingFunction}
    * @throws NullPointerException if the mappingFunction is null
    */
-  static <K, V> AsyncCacheLoader<K, V> bulk(Function<? super Set<? extends K>,
-      ? extends Map<? extends K, ? extends V>> mappingFunction) {
+  static <K, V extends @Nullable Object> AsyncCacheLoader<K, V> bulk(
+      Function<? super Set<? extends K>, ? extends Map<? extends K, ? extends @NonNull V>>
+          mappingFunction) {
     return CacheLoader.bulk(mappingFunction);
   }
 
@@ -162,8 +163,12 @@ static <K, V> AsyncCacheLoader<K, V> bulk(Function<? super Set<? extends K>,
    * @return an asynchronous cache loader that delegates to the supplied {@code mappingFunction}
    * @throws NullPointerException if the mappingFunction is null
    */
-  static <K, V> AsyncCacheLoader<K, V> bulk(BiFunction<? super Set<? extends K>, ? super Executor,
-      ? extends CompletableFuture<? extends Map<? extends K, ? extends V>>> mappingFunction) {
+  static <K, V extends @Nullable Object> AsyncCacheLoader<K, V> bulk(
+      BiFunction<
+          ? super Set<? extends K>,
+          ? super Executor,
+          ? extends CompletableFuture<? extends Map<? extends K, ? extends @NonNull V>>>
+      mappingFunction) {
     requireNonNull(mappingFunction);
     return new AsyncCacheLoader<>() {
       @Override public CompletableFuture<V> asyncLoad(K key, Executor executor) {