Merge pull request #69 from dugenkui03/call_getCacheKey_when_cachingEnabled

call getCacheKey() when cachingEnabled in DataLoaderHelper

Author: bbakerman

src/main/java/org/dataloader/DataLoaderHelper.java

@@ -73,9 +73,9 @@ Object getCallContext() {
 
     Optional<CompletableFuture<V>> getIfPresent(K key) {
         synchronized (dataLoader) {
-            Object cacheKey = getCacheKey(nonNull(key));
             boolean cachingEnabled = loaderOptions.cachingEnabled();
             if (cachingEnabled) {
+                Object cacheKey = getCacheKey(nonNull(key));
                 if (futureCache.containsKey(cacheKey)) {
                     stats.incrementCacheHitCount();
                     return Optional.of(futureCache.get(cacheKey));
@@ -101,12 +101,12 @@ Optional<CompletableFuture<V>> getIfCompleted(K key) {
 
     CompletableFuture<V> load(K key, Object loadContext) {
         synchronized (dataLoader) {
-            Object cacheKey = getCacheKey(nonNull(key));
-            stats.incrementLoadCount();
-
             boolean batchingEnabled = loaderOptions.batchingEnabled();
             boolean cachingEnabled = loaderOptions.cachingEnabled();
 
+            Object cacheKey = cachingEnabled ? getCacheKey(nonNull(key)) : null;
+            stats.incrementLoadCount();
+
             if (cachingEnabled) {
                 if (futureCache.containsKey(cacheKey)) {
                     stats.incrementCacheHitCount();