Fixed bug in caching, improved generics handling

Author: aschrijver

src/main/java/io/engagingspaces/vertx/dataloader/CacheKey.java

@@ -20,18 +20,17 @@
  * Function that is invoked on input keys of type {@code K} to derive keys that are required by the {@link CacheMap}
  * implementation.
  *
+ * @param <K>   type parameter indicating the type of the input key
  * @author <a href="https://github.com/aschrijver/">Arnold Schrijver</a>
  */
 @FunctionalInterface
-public interface CacheKey {
+public interface CacheKey<K> {
 
     /**
      * Returns the cache key that is created from the provided input key.
      *
      * @param input the input key
-     * @param <K>   type parameter indicating the type of the input key
-     * @param <U>   type parameter indicating the type of the cache key that is returned
      * @return the cache key
      */
-    <K, U> U getKey(K input);
+    Object getKey(K input);
 }

src/main/java/io/engagingspaces/vertx/dataloader/DataLoader.java

@@ -49,7 +49,7 @@
 public class DataLoader<K, V> {
 
     private final BatchLoader<K> batchLoadFunction;
-    private final DataLoaderOptions<K, V> loaderOptions;
+    private final DataLoaderOptions loaderOptions;
     private final CacheMap<Object, Future<V>> futureCache;
     private final LinkedHashMap<K, Future<V>> loaderQueue;
 
@@ -69,10 +69,10 @@ public DataLoader(BatchLoader<K> batchLoadFunction) {
      * @param options           the batch load options
      */
     @SuppressWarnings("unchecked")
-    public DataLoader(BatchLoader<K> batchLoadFunction, DataLoaderOptions<K, V> options) {
+    public DataLoader(BatchLoader<K> batchLoadFunction, DataLoaderOptions options) {
         Objects.requireNonNull(batchLoadFunction, "Batch load function cannot be null");
         this.batchLoadFunction = batchLoadFunction;
-        this.loaderOptions = options == null ? new DataLoaderOptions<>() : options;
+        this.loaderOptions = options == null ? new DataLoaderOptions() : options;
         this.futureCache = loaderOptions.cacheMap().isPresent() ? (CacheMap<Object, Future<V>>) loaderOptions.cacheMap().get() : CacheMap.simpleMap();
         this.loaderQueue = new LinkedHashMap<>();
     }
@@ -91,7 +91,7 @@ public Future<V> load(K key) {
         Objects.requireNonNull(key, "Key cannot be null");
         Object cacheKey = getCacheKey(key);
         if (loaderOptions.cachingEnabled() && futureCache.containsKey(cacheKey)) {
-            return futureCache.get(key);
+            return futureCache.get(cacheKey);
         }
 
         Future<V> future = Future.future();
@@ -106,7 +106,7 @@ public Future<V> load(K key) {
             }
         }
         if (loaderOptions.cachingEnabled()) {
-            futureCache.set(key, future);
+            futureCache.set(cacheKey, future);
         }
         return future;
     }
@@ -213,6 +213,7 @@ public DataLoader<K, V> prime(K key, Exception error) {
      * @param key the input key
      * @return the cache key after the input is transformed with the cache key function
      */
+    @SuppressWarnings("unchecked")
     public Object getCacheKey(K key) {
         return loaderOptions.cacheKeyFunction().isPresent() ?
                 loaderOptions.cacheKeyFunction().get().getKey(key) : key;

src/main/java/io/engagingspaces/vertx/dataloader/DataLoaderOptions.java

@@ -27,12 +27,12 @@
  *
  * @author <a href="https://github.com/aschrijver/">Arnold Schrijver</a>
  */
-public class DataLoaderOptions<K, V> {
+public class DataLoaderOptions {
 
     private boolean batchingEnabled;
     private boolean cachingEnabled;
     private CacheKey cacheKeyFunction;
-    private CacheMap<K, Future<V>> cacheMap;
+    private CacheMap cacheMap;
 
     /**
      * Creates a new data loader options with default settings.
@@ -42,16 +42,16 @@ public DataLoaderOptions() {
         cachingEnabled = true;
     }
 
-    public static <K, V> DataLoaderOptions<K, V> create() {
-        return new DataLoaderOptions<>();
+    public static DataLoaderOptions create() {
+        return new DataLoaderOptions();
     }
 
     /**
      * Clones the provided data loader options.
      *
      * @param other the other options instance
      */
-    public DataLoaderOptions(DataLoaderOptions<K, V> other) {
+    public DataLoaderOptions(DataLoaderOptions other) {
         Objects.requireNonNull(other, "Other data loader options cannot be null");
         this.batchingEnabled = other.batchingEnabled;
         this.cachingEnabled = other.cachingEnabled;
@@ -90,7 +90,7 @@ public boolean batchingEnabled() {
      * @param batchingEnabled {@code true} to enable batch loading, {@code false} otherwise
      * @return the data loader options for fluent coding
      */
-    public DataLoaderOptions<K, V> setBatchingEnabled(boolean batchingEnabled) {
+    public DataLoaderOptions setBatchingEnabled(boolean batchingEnabled) {
         this.batchingEnabled = batchingEnabled;
         return this;
     }
@@ -110,7 +110,7 @@ public boolean cachingEnabled() {
      * @param cachingEnabled {@code true} to enable caching, {@code false} otherwise
      * @return the data loader options for fluent coding
      */
-    public DataLoaderOptions<K, V> setCachingEnabled(boolean cachingEnabled) {
+    public DataLoaderOptions setCachingEnabled(boolean cachingEnabled) {
         this.cachingEnabled = cachingEnabled;
         return this;
     }
@@ -132,7 +132,7 @@ public Optional<CacheKey> cacheKeyFunction() {
      * @param cacheKeyFunction the cache key function to use
      * @return the data loader options for fluent coding
      */
-    public DataLoaderOptions<K, V> setCacheKeyFunction(CacheKey cacheKeyFunction) {
+    public DataLoaderOptions setCacheKeyFunction(CacheKey cacheKeyFunction) {
         this.cacheKeyFunction = cacheKeyFunction;
         return this;
     }
@@ -144,7 +144,7 @@ public DataLoaderOptions<K, V> setCacheKeyFunction(CacheKey cacheKeyFunction) {
      *
      * @return an optional with the cache map instance, or empty
      */
-    public Optional<CacheMap<K, Future<V>>> cacheMap() {
+    public Optional<CacheMap> cacheMap() {
         return Optional.ofNullable(cacheMap);
     }
 
@@ -154,7 +154,7 @@ public Optional<CacheMap<K, Future<V>>> cacheMap() {
      * @param cacheMap the cache map instance
      * @return the data loader options for fluent coding
      */
-    public DataLoaderOptions setCacheMap(CacheMap<K, Future<V>> cacheMap) {
+    public <K, V> DataLoaderOptions setCacheMap(CacheMap<K, Future<V>> cacheMap) {
         this.cacheMap = cacheMap;
         return this;
     }