From 39be839cf56497bac9b20e5c17c3d84e0ae8e7d4 Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 29 Jul 2025 01:28:24 -0400 Subject: [PATCH] fix: channel stuff --- .../java/singularity/configs/given/GivenConfigs.java | 9 --------- .../src/main/java/singularity/redis/RedisClient.java | 4 ---- .../src/main/java/singularity/redis/RedisListener.java | 6 ++++-- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/singularity-api/src/main/java/singularity/configs/given/GivenConfigs.java b/singularity-api/src/main/java/singularity/configs/given/GivenConfigs.java index 4b9cfc91..7bea8c54 100644 --- a/singularity-api/src/main/java/singularity/configs/given/GivenConfigs.java +++ b/singularity-api/src/main/java/singularity/configs/given/GivenConfigs.java @@ -33,9 +33,6 @@ public class GivenConfigs { @Getter @Setter private static CoreDBOperator mainDatabase; - @Getter @Setter - private static RedisClient redisClient; - public static void init() { setMainConfig(new MainConfigHandler()); setMainMessages(new MainMessagesHandler()); @@ -53,12 +50,6 @@ public static void init() { } catch (Exception e) { e.printStackTrace(); } - - try { - setRedisClient(new RedisClient()); - } catch (Exception e) { - e.printStackTrace(); - } } public static void ensureFolders() { diff --git a/singularity-api/src/main/java/singularity/redis/RedisClient.java b/singularity-api/src/main/java/singularity/redis/RedisClient.java index 879136d3..bb4eca51 100644 --- a/singularity-api/src/main/java/singularity/redis/RedisClient.java +++ b/singularity-api/src/main/java/singularity/redis/RedisClient.java @@ -75,10 +75,6 @@ public static void withJedis(Consumer consumer, boolean silent) { }); } - public static RedisClient getInstance() { - return GivenConfigs.getRedisClient(); - } - public static void sendMessage(RedisMessage message) { withJedis(j -> j.publish(message.getChannel(), message.getMessage())); } diff --git a/singularity-api/src/main/java/singularity/redis/RedisListener.java b/singularity-api/src/main/java/singularity/redis/RedisListener.java index 7ea27c6e..95d2e23c 100644 --- a/singularity-api/src/main/java/singularity/redis/RedisListener.java +++ b/singularity-api/src/main/java/singularity/redis/RedisListener.java @@ -7,7 +7,7 @@ import singularity.utils.MessageUtils; @Getter @Setter -public abstract class RedisListener extends JedisPubSub implements Identifiable { +public class RedisListener extends JedisPubSub implements Identifiable { private String identifier; public RedisListener(String identifier) { @@ -39,5 +39,7 @@ public void registerAndLoad() { load(); } - abstract String[] getChannelsArray(); + public String[] getChannelsArray() { + return new String[] {}; + } }