diff --git a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/chain/alarm/AlarmOperator.java b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/chain/alarm/AlarmMessageStorage.java similarity index 77% rename from skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/chain/alarm/AlarmOperator.java rename to skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/chain/alarm/AlarmMessageStorage.java index 6b3af13b4..c03858a3a 100644 --- a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/chain/alarm/AlarmOperator.java +++ b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/chain/alarm/AlarmMessageStorage.java @@ -1,16 +1,15 @@ package com.ai.cloud.skywalking.reciever.storage.chain.alarm; -import com.ai.cloud.skywalking.reciever.storage.chain.alarm.redis.RedisInitializer; import redis.clients.jedis.Jedis; import java.util.Collection; import static com.ai.cloud.skywalking.reciever.conf.Config.Alarm.ALARM_EXPIRE_SECONDS; -public class AlarmOperator { +public class AlarmMessageStorage { private static boolean exist(final String key, final String field) { - return RedisInitializer.redis(new RedisInitializer.Executor() { + return RedisAccessController.redis(new RedisAccessController.Executor() { @Override public Boolean exec(Jedis jedis) { return jedis.hexists(key, field); @@ -19,7 +18,7 @@ public class AlarmOperator { } private static boolean exist(final String key) { - return RedisInitializer.redis(new RedisInitializer.Executor() { + return RedisAccessController.redis(new RedisAccessController.Executor() { @Override public Boolean exec(Jedis jedis) { return jedis.exists(key); @@ -28,7 +27,7 @@ public class AlarmOperator { } private static Long set(final String key, final String field, final String value) { - return RedisInitializer.redis(new RedisInitializer.Executor() { + return RedisAccessController.redis(new RedisAccessController.Executor() { @Override public Long exec(Jedis jedis) { if (exist(key, field)) { @@ -42,7 +41,7 @@ public class AlarmOperator { } private static Collection get(final String key) { - return RedisInitializer.redis(new RedisInitializer.Executor>() { + return RedisAccessController.redis(new RedisAccessController.Executor>() { @Override public Collection exec(Jedis jedis) { if (!exist(key)) { diff --git a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/chain/alarm/redis/RedisInitializer.java b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/chain/alarm/RedisAccessController.java similarity index 94% rename from skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/chain/alarm/redis/RedisInitializer.java rename to skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/chain/alarm/RedisAccessController.java index b552c948e..50e154580 100644 --- a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/chain/alarm/redis/RedisInitializer.java +++ b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/chain/alarm/RedisAccessController.java @@ -1,4 +1,4 @@ -package com.ai.cloud.skywalking.reciever.storage.chain.alarm.redis; +package com.ai.cloud.skywalking.reciever.storage.chain.alarm; import com.ai.cloud.skywalking.reciever.conf.Config; import org.apache.commons.pool2.impl.GenericObjectPoolConfig; @@ -7,9 +7,9 @@ import org.apache.logging.log4j.Logger; import redis.clients.jedis.Jedis; import redis.clients.jedis.JedisPool; -public class RedisInitializer { +public class RedisAccessController { - private static Logger logger = LogManager.getLogger(RedisInitializer.class); + private static Logger logger = LogManager.getLogger(RedisAccessController.class); private static JedisPool jedisPool; private static Object lock = new Object(); @@ -29,7 +29,7 @@ public class RedisInitializer { new JedisPool(genericObjectPoolConfig, config[0], Integer.valueOf(config[1])); // Test connect redis. - RedisInitializer.redis(new Executor() { + RedisAccessController.redis(new Executor() { @Override public String exec(Jedis jedis) { return jedis.get("ok"); diff --git a/skywalking-server/src/test/java/com/ai/cloud/skywalking/reciever/storage/chain/alarm/AlarmOperatorTest.java b/skywalking-server/src/test/java/com/ai/cloud/skywalking/reciever/storage/chain/alarm/AlarmOperatorTest.java index e22505313..45558526f 100644 --- a/skywalking-server/src/test/java/com/ai/cloud/skywalking/reciever/storage/chain/alarm/AlarmOperatorTest.java +++ b/skywalking-server/src/test/java/com/ai/cloud/skywalking/reciever/storage/chain/alarm/AlarmOperatorTest.java @@ -18,8 +18,8 @@ public class AlarmOperatorTest { ConfigInitializer.initialize(properties, Config.class); String key = UUID.randomUUID().toString(); - AlarmOperator.saveAlarmMessage(key, UUID.randomUUID().toString()); - assertEquals(1, AlarmOperator.getAlarmMessage(key).size()); + AlarmMessageStorage.saveAlarmMessage(key, UUID.randomUUID().toString()); + assertEquals(1, AlarmMessageStorage.getAlarmMessage(key).size()); }