Merge pull request #6 from Neruxov/master

New URI parsers, refactoring

Author: Swofty-Developments

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

@@ -1,7 +1,6 @@
 package net.swofty.redisapi.api;
 
 public enum ChannelFunctionType {
-      CONSUMER(),
-      CLASS(),
-      ;
+      CONSUMER,
+      CLASS
 }

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

@@ -1,16 +1,16 @@
 package net.swofty.redisapi.api;
 
-import net.swofty.redisapi.events.EventRegistry;
+import lombok.experimental.UtilityClass;
 import net.swofty.redisapi.exceptions.ChannelAlreadyRegisteredException;
 import net.swofty.redisapi.exceptions.ChannelNotRegisteredException;
 import lombok.NonNull;
 
 import java.util.ArrayList;
-import java.util.Objects;
 
+@UtilityClass
 public class ChannelRegistry {
 
-      public static ArrayList<RedisChannel> registeredChannels = new ArrayList<>();
+      public ArrayList<RedisChannel> registeredChannels = new ArrayList<>();
 
       /**
        * Used to receive a channel that has already been registered
@@ -19,16 +19,17 @@ public class ChannelRegistry {
        * @throws ChannelNotRegisteredException returns channelNotRegistered when you call this method upon a channel that does not exist
        */
       @NonNull
-      public static RedisChannel getFromName(String channelName) {
+      public RedisChannel getFromName(String 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) {
+      public 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);
 //            RedisAPI.getInstance().getPool().getResource().subscribe(EventRegistry.pubSub, channel.channelName);
       }
+
 }

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

@@ -1,6 +1,8 @@
 package net.swofty.redisapi.api;
 
+import lombok.AccessLevel;
 import lombok.NonNull;
+import lombok.experimental.FieldDefaults;
 import net.swofty.redisapi.events.EventRegistry;
 import net.swofty.redisapi.events.RedisMessagingReceiveEvent;
 import net.swofty.redisapi.events.RedisMessagingReceiveInterface;
@@ -16,48 +18,117 @@
 
 import java.util.function.Consumer;
 
