fix: optimize guava cache

Author: easepan

src/main/java/org/code4everything/boot/cache/guava/GuavaCache.java

@@ -1,13 +1,8 @@
 package org.code4everything.boot.cache.guava;
 
 import com.google.common.cache.CacheBuilder;
-import org.code4everything.boot.config.BootConfig;
-import org.code4everything.boot.web.mvc.exception.ExceptionFactory;
-import org.springframework.cache.Cache;
-import org.springframework.cache.support.SimpleValueWrapper;
-import org.springframework.http.HttpStatus;
+import org.code4everything.boot.cache.AbstractCache;
 
-import java.util.Objects;
 import java.util.concurrent.Callable;
 
 /**
@@ -16,74 +11,39 @@
  * @author pantao
  * @since 2019/6/13
  **/
-public class GuavaCache implements Cache {
+public class GuavaCache extends AbstractCache {
 
     private final com.google.common.cache.Cache<Object, Object> cache;
 
-    private final String name;
-
     public GuavaCache(String name, com.google.common.cache.Cache<Object, Object> cache) {
-        this.name = name;
+        super(name, cache);
         this.cache = cache;
     }
 
     public GuavaCache(String name, CacheBuilder<Object, Object> cacheBuilder) {
         this(name, cacheBuilder.build());
     }
 
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public Object getNativeCache() {
-        return cache;
-    }
-
     @Override
     public ValueWrapper get(Object key) {
-        Object value = cache.getIfPresent(key);
-        return Objects.isNull(value) ? null : new SimpleValueWrapper(value);
+        return wrapValueIfNotNull(cache.getIfPresent(key));
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public <T> T get(Object key, Class<T> type) {
-        return (T) cache.getIfPresent(key);
+        return convert2(cache.getIfPresent(key), type);
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public <T> T get(Object key, Callable<T> valueLoader) {
-        Object value = cache.getIfPresent(key);
-        if (Objects.isNull(value)) {
-            try {
-                return valueLoader.call();
-            } catch (Exception e) {
-                if (BootConfig.isDebug()) {
-                    throw ExceptionFactory.exception(HttpStatus.INTERNAL_SERVER_ERROR, "value loader error");
-                }
-                return null;
-            }
-        }
-        return (T) value;
+        return convert2(cache.getIfPresent(key), valueLoader);
     }
 
     @Override
     public void put(Object key, Object value) {
         cache.put(key, value);
     }
 
-    @Override
-    public ValueWrapper putIfAbsent(Object key, Object value) {
-        Object val = cache.getIfPresent(key);
-        if (Objects.isNull(val)) {
-            put(key, value);
-        }
-        return new SimpleValueWrapper(val);
-    }
-
     @Override
     public void evict(Object key) {
         cache.invalidate(key);

src/main/java/org/code4everything/boot/cache/guava/GuavaCacheCreator.java

@@ -2,7 +2,6 @@
 
 import com.google.common.cache.CacheBuilder;
 import org.code4everything.boot.cache.CacheCreator;
-import org.springframework.cache.Cache;
 
 import java.util.Objects;
 
@@ -14,19 +13,15 @@
  **/
 public class GuavaCacheCreator implements CacheCreator {
 
-    private final CacheBuilder<Object, Object> cacheBuilder;
+    protected final CacheBuilder<Object, Object> cacheBuilder;
 
     public GuavaCacheCreator(CacheBuilder<Object, Object> cacheBuilder) {
         Objects.requireNonNull(cacheBuilder, "guava cache builder must not be null");
         this.cacheBuilder = cacheBuilder;
     }
 
     @Override
-    public Cache createCache(String cacheName) {
+    public GuavaCache createCache(String cacheName) {
         return new GuavaCache(cacheName, cacheBuilder.build());
     }
-
-    public CacheBuilder<Object, Object> getCacheBuilder() {
-        return cacheBuilder;
-    }
 }

src/main/java/org/code4everything/boot/cache/guava/GuavaCacheManager.java

@@ -2,9 +2,8 @@
 
 import com.google.common.cache.CacheBuilder;
 import org.code4everything.boot.cache.BootCacheManager;
-import org.code4everything.boot.cache.CacheCreator;
-import org.springframework.cache.Cache;
 
+import java.util.ArrayList;
 import java.util.Collection;
 
 /**
@@ -23,23 +22,23 @@ public GuavaCacheManager(CacheBuilder<Object, Object> cacheBuilder, int capacity
         this(new GuavaCacheCreator(cacheBuilder), capacity);
     }
 
-    public GuavaCacheManager(CacheCreator cacheCreator) {
-        this(cacheCreator, 16);
+    public GuavaCacheManager(GuavaCacheCreator guavaCacheCreator) {
+        this(guavaCacheCreator, 16);
     }
 
-    public GuavaCacheManager(CacheCreator cacheCreator, int capacity) {
-        super(cacheCreator, capacity);
+    public GuavaCacheManager(GuavaCacheCreator guavaCacheCreator, int capacity) {
+        super(guavaCacheCreator, capacity);
     }
 
-    public GuavaCacheManager(Collection<Cache> caches, CacheCreator cacheCreator) {
-        super(caches, cacheCreator);
+    public GuavaCacheManager(Collection<GuavaCache> caches, GuavaCacheCreator guavaCacheCreator) {
+        super(new ArrayList<>(caches), guavaCacheCreator);
     }
 
-    public GuavaCacheManager(Collection<Cache> caches, CacheBuilder<Object, Object> cacheBuilder) {
-        super(caches, new GuavaCacheCreator(cacheBuilder));
+    public GuavaCacheManager(Collection<GuavaCache> caches, CacheBuilder<Object, Object> cacheBuilder) {
+        super(new ArrayList<>(caches), new GuavaCacheCreator(cacheBuilder));
     }
 
-    public GuavaCacheManager(Collection<Cache> caches) {
-        super(caches);
+    public GuavaCacheManager(Collection<GuavaCache> caches) {
+        super(new ArrayList<>(caches));
     }
 }

src/main/java/org/code4everything/boot/cache/redis/RedisCacheCreator.java

@@ -14,9 +14,9 @@
  **/
 public class RedisCacheCreator implements CacheCreator {
 
-    private final long timeout;
+    protected final long timeout;
 
-    private final Map<String, String> prefixMap;
+    protected final Map<String, String> prefixMap;
 
     public RedisCacheCreator() {
         this(Long.MAX_VALUE, null);