From b2e2cc52cfb2b82059f531d978f739d7aa6a6b0c Mon Sep 17 00:00:00 2001
From: M Sazzadul Hoque <7600764+sazzad16@users.noreply.github.com>
Date: Tue, 6 Apr 2021 21:16:37 +0600
Subject: [PATCH] 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
---
 .../clients/jedis/MultiKeyPipelineBase.java   | 12 ---------
 .../java/redis/clients/jedis/Pipeline.java    | 10 +++++++
 .../java/redis/clients/jedis/Transaction.java | 26 -------------------
 .../commands/MultiKeyBinaryRedisPipeline.java |  2 --
 .../commands/MultiKeyCommandsPipeline.java    |  2 --
 5 files changed, 10 insertions(+), 42 deletions(-)

diff --git a/src/main/java/redis/clients/jedis/MultiKeyPipelineBase.java b/src/main/java/redis/clients/jedis/MultiKeyPipelineBase.java
index b23a14cb71..4fb5d2df1e 100644
--- 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
index 807ffe09f8..0717a4e17b 100644
--- 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
index de2800e9f2..f2b09b702d 100644
--- 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
index f077ead00e..9b1d402fd5 100644
--- 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
index 40e698b0b9..7845da4ab2 100644
--- 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);