add url support

src/test/java/redis/clients/jedis/tests/JedisPoolTest.java

@@ -1,5 +1,8 @@
 package redis.clients.jedis.tests;
 
+import java.net.URI;
+import java.net.URISyntaxException;
+
 import org.apache.commons.pool.impl.GenericObjectPool;
 import org.apache.commons.pool.impl.GenericObjectPool.Config;
 import org.junit.Assert;
@@ -123,4 +126,28 @@ public class JedisPoolTest extends Assert {
         pool.returnResource(jedis);
         pool.destroy();
     }
+    
+    @Test
+    public void startWithUrlString() {
+	Jedis j = new Jedis("localhost", 6380);
+	j.auth("foobared");
+	j.select(2);
+	j.set("foo", "bar");
+	JedisPool pool = new JedisPool("redis://:foobared@localhost:6380/2");
+	Jedis jedis = pool.getResource();
+	assertEquals("PONG", jedis.ping());
+	assertEquals("bar", jedis.get("foo"));
+    }
+    
+    @Test
+    public void startWithUrl() throws URISyntaxException {
+	Jedis j = new Jedis("localhost", 6380);
+	j.auth("foobared");
+	j.select(2);
+	j.set("foo", "bar");
+	JedisPool pool = new JedisPool(new URI("redis://:foobared@localhost:6380/2"));
+	Jedis jedis = pool.getResource();
+	assertEquals("PONG", jedis.ping());
+	assertEquals("bar", jedis.get("foo"));
+    }
 }

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

@@ -1,6 +1,8 @@
 package redis.clients.jedis.tests;
 
 import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -17,56 +19,78 @@ import redis.clients.util.SafeEncoder;
 public class JedisTest extends JedisCommandTestBase {
     @Test
     public void useWithoutConnecting() {
-        Jedis jedis = new Jedis("localhost");
-        jedis.auth("foobared");
-        jedis.dbSize();
+	Jedis jedis = new Jedis("localhost");
+	jedis.auth("foobared");
+	jedis.dbSize();
     }
 
     @Test
     public void checkBinaryData() {
-        byte[] bigdata = new byte[1777];
-        for (int b = 0; b < bigdata.length; b++) {
-            bigdata[b] = (byte) ((byte) b % 255);
-        }
-        Map<String, String> hash = new HashMap<String, String>();
-        hash.put("data", SafeEncoder.encode(bigdata));
+	byte[] bigdata = new byte[1777];
+	for (int b = 0; b < bigdata.length; b++) {
+	    bigdata[b] = (byte) ((byte) b % 255);
+	}
+	Map<String, String> hash = new HashMap<String, String>();
+	hash.put("data", SafeEncoder.encode(bigdata));
 
-        String status = jedis.hmset("foo", hash);
-        assertEquals("OK", status);
-        assertEquals(hash, jedis.hgetAll("foo"));
+	String status = jedis.hmset("foo", hash);
+	assertEquals("OK", status);
+	assertEquals(hash, jedis.hgetAll("foo"));
     }
 
     @Test
     public void connectWithShardInfo() {
-        JedisShardInfo shardInfo = new JedisShardInfo("localhost",
-                Protocol.DEFAULT_PORT);
-        shardInfo.setPassword("foobared");
-        Jedis jedis = new Jedis(shardInfo);
-        jedis.get("foo");
+	JedisShardInfo shardInfo = new JedisShardInfo("localhost",
+		Protocol.DEFAULT_PORT);
+	shardInfo.setPassword("foobared");
+	Jedis jedis = new Jedis(shardInfo);
+	jedis.get("foo");
     }
 
     @Test(expected = JedisConnectionException.class)
     public void timeoutConnection() throws Exception {
-        jedis = new Jedis("localhost", 6379, 15000);
-        jedis.auth("foobared");
-        jedis.configSet("timeout", "1");
-        // we need to sleep a long time since redis check for idle connections
-        // every 10 seconds or so
-        Thread.sleep(20000);
-        jedis.hmget("foobar", "foo");
+	jedis = new Jedis("localhost", 6379, 15000);
+	jedis.auth("foobared");
+	jedis.configSet("timeout", "1");
+	// we need to sleep a long time since redis check for idle connections
+	// every 10 seconds or so
+	Thread.sleep(20000);
+	jedis.hmget("foobar", "foo");
     }
 
     @Test(expected = JedisDataException.class)
     public void failWhenSendingNullValues() {
-        jedis.set("foo", null);
+	jedis.set("foo", null);
     }
 
     @Test
     public void shouldReconnectToSameDB() throws IOException {
-        jedis.select(1);
-        jedis.set("foo", "bar");
-        jedis.getClient().getSocket().shutdownInput();
-        jedis.getClient().getSocket().shutdownOutput();
-        assertEquals("bar", jedis.get("foo"));
+	jedis.select(1);
+	jedis.set("foo", "bar");
+	jedis.getClient().getSocket().shutdownInput();
+	jedis.getClient().getSocket().shutdownOutput();
+	assertEquals("bar", jedis.get("foo"));
+    }
+
+    @Test
+    public void startWithUrlString() {
+	Jedis j = new Jedis("localhost", 6380);
+	j.auth("foobared");
+	j.select(2);
+	j.set("foo", "bar");
+	Jedis jedis = new Jedis("redis://:foobared@localhost:6380/2");
+	assertEquals("PONG", jedis.ping());
+	assertEquals("bar", jedis.get("foo"));
+    }
+
+    @Test
+    public void startWithUrl() throws URISyntaxException {
+	Jedis j = new Jedis("localhost", 6380);
+	j.auth("foobared");
+	j.select(2);
+	j.set("foo", "bar");
+	Jedis jedis = new Jedis(new URI("redis://:foobared@localhost:6380/2"));
+	assertEquals("PONG", jedis.ping());
+	assertEquals("bar", jedis.get("foo"));
     }
 }