+@Getter
+@Setter
+@FieldDefaults(level = AccessLevel.PRIVATE)
 public class RedisAPI {
 
+      private static final String REDIS_FULL_URI_PATTERN = "rediss?:\\/\\/\\w+:[\\w-]+@[\\w.-]+:\\d+";
+      private static final String REDIS_URI_PATTERN = "rediss?:\\/\\/[\\w.-]+:\\d+";
+
       @Getter
-      public static RedisAPI instance = null;
-      @Getter
+      private static RedisAPI instance = null;
+
       @Setter
-      private JedisPool pool;
-      @Getter
+      JedisPool pool;
+
       @Setter
-      private String filterId;
+      String filterId;
 
       /**
        * 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
-       * @param password the password used to connect to the Redis server running
+       * @param credentials the credentials used to connect to the Redis server running, instanceof api.RedisCredentials
        * @exception CouldNotConnectToRedisException signifies either an issue with the password passed through or the URI that is passed through the method
        * @return main instance of the api.RedisAPI
        */
-      public static RedisAPI generateInstance(String uri, String password) {
+      public static RedisAPI generateInstance(@NonNull RedisCredentials credentials) {
             RedisAPI api = new RedisAPI();
 
             if (instance != null) {
                   instance.getPool().close();
             }
 
-            String host = uri.split("//")[1].split(":")[0];
-            int port = Integer.parseInt(uri.split("//")[1].split(":")[1]);
+            String host = credentials.getHost();
+            int port = credentials.getPort();
+
+            String password = credentials.getPassword();
+            String user = credentials.getUser();
+
+            boolean ssl = credentials.isSsl();
 
             try {
-                  if (password == null) {
-                        api.setPool(new JedisPool(new JedisPoolConfig(), host, port, 20));
+                  JedisPool pool;
+
+                  if (user != null) {
+                        pool = new JedisPool(new JedisPoolConfig(), host, port, 2000, user, password, ssl);
+                  } else if (password != null) {
+                        pool = new JedisPool(new JedisPoolConfig(), host, port, 2000, password, ssl);
                   } else {
-                        api.setPool(new JedisPool(new JedisPoolConfig(), host, port, 20, password));
+                        pool = new JedisPool(new JedisPoolConfig(), host, port, 2000, ssl);
                   }
+
+                  api.setPool(pool);
             } catch (Exception e) {
-                  throw new CouldNotConnectToRedisException("Either invalid Redis URI passed through; '" + uri + "' OR invalid Redis Password passed through; '" + password + "'");
+                  throw new CouldNotConnectToRedisException("Either invalid Redis Credentials passed through; '" + credentials + "' OR invalid Redis Password passed through; '" + password + "'");
             }
 
             instance = api;
             return api;
       }
 
+      /**
+       * 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 (e.g. redis://username:password@localhost:6379 or redis://localhost:6379)
+       * @exception CouldNotConnectToRedisException signifies either an issue with the password passed through or the URI that is passed through the method
+       * @return main instance of the api.RedisAPI
+       */
+      public static RedisAPI generateInstance(@NonNull String uri) {
+            String user = null, password = null, target;
+
+            if (uri.matches(REDIS_FULL_URI_PATTERN)) {
+                  String[] parts = uri.split("//")[1].split("@");
+
+                  String credentials = parts[0];
+                  target = parts[1];
+
+                  user = credentials.split(":")[0];
+                  password = credentials.split(":")[1];
+            } else if (uri.matches(REDIS_URI_PATTERN)) {
+                  target = uri.split("//")[1];
+            } else {
+                  throw new CouldNotConnectToRedisException("Invalid Redis URI passed through; '" + uri + "'");
+            }
+
+            String host = target.split(":")[0];
+            int port = Integer.parseInt(target.split(":")[1]);
+
+            boolean ssl = uri.startsWith("rediss");
+
+            return generateInstance(new RedisCredentials(host, port, user, password, ssl));
+      }
+
+      /**
+       * 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 (e.g. redis://localhost:6379)
+       * @param password the password used to connect to the Redis server running
+       * @exception CouldNotConnectToRedisException signifies either an issue with the password passed through or the URI that is passed through the method
+       * @return main instance of the api.RedisAPI
+       */
+      public static RedisAPI generateInstance(@NonNull String uri, String password) {
+            if (!uri.matches(REDIS_URI_PATTERN)) {
+                  throw new CouldNotConnectToRedisException("Invalid Redis URI passed through; '" + uri + "'");
+            }
+
+            String target = uri.split("//")[1];
+
+            String host = target.split(":")[0];
+            int port = Integer.parseInt(target.split(":")[1]);
+
+            boolean ssl = uri.startsWith("rediss");
+
+            return generateInstance(new RedisCredentials(host, port, password, ssl));
+      }
+
       /**
        * Starts listeners for the Redis Pub/Sub channels
        */
@@ -78,16 +149,6 @@ public void onMessage(String channel, String message) {
             }).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
-       * @exception CouldNotConnectToRedisException signifies either an issue with the password passed through or the URI that is passed through the method
-       * @return main instance of the api.RedisAPI
-       */
-      public static RedisAPI generateInstance(String uri) {
-            return generateInstance(uri, null);
-      }
-
       /**
        * This method is used to set a filter ID onto your Redis Pool, you can then use this when publishing messages to
        * a channel to ensure that a specific RedisAPI instance receives your message

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

@@ -0,0 +1,40 @@
+package net.swofty.redisapi.api;
+
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
+@Getter
+@AllArgsConstructor
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class RedisCredentials {
+
+      @NonNull
+      String host;
+
+      @NonNull
+      int port;
+
+      String user;
+      String password;
+
+      boolean ssl;
+
+      public RedisCredentials(@NonNull String host, @NonNull int port, @NonNull String password, boolean ssl) {
+            this.host = host;
+            this.port = port;
+            this.password = password;
+            this.user = null;
+            this.ssl = ssl;
+      }
+
+      @Override
+      public String toString() {
+            return "RedisCredentials(" +
+                  "host=" + this.getHost() + ", " +
+                  "port=" + this.getPort() + ", " +
+                  "user=" + this.getUser() + ", " +
+                  "password=" + this.getPassword() +
+            ")";
+      }
+
+}