Support RESP3 protocol through URI/URL

src/main/java/redis/clients/jedis/Jedis.java

@@ -151,6 +151,7 @@ public Jedis(URI uri) {
     connection = new Connection(new HostAndPort(uri.getHost(), uri.getPort()),
         DefaultJedisClientConfig.builder().user(JedisURIHelper.getUser(uri))
             .password(JedisURIHelper.getPassword(uri)).database(JedisURIHelper.getDBIndex(uri))
+            .protocol(JedisURIHelper.getRedisProtocol(uri))
             .ssl(JedisURIHelper.isRedisSSLScheme(uri)).build());
   }
 
@@ -203,6 +204,7 @@ public Jedis(final URI uri, JedisClientConfig config) {
             .blockingSocketTimeoutMillis(config.getBlockingSocketTimeoutMillis())
             .user(JedisURIHelper.getUser(uri)).password(JedisURIHelper.getPassword(uri))
             .database(JedisURIHelper.getDBIndex(uri)).clientName(config.getClientName())
+            .protocol(JedisURIHelper.getRedisProtocol(uri))
             .ssl(JedisURIHelper.isRedisSSLScheme(uri)).sslSocketFactory(config.getSslSocketFactory())
             .sslParameters(config.getSslParameters()).hostnameVerifier(config.getHostnameVerifier())
             .build());

src/main/java/redis/clients/jedis/JedisFactory.java

