Skip to content
This repository was archived by the owner on Nov 21, 2020. It is now read-only.

Commit a6abc06

Browse files
committed
fix: remove redis for spring cache
1 parent 9aa5108 commit a6abc06

File tree

5 files changed

+6
-325
lines changed

5 files changed

+6
-325
lines changed

docs/cache.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ public GuavaCacheManager guavaCacheManager() {
2121

2222
``` java
2323
@Bean
24-
public RedisCacheManager redisCacheManager() {
25-
Map<String, RedisCacheCreator> creatorMap = new HashMap<>(2, 1);
24+
public GuavaCacheManager guavaCacheManager() {
25+
Map<String, GuavaCacheCreator> creatorMap = new HashMap<>(2, 1);
2626
// 不同的缓存使用不同的缓存策略
27-
creatorMap.put("cache1", new RedisCacheCreator(60 * 60));
28-
creatorMap.put("cache2", new RedisCacheCreator(60 * 60 * 24));
29-
return CacheUtils.newRedisCacheManager(creatorMap);
27+
creatorMap.put("cache1", CacheBuilder.newBuilder().expireAfterWrite(10, TimeUnit.MINUTES));
28+
creatorMap.put("cache2", CacheBuilder.newBuilder().expireAfterWrite(60, TimeUnit.MINUTES));
29+
return CacheUtils.newGuavaCacheManager(creatorMap);
3030
}
3131
```
3232

@@ -47,7 +47,7 @@ public RedisCacheManager redisCacheManager() {
4747
或者
4848

4949
``` java
50-
@Cacheable(value = "cache2", key = "#root.args", cacheManager = "redisCacheManager")
50+
@Cacheable(value = "cache2", key = "#root.args", cacheManager = "guavaCacheManager")
5151
```
5252

5353
当然,你也可以不使用注解,直接在代码中手动缓存,使用你用到的 `CacheManager` 即可

src/main/java/org/code4everything/boot/cache/CacheUtils.java

Lines changed: 0 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
import com.google.common.cache.CacheBuilder;
55
import org.code4everything.boot.cache.guava.GuavaCache;
66
import org.code4everything.boot.cache.guava.GuavaCacheManager;
7-
import org.code4everything.boot.cache.redis.RedisCache;
8-
import org.code4everything.boot.cache.redis.RedisCacheCreator;
9-
import org.code4everything.boot.cache.redis.RedisCacheManager;
107
import org.springframework.cache.Cache;
118

129
import java.util.ArrayList;
@@ -24,72 +21,6 @@ public class CacheUtils {
2421

2522
private CacheUtils() {}
2623

27-
// -------------------------------------------Redis-----------------------------------------------------------------
28-
29-
/**
30-
* 新建缓存管理器
31-
*
32-
* @param redisCacheCreatorMap 缓存名与缓存创建者的映射
33-
*
34-
* @return 缓存管理器
35-
*
36-
* @since 1.1.3
37-
*/
38-
public static RedisCacheManager newRedisCacheManager(Map<String, RedisCacheCreator> redisCacheCreatorMap) {
39-
return newRedisCacheManager(redisCacheCreatorMap, null);
40-
}
41-
42-
/**
43-
* 新建缓存管理器
44-
*
45-
* @param redisCacheCreatorMap 缓存名与缓存创建者的映射
46-
* @param defaultRedisCacheCreator 缓存创建者
47-
*
48-
* @return 缓存管理器
49-
*
50-
* @since 1.1.3
51-
*/
52-
public static RedisCacheManager newRedisCacheManager(Map<String, RedisCacheCreator> redisCacheCreatorMap,
53-
RedisCacheCreator defaultRedisCacheCreator) {
54-
Collection<RedisCache> caches = new ArrayList<>();
55-
redisCacheCreatorMap.forEach((k, v) -> caches.add(v.createCache(k)));
56-
return new RedisCacheManager(caches, defaultRedisCacheCreator);
57-
}
58-
59-
/**
60-
* 新建缓存管理器
61-
*
62-
* @param redisCacheCreator 缓存创建者
63-
* @param names 缓存名集合
64-
*
65-
* @return 缓存管理器
66-
*
67-
* @since 1.1.3
68-
*/
69-
public static RedisCacheManager newRedisCacheManager(RedisCacheCreator redisCacheCreator, String... names) {
70-
return newRedisCacheManager(redisCacheCreator, Arrays.asList(names));
71-
}
72-
73-
/**
74-
* 新建缓存管理器
75-
*
76-
* @param redisCacheCreator 缓存创建者
77-
* @param names 缓存名集合
78-
*
79-
* @return 缓存管理器
80-
*
81-
* @since 1.1.3
82-
*/
83-
public static RedisCacheManager newRedisCacheManager(RedisCacheCreator redisCacheCreator,
84-
Collection<String> names) {
85-
if (CollUtil.isEmpty(names)) {
86-
return new RedisCacheManager(redisCacheCreator);
87-
}
88-
Collection<RedisCache> caches = new ArrayList<>(names.size());
89-
names.forEach(name -> caches.add(redisCacheCreator.createCache(name)));
90-
return new RedisCacheManager(caches, redisCacheCreator);
91-
}
92-
9324
// ---------------------------------------Guava---------------------------------------------------------------------
9425

9526
/**

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

Lines changed: 0 additions & 118 deletions
This file was deleted.

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

Lines changed: 0 additions & 76 deletions
This file was deleted.

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

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)