Remove WATCH from Transaction (#2033)

* Remove WATCH from Transaction Redis doesn't support WATCH within MULTI * Add UNWATCH in pipeline interfaces * Remove watch and unwatch from Transaction
redis · Apr 6, 2021 · b2e2cc5 · b2e2cc5
1 parent ec49cd7
commit b2e2cc5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 42 deletions.
diff --git a/src/main/java/redis/clients/jedis/MultiKeyPipelineBase.java b/src/main/java/redis/clients/jedis/MultiKeyPipelineBase.java
@@ -411,18 +411,6 @@ public Response<Long> sunionstore(byte[] dstkey, byte[]... keys) {
     return getResponse(BuilderFactory.LONG);
   }
 
-  @Override
-  public Response<String> watch(String... keys) {
-    client.watch(keys);
-    return getResponse(BuilderFactory.STRING);
-  }
-
-  @Override
-  public Response<String> watch(byte[]... keys) {
-    client.watch(keys);
-    return getResponse(BuilderFactory.STRING);
-  }
-
   @Override
   public Response<String> unwatch() {
     client.unwatch();

diff --git a/src/main/java/redis/clients/jedis/Pipeline.java b/src/main/java/redis/clients/jedis/Pipeline.java
@@ -156,4 +156,14 @@ public void close() {
     clear();
   }
 
+  public Response<String> watch(String... keys) {
+    client.watch(keys);
+    return getResponse(BuilderFactory.STRING);
+  }
+
+  public Response<String> watch(byte[]... keys) {
+    client.watch(keys);
+    return getResponse(BuilderFactory.STRING);
+  }
+
 }
diff --git a/src/main/java/redis/clients/jedis/Transaction.java b/src/main/java/redis/clients/jedis/Transaction.java
@@ -91,30 +91,4 @@ public void setClient(Client client) {
   public void close() {
     clear();
   }
-
-  private static final String WATCH_INSIDE_MULTI_MESSAGE = "WATCH inside MULTI is not allowed";
-
-  /**
-   * @param keys
-   * @return
-   * @throws UnsupportedOperationException
-   * @deprecated {@value #WATCH_INSIDE_MULTI_MESSAGE}
-   */
-  @Override
-  @Deprecated
-  public Response<String> watch(String... keys) throws UnsupportedOperationException {
-    throw new UnsupportedOperationException(WATCH_INSIDE_MULTI_MESSAGE);
-  }
-
-  /**
-   * @param keys
-   * @return
-   * @throws UnsupportedOperationException
-   * @deprecated {@value #WATCH_INSIDE_MULTI_MESSAGE}
-   */
-  @Override
-  @Deprecated
-  public Response<String> watch(byte[]... keys) throws UnsupportedOperationException {
-    throw new UnsupportedOperationException(WATCH_INSIDE_MULTI_MESSAGE);
-  }
 }
diff --git a/src/main/java/redis/clients/jedis/commands/MultiKeyBinaryRedisPipeline.java b/src/main/java/redis/clients/jedis/commands/MultiKeyBinaryRedisPipeline.java
@@ -75,8 +75,6 @@ public interface MultiKeyBinaryRedisPipeline {
 
   Response<Long> sunionstore(byte[] dstkey, byte[]... keys);
 
-  Response<String> watch(byte[]... keys);
-
   Response<String> unwatch();
 
   Response<Set<byte[]>> zdiff(byte[]... keys);

diff --git a/src/main/java/redis/clients/jedis/commands/MultiKeyCommandsPipeline.java b/src/main/java/redis/clients/jedis/commands/MultiKeyCommandsPipeline.java
@@ -83,8 +83,6 @@ Response<String> blmove(String srcKey, String dstKey, ListDirection from, ListDi
 
   Response<Long> sunionstore(String dstkey, String... keys);
 
-  Response<String> watch(String... keys);
-
   Response<String> unwatch();
 
   Response<Set<String>> zdiff(String... keys);