Added support for a delegating data loader - jspecify annotations

Author: bbakerman

src/main/java/org/dataloader/DataLoader.java

@@ -21,6 +21,7 @@
 import org.dataloader.impl.CompletableFutureKit;
 import org.dataloader.stats.Statistics;
 import org.dataloader.stats.StatisticsCollector;
+import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
@@ -517,8 +518,8 @@ public Optional<CompletableFuture<V>> getIfCompleted(K key) {
      * @param keyContext a context object that is specific to this key
      * @return the future of the value
      */
-    public CompletableFuture<V> load(K key, Object keyContext) {
-        return helper.load(key, keyContext);
+    public CompletableFuture<V> load(@NonNull K key, @Nullable Object keyContext) {
+        return helper.load(nonNull(key), keyContext);
     }
 
     /**

src/main/java/org/dataloader/DelegatingDataLoader.java

@@ -2,6 +2,9 @@
 
 import org.dataloader.annotations.PublicApi;
 import org.dataloader.stats.Statistics;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -19,6 +22,7 @@
  * @param <V> type parameter indicating the type of the data that is returned
  */
 @PublicApi
+@NullMarked
 public class DelegatingDataLoader<K, V> extends DataLoader<K, V> {
 
     protected final DataLoader<K, V> delegate;
@@ -57,7 +61,7 @@ public DataLoader<K, V> getDelegate() {
      * @return the future of the value
      */
     @Override
-    public CompletableFuture<V> load(K key, Object keyContext) {
+    public CompletableFuture<V> load(@NonNull K key, @Nullable Object keyContext) {
         return delegate.load(key, keyContext);
     }
 

src/test/java/org/dataloader/DelegatingDataLoaderTest.java

@@ -1,6 +1,8 @@
 package org.dataloader;
 
 import org.dataloader.fixtures.TestKit;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
@@ -31,7 +33,7 @@ void canCreateAClassOk() {
         DataLoader<String, String> rawLoader = TestKit.idLoader();
         DelegatingDataLoader<String, String> delegatingDataLoader = new DelegatingDataLoader<>(rawLoader) {
             @Override
-            public CompletableFuture<String> load(String key, Object keyContext) {
+            public CompletableFuture<String> load(@NonNull String key, @Nullable Object keyContext) {
                 CompletableFuture<String> cf = super.load(key, keyContext);
                 return cf.thenApply(v -> "|" + v + "|");
             }