Merge branch 'unsigned_long_cursor_remove_deprecated' of https://github.com/HeartSaVioR/jedis into HeartSaVioR-unsigned_long_cursor_remove_deprecated

Conflicts:
	src/main/java/redis/clients/jedis/Jedis.java
	src/main/java/redis/clients/jedis/JedisCluster.java
	src/main/java/redis/clients/jedis/ScanResult.java
	src/main/java/redis/clients/jedis/ShardedJedis.java

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

@@ -1165,61 +1165,6 @@ public class BinaryClient extends Connection {
 	sendCommand(HINCRBYFLOAT, key, field, toByteArray(increment));
     }
 
-    @Deprecated
-    /**
-     * This method is deprecated due to bug (scan cursor should be unsigned long)
-     * And will be removed on next major release
-     * @see https://github.com/xetorthio/jedis/issues/531
-     */
-    public void scan(int cursor, final ScanParams params) {
-	final List<byte[]> args = new ArrayList<byte[]>();
-	args.add(toByteArray(cursor));
-	args.addAll(params.getParams());
-	sendCommand(SCAN, args.toArray(new byte[args.size()][]));
-    }
-
-    @Deprecated
-    /**
-     * This method is deprecated due to bug (scan cursor should be unsigned long)
-     * And will be removed on next major release
-     * @see https://github.com/xetorthio/jedis/issues/531 
-     */
-    public void hscan(final byte[] key, int cursor, final ScanParams params) {
-	final List<byte[]> args = new ArrayList<byte[]>();
-	args.add(key);
-	args.add(toByteArray(cursor));
-	args.addAll(params.getParams());
-	sendCommand(HSCAN, args.toArray(new byte[args.size()][]));
-    }
-    
-    @Deprecated
-    /**
-     * This method is deprecated due to bug (scan cursor should be unsigned long)
-     * And will be removed on next major release
-     * @see https://github.com/xetorthio/jedis/issues/531 
-     */
-    public void sscan(final byte[] key, int cursor, final ScanParams params) {
-	final List<byte[]> args = new ArrayList<byte[]>();
-	args.add(key);
-	args.add(toByteArray(cursor));
-	args.addAll(params.getParams());
-	sendCommand(SSCAN, args.toArray(new byte[args.size()][]));
-    }
-    
-    @Deprecated
-    /**
-     * This method is deprecated due to bug (scan cursor should be unsigned long)
-     * And will be removed on next major release
-     * @see https://github.com/xetorthio/jedis/issues/531 
-     */
-    public void zscan(final byte[] key, int cursor, final ScanParams params) {
-	final List<byte[]> args = new ArrayList<byte[]>();
-	args.add(key);
-	args.add(toByteArray(cursor));
-	args.addAll(params.getParams());
-	sendCommand(ZSCAN, args.toArray(new byte[args.size()][]));
-    }
-    
     public void scan(final byte[] cursor, final ScanParams params) {
 	final List<byte[]> args = new ArrayList<byte[]>();
 	args.add(cursor);

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

@@ -841,36 +841,6 @@ public class Client extends BinaryClient implements Commands {
 		increment);
     }
 
-    @Deprecated
-    /**
-     * This method is deprecated due to bug (scan cursor should be unsigned long)
-     * And will be removed on next major release
-     * @see https://github.com/xetorthio/jedis/issues/531 
-     */
-    public void hscan(final String key, int cursor, final ScanParams params) {
-	hscan(SafeEncoder.encode(key), cursor, params);
-    }
-
-    @Deprecated
-    /**
-     * This method is deprecated due to bug (scan cursor should be unsigned long)
-     * And will be removed on next major release
-     * @see https://github.com/xetorthio/jedis/issues/531 
-     */
-    public void sscan(final String key, int cursor, final ScanParams params) {
-	sscan(SafeEncoder.encode(key), cursor, params);
-    }
-
-    @Deprecated
-    /**
-     * This method is deprecated due to bug (scan cursor should be unsigned long)
-     * And will be removed on next major release
-     * @see https://github.com/xetorthio/jedis/issues/531 
-     */
-    public void zscan(final String key, int cursor, final ScanParams params) {
-	zscan(SafeEncoder.encode(key), cursor, params);
-    }
-    
     public void scan(final String cursor, final ScanParams params) {
 	scan(SafeEncoder.encode(cursor), params);
     }

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

