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 sunionstore(byte[] dstkey, byte[]... keys) { return getResponse(BuilderFactory.LONG); } - @Override - public Response watch(String... keys) { - client.watch(keys); - return getResponse(BuilderFactory.STRING); - } - - @Override - public Response watch(byte[]... keys) { - client.watch(keys); - return getResponse(BuilderFactory.STRING); - } - @Override public Response unwatch() { client.unwatch(); diff --git a/src/main/java/redis/clients/jedis/Pipeline.java b/src/main/java/redis/clients/jedis/Pipeline.java index 37712790d5..4fbc6b6e06 100644 --- a/src/main/java/redis/clients/jedis/Pipeline.java +++ b/src/main/java/redis/clients/jedis/Pipeline.java @@ -157,4 +157,14 @@ public void close() { clear(); } + public Response watch(String... keys) { + client.watch(keys); + return getResponse(BuilderFactory.STRING); + } + + public Response 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 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 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 sunionstore(byte[] dstkey, byte[]... keys); - Response watch(byte[]... keys); - Response unwatch(); Response> 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 blmove(String srcKey, String dstKey, ListDirection from, ListDi Response sunionstore(String dstkey, String... keys); - Response watch(String... keys); - Response unwatch(); Response> zdiff(String... keys);