From ff6b26ee605558b2cd1c730fb0de38a2b79ec76b Mon Sep 17 00:00:00 2001
From: Jungtaek Lim <kabhwan@gmail.com>
Date: Thu, 13 Feb 2014 07:42:10 +0900
Subject: [PATCH] Remove @Deprecated TransactionBlock and PipelineBlock

* remove all @Deprecated methods and classes about TransactionBlock and PipelineBlock
---
 .../java/redis/clients/jedis/BinaryJedis.java | 29 -------------------
 .../clients/jedis/BinaryShardedJedis.java     | 13 ---------
 .../redis/clients/jedis/PipelineBlock.java    | 11 -------
 .../clients/jedis/ShardedJedisPipeline.java   |  8 -----
 .../redis/clients/jedis/TransactionBlock.java | 24 ---------------
 5 files changed, 85 deletions(-)
 delete mode 100644 src/main/java/redis/clients/jedis/PipelineBlock.java
 delete mode 100644 src/main/java/redis/clients/jedis/TransactionBlock.java

diff --git a/src/main/java/redis/clients/jedis/BinaryJedis.java b/src/main/java/redis/clients/jedis/BinaryJedis.java
index eba466f..648c9b5 100644
--- a/src/main/java/redis/clients/jedis/BinaryJedis.java
+++ b/src/main/java/redis/clients/jedis/BinaryJedis.java
@@ -1697,22 +1697,6 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
 	return new Transaction(client);
     }
 
-    @Deprecated
-    /**
-     * This method is deprecated due to its error prone
-     * and will be removed on next major release
-     * You can use multi() instead
-     * @see https://github.com/xetorthio/jedis/pull/498
-     */
-    public List<Object> multi(final TransactionBlock jedisTransaction) {
-	List<Object> results = null;
-	jedisTransaction.setClient(client);
-    client.multi();
-    jedisTransaction.execute();
-    results = jedisTransaction.exec();
-	return results;
-    }
-
     protected void checkIsInMulti() {
 	if (client.isInMulti()) {
 	    throw new JedisDataException(
@@ -2132,19 +2116,6 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
 	return client.getStatusCodeReply();
     }
 
-    @Deprecated
-    /**
-     * This method is deprecated due to its error prone with multi
-     * and will be removed on next major release
-     * You can use pipelined() instead
-     * @see https://github.com/xetorthio/jedis/pull/498
-     */
-    public List<Object> pipelined(final PipelineBlock jedisPipeline) {
-	jedisPipeline.setClient(client);
-	jedisPipeline.execute();
-	return jedisPipeline.syncAndReturnAll();
-    }
-
     public Pipeline pipelined() {
 	Pipeline pipeline = new Pipeline();
 	pipeline.setClient(client);
diff --git a/src/main/java/redis/clients/jedis/BinaryShardedJedis.java b/src/main/java/redis/clients/jedis/BinaryShardedJedis.java
index 5895f20..8cbbec9 100644
--- a/src/main/java/redis/clients/jedis/BinaryShardedJedis.java
+++ b/src/main/java/redis/clients/jedis/BinaryShardedJedis.java
@@ -481,19 +481,6 @@ public class BinaryShardedJedis extends Sharded<Jedis, JedisShardInfo>
 	return j.linsert(key, where, pivot, value);
     }
 
-    @Deprecated
-    /**
-     * This method is deprecated due to its error prone with multi
-     * and will be removed on next major release
-     * You can use pipelined() instead
-     * @see https://github.com/xetorthio/jedis/pull/498
-     */
-    public List<Object> pipelined(ShardedJedisPipeline shardedJedisPipeline) {
-	shardedJedisPipeline.setShardedJedis(this);
-	shardedJedisPipeline.execute();
-	return shardedJedisPipeline.getResults();
-    }
-
     public ShardedJedisPipeline pipelined() {
 	ShardedJedisPipeline pipeline = new ShardedJedisPipeline();
 	pipeline.setShardedJedis(this);
diff --git a/src/main/java/redis/clients/jedis/PipelineBlock.java b/src/main/java/redis/clients/jedis/PipelineBlock.java
deleted file mode 100644
index 50181ba..0000000
--- a/src/main/java/redis/clients/jedis/PipelineBlock.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package redis.clients.jedis;
-
-@Deprecated
-/**
- * This method is deprecated due to its error prone with multi
- * and will be removed on next major release
- * @see https://github.com/xetorthio/jedis/pull/498
- */
-public abstract class PipelineBlock extends Pipeline {
-    public abstract void execute();
-}
diff --git a/src/main/java/redis/clients/jedis/ShardedJedisPipeline.java b/src/main/java/redis/clients/jedis/ShardedJedisPipeline.java
index 6b68e95..480d153 100644
--- a/src/main/java/redis/clients/jedis/ShardedJedisPipeline.java
+++ b/src/main/java/redis/clients/jedis/ShardedJedisPipeline.java
@@ -61,14 +61,6 @@ public class ShardedJedisPipeline extends PipelineBase {
 	return formatted;
     }
 
-    /**
-     * This method will be removed in Jedis 3.0. Use the methods that return
-     * Response's and call sync().
-     */
-    @Deprecated
-    public void execute() {
-    }
-
     @Override
     protected Client getClient(String key) {
 	Client client = jedis.getShard(key).getClient();
diff --git a/src/main/java/redis/clients/jedis/TransactionBlock.java b/src/main/java/redis/clients/jedis/TransactionBlock.java
deleted file mode 100644
index 86f7c44..0000000
--- a/src/main/java/redis/clients/jedis/TransactionBlock.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package redis.clients.jedis;
-
-import redis.clients.jedis.exceptions.JedisException;
-
-@Deprecated
-/**
- * This class is deprecated due to its error prone
- * and will be removed on next major release
- * @see https://github.com/xetorthio/jedis/pull/498
- */
-public abstract class TransactionBlock extends Transaction {
-    public TransactionBlock(Client client) {
-	super(client);
-    }
-
-    public TransactionBlock() {
-    }
-
-    public abstract void execute() throws JedisException;
-
-    public void setClient(Client client) {
-	this.client = client;
-    }
-}