Merge pull request #341 from LangInteger/master

feat - check wrong connectionString syntax via host&port parse result

Author: pmlopes

src/main/java/io/vertx/redis/client/impl/RedisURI.java

@@ -80,8 +80,17 @@ public RedisURI(String connectionString) {
     try {
       final URI uri = new URI(connectionString);
 
-      final String host = uri.getHost() == null ? DEFAULT_HOST : uri.getHost();
-      final int port = uri.getPort() == -1 ? DEFAULT_PORT : uri.getPort();
+      boolean directRedisScheme = "rediss".equals(uri.getScheme()) || "redis".equals(uri.getScheme());
+      if (directRedisScheme && uri.getHost() == null) {
+        throw new IllegalArgumentException("Fail to parse connection string host");
+      }
+      final String host = uri.getHost();
+
+      if (directRedisScheme && uri.getPort() == -1) {
+        throw new IllegalArgumentException("Fail to parse connection string port");
+      }
+      final int port = uri.getPort();
+
       final String path = (uri.getPath() == null || uri.getPath().isEmpty()) ? "/" : uri.getPath();
 
       // According to https://www.iana.org/assignments/uri-schemes/prov/redis there is no specified order of decision

src/test/java/io/vertx/redis/client/impl/RedisURITest.java

@@ -1,13 +1,18 @@
 package io.vertx.redis.client.impl;
 
 import org.junit.Assert;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
 /**
  * @author <a href="mailto:artursletter@gmail.com">Artur Badretdinov</a>
  */
 public class RedisURITest {
 
+  @Rule
+  public ExpectedException exceptionRule = ExpectedException.none();
+
   @Test
   public void testHostAndPort() {
     RedisURI redisURI = new RedisURI("redis://redis-1234.hosted.com:1234");
@@ -82,4 +87,18 @@ public void testColon() {
     RedisURI redisURI = new RedisURI("redis://:admin%3Aqwer@localhost:6379/1");
     Assert.assertEquals("admin:qwer", redisURI.password());
   }
+
+  @Test
+  public void testRightSyntax() {
+    RedisURI redisURI = new RedisURI("redis://your-redis-domain:6379");
+    Assert.assertEquals(6379, redisURI.socketAddress().port());
+    Assert.assertEquals("your-redis-domain", redisURI.socketAddress().host());
+  }
+
+  @Test
+  public void testWrongSyntax() {
+    exceptionRule.expect(IllegalArgumentException.class);
+    exceptionRule.expectMessage("Fail to parse connection string host");
+    new RedisURI("redis://:your-redis-domain:6379");
+  }
 }