v1.1.0 update, includes; more documentation, fixed bugs with channel registration

Author: Swofty-Developments

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>net.swofty</groupId>
     <artifactId>AtlasRedisAPI</artifactId>
-    <version>1.0.3</version>
+    <version>1.1.0</version>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>

src/main/java/net/swofty/redisapi/api/ChannelRegistry.java

@@ -20,14 +20,15 @@ public class ChannelRegistry {
        */
       @NonNull
       public static RedisChannel getFromName(String channelName) {
-            return registeredChannels.stream().filter(channel -> Objects.equals(channel.channelName, channelName)).findFirst().orElseThrow(() -> new ChannelNotRegisteredException("There is no channel registered with the name '" + channelName + "'"));
+            return new RedisChannel(channelName, (e) -> {});
+//            return registeredChannels.stream().filter(channel -> Objects.equals(channel.channelName, channelName)).findFirst().orElseThrow(() -> new ChannelNotRegisteredException("There is no channel registered with the name '" + channelName + "'"));
       }
 
       public static void registerChannel(RedisChannel channel) {
             if (registeredChannels.stream().anyMatch(channel2 -> channel2.channelName.equals(channel.channelName)))
                   throw new ChannelAlreadyRegisteredException("A channel already exists with this name '" + channel.channelName + "'");
 
             registeredChannels.add(channel);
-            Utility.runAsync(() -> RedisAPI.getInstance().getPool().getResource().subscribe(EventRegistry.pubSub, channel.channelName));
+//            RedisAPI.getInstance().getPool().getResource().subscribe(EventRegistry.pubSub, channel.channelName);
       }
 }

src/main/java/net/swofty/redisapi/api/RedisAPI.java

@@ -8,6 +8,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import net.swofty.redisapi.exceptions.ChannelAlreadyRegisteredException;
+import net.swofty.redisapi.exceptions.MessageFailureException;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 import redis.clients.jedis.JedisPoolConfig;
@@ -53,22 +54,30 @@ public static RedisAPI generateInstance(String uri, String password) {
                   throw new CouldNotConnectToRedisException("Either invalid Redis URI passed through; '" + uri + "' OR invalid Redis Password passed through; '" + password + "'");
             }
 
-            Jedis jedis = api.getPool().getResource();
-            jedis.connect();
-
-            EventRegistry.pubSub = new JedisPubSub() {
-                  @Override
-                  public void onMessage(String channel, String message) {
-                        System.out.println("Received " + message);
-                        EventRegistry.handleAll(channel, message);
-                        super.onMessage(channel, message);
-                  }
-            };
-
             instance = api;
             return api;
       }
 
+      /**
+       * Starts listeners for the Redis Pub/Sub channels
+       */
+      public void startListeners() {
+            new Thread(() -> {
+                  try (Jedis jedis = getPool().getResource()) {
+                        EventRegistry.pubSub = new JedisPubSub() {
+                              @Override
+                              public void onMessage(String channel, String message) {
+                                    EventRegistry.handleAll(channel, message);
+                              }
+                        };
+                        jedis.subscribe(EventRegistry.pubSub, ChannelRegistry.registeredChannels.stream().map((e) -> e.channelName).toArray(String[]::new));
+                        getPool().returnResource(jedis);
+                  } catch (Exception e) {
+                        e.printStackTrace();
+                  }
+            }).start();
+      }
+
       /**
        * Creates a new main Redis pool instance, there will only ever be one at a time so #getInstance should be used after generation
        * @param uri the URI used to connect to the Redis server running
@@ -94,9 +103,11 @@ public void setFilterID(String filterId) {
        * @param message the message being sent across that channel
        */
       public void publishMessage(RedisChannel channel, String message) {
-            Jedis jedis = pool.getResource();
-            jedis.connect();
-            jedis.publish(channel.channelName, "all" + ";" + message);
+            try (Jedis jedis = pool.getResource()) {
+                  jedis.publish(channel.channelName, "none" + ";" + message);
+            } catch (Exception ex) {
+                  throw new MessageFailureException("Failed to send message to redis", ex);
+            }
       }
 
       /**
@@ -107,9 +118,11 @@ public void publishMessage(RedisChannel channel, String message) {
        * @param message the message being sent across that channel
        */
       public void publishMessage(String filterId, RedisChannel channel, String message) {
-            Jedis jedis = pool.getResource();
-            jedis.connect();
-            jedis.publish(channel.channelName, filterId + ";" + message);
+            try (Jedis jedis = pool.getResource()) {
+                  jedis.publish(channel.channelName, filterId + ";" + message);
+            } catch (Exception ex) {
+                  throw new MessageFailureException("Failed to send message to redis", ex);
+            }
       }
 
       /**
@@ -139,4 +152,4 @@ public RedisChannel registerChannel(String channelName, @NonNull Consumer<RedisM
             ChannelRegistry.registerChannel(channel);
             return channel;
       }
-}
+}

src/main/java/net/swofty/redisapi/api/RedisChannel.java

@@ -51,4 +51,4 @@ public RedisChannel(String channelName, Class<? extends RedisMessagingReceiveInt
       public java.lang.Long getTimestamp() {
             return timestamp;
       }
-}
+}

src/main/java/net/swofty/redisapi/exceptions/MessageFailureException.java

@@ -0,0 +1,9 @@
+package net.swofty.redisapi.exceptions;
+
+public class MessageFailureException extends RuntimeException
+{
+	public MessageFailureException(String errorMessage, Throwable t) {
+		super(errorMessage);
+		this.setStackTrace(t.getStackTrace());
+	}
+}