v1.1.2 - Added ability to have an empty username

Author: Swofty-Developments

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

@@ -17,13 +17,14 @@
 import redis.clients.jedis.JedisPubSub;
 
 import java.util.function.Consumer;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 @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_FULL_URI_PATTERN = "rediss?:\\/\\/(?:(?<user>\\w+)?:(?<password>[\\w-]+)@)?(?<host>[\\w.-]+):(?<port>\\d+)";
       private static final String REDIS_URI_PATTERN = "rediss?:\\/\\/[\\w.-]+:\\d+";
 
       @Getter
@@ -83,27 +84,26 @@ public static RedisAPI generateInstance(@NonNull RedisCredentials credentials) {
        * @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 user = null, password = null, host, target;
+            int port;
 
-                  String credentials = parts[0];
-                  target = parts[1];
+            Pattern pattern = java.util.regex.Pattern.compile(REDIS_FULL_URI_PATTERN);
+            Matcher matcher = pattern.matcher(uri);
 
-                  user = credentials.split(":")[0];
-                  password = credentials.split(":")[1];
+            if (matcher.matches()) {
+                  user = matcher.group("user");
+                  password = matcher.group("password");
+                  host = matcher.group("host");
+                  port = Integer.parseInt(matcher.group("port"));
             } else if (uri.matches(REDIS_URI_PATTERN)) {
                   target = uri.split("//")[1];
+                  host = target.split(":")[0];
+                  port = Integer.parseInt(target.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));
       }
 
@@ -115,18 +115,22 @@ public static RedisAPI generateInstance(@NonNull String uri) {
        * @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 user = null, host, target;
+            int port;
 
-            String target = uri.split("//")[1];
+            java.util.regex.Pattern pattern = java.util.regex.Pattern.compile(REDIS_URI_PATTERN);
+            java.util.regex.Matcher matcher = pattern.matcher(uri);
 
-            String host = target.split(":")[0];
-            int port = Integer.parseInt(target.split(":")[1]);
+            if (matcher.matches()) {
+                  host = matcher.group("host");
+                  port = Integer.parseInt(matcher.group("port"));
+            } else {
+                  throw new CouldNotConnectToRedisException("Invalid Redis URI passed through; '" + uri + "'");
+            }
 
             boolean ssl = uri.startsWith("rediss");
 
-            return generateInstance(new RedisCredentials(host, port, password, ssl));
+            return generateInstance(new RedisCredentials(host, port, user, password, ssl));
       }
 
       /**