LamGC/ContentGrabbingJi
1
0
Fork 0
mirror of https://github.com/LamGC/ContentGrabbingJi.git synced 2025-04-30 06:37:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Fix][Update] CacheStore-redis, Core 修复缓存组件的逻辑问题, 调整 Core 中对于 CacheStoreBuilder 的测试用例;

Browse Source 
[Fix] CacheStoreBuilder 修复 Factory.canGetCacheStore 返回 false 被无视的问题;
[Fix] RedisConnectionPool 修复因变量未及时更新导致的逻辑异常;
[Update] CacheStoreBuilderTest 调整测试用例以更具体的检查获取的缓存实现类与预期是否相同;
This commit is contained in:
LamGC 2020-10-06 10:28:45 +08:00
parent b017599eae
commit c27d072e68
Signed by: LamGC
GPG Key ID: 6C5AE2A913941E1D
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ContentGrabbingJi-CacheStore-redis/src/main/java/net/lamgc/cgj/bot/cache/redis/RedisConnectionPool.java vendored
View File

@ -85,6 +85,7 @@ class RedisConnectionPool {
JedisPool jedisPool = POOL.get(); JedisPool jedisPool = POOL.get();
if (jedisPool == null || jedisPool.isClosed()) { if (jedisPool == null || jedisPool.isClosed()) {
reconnectRedis(); reconnectRedis();
jedisPool = POOL.get();
if (jedisPool == null || jedisPool.isClosed()) { if (jedisPool == null || jedisPool.isClosed()) {
return false; return false;
} }

2
ContentGrabbingJi-core/src/main/java/net/lamgc/cgj/bot/cache/CacheStoreBuilder.java vendored
View File

@ -112,6 +112,8 @@ public class CacheStoreBuilder {
try { try {
if (factory.canGetCacheStore()) { if (factory.canGetCacheStore()) {
log.debug("CacheStoreFactory {} 可用(优先级: {}).", info.getFactoryName(), info.getFactoryPriority()); log.debug("CacheStoreFactory {} 可用(优先级: {}).", info.getFactoryName(), info.getFactoryPriority());
} else {
continue;
} }
} catch (Exception e) { } catch (Exception e) {
log.error("CacheStoreFactory " + info.getFactoryName() + log.error("CacheStoreFactory " + info.getFactoryName() +

23
ContentGrabbingJi-core/src/test/java/net/lamgc/cgj/bot/cache/CacheStoreBuilderTest.java vendored
View File

@ -19,6 +19,10 @@ package net.lamgc.cgj.bot.cache;
import net.lamgc.cgj.bot.cache.convert.StringConverter; import net.lamgc.cgj.bot.cache.convert.StringConverter;
import net.lamgc.cgj.bot.cache.convert.StringToStringConverter; import net.lamgc.cgj.bot.cache.convert.StringToStringConverter;
import net.lamgc.cgj.bot.cache.local.CopyOnWriteArrayListCacheStore;
import net.lamgc.cgj.bot.cache.local.HashSetCacheStore;
import net.lamgc.cgj.bot.cache.redis.RedisMapCacheStore;
import net.lamgc.cgj.bot.cache.redis.RedisSingleCacheStore;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
@ -32,10 +36,21 @@ public class CacheStoreBuilderTest {
final String identify = "test"; final String identify = "test";
final StringConverter<String> converter = new StringToStringConverter(); final StringConverter<String> converter = new StringToStringConverter();
Assert.assertNotNull(CacheStoreBuilder.newSingleCacheStore(CacheStoreSource.REMOTE, identify, converter)); SingleCacheStore<String> singleCacheStore = CacheStoreBuilder.newSingleCacheStore(CacheStoreSource.REMOTE, identify, converter);
Assert.assertNotNull(CacheStoreBuilder.newListCacheStore(CacheStoreSource.MEMORY, identify, converter)); Assert.assertNotNull(singleCacheStore);
Assert.assertNotNull(CacheStoreBuilder.newMapCacheStore(CacheStoreSource.REMOTE, identify, converter)); Assert.assertEquals(RedisSingleCacheStore.class, singleCacheStore.getClass());
Assert.assertNotNull(CacheStoreBuilder.newSetCacheStore(identify, converter));
ListCacheStore<String> listCacheStore = CacheStoreBuilder.newListCacheStore(CacheStoreSource.MEMORY, identify, converter);
Assert.assertNotNull(listCacheStore);
Assert.assertEquals(CopyOnWriteArrayListCacheStore.class, listCacheStore.getClass());
MapCacheStore<String> mapCacheStore = CacheStoreBuilder.newMapCacheStore(CacheStoreSource.REMOTE, identify, converter);
Assert.assertNotNull(mapCacheStore);
Assert.assertEquals(RedisMapCacheStore.class, mapCacheStore.getClass());
SetCacheStore<String> setCacheStore = CacheStoreBuilder.newSetCacheStore(identify, converter);
Assert.assertNotNull(setCacheStore);
Assert.assertEquals(HashSetCacheStore.class, setCacheStore.getClass());
} }