@@ -301,38 +301,6 @@ public interface Commands {
 
     public void bitop(BitOP op, final String destKey, String... srcKeys);
 
-    @Deprecated
-    /**
-     * This method is deprecated due to bug (scan cursor should be unsigned long)
-     * And will be removed on next major release
-     * @see https://github.com/xetorthio/jedis/issues/531 
-     */
-    public void scan(int cursor, final ScanParams params);
-
-    @Deprecated
-    /**
-     * This method is deprecated due to bug (scan cursor should be unsigned long)
-     * And will be removed on next major release
-     * @see https://github.com/xetorthio/jedis/issues/531 
-     */
-    public void hscan(final String key, int cursor, final ScanParams params);
-
-    @Deprecated
-    /**
-     * This method is deprecated due to bug (scan cursor should be unsigned long)
-     * And will be removed on next major release
-     * @see https://github.com/xetorthio/jedis/issues/531 
-     */
-    public void sscan(final String key, int cursor, final ScanParams params);
-
-    @Deprecated
-    /**
-     * This method is deprecated due to bug (scan cursor should be unsigned long)
-     * And will be removed on next major release
-     * @see https://github.com/xetorthio/jedis/issues/531 
-     */
-    public void zscan(final String key, int cursor, final ScanParams params);
-
     public void scan(final String cursor, final ScanParams params);
 
     public void hscan(final String key, final String cursor, final ScanParams params);

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

@@ -3180,131 +3180,6 @@ public class Jedis extends BinaryJedis implements JedisCommands,
 	return client.getStatusCodeReply();
     }
 
-    @Deprecated
-    /**
-     * This method is deprecated due to bug (scan cursor should be unsigned long)
-     * And will be removed on next major release
-     * @see https://github.com/xetorthio/jedis/issues/531 
-     */
-    public ScanResult<String> scan(int cursor) {
-	return scan(cursor, new ScanParams());
-    }
-
-    @Deprecated
-    /**
-     * This method is deprecated due to bug (scan cursor should be unsigned long)
-     * And will be removed on next major release
-     * @see https://github.com/xetorthio/jedis/issues/531 
-     */
-    public ScanResult<String> scan(int cursor, final ScanParams params) {
-	checkIsInMulti();
-	client.scan(cursor, params);
-	List<Object> result = client.getObjectMultiBulkReply();
-	int newcursor = Integer.parseInt(new String((byte[]) result.get(0)));
-	List<String> results = new ArrayList<String>();
-	List<byte[]> rawResults = (List<byte[]>) result.get(1);
-	for (byte[] bs : rawResults) {
-	    results.add(SafeEncoder.encode(bs));
-	}
-	return new ScanResult<String>(newcursor, results);
-    }
-
-    @Deprecated
-    /**
-     * This method is deprecated due to bug (scan cursor should be unsigned long)
-     * And will be removed on next major release
-     * @see https://github.com/xetorthio/jedis/issues/531 
-     */
-    public ScanResult<Map.Entry<String, String>> hscan(final String key,
-	    int cursor) {
-	return hscan(key, cursor, new ScanParams());
-    }
-
-    @Deprecated
-    /**
-     * This method is deprecated due to bug (scan cursor should be unsigned long)
-     * And will be removed on next major release
-     * @see https://github.com/xetorthio/jedis/issues/531 
-     */
-    public ScanResult<Map.Entry<String, String>> hscan(final String key,
-	    int cursor, final ScanParams params) {
-	checkIsInMulti();
-	client.hscan(key, cursor, params);
-	List<Object> result = client.getObjectMultiBulkReply();
-	int newcursor = Integer.parseInt(new String((byte[]) result.get(0)));
-	List<Map.Entry<String, String>> results = new ArrayList<Map.Entry<String, String>>();
-	List<byte[]> rawResults = (List<byte[]>) result.get(1);
-	Iterator<byte[]> iterator = rawResults.iterator();
-	while (iterator.hasNext()) {
-	    results.add(new AbstractMap.SimpleEntry<String, String>(SafeEncoder
-		    .encode(iterator.next()), SafeEncoder.encode(iterator
-		    .next())));
-	}
-	return new ScanResult<Map.Entry<String, String>>(newcursor, results);
-    }
-
-    @Deprecated
-    /**
-     * This method is deprecated due to bug (scan cursor should be unsigned long)
-     * And will be removed on next major release
-     * @see https://github.com/xetorthio/jedis/issues/531 
-     */
-    public ScanResult<String> sscan(final String key, int cursor) {
-	return sscan(key, cursor, new ScanParams());
-    }
-
-    @Deprecated
-    /**
-     * This method is deprecated due to bug (scan cursor should be unsigned long)
-     * And will be removed on next major release
-     * @see https://github.com/xetorthio/jedis/issues/531 
-     */
-    public ScanResult<String> sscan(final String key, int cursor,
-	    final ScanParams params) {
-	checkIsInMulti();
-	client.sscan(key, cursor, params);
-	List<Object> result = client.getObjectMultiBulkReply();
-	int newcursor = Integer.parseInt(new String((byte[]) result.get(0)));
-	List<String> results = new ArrayList<String>();
-	List<byte[]> rawResults = (List<byte[]>) result.get(1);
-	for (byte[] bs : rawResults) {
-	    results.add(SafeEncoder.encode(bs));
-	}
-	return new ScanResult<String>(newcursor, results);
-    }
-
-    @Deprecated
-    /**
-     * This method is deprecated due to bug (scan cursor should be unsigned long)
-     * And will be removed on next major release
-     * @see https://github.com/xetorthio/jedis/issues/531 
-     */
-    public ScanResult<Tuple> zscan(final String key, int cursor) {
-	return zscan(key, cursor, new ScanParams());
-    }
-
-    @Deprecated
-    /**
-     * This method is deprecated due to bug (scan cursor should be unsigned long)
-     * And will be removed on next major release
-     * @see https://github.com/xetorthio/jedis/issues/531 
-     */
-    public ScanResult<Tuple> zscan(final String key, int cursor,
-	    final ScanParams params) {
-	checkIsInMulti();
-	client.zscan(key, cursor, params);
-	List<Object> result = client.getObjectMultiBulkReply();
-	int newcursor = Integer.parseInt(new String((byte[]) result.get(0)));
-	List<Tuple> results = new ArrayList<Tuple>();
-	List<byte[]> rawResults = (List<byte[]>) result.get(1);
-	Iterator<byte[]> iterator = rawResults.iterator();
-	while (iterator.hasNext()) {
-	    results.add(new Tuple(SafeEncoder.encode(iterator.next()), Double
-		    .valueOf(SafeEncoder.encode(iterator.next()))));
-	}
-	return new ScanResult<Tuple>(newcursor, results);
-    }
-
     public ScanResult<String> scan(final String cursor) {
 	return scan(cursor, new ScanParams());
     }

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

