(incompatible) GET/GET_ALL method of RefreshCache will not trigger re…

…fresh. All upper case method of Cache interface should simply access the cache system and have no side-effect.
hezhaoming · Aug 4, 2019 · d280196 · d280196
1 parent 3e57bff
commit d280196
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/jetcache-core/src/main/java/com/alicp/jetcache/AbstractCache.java b/jetcache-core/src/main/java/com/alicp/jetcache/AbstractCache.java
@@ -147,7 +147,7 @@ static <K, V> V computeIfAbsentImpl(K key, Function<K, V> loader, boolean cacheN
         CacheGetResult<V> r;
         if (cache instanceof RefreshCache) {
             RefreshCache<K, V> refreshCache = ((RefreshCache<K, V>) cache);
-            r = refreshCache.getTargetCache().GET(key);
+            r = refreshCache.GET(key);
             refreshCache.addOrUpdateRefreshTask(key, newLoader);
         } else {
             r = cache.GET(key);

diff --git a/jetcache-core/src/main/java/com/alicp/jetcache/RefreshCache.java b/jetcache-core/src/main/java/com/alicp/jetcache/RefreshCache.java
@@ -7,10 +7,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
@@ -126,21 +123,21 @@ protected void addOrUpdateRefreshTask(K key, CacheLoader<K,V> loader) {
     }
 
     @Override
-    public CacheGetResult<V> GET(K key) {
+    public V get(K key) throws CacheInvokeException {
         if (config.getRefreshPolicy() != null && hasLoader()) {
             addOrUpdateRefreshTask(key, null);
         }
-        return cache.GET(key);
+        return super.get(key);
     }
 
     @Override
-    public MultiGetResult<K, V> GET_ALL(Set<? extends K> keys) {
+    public Map<K, V> getAll(Set<? extends K> keys) throws CacheInvokeException {
         if (config.getRefreshPolicy() != null && hasLoader()) {
             for (K key : keys) {
                 addOrUpdateRefreshTask(key, null);
             }
         }
-        return cache.GET_ALL(keys);
+        return super.getAll(keys);
     }
 
     class RefreshTask implements Runnable {