add JedisDataException and JedisConnectionException

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

@@ -11,6 +11,7 @@ import java.util.Map;
 import java.util.Set;
 
 import redis.clients.jedis.BinaryClient.LIST_POSITION;
+import redis.clients.jedis.exceptions.JedisException;
 import redis.clients.util.JedisByteHashMap;
 import redis.clients.util.SafeEncoder;
 

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

@@ -10,6 +10,8 @@ import static redis.clients.jedis.Protocol.Keyword.UNSUBSCRIBE;
 import java.util.Arrays;
 import java.util.List;
 
+import redis.clients.jedis.exceptions.JedisException;
+
 public abstract class BinaryJedisPubSub {
     private int subscribedChannels = 0;
     private Client client;

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

@@ -3,11 +3,12 @@ package redis.clients.jedis;
 import java.io.IOException;
 import java.net.Socket;
 import java.net.SocketException;
-import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.List;
 
 import redis.clients.jedis.Protocol.Command;
+import redis.clients.jedis.exceptions.JedisConnectionException;
+import redis.clients.jedis.exceptions.JedisException;
 import redis.clients.util.RedisInputStream;
 import redis.clients.util.RedisOutputStream;
 import redis.clients.util.SafeEncoder;
@@ -60,26 +61,14 @@ public class Connection {
     }
 
     protected Connection sendCommand(final Command cmd, final byte[]... args) {
-        try {
         connect();
-        } catch (UnknownHostException e) {
-            throw new JedisException("Could not connect to redis-server", e);
-        } catch (IOException e) {
-            throw new JedisException("Could not connect to redis-server", e);
-        }
         protocol.sendCommand(outputStream, cmd, args);
         pipelinedCommands++;
         return this;
     }
 
     protected Connection sendCommand(final Command cmd) {
-        try {
         connect();
-        } catch (UnknownHostException e) {
-            throw new JedisException("Could not connect to redis-server", e);
-        } catch (IOException e) {
-            throw new JedisException("Could not connect to redis-server", e);
-        }
         protocol.sendCommand(outputStream, cmd, new byte[0][]);
         pipelinedCommands++;
         return this;
@@ -110,12 +99,16 @@ public class Connection {
     public Connection() {
     }
 
-    public void connect() throws UnknownHostException, IOException {
+    public void connect() {
         if (!isConnected()) {
+            try {
                 socket = new Socket(host, port);
                 socket.setSoTimeout(timeout);
                 outputStream = new RedisOutputStream(socket.getOutputStream());
                 inputStream = new RedisInputStream(socket.getInputStream());
+            } catch (IOException ex) {
+                throw new JedisConnectionException(ex);
+            }
         }
     }
 
@@ -128,7 +121,7 @@ public class Connection {
                     socket.close();
                 }
             } catch (IOException ex) {
-                throw new JedisException(ex);
+                throw new JedisConnectionException(ex);
             }
         }
     }

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

@@ -1,7 +1,5 @@
 package redis.clients.jedis;
 
-import java.io.IOException;
-import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -12,6 +10,7 @@ import java.util.Map;
 import java.util.Set;
 
 import redis.clients.jedis.BinaryClient.LIST_POSITION;
+import redis.clients.jedis.exceptions.JedisDataException;
 
 public class Jedis extends BinaryJedis implements JedisCommands {
     public Jedis(final String host) {
@@ -1647,19 +1646,13 @@ public class Jedis extends BinaryJedis implements JedisCommands {
 
     private void runChecks() {
         if (client.isInMulti()) {
-            throw new JedisException(
+            throw new JedisDataException(
                     "Cannot use Jedis when in Multi. Please use JedisTransaction instead.");
         }
-        try {
         this.connect();
-        } catch (UnknownHostException e) {
-            throw new JedisException(e);
-        } catch (IOException e) {
-            throw new JedisException(e);
-        }
     }
 
-    public void connect() throws UnknownHostException, IOException {
+    public void connect() {
         if (!client.isConnected()) {
             client.connect();
             if (this.password != null) {
@@ -1668,7 +1661,7 @@ public class Jedis extends BinaryJedis implements JedisCommands {
         }
     }
 
-    public void disconnect() throws IOException {
+    public void disconnect() {
         client.disconnect();
     }
 

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

@@ -1,22 +0,0 @@
-package redis.clients.jedis;
-
-import java.io.IOException;
-
-public class JedisException extends RuntimeException {
-    /**
-     * 
-     */
-    private static final long serialVersionUID = -2946266495682282677L;
-
-    public JedisException(String message) {
-	super(message);
-    }
-
-    public JedisException(IOException e) {
-	super(e);
-    }
-
-	public JedisException(String message, Throwable cause) {
-		super(message, cause);
-	}
-}

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

@@ -10,6 +10,7 @@ import static redis.clients.jedis.Protocol.Keyword.UNSUBSCRIBE;
 import java.util.Arrays;
 import java.util.List;
 
+import redis.clients.jedis.exceptions.JedisException;
 import redis.clients.util.SafeEncoder;
 
 public abstract class JedisPubSub {

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

@@ -4,6 +4,8 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import redis.clients.jedis.exceptions.JedisConnectionException;
+import redis.clients.jedis.exceptions.JedisDataException;
 import redis.clients.util.RedisInputStream;
 import redis.clients.util.RedisOutputStream;
 import redis.clients.util.SafeEncoder;
@@ -44,13 +46,13 @@ public final class Protocol {
             }
             os.flush();
         } catch (IOException e) {
-            throw new JedisException(e);
+            throw new JedisConnectionException(e);
         }
     }
 
     private void processError(final RedisInputStream is) {
         String message = is.readLine();
-        throw new JedisException(message);
+        throw new JedisDataException(message);
     }
 
     private Object process(final RedisInputStream is) {
@@ -67,10 +69,10 @@ public final class Protocol {
             } else if (b == PLUS_BYTE) {
                 return processStatusCodeReply(is);
             } else {
-                throw new JedisException("Unknown reply: " + (char) b);
+                throw new JedisConnectionException("Unknown reply: " + (char) b);
             }
         } catch (IOException e) {
-            throw new JedisException(e);
+            throw new JedisConnectionException(e);
         }
         return null;
     }
@@ -94,7 +96,7 @@ public final class Protocol {
             is.readByte();
             is.readByte();
         } catch (IOException e) {
-            throw new JedisException(e);
+            throw new JedisConnectionException(e);
         }
 
         return read;

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

@@ -1,6 +1,5 @@
 package redis.clients.jedis;
 
-import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -28,8 +27,7 @@ public class ShardedJedis extends BinaryShardedJedis implements JedisCommands {
         super(shards, algo, keyTagPattern);
     }
 
-    @Override
+    public void disconnect() {
-    public void disconnect() throws IOException {
         for (Jedis jedis : getAllShards()) {
             jedis.quit();
             jedis.disconnect();

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

@@ -1,5 +1,7 @@
 package redis.clients.jedis;
 
+import redis.clients.jedis.exceptions.JedisException;
+
 public abstract class TransactionBlock extends Transaction {
     public TransactionBlock(Client client) {
 	super(client);

src/main/java/redis/clients/jedis/exceptions/JedisConnectionException.java

@@ -0,0 +1,17 @@
+package redis.clients.jedis.exceptions;
+
+public class JedisConnectionException extends JedisException {
+    private static final long serialVersionUID = 3878126572474819403L;
+
+    public JedisConnectionException(String message) {
+        super(message);
+    }
+
+    public JedisConnectionException(Throwable cause) {
+        super(cause);
+    }
+
+    public JedisConnectionException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

src/main/java/redis/clients/jedis/exceptions/JedisDataException.java

@@ -0,0 +1,17 @@
+package redis.clients.jedis.exceptions;
+
+public class JedisDataException extends JedisException {
+    private static final long serialVersionUID = 3878126572474819403L;
+
+    public JedisDataException(String message) {
+        super(message);
+    }
+
+    public JedisDataException(Throwable cause) {
+        super(cause);
+    }
+
+    public JedisDataException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

src/main/java/redis/clients/jedis/exceptions/JedisException.java

@@ -0,0 +1,18 @@
+package redis.clients.jedis.exceptions;
+
+
+public class JedisException extends RuntimeException {
+    private static final long serialVersionUID = -2946266495682282677L;
+
+    public JedisException(String message) {
+        super(message);
+    }
+
+    public JedisException(Throwable e) {
+        super(e);
+    }
+
+    public JedisException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

src/main/java/redis/clients/util/Pool.java

@@ -3,7 +3,8 @@ package redis.clients.util;
 import org.apache.commons.pool.PoolableObjectFactory;
 import org.apache.commons.pool.impl.GenericObjectPool;
 
-import redis.clients.jedis.JedisException;
+import redis.clients.jedis.exceptions.JedisConnectionException;
+import redis.clients.jedis.exceptions.JedisException;
 
 public abstract class Pool<T> {
     private final GenericObjectPool internalPool;
@@ -18,8 +19,8 @@ public abstract class Pool<T> {
         try {
             return (T) internalPool.borrowObject();
         } catch (Exception e) {
-            throw new JedisException("Could not get a resource from the pool",
+            throw new JedisConnectionException(
-                    e);
+                    "Could not get a resource from the pool", e);
         }
     }
 

src/main/java/redis/clients/util/RedisInputStream.java

@@ -20,7 +20,8 @@ import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import redis.clients.jedis.JedisException;
+import redis.clients.jedis.exceptions.JedisConnectionException;
+import redis.clients.jedis.exceptions.JedisException;
 
 public class RedisInputStream extends FilterInputStream {
 
@@ -87,13 +88,12 @@ public class RedisInputStream extends FilterInputStream {
         }
         String reply = sb.toString();
         if (reply.length() == 0) {
-            throw new JedisException(
+            throw new JedisConnectionException(
                     "It seems like server has closed the connection.");
         }
         return reply;
     }
 
-    @Override
     public int read(byte[] b, int off, int len) throws IOException {
         if (count == limit) {
             fill();

src/main/java/redis/clients/util/SafeEncoder.java

@@ -2,8 +2,8 @@ package redis.clients.util;
 
 import java.io.UnsupportedEncodingException;
 
-import redis.clients.jedis.JedisException;
 import redis.clients.jedis.Protocol;
+import redis.clients.jedis.exceptions.JedisException;
 
 /**
  * The only reason to have this is to be able to compatible with java 1.5 :(

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

@@ -1,14 +1,12 @@
 package redis.clients.jedis.tests;
 
-import java.io.IOException;
-import java.net.UnknownHostException;
-
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
 import redis.clients.jedis.Connection;
+import redis.clients.jedis.exceptions.JedisConnectionException;
 
 public class ConnectionTest extends Assert {
     private Connection client;
@@ -23,14 +21,14 @@ public class ConnectionTest extends Assert {
         client.disconnect();
     }
 
-    @Test(expected = UnknownHostException.class)
+    @Test(expected = JedisConnectionException.class)
-    public void checkUnkownHost() throws UnknownHostException, IOException {
+    public void checkUnkownHost() {
         client.setHost("someunknownhost");
         client.connect();
     }
 
-    @Test(expected = IOException.class)
+    @Test(expected = JedisConnectionException.class)
-    public void checkWrongPort() throws UnknownHostException, IOException {
+    public void checkWrongPort() {
         client.setHost("localhost");
         client.setPort(55665);
         client.connect();

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

@@ -7,11 +7,11 @@ import java.io.ByteArrayInputStream;
  */
 public class FragmentedByteArrayInputStream extends ByteArrayInputStream {
     private int readMethodCallCount = 0;
+
     public FragmentedByteArrayInputStream(final byte[] buf) {
         super(buf);
     }
 
-	@Override
     public synchronized int read(final byte[] b, final int off, final int len) {
         readMethodCallCount++;
         if (len <= 10) {

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

@@ -6,7 +6,8 @@ import java.util.List;
 import redis.clients.jedis.Protocol;
 
 public class HostAndPortUtil {
-	private static List<HostAndPort> hostAndPortList = new ArrayList<HostAndPortUtil.HostAndPort>(2);
+    private static List<HostAndPort> hostAndPortList = new ArrayList<HostAndPortUtil.HostAndPort>(
+            2);
 
     static {
         final HostAndPort defaulthnp1 = new HostAndPort();
@@ -19,12 +20,12 @@ public class HostAndPortUtil {
         defaulthnp2.port = Protocol.DEFAULT_PORT + 1;
         hostAndPortList.add(defaulthnp2);
 
-		
         final String envHosts = System.getProperty("redis-hosts");
         if (null != envHosts && 0 < envHosts.length()) {
             final String[] hostDefs = envHosts.split(",");
             if (null != hostDefs && 2 <= hostDefs.length) {
-				hostAndPortList = new ArrayList<HostAndPortUtil.HostAndPort>(hostDefs.length);
+                hostAndPortList = new ArrayList<HostAndPortUtil.HostAndPort>(
+                        hostDefs.length);
                 for (String hostDef : hostDefs) {
                     final String[] hostAndPort = hostDef.split(":");
                     if (null != hostAndPort && 2 == hostAndPort.length) {
@@ -40,9 +41,11 @@ public class HostAndPortUtil {
                 }
             }
         }
-		final StringBuilder strb = new StringBuilder("Redis hosts to be used : ");
+        final StringBuilder strb = new StringBuilder(
+                "Redis hosts to be used : ");
         for (HostAndPort hnp : hostAndPortList) {
-			strb.append('[').append(hnp.host).append(':').append(hnp.port).append(']').append(' ');
+            strb.append('[').append(hnp.host).append(':').append(hnp.port)
+                    .append(']').append(' ');
         }
         System.out.println(strb);
     }

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

@@ -6,16 +6,16 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisException;
 import redis.clients.jedis.JedisPool;
 import redis.clients.jedis.JedisPoolConfig;
+import redis.clients.jedis.exceptions.JedisConnectionException;
 import redis.clients.jedis.tests.HostAndPortUtil.HostAndPort;
 
 public class JedisPoolTest extends Assert {
     private static HostAndPort hnp = HostAndPortUtil.getRedisServers().get(0);
 
     @Test
-    public void checkConnections() throws Exception {
+    public void checkConnections() {
         JedisPool pool = new JedisPool(new JedisPoolConfig(), hnp.host,
                 hnp.port, 2000);
         Jedis jedis = pool.getResource();
@@ -27,7 +27,7 @@ public class JedisPoolTest extends Assert {
     }
 
     @Test
-    public void checkConnectionWithDefaultPort() throws Exception {
+    public void checkConnectionWithDefaultPort() {
         JedisPool pool = new JedisPool(new JedisPoolConfig(), hnp.host,
                 hnp.port);
         Jedis jedis = pool.getResource();
@@ -39,7 +39,7 @@ public class JedisPoolTest extends Assert {
     }
 
     @Test
-    public void checkJedisIsReusedWhenReturned() throws Exception {
+    public void checkJedisIsReusedWhenReturned() {
         JedisPool pool = new JedisPool(new JedisPoolConfig(), hnp.host,
                 hnp.port);
         Jedis jedis = pool.getResource();
@@ -55,7 +55,7 @@ public class JedisPoolTest extends Assert {
     }
 
     @Test
-    public void checkPoolRepairedWhenJedisIsBroken() throws Exception {
+    public void checkPoolRepairedWhenJedisIsBroken() {
         JedisPool pool = new JedisPool(new JedisPoolConfig(), hnp.host,
                 hnp.port);
         Jedis jedis = pool.getResource();
@@ -70,7 +70,7 @@ public class JedisPoolTest extends Assert {
         pool.destroy();
     }
 
-    @Test(expected = JedisException.class)
+    @Test(expected = JedisConnectionException.class)
     public void checkPoolOverflow() {
         Config config = new Config();
         config.maxActive = 1;

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

@@ -6,9 +6,9 @@ import java.util.Map;
 import org.junit.Test;
 
 import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisException;
 import redis.clients.jedis.JedisShardInfo;
 import redis.clients.jedis.Protocol;
+import redis.clients.jedis.exceptions.JedisConnectionException;
 import redis.clients.jedis.tests.commands.JedisCommandTestBase;
 import redis.clients.util.SafeEncoder;
 
@@ -43,7 +43,7 @@ public class JedisTest extends JedisCommandTestBase {
         jedis.get("foo");
     }
 
-    @Test(expected = JedisException.class)
+    @Test(expected = JedisConnectionException.class)
     public void timeoutConnection() throws Exception {
         jedis = new Jedis("localhost", 6379, 15000);
         jedis.auth("foobared");

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

@@ -1,7 +1,6 @@
 package redis.clients.jedis.tests;
 
-import java.io.IOException;
+import java.io.UnsupportedEncodingException;
-import java.net.UnknownHostException;
 import java.util.List;
 
 import org.junit.Assert;
@@ -9,8 +8,8 @@ import org.junit.Before;
 import org.junit.Test;
 
 import redis.clients.jedis.Jedis;
-import redis.clients.jedis.PipelineBlock;
 import redis.clients.jedis.Pipeline;
+import redis.clients.jedis.PipelineBlock;
 import redis.clients.jedis.Protocol;
 import redis.clients.jedis.tests.HostAndPortUtil.HostAndPort;
 
@@ -28,7 +27,7 @@ public class PipeliningTest extends Assert {
     }
 
     @Test
-    public void pipeline() throws UnknownHostException, IOException {
+    public void pipeline() throws UnsupportedEncodingException {
         List<Object> results = jedis.pipelined(new PipelineBlock() {
             public void execute() {
                 set("foo", "bar");

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

@@ -1,7 +1,5 @@
 package redis.clients.jedis.tests;
 
-import java.io.IOException;
-import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -12,10 +10,10 @@ import org.junit.Before;
 import org.junit.Test;
 
 import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisException;
 import redis.clients.jedis.JedisShardInfo;
 import redis.clients.jedis.ShardedJedis;
 import redis.clients.jedis.ShardedJedisPool;
+import redis.clients.jedis.exceptions.JedisConnectionException;
 import redis.clients.jedis.tests.HostAndPortUtil.HostAndPort;
 
 public class ShardedJedisPoolTest extends Assert {
@@ -27,7 +25,7 @@ public class ShardedJedisPoolTest extends Assert {
     private List<JedisShardInfo> shards;
 
     @Before
-    public void startUp() throws UnknownHostException, IOException {
+    public void startUp() {
         shards = new ArrayList<JedisShardInfo>();
         shards.add(new JedisShardInfo(redis1.host, redis1.port));
         shards.add(new JedisShardInfo(redis2.host, redis2.port));
@@ -77,7 +75,7 @@ public class ShardedJedisPoolTest extends Assert {
     }
 
     @Test
-    public void checkPoolRepairedWhenJedisIsBroken() throws Exception {
+    public void checkPoolRepairedWhenJedisIsBroken() {
         ShardedJedisPool pool = new ShardedJedisPool(new Config(), shards);
         ShardedJedis jedis = pool.getResource();
         jedis.disconnect();
@@ -89,7 +87,7 @@ public class ShardedJedisPoolTest extends Assert {
         pool.destroy();
     }
 
-    @Test(expected = JedisException.class)
+    @Test(expected = JedisConnectionException.class)
     public void checkPoolOverflow() {
         Config config = new Config();
         config.maxActive = 1;

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

@@ -1,6 +1,5 @@
 package redis.clients.jedis.tests;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -24,7 +23,7 @@ public class ShardedJedisTest extends Assert {
             .get(1);
 
     @Test
-    public void checkSharding() throws IOException {
+    public void checkSharding() {
         List<JedisShardInfo> shards = new ArrayList<JedisShardInfo>();
         shards.add(new JedisShardInfo(redis1.host, redis1.port));
         shards.add(new JedisShardInfo(redis2.host, redis2.port));
@@ -35,7 +34,7 @@ public class ShardedJedisTest extends Assert {
     }
 
     @Test
-    public void trySharding() throws IOException {
+    public void trySharding() {
         List<JedisShardInfo> shards = new ArrayList<JedisShardInfo>();
         JedisShardInfo si = new JedisShardInfo(redis1.host, redis1.port);
         si.setPassword("foobared");
@@ -62,7 +61,7 @@ public class ShardedJedisTest extends Assert {
     }
 
     @Test
-    public void tryShardingWithMurmure() throws IOException {
+    public void tryShardingWithMurmure() {
         List<JedisShardInfo> shards = new ArrayList<JedisShardInfo>();
         JedisShardInfo si = new JedisShardInfo(redis1.host, redis1.port);
         si.setPassword("foobared");
@@ -154,7 +153,7 @@ public class ShardedJedisTest extends Assert {
     }
 
     @Test
-    public void testMD5Sharding() throws Exception {
+    public void testMD5Sharding() {
         List<JedisShardInfo> shards = new ArrayList<JedisShardInfo>(3);
         shards.add(new JedisShardInfo("localhost", Protocol.DEFAULT_PORT));
         shards.add(new JedisShardInfo("localhost", Protocol.DEFAULT_PORT + 1));
@@ -189,7 +188,7 @@ public class ShardedJedisTest extends Assert {
     }
 
     @Test
-    public void testMurmurSharding() throws Exception {
+    public void testMurmurSharding() {
         List<JedisShardInfo> shards = new ArrayList<JedisShardInfo>(3);
         shards.add(new JedisShardInfo("localhost", Protocol.DEFAULT_PORT));
         shards.add(new JedisShardInfo("localhost", Protocol.DEFAULT_PORT + 1));

src/test/java/redis/clients/jedis/tests/commands/AllKindOfValuesCommandsTest.java

@@ -6,7 +6,7 @@ import java.util.Set;
 
 import org.junit.Test;
 
-import redis.clients.jedis.JedisException;
+import redis.clients.jedis.exceptions.JedisDataException;
 import redis.clients.util.SafeEncoder;
 
 public class AllKindOfValuesCommandsTest extends JedisCommandTestBase {
@@ -205,16 +205,16 @@ public class AllKindOfValuesCommandsTest extends JedisCommandTestBase {
         try {
             jedis.set("foo", "bar");
             jedis.rename("foo", "foo");
-            fail("JedisException expected");
+            fail("JedisDataException expected");
-        } catch (final JedisException e) {
+        } catch (final JedisDataException e) {
         }
 
         // Binary
         try {
             jedis.set(bfoo, bbar);
             jedis.rename(bfoo, bfoo);
-            fail("JedisException expected");
+            fail("JedisDataException expected");
-        } catch (final JedisException e) {
+        } catch (final JedisDataException e) {
         }
 
     }

src/test/java/redis/clients/jedis/tests/commands/BinaryValuesCommandsTest.java

@@ -7,8 +7,8 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 
-import redis.clients.jedis.JedisException;
 import redis.clients.jedis.Protocol.Keyword;
+import redis.clients.jedis.exceptions.JedisDataException;
 
 public class BinaryValuesCommandsTest extends JedisCommandTestBase {
     byte[] bfoo = { 0x01, 0x02, 0x03, 0x04 };
@@ -113,7 +113,7 @@ public class BinaryValuesCommandsTest extends JedisCommandTestBase {
         assertTrue(Arrays.equals(bfoo, jedis.get(bbar)));
     }
 
-    @Test(expected = JedisException.class)
+    @Test(expected = JedisDataException.class)
     public void incrWrongValue() {
         jedis.set(bfoo, binaryValue);
         jedis.incr(bfoo);
@@ -127,7 +127,7 @@ public class BinaryValuesCommandsTest extends JedisCommandTestBase {
         assertEquals(2, value);
     }
 
-    @Test(expected = JedisException.class)
+    @Test(expected = JedisDataException.class)
     public void incrByWrongValue() {
         jedis.set(bfoo, binaryValue);
         jedis.incrBy(bfoo, 2);
@@ -141,7 +141,7 @@ public class BinaryValuesCommandsTest extends JedisCommandTestBase {
         assertEquals(4, value);
     }
 
-    @Test(expected = JedisException.class)
+    @Test(expected = JedisDataException.class)
     public void decrWrongValue() {
         jedis.set(bfoo, binaryValue);
         jedis.decr(bfoo);
@@ -155,7 +155,7 @@ public class BinaryValuesCommandsTest extends JedisCommandTestBase {
         assertEquals(-2, value);
     }
 
-    @Test(expected = JedisException.class)
+    @Test(expected = JedisDataException.class)
     public void decrByWrongValue() {
         jedis.set(bfoo, binaryValue);
         jedis.decrBy(bfoo, 2);

src/test/java/redis/clients/jedis/tests/commands/ControlCommandsTest.java

@@ -5,8 +5,8 @@ import java.util.List;
 import org.junit.Test;
 
 import redis.clients.jedis.DebugParams;
-import redis.clients.jedis.JedisException;
 import redis.clients.jedis.JedisMonitor;
+import redis.clients.jedis.exceptions.JedisDataException;
 
 public class ControlCommandsTest extends JedisCommandTestBase {
     @Test
@@ -20,9 +20,8 @@ public class ControlCommandsTest extends JedisCommandTestBase {
         try {
             String status = jedis.bgsave();
             assertEquals("Background saving started", status);
-	} catch (JedisException e) {
+        } catch (JedisDataException e) {
-		assertTrue(
+            assertTrue("ERR Background save already in progress"
-				"ERR Background save already in progress"
                     .equalsIgnoreCase(e.getMessage()));
         }
     }
@@ -41,7 +40,7 @@ public class ControlCommandsTest extends JedisCommandTestBase {
             try {
                 Thread.sleep(1000);
                 st = jedis.save();
-	    } catch (JedisException e) {
+            } catch (JedisDataException e) {
 
             }
         }

src/test/java/redis/clients/jedis/tests/commands/JedisCommandTestBase.java

@@ -1,7 +1,5 @@
 package redis.clients.jedis.tests.commands;
 
-import java.io.IOException;
-import java.net.UnknownHostException;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
@@ -33,11 +31,11 @@ public abstract class JedisCommandTestBase extends JedisTestBase {
     }
 
     @After
-    public void tearDown() throws Exception {
+    public void tearDown() {
         jedis.disconnect();
     }
 
-    protected Jedis createJedis() throws UnknownHostException, IOException {
+    protected Jedis createJedis() {
         Jedis j = new Jedis(hnp.host, hnp.port);
         j.connect();
         j.auth("foobared");

src/test/java/redis/clients/jedis/tests/commands/ListCommandsTest.java

@@ -1,7 +1,5 @@
 package redis.clients.jedis.tests.commands;
 
-import java.io.IOException;
-import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -10,7 +8,7 @@ import org.junit.Test;
 
 import redis.clients.jedis.Client;
 import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisException;
+import redis.clients.jedis.exceptions.JedisDataException;
 
 public class ListCommandsTest extends JedisCommandTestBase {
     final byte[] bfoo = { 0x01, 0x02, 0x03, 0x04 };
@@ -76,16 +74,16 @@ public class ListCommandsTest extends JedisCommandTestBase {
         try {
             jedis.set("foo", "bar");
             jedis.llen("foo");
-            fail("JedisException expected");
+            fail("JedisDataException expected");
-        } catch (final JedisException e) {
+        } catch (final JedisDataException e) {
         }
 
         // Binary
         try {
             jedis.set(bfoo, bbar);
             jedis.llen(bfoo);
-            fail("JedisException expected");
+            fail("JedisDataException expected");
-        } catch (final JedisException e) {
+        } catch (final JedisDataException e) {
         }
 
     }
@@ -592,10 +590,6 @@ public class ListCommandsTest extends JedisCommandTestBase {
                     j.lpush("foo", "a");
                 } catch (InterruptedException e) {
                     e.printStackTrace();
-                } catch (UnknownHostException e) {
-                    e.printStackTrace();
-                } catch (IOException e) {
-                    e.printStackTrace();
                 }
             }
         })).start();
@@ -614,10 +608,6 @@ public class ListCommandsTest extends JedisCommandTestBase {
                     j.lpush("foo", "a");
                 } catch (InterruptedException e) {
                     e.printStackTrace();
-                } catch (UnknownHostException e) {
-                    e.printStackTrace();
-                } catch (IOException e) {
-                    e.printStackTrace();
                 }
             }
         })).start();

src/test/java/redis/clients/jedis/tests/commands/PublishSubscribeCommandsTest.java

@@ -8,14 +8,13 @@ import org.junit.Test;
 
 import redis.clients.jedis.BinaryJedisPubSub;
 import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisException;
 import redis.clients.jedis.JedisPubSub;
+import redis.clients.jedis.exceptions.JedisDataException;
 import redis.clients.util.SafeEncoder;
 
 public class PublishSubscribeCommandsTest extends JedisCommandTestBase {
     @Test
-    public void subscribe() throws UnknownHostException, IOException,
+    public void subscribe() throws InterruptedException {
-            InterruptedException {
         Thread t = new Thread(new Runnable() {
             public void run() {
                 try {
@@ -498,7 +497,7 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase {
             }, "foo");
         } catch (NullPointerException ex) {
             fail();
-        } catch (JedisException ex) {
+        } catch (JedisDataException ex) {
             // this is OK because we are not sending AUTH command
         }
     }

src/test/java/redis/clients/jedis/tests/commands/StringValuesCommandsTest.java

@@ -5,7 +5,7 @@ import java.util.List;
 
 import org.junit.Test;
 
-import redis.clients.jedis.JedisException;
+import redis.clients.jedis.exceptions.JedisDataException;
 
 public class StringValuesCommandsTest extends JedisCommandTestBase {
     @Test
@@ -95,7 +95,7 @@ public class StringValuesCommandsTest extends JedisCommandTestBase {
         assertEquals("foo", jedis.get("bar"));
     }
 
-    @Test(expected = JedisException.class)
+    @Test(expected = JedisDataException.class)
     public void incrWrongValue() {
         jedis.set("foo", "bar");
         jedis.incr("foo");
@@ -109,7 +109,7 @@ public class StringValuesCommandsTest extends JedisCommandTestBase {
         assertEquals(2, value);
     }
 
-    @Test(expected = JedisException.class)
+    @Test(expected = JedisDataException.class)
     public void incrByWrongValue() {
         jedis.set("foo", "bar");
         jedis.incrBy("foo", 2);
@@ -123,7 +123,7 @@ public class StringValuesCommandsTest extends JedisCommandTestBase {
         assertEquals(4, value);
     }
 
-    @Test(expected = JedisException.class)
+    @Test(expected = JedisDataException.class)
     public void decrWrongValue() {
         jedis.set("foo", "bar");
         jedis.decr("foo");
@@ -137,7 +137,7 @@ public class StringValuesCommandsTest extends JedisCommandTestBase {
         assertEquals(-2, value);
     }
 
-    @Test(expected = JedisException.class)
+    @Test(expected = JedisDataException.class)
     public void decrByWrongValue() {
         jedis.set("foo", "bar");
         jedis.decrBy("foo", 2);
@@ -184,7 +184,7 @@ public class StringValuesCommandsTest extends JedisCommandTestBase {
                 Integer.MAX_VALUE));
     }
 
-    @Test(expected = JedisException.class)
+    @Test(expected = JedisDataException.class)
     public void incrReallyLargeNumbers() {
         jedis.set("foo", Long.toString(Long.MAX_VALUE));
         long value = jedis.incr("foo");

src/test/java/redis/clients/jedis/tests/commands/TransactionCommandsTest.java

@@ -10,11 +10,11 @@ import org.junit.Before;
 import org.junit.Test;
 
 import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisException;
 import redis.clients.jedis.Protocol;
 import redis.clients.jedis.Transaction;
 import redis.clients.jedis.TransactionBlock;
 import redis.clients.jedis.Protocol.Keyword;
+import redis.clients.jedis.exceptions.JedisDataException;
 
 public class TransactionCommandsTest extends JedisCommandTestBase {
     final byte[] bfoo = { 0x01, 0x02, 0x03, 0x04 };
@@ -195,7 +195,7 @@ public class TransactionCommandsTest extends JedisCommandTestBase {
                 (byte[]) resp.get(0));
     }
 
-    @Test(expected = JedisException.class)
+    @Test(expected = JedisDataException.class)
     public void validateWhenInMulti() {
         jedis.multi();
         jedis.ping();