@@ -1419,58 +1419,6 @@ public class JedisCluster implements JedisCommands, BasicCommands {
 	return null;
     }
 
-    @Deprecated
-    /**
-     * This method is deprecated due to bug (scan cursor should be unsigned long)
-     * And will be removed on next major release
-     * @see https://github.com/xetorthio/jedis/issues/531 
-     */
-    @Override
-    public ScanResult<Entry<String, String>> hscan(final String key,
-	    final int cursor) {
-	return new JedisClusterCommand<ScanResult<Entry<String, String>>>(
-		connectionHandler, timeout, maxRedirections) {
-	    @Override
-	    public ScanResult<Entry<String, String>> execute(Jedis connection) {
-		return connection.hscan(key, cursor);
-	    }
-	}.run(null);
-    }
-
-    @Deprecated
-    /**
-     * This method is deprecated due to bug (scan cursor should be unsigned long)
-     * And will be removed on next major release
-     * @see https://github.com/xetorthio/jedis/issues/531 
-     */
-    @Override
-    public ScanResult<String> sscan(final String key, final int cursor) {
-	return new JedisClusterCommand<ScanResult<String>>(connectionHandler,
-		timeout, maxRedirections) {
-	    @Override
-	    public ScanResult<String> execute(Jedis connection) {
-		return connection.sscan(key, cursor);
-	    }
-	}.run(null);
-    }
-
-    @Deprecated
-    /**
-     * This method is deprecated due to bug (scan cursor should be unsigned long)
-     * And will be removed on next major release
-     * @see https://github.com/xetorthio/jedis/issues/531 
-     */
-    @Override
-    public ScanResult<Tuple> zscan(final String key, final int cursor) {
-	return new JedisClusterCommand<ScanResult<Tuple>>(connectionHandler,
-		timeout, maxRedirections) {
-	    @Override
-	    public ScanResult<Tuple> execute(Jedis connection) {
-		return connection.zscan(key, cursor);
-	    }
-	}.run(null);
-    }
-    
     @Override
     public ScanResult<Entry<String, String>> hscan(final String key,
 	    final String cursor) {

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

@@ -216,30 +216,6 @@ public interface JedisCommands {
 
     Long bitcount(final String key, long start, long end);
 
-    @Deprecated
-    /**
-     * This method is deprecated due to bug (scan cursor should be unsigned long)
-     * And will be removed on next major release
-     * @see https://github.com/xetorthio/jedis/issues/531 
-     */
-    ScanResult<Map.Entry<String, String>> hscan(final String key, int cursor);
-
-    @Deprecated
-    /**
-     * This method is deprecated due to bug (scan cursor should be unsigned long)
-     * And will be removed on next major release
-     * @see https://github.com/xetorthio/jedis/issues/531 
-     */
-    ScanResult<String> sscan(final String key, int cursor);
-
-    @Deprecated
-    /**
-     * This method is deprecated due to bug (scan cursor should be unsigned long)
-     * And will be removed on next major release
-     * @see https://github.com/xetorthio/jedis/issues/531 
-     */
-    ScanResult<Tuple> zscan(final String key, int cursor);
-    
     ScanResult<Map.Entry<String, String>> hscan(final String key, final String cursor);
     
     ScanResult<String> sscan(final String key, final String cursor);

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

@@ -70,14 +70,6 @@ public interface MultiKeyCommands {
 
     Long bitop(BitOP op, final String destKey, String... srcKeys);
 
-    @Deprecated
-    /**
-     * This method is deprecated due to bug (scan cursor should be unsigned long)
-     * And will be removed on next major release
-     * @see https://github.com/xetorthio/jedis/issues/531 
-     */
-    ScanResult<String> scan(int cursor);
-    
     ScanResult<String> scan(final String cursor);
     
     String pfmerge(final String destkey, final String... sourcekeys);

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

@@ -8,16 +8,6 @@ public class ScanResult<T> {
     private byte[] cursor;
     private List<T> results;
 
-    @Deprecated
-    /**
-     * This method is deprecated due to bug (scan cursor should be unsigned long)
-     * And will be removed on next major release
-     * @see https://github.com/xetorthio/jedis/issues/531 
-     */
-    public ScanResult(int cursor, List<T> results) {
-	this(Protocol.toByteArray(cursor), results);
-    }
-
     public ScanResult(String cursor, List<T> results) {
 	this(SafeEncoder.encode(cursor), results);
     }
@@ -27,21 +17,7 @@ public class ScanResult<T> {
 	this.results = results;
     }
     
-    @Deprecated
+    public String getCursor() {
-    /**
-     * This method is deprecated due to bug (scan cursor should be unsigned long)
-     * And will be removed on next major release
-     * @see https://github.com/xetorthio/jedis/issues/531
-     * @return int(currently), but will be changed to String, so be careful to prepare! 
-     */
-    public int getCursor() {
-	return Integer.parseInt(getStringCursor());
-    }
-
-    /**
-     * FIXME: This method should be changed to getCursor() on next major release
-     */
-    public String getStringCursor() {
 	return SafeEncoder.encode(cursor);
     }
     

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

@@ -553,41 +553,7 @@ public class ShardedJedis extends BinaryShardedJedis implements JedisCommands,
 	return j.bitcount(key, start, end);
     }
 
-    @Deprecated
+    public ScanResult<Entry<String, String>> hscan(String key, final String cursor) {
-    /**
-     * This method is deprecated due to bug (scan cursor should be unsigned long)
-     * And will be removed on next major release
-     * @see https://github.com/xetorthio/jedis/issues/531 
-     */
-    public ScanResult<Entry<String, String>> hscan(String key, int cursor) {
-	Jedis j = getShard(key);
-	return j.hscan(key, cursor);
-    }
-
-    @Deprecated
-    /**
-     * This method is deprecated due to bug (scan cursor should be unsigned long)
-     * And will be removed on next major release
-     * @see https://github.com/xetorthio/jedis/issues/531 
-     */
-    public ScanResult<String> sscan(String key, int cursor) {
-	Jedis j = getShard(key);
-	return j.sscan(key, cursor);
-    }
-
-    @Deprecated
-    /**
-     * This method is deprecated due to bug (scan cursor should be unsigned long)
-     * And will be removed on next major release
-     * @see https://github.com/xetorthio/jedis/issues/531 
-     */
-    public ScanResult<Tuple> zscan(String key, int cursor) {
-	Jedis j = getShard(key);
-	return j.zscan(key, cursor);
-    }
-
-    public ScanResult<Entry<String, String>> hscan(String key,
-	    final String cursor) {
 	Jedis j = getShard(key);
 	return j.hscan(key, cursor);
     }

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

@@ -521,7 +521,7 @@ public class AllKindOfValuesCommandsTest extends JedisCommandTestBase {
 
 	ScanResult<String> result = jedis.scan(SCAN_POINTER_START);
 
-	assertEquals(SCAN_POINTER_START, result.getStringCursor());
+	assertEquals(SCAN_POINTER_START, result.getCursor());
 	assertFalse(result.getResult().isEmpty());
 	
 	// binary
@@ -541,7 +541,7 @@ public class AllKindOfValuesCommandsTest extends JedisCommandTestBase {
 	jedis.set("aa", "aa");
 	ScanResult<String> result = jedis.scan(SCAN_POINTER_START, params);
 
-	assertEquals(SCAN_POINTER_START, result.getStringCursor());
+	assertEquals(SCAN_POINTER_START, result.getCursor());
 	assertFalse(result.getResult().isEmpty());
 	
 	// binary

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

@@ -323,7 +323,7 @@ public class HashesCommandsTest extends JedisCommandTestBase {
 
 	ScanResult<Map.Entry<String, String>> result = jedis.hscan("foo", SCAN_POINTER_START);
 
-	assertEquals(SCAN_POINTER_START, result.getStringCursor());
+	assertEquals(SCAN_POINTER_START, result.getCursor());
 	assertFalse(result.getResult().isEmpty());
 	
 	// binary
@@ -346,7 +346,7 @@ public class HashesCommandsTest extends JedisCommandTestBase {
 	ScanResult<Map.Entry<String, String>> result = jedis.hscan("foo", 
 		SCAN_POINTER_START, params);
 
-	assertEquals(SCAN_POINTER_START, result.getStringCursor());
+	assertEquals(SCAN_POINTER_START, result.getCursor());
 	assertFalse(result.getResult().isEmpty());
 	
 	// binary

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

@@ -466,7 +466,7 @@ public class SetCommandsTest extends JedisCommandTestBase {
 
 	ScanResult<String> result = jedis.sscan("foo", SCAN_POINTER_START);
 
-	assertEquals(SCAN_POINTER_START, result.getStringCursor());
+	assertEquals(SCAN_POINTER_START, result.getCursor());
 	assertFalse(result.getResult().isEmpty());
 	
 	// binary
@@ -486,7 +486,7 @@ public class SetCommandsTest extends JedisCommandTestBase {
 	jedis.sadd("foo", "b", "a", "aa");
 	ScanResult<String> result = jedis.sscan("foo", SCAN_POINTER_START, params);
 
-	assertEquals(SCAN_POINTER_START, result.getStringCursor());
+	assertEquals(SCAN_POINTER_START, result.getCursor());
 	assertFalse(result.getResult().isEmpty());
 	
 	// binary

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

@@ -903,7 +903,7 @@ public class SortedSetCommandsTest extends JedisCommandTestBase {
 
 	ScanResult<Tuple> result = jedis.zscan("foo", SCAN_POINTER_START);
 
-	assertEquals(SCAN_POINTER_START, result.getStringCursor());
+	assertEquals(SCAN_POINTER_START, result.getCursor());
 	assertFalse(result.getResult().isEmpty());
 	
 	// binary
@@ -926,7 +926,7 @@ public class SortedSetCommandsTest extends JedisCommandTestBase {
 	jedis.zadd("foo", 11, "aa");
 	ScanResult<Tuple> result = jedis.zscan("foo", SCAN_POINTER_START, params);
 
-	assertEquals(SCAN_POINTER_START, result.getStringCursor());
+	assertEquals(SCAN_POINTER_START, result.getCursor());
 	assertFalse(result.getResult().isEmpty());
 	
 	// binary