@@ -130,6 +130,7 @@ protected JedisFactory(final URI uri, final int connectionTimeout, final int soT
         .socketTimeoutMillis(soTimeout).blockingSocketTimeoutMillis(infiniteSoTimeout)
         .user(JedisURIHelper.getUser(uri)).password(JedisURIHelper.getPassword(uri))
         .database(JedisURIHelper.getDBIndex(uri)).clientName(clientName)
+        .protocol(JedisURIHelper.getRedisProtocol(uri))
         .ssl(JedisURIHelper.isRedisSSLScheme(uri)).sslSocketFactory(sslSocketFactory)
         .sslParameters(sslParameters).hostnameVerifier(hostnameVerifier).build();
     this.jedisSocketFactory = new DefaultJedisSocketFactory(new HostAndPort(uri.getHost(), uri.getPort()), this.clientConfig);

src/main/java/redis/clients/jedis/JedisPooled.java

@@ -353,11 +353,13 @@ public JedisPooled(final GenericObjectPoolConfig<Connection> poolConfig, final U
       final int connectionTimeout, final int soTimeout, final int infiniteSoTimeout,
       final SSLSocketFactory sslSocketFactory, final SSLParameters sslParameters,
       final HostnameVerifier hostnameVerifier) {
-    this(new HostAndPort(uri.getHost(), uri.getPort()), DefaultJedisClientConfig.create(
-        connectionTimeout, soTimeout, infiniteSoTimeout, JedisURIHelper.getUser(uri),
-        JedisURIHelper.getPassword(uri), JedisURIHelper.getDBIndex(uri), null,
-        JedisURIHelper.isRedisSSLScheme(uri), sslSocketFactory, sslParameters, hostnameVerifier,
-        null), poolConfig);
+    this(new HostAndPort(uri.getHost(), uri.getPort()), DefaultJedisClientConfig.builder()
+        .connectionTimeoutMillis(connectionTimeout).socketTimeoutMillis(soTimeout)
+        .blockingSocketTimeoutMillis(infiniteSoTimeout).user(JedisURIHelper.getUser(uri))
+        .password(JedisURIHelper.getPassword(uri)).database(JedisURIHelper.getDBIndex(uri))
+        .protocol(JedisURIHelper.getRedisProtocol(uri)).ssl(JedisURIHelper.isRedisSSLScheme(uri))
+        .sslSocketFactory(sslSocketFactory).sslParameters(sslParameters)
+        .hostnameVerifier(hostnameVerifier).build(), poolConfig);
   }
 
   public JedisPooled(final HostAndPort hostAndPort, final GenericObjectPoolConfig<Connection> poolConfig) {

src/main/java/redis/clients/jedis/RedisProtocol.java

@@ -2,16 +2,16 @@
 
 public enum RedisProtocol {
 
-  RESP2(2),
-  RESP3(3);
+  RESP2("2"),
+  RESP3("3");
 
-  private final int version;
+  private final String version;
 
-  private RedisProtocol(int version) {
-    this.version = version;
+  private RedisProtocol(String ver) {
+    this.version = ver;
   }
 
-  public int version() {
+  public String version() {
     return version;
   }
 }

src/main/java/redis/clients/jedis/UnifiedJedis.java

@@ -65,7 +65,8 @@ public UnifiedJedis(final String url) {
   public UnifiedJedis(final URI uri) {
     this(JedisURIHelper.getHostAndPort(uri), DefaultJedisClientConfig.builder()
         .user(JedisURIHelper.getUser(uri)).password(JedisURIHelper.getPassword(uri))
-        .database(JedisURIHelper.getDBIndex(uri)).ssl(JedisURIHelper.isRedisSSLScheme(uri)).build());
+        .database(JedisURIHelper.getDBIndex(uri)).protocol(JedisURIHelper.getRedisProtocol(uri))
+        .ssl(JedisURIHelper.isRedisSSLScheme(uri)).build());
   }
 
   public UnifiedJedis(final URI uri, JedisClientConfig config) {
@@ -75,6 +76,7 @@ public UnifiedJedis(final URI uri, JedisClientConfig config) {
         .blockingSocketTimeoutMillis(config.getBlockingSocketTimeoutMillis())
         .user(JedisURIHelper.getUser(uri)).password(JedisURIHelper.getPassword(uri))
         .database(JedisURIHelper.getDBIndex(uri)).clientName(config.getClientName())
+        .protocol(JedisURIHelper.getRedisProtocol(uri))
         .ssl(JedisURIHelper.isRedisSSLScheme(uri)).sslSocketFactory(config.getSslSocketFactory())
         .sslParameters(config.getSslParameters()).hostnameVerifier(config.getHostnameVerifier())
         .build());

src/main/java/redis/clients/jedis/util/JedisURIHelper.java

@@ -2,11 +2,11 @@
 
 import java.net.URI;
 import redis.clients.jedis.HostAndPort;
+import redis.clients.jedis.Protocol;
+import redis.clients.jedis.RedisProtocol;
 
 public final class JedisURIHelper {
 
-  private static final int DEFAULT_DB = 0;
-
   private static final String REDIS = "redis";
   private static final String REDISS = "rediss";
 
@@ -43,12 +43,31 @@ public static int getDBIndex(URI uri) {
     if (pathSplit.length > 1) {
       String dbIndexStr = pathSplit[1];
       if (dbIndexStr.isEmpty()) {
-        return DEFAULT_DB;
+        return Protocol.DEFAULT_DATABASE;
       }
       return Integer.parseInt(dbIndexStr);
     } else {
-      return DEFAULT_DB;
+      return Protocol.DEFAULT_DATABASE;
+    }
+  }
+
+  public static RedisProtocol getRedisProtocol(URI uri) {
+    if (uri.getQuery() == null) return null;
+
+    String[] pairs = uri.getQuery().split("&");
+    for (String pair : pairs) {
+      int idx = pair.indexOf("=");
+      if ("protocol".equals(pair.substring(0, idx))) {
+        String ver = pair.substring(idx + 1);
+        for (RedisProtocol proto : RedisProtocol.values()) {
+          if (proto.version().equals(ver)) {
+            return proto;
+          }
+        }
+        throw new IllegalArgumentException("Unknown protocol " + ver);
+      }
     }
+    return null; // null (default) when not defined
   }
 
   public static boolean isValid(URI uri) {

src/test/java/redis/clients/jedis/ACLJedisTest.java

@@ -89,42 +89,14 @@ public void startWithUri() throws URISyntaxException {
       assertEquals("OK", j.select(2));
       j.set("foo", "bar");
     }
-    try (Jedis j2 = new Jedis(new URI("redis://acljedis:fizzbuzz@localhost:6379/2"))) {
-      assertEquals("PONG", j2.ping());
-      assertEquals("bar", j2.get("foo"));
-    }
-  }
-
-  @Test
-  public void connectWithURICredentials() throws URISyntaxException {
-    jedis.set("foo", "bar");
-
-    try (Jedis j1 = new Jedis(new URI("redis://default:foobared@localhost:6379"))) {
+    try (Jedis j1 = new Jedis(new URI("redis://acljedis:fizzbuzz@localhost:6379/2"))) {
       assertEquals("PONG", j1.ping());
       assertEquals("bar", j1.get("foo"));
     }
-
-    try (Jedis j2 = new Jedis(new URI("redis://acljedis:fizzbuzz@localhost:6379"))) {
+    try (Jedis j2 = new Jedis(new URI("redis://acljedis:fizzbuzz@localhost:6379/2"))) {
       assertEquals("PONG", j2.ping());
       assertEquals("bar", j2.get("foo"));
     }
   }
 
-  @Test
-  public void allowUrlWithNoDBAndNoPassword() {
-    try (Jedis j1 = new Jedis("redis://localhost:6379")) {
-      assertEquals("OK", j1.auth("acljedis", "fizzbuzz"));
-//      assertEquals("localhost", j1.getClient().getHost());
-//      assertEquals(6379, j1.getClient().getPort());
-      assertEquals(0, j1.getDB());
-    }
-
-    try (Jedis j2 = new Jedis("redis://localhost:6379/")) {
-      assertEquals("OK", j2.auth("acljedis", "fizzbuzz"));
-//      assertEquals("localhost", j2.getClient().getHost());
-//      assertEquals(6379, j2.getClient().getPort());
-      assertEquals(0, j2.getDB());
-    }
-  }
-
 }

src/test/java/redis/clients/jedis/JedisTest.java

@@ -81,18 +81,20 @@ public String getPassword() {
   }
 
   @Test
-  public void resp3Protocol() {
+  public void connectOnResp3Protocol() {
     try (Jedis jedis = new Jedis(hnp, DefaultJedisClientConfig.builder()
-        .protocol(RedisProtocol.RESP3).user("default").password("foobared").build())) {
+        .protocol(RedisProtocol.RESP3).password("foobared").build())) {
       assertEquals("PONG", jedis.ping());
+      assertEquals(RedisProtocol.RESP3, jedis.getConnection().getRedisProtocol());
     }
   }
 
   @Test
-  public void resp3Shortcut() {
+  public void connectOnResp3ProtocolShortcut() {
     try (Jedis jedis = new Jedis(hnp, DefaultJedisClientConfig.builder().resp3()
-        .user("default").password("foobared").build())) {
+        .password("foobared").build())) {
       assertEquals("PONG", jedis.ping());
+      assertEquals(RedisProtocol.RESP3, jedis.getConnection().getRedisProtocol());
     }
   }
 
@@ -153,7 +155,7 @@ public void shouldThrowInvalidURIExceptionForInvalidURI() throws URISyntaxExcept
 //  }
 
   @Test
-  public void startWithUrl() {
+  public void connectWithUrl() {
     try (Jedis j = new Jedis("localhost", 6380)) {
       j.auth("foobared");
       j.select(2);
@@ -167,7 +169,7 @@ public void startWithUrl() {
   }
 
   @Test
-  public void startWithUri() throws URISyntaxException {
+  public void connectWithUri() throws URISyntaxException {
     try (Jedis j = new Jedis("localhost", 6380)) {
       j.auth("foobared");
       j.select(2);
@@ -180,6 +182,34 @@ public void startWithUri() throws URISyntaxException {
     }
   }
 
+  @Test
+  public void connectWithUrlOnResp3() {
+    try (Jedis j = new Jedis("localhost", 6380)) {
+      j.auth("foobared");
+      j.select(2);
+      j.set("foo", "bar");
+    }
+
+    try (Jedis j2 = new Jedis("redis://:foobared@localhost:6380/2?protocol=3")) {
+      assertEquals("PONG", j2.ping());
+      assertEquals("bar", j2.get("foo"));
+    }
+  }
+
+  @Test
+  public void connectWithUriOnResp3() throws URISyntaxException {
+    try (Jedis j = new Jedis("localhost", 6380)) {
+      j.auth("foobared");
+      j.select(2);
+      j.set("foo", "bar");
+    }
+
+    try (Jedis jedis = new Jedis(new URI("redis://:foobared@localhost:6380/2?protocol=3"))) {
+      assertEquals("PONG", jedis.ping());
+      assertEquals("bar", jedis.get("foo"));
+    }
+  }
+
   @Test
   public void shouldNotUpdateDbIndexIfSelectFails() {
     int currentDb = jedis.getDB();

src/test/java/redis/clients/jedis/SSLACLJedisTest.java

@@ -42,28 +42,15 @@ public void connectWithSsl() {
 
   @Test
   public void connectWithConfig() {
-    try (Jedis jedis = new Jedis(new HostAndPort("localhost", 6390), DefaultJedisClientConfig
-        .builder().ssl(true).build())) {
+    try (Jedis jedis = new Jedis(new HostAndPort("localhost", 6390),
+        DefaultJedisClientConfig.builder().ssl(true).build())) {
       jedis.auth("acljedis", "fizzbuzz");
       assertEquals("PONG", jedis.ping());
     }
   }
 
   @Test
   public void connectWithUrl() {
-    // The "rediss" scheme instructs jedis to open a SSL/TLS connection.
-    try (Jedis jedis = new Jedis("rediss://localhost:6390")) {
-      jedis.auth("default", "foobared");
-      assertEquals("PONG", jedis.ping());
-    }
-    try (Jedis jedis = new Jedis("rediss://localhost:6390")) {
-      jedis.auth("acljedis", "fizzbuzz");
-      assertEquals("PONG", jedis.ping());
-    }
-  }
-
-  @Test
-  public void connectWithCompleteCredentialsUrl() {
     // The "rediss" scheme instructs jedis to open a SSL/TLS connection.
     try (Jedis jedis = new Jedis("rediss://default:foobared@localhost:6390")) {
       assertEquals("PONG", jedis.ping());
@@ -75,15 +62,6 @@ public void connectWithCompleteCredentialsUrl() {
 
   @Test
   public void connectWithUri() {
-    // The "rediss" scheme instructs jedis to open a SSL/TLS connection.
-    try (Jedis jedis = new Jedis(URI.create("rediss://localhost:6390"))) {
-      jedis.auth("acljedis", "fizzbuzz");
-      assertEquals("PONG", jedis.ping());
-    }
-  }
-
-  @Test
-  public void connectWithCompleteCredentialsUri() {
     // The "rediss" scheme instructs jedis to open a SSL/TLS connection.
     try (Jedis jedis = new Jedis(URI.create("rediss://default:foobared@localhost:6390"))) {
       assertEquals("PONG", jedis.ping());

src/test/java/redis/clients/jedis/SSLJedisTest.java

@@ -52,8 +52,8 @@ public void connectWithSsl() {
 
   @Test
   public void connectWithConfig() {
-    try (Jedis jedis = new Jedis(new HostAndPort("localhost", 6390), DefaultJedisClientConfig
-        .builder().ssl(true).build())) {
+    try (Jedis jedis = new Jedis(new HostAndPort("localhost", 6390),
+        DefaultJedisClientConfig.builder().ssl(true).build())) {
       jedis.auth("foobared");
       assertEquals("PONG", jedis.ping());
     }
@@ -63,11 +63,11 @@ public void connectWithConfig() {
   public void connectWithConfigInterface() {
     try (Jedis jedis = new Jedis(new HostAndPort("localhost", 6390),
         new JedisClientConfig() {
-      @Override
-      public boolean isSsl() {
-        return true;
-      }
-    })) {
+          @Override
+          public boolean isSsl() {
+            return true;
+          }
+        })) {
       jedis.auth("foobared");
       assertEquals("PONG", jedis.ping());
     }

src/test/java/redis/clients/jedis/util/JedisURIHelperTest.java

@@ -1,12 +1,15 @@
 package redis.clients.jedis.util;
 
+import static redis.clients.jedis.util.JedisURIHelper.*;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 
 import java.net.URI;
 import java.net.URISyntaxException;
 import org.junit.Test;
+import redis.clients.jedis.RedisProtocol;
 
 public class JedisURIHelperTest {
 
@@ -57,4 +60,17 @@ public void shouldValidateInvalidURIs() throws URISyntaxException {
     assertFalse(JedisURIHelper.isValid(new URI("redis://host/0")));
   }
 
+  @Test
+  public void shouldGetDefaultProtocolWhenNotDefined() {
+    assertNull(getRedisProtocol(URI.create("redis://host:1234")));
+    assertNull(getRedisProtocol(URI.create("redis://host:1234/1")));
+  }
+
+  @Test
+  public void shouldGetProtocolFromDefinition() {
+    assertEquals(RedisProtocol.RESP3, getRedisProtocol(URI.create("redis://host:1234?protocol=3")));
+    assertEquals(RedisProtocol.RESP3, getRedisProtocol(URI.create("redis://host:1234/?protocol=3")));
+    assertEquals(RedisProtocol.RESP3, getRedisProtocol(URI.create("redis://host:1234/1?protocol=3")));
+    assertEquals(RedisProtocol.RESP3, getRedisProtocol(URI.create("redis://host:1234/1/?protocol=3")));
+  }
 }