src/test/java/redis/clients/jedis/tests/ShardedJedisPoolTest.java

@@ -1,5 +1,7 @@
 package redis.clients.jedis.tests;
 
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -167,4 +169,60 @@ public class ShardedJedisPoolTest extends Assert {
         assertEquals(actual, c1);
         assertEquals(fails, c2);
     }
+    
+    @Test
+    public void startWithUrlString() {
+	Jedis j = new Jedis("localhost", 6380);
+	j.auth("foobared");
+	j.set("foo", "bar");
+	
+	j = new Jedis("localhost", 6379);
+	j.auth("foobared");
+	j.set("foo", "bar");
+	
+	List<JedisShardInfo> shards = new ArrayList<JedisShardInfo>();
+	shards.add(new JedisShardInfo("redis://:foobared@localhost:6380"));
+	shards.add(new JedisShardInfo("redis://:foobared@localhost:6379"));
+	
+	Config redisConfig = new Config();
+	ShardedJedisPool pool = new ShardedJedisPool(redisConfig, shards);
+	
+	Jedis[] jedises = pool.getResource().getAllShards().toArray(new Jedis[2]);
+	
+	Jedis jedis = jedises[0];
+	assertEquals("PONG", jedis.ping());
+	assertEquals("bar", jedis.get("foo"));
+	
+	jedis = jedises[1];
+	assertEquals("PONG", jedis.ping());
+	assertEquals("bar", jedis.get("foo"));
+    }
+    
+    @Test
+    public void startWithUrl() throws URISyntaxException {
+	Jedis j = new Jedis("localhost", 6380);
+	j.auth("foobared");
+	j.set("foo", "bar");
+	
+	j = new Jedis("localhost", 6379);
+	j.auth("foobared");
+	j.set("foo", "bar");
+	
+	List<JedisShardInfo> shards = new ArrayList<JedisShardInfo>();
+	shards.add(new JedisShardInfo(new URI("redis://:foobared@localhost:6380")));
+	shards.add(new JedisShardInfo(new URI("redis://:foobared@localhost:6379")));
+	
+	Config redisConfig = new Config();
+	ShardedJedisPool pool = new ShardedJedisPool(redisConfig, shards);
+	
+	Jedis[] jedises = pool.getResource().getAllShards().toArray(new Jedis[2]);
+	
+	Jedis jedis = jedises[0];
+	assertEquals("PONG", jedis.ping());
+	assertEquals("bar", jedis.get("foo"));
+	
+	jedis = jedises[1];
+	assertEquals("PONG", jedis.ping());
+	assertEquals("bar", jedis.get("foo"));
+    }
 }