🔖 Releasing / Version tags. 0.0.3

Author: pig666

README.md

@@ -32,7 +32,7 @@
 <dependency>
     <groupId>com.pig4cloud.plugin</groupId>
     <artifactId>multilevel-cache-spring-boot-starter</artifactId>
-    <version>0.0.1</version>
+    <version>0.0.3</version>
 </dependency>
 ```
 

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.pig4cloud.plugin</groupId>
     <artifactId>multilevel-cache-spring-boot-starter</artifactId>
-    <version>0.0.2</version>
+    <version>0.0.3</version>
     <name>multilevel-cache-spring-boot-starter</name>
     <description>support L1 caffeine and L2 redis cache</description>
     <url>https://pig4cloud.com</url>

src/main/java/com/pig4cloud/plugin/cache/support/RedisCaffeineCache.java

@@ -6,6 +6,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.support.AbstractValueAdaptingCache;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.util.Map;
@@ -64,12 +65,11 @@ public <T> T get(Object key, Callable<T> valueLoader) {
 			return (T) value;
 		}
 
-		ReentrantLock lock = keyLockMap.get(key.toString());
-		if (lock == null) {
-			log.debug("create lock for key : {}", key);
-			lock = new ReentrantLock();
-			keyLockMap.putIfAbsent(key.toString(), lock);
-		}
+		ReentrantLock lock = keyLockMap.computeIfAbsent(key.toString(), s -> {
+			log.trace("create lock for key : {}", s);
+			return new ReentrantLock();
+		});
+
 		try {
 			lock.lock();
 			value = lookup(key);
@@ -147,8 +147,9 @@ public void evict(Object key) {
 	public void clear() {
 		// 先清除redis中缓存数据，然后清除caffeine中的缓存，避免短时间内如果先清除caffeine缓存后其他请求会再从redis里加载到caffeine中
 		Set<Object> keys = stringKeyRedisTemplate.keys(this.name.concat(":*"));
-		for (Object key : keys) {
-			stringKeyRedisTemplate.delete(key);
+
+		if (!CollectionUtils.isEmpty(keys)){
+			stringKeyRedisTemplate.delete(keys);
 		}
 
 		push(new CacheMessage(this.name, null));
@@ -180,9 +181,8 @@ private Object getKey(Object key) {
 	}
 
 	private long getExpire() {
-		long expire = defaultExpiration;
 		Long cacheNameExpire = expires.get(this.name);
-		return cacheNameExpire == null ? expire : cacheNameExpire.longValue();
+		return cacheNameExpire == null ? defaultExpiration : cacheNameExpire;
 	}
 
 	/**