Introduce JedisBatchOperationException

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

@@ -27,7 +27,7 @@
 import redis.clients.jedis.commands.MultiKeyBinaryCommands;
 import redis.clients.jedis.commands.ProtocolCommand;
 import redis.clients.jedis.exceptions.InvalidURIException;
-import redis.clients.jedis.exceptions.JedisDataException;
+import redis.clients.jedis.exceptions.JedisBatchOperationException;
 import redis.clients.jedis.exceptions.JedisException;
 import redis.clients.jedis.params.ClientKillParams;
 import redis.clients.jedis.params.GeoRadiusParam;
@@ -2027,11 +2027,11 @@ public Transaction multi() {
 
   protected void checkIsInMultiOrPipeline() {
     if (client.isInMulti()) {
-      throw new JedisDataException(
+      throw new JedisBatchOperationException(
           "Cannot use Jedis when in Multi. Please use Transaction or reset jedis state.");
     } else if (pipeline != null && pipeline.hasPipelinedResponse()) {
-      throw new JedisDataException(
-          "Cannot use Jedis when in Pipeline. Please use Pipeline or reset jedis state .");
+      throw new JedisBatchOperationException(
+          "Cannot use Jedis when in Pipeline. Please use Pipeline or reset jedis state.");
     }
   }
 

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

@@ -4,6 +4,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import redis.clients.jedis.exceptions.JedisBatchOperationException;
 import redis.clients.jedis.exceptions.JedisDataException;
 
 public class Pipeline extends MultiKeyPipelineBase implements Closeable {
@@ -20,8 +21,8 @@ public List<Object> build(Object data) {
       List<Object> values = new ArrayList<>();
 
       if (list.size() != responses.size()) {
-        throw new JedisDataException("Expected data size " + responses.size() + " but was "
-            + list.size());
+        throw new JedisBatchOperationException(
+            "Expected data size " + responses.size() + " but was " + list.size());
       }
 
       for (int i = 0; i < list.size(); i++) {
@@ -126,14 +127,14 @@ public List<Object> syncAndReturnAll() {
   }
 
   public Response<String> discard() {
-    if (currentMulti == null) throw new JedisDataException("DISCARD without MULTI");
+    if (currentMulti == null) throw new JedisBatchOperationException("DISCARD without MULTI");
     client.discard();
     currentMulti = null;
     return getResponse(BuilderFactory.STRING);
   }
 
   public Response<List<Object>> exec() {
-    if (currentMulti == null) throw new JedisDataException("EXEC without MULTI");
+    if (currentMulti == null) throw new JedisBatchOperationException("EXEC without MULTI");
 
     client.exec();
     Response<List<Object>> response = super.getResponse(currentMulti);
@@ -143,11 +144,10 @@ public Response<List<Object>> exec() {
   }
 
   public Response<String> multi() {
-    if (currentMulti != null) throw new JedisDataException("MULTI calls can not be nested");
+    if (currentMulti != null) throw new JedisBatchOperationException("MULTI calls can not be nested");
 
     client.multi();
-    Response<String> response = getResponse(BuilderFactory.STRING); // Expecting
-    // OK
+    Response<String> response = getResponse(BuilderFactory.STRING); // Expecting OK
     currentMulti = new MultiResponseBuilder();
     return response;
   }

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

@@ -1,5 +1,6 @@
 package redis.clients.jedis;
 
+import redis.clients.jedis.exceptions.JedisBatchOperationException;
 import redis.clients.jedis.exceptions.JedisDataException;
 
 public class Response<T> {
@@ -24,13 +25,12 @@ public void set(Object data) {
   }
 
   public T get() {
-    // if response has dependency response and dependency is not built,
-    // build it first and no more!!
+    // if response has dependency response and dependency is not built, build it first and no more!!
     if (dependency != null && dependency.set && !dependency.built) {
       dependency.build();
     }
     if (!set) {
-      throw new JedisDataException(
+      throw new JedisBatchOperationException(
           "Please close pipeline or multi block before calling this method.");
     }
     if (!built) {

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

@@ -0,0 +1,10 @@
+package redis.clients.jedis.exceptions;
+
+public class JedisBatchOperationException extends JedisException {
+  private static final long serialVersionUID = -1464241173812705493L;
+
+  public JedisBatchOperationException(String message) {
+    super(message);
+  }
+
+}

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

@@ -5,7 +5,6 @@
 import java.util.List;
 
 import redis.clients.jedis.Protocol;
-import redis.clients.jedis.exceptions.JedisDataException;
 import redis.clients.jedis.exceptions.JedisException;
 
 /**
@@ -27,7 +26,7 @@ public static byte[][] encodeMany(final String... strs) {
   public static byte[] encode(final String str) {
     try {
       if (str == null) {
-        throw new JedisDataException("value sent to redis cannot be null");
+        throw new JedisException("null value cannot be sent to redis");
       }
       return str.getBytes(Protocol.CHARSET);
     } catch (UnsupportedEncodingException e) {

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

@@ -19,7 +19,6 @@
 import redis.clients.jedis.Protocol;
 import redis.clients.jedis.exceptions.InvalidURIException;
 import redis.clients.jedis.exceptions.JedisConnectionException;
-import redis.clients.jedis.exceptions.JedisDataException;
 import redis.clients.jedis.exceptions.JedisException;
 import redis.clients.jedis.tests.commands.JedisCommandTestBase;
 import redis.clients.jedis.util.SafeEncoder;
@@ -114,7 +113,7 @@ public void infiniteTimeout() throws Exception {
     jedis.close();
   }
 
-  @Test(expected = JedisDataException.class)
+  @Test(expected = JedisException.class)
   public void failWhenSendingNullValues() {
     jedis.set("foo", null);
   }
@@ -204,4 +203,4 @@ public void checkDisconnectOnQuit() {
     assertFalse(jedis.getClient().isConnected());
   }
 
-}
+}

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

@@ -105,4 +105,4 @@ public void allowUrlWithNoDBAndNoPassword() {
     }
   }
 
-}
+}

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

@@ -29,6 +29,7 @@
 import redis.clients.jedis.Pipeline;
 import redis.clients.jedis.Response;
 import redis.clients.jedis.Tuple;
+import redis.clients.jedis.exceptions.JedisBatchOperationException;
 import redis.clients.jedis.exceptions.JedisDataException;
 import redis.clients.jedis.tests.commands.JedisCommandTestBase;
 import redis.clients.jedis.util.SafeEncoder;
@@ -183,7 +184,7 @@ public void pipelineResponseWithoutData() {
     assertNull(score.get());
   }
 
-  @Test(expected = JedisDataException.class)
+  @Test(expected = JedisBatchOperationException.class)
   public void pipelineResponseWithinPipeline() {
     jedis.set("string", "foo");
 
@@ -351,27 +352,27 @@ public void multiUnwatch() {
     assertEquals(expect, pipe.syncAndReturnAll());
   }
 
-  @Test(expected = JedisDataException.class)
-  public void pipelineExecShoudThrowJedisDataExceptionWhenNotInMulti() {
+  @Test(expected = JedisBatchOperationException.class)
+  public void pipelineExecShoudThrowBatchExceptionWhenNotInMulti() {
     Pipeline pipeline = jedis.pipelined();
     pipeline.exec();
   }
 
-  @Test(expected = JedisDataException.class)
-  public void pipelineDiscardShoudThrowJedisDataExceptionWhenNotInMulti() {
+  @Test(expected = JedisBatchOperationException.class)
+  public void pipelineDiscardShoudThrowBatchExceptionWhenNotInMulti() {
     Pipeline pipeline = jedis.pipelined();
     pipeline.discard();
   }
 
-  @Test(expected = JedisDataException.class)
-  public void pipelineMultiShoudThrowJedisDataExceptionWhenAlreadyInMulti() {
+  @Test(expected = JedisBatchOperationException.class)
+  public void pipelineMultiShoudThrowBatchExceptionWhenAlreadyInMulti() {
     Pipeline pipeline = jedis.pipelined();
     pipeline.multi();
     pipeline.set("foo", "3");
     pipeline.multi();
   }
 
-  @Test(expected = JedisDataException.class)
+  @Test(expected = JedisBatchOperationException.class)
   public void testJedisThowExceptionWhenInPipeline() {
     Pipeline pipeline = jedis.pipelined();
     pipeline.set("foo", "3");
@@ -680,7 +681,7 @@ public void testCloseableWithMulti() throws IOException {
     try {
       pipeline.exec();
       fail("close should discard transaction");
-    } catch (JedisDataException e) {
+    } catch (JedisBatchOperationException e) {
       assertTrue(e.getMessage().contains("EXEC without MULTI"));
       // pass
     }

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

@@ -23,7 +23,7 @@
 import redis.clients.jedis.ShardedJedis;
 import redis.clients.jedis.ShardedJedisPipeline;
 import redis.clients.jedis.Tuple;
-import redis.clients.jedis.exceptions.JedisDataException;
+import redis.clients.jedis.exceptions.JedisBatchOperationException;
 
 public class ShardedJedisPipelineTest {
 
@@ -109,7 +109,7 @@ public void pipelineResponse() {
     assertEquals(1, zrangeWithScores.get().size());
   }
 
-  @Test(expected = JedisDataException.class)
+  @Test(expected = JedisBatchOperationException.class)
   public void pipelineResponseWithinPipeline() {
     jedis.set("string", "foo");
 

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

@@ -24,6 +24,7 @@
 import redis.clients.jedis.Protocol.Keyword;
 import redis.clients.jedis.Response;
 import redis.clients.jedis.Transaction;
+import redis.clients.jedis.exceptions.JedisBatchOperationException;
 import redis.clients.jedis.exceptions.JedisDataException;
 import redis.clients.jedis.util.SafeEncoder;
 
@@ -156,7 +157,7 @@ public void unwatch() {
     assertEquals("OK", resp.get(0));
   }
 
-  @Test(expected = JedisDataException.class)
+  @Test(expected = JedisBatchOperationException.class)
   public void validateWhenInMulti() {
     jedis.multi();
     jedis.ping();
@@ -215,7 +216,7 @@ public void transactionResponseBinary() {
     assertArrayEquals("foo".getBytes(), set.get());
   }
 
-  @Test(expected = JedisDataException.class)
+  @Test(expected = JedisBatchOperationException.class)
   public void transactionResponseWithinPipeline() {
     jedis.set("string", "foo");