rik/jlibredis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary Builder and fix merge issue. Fixes #520

Browse Source
This commit is contained in:
Marcos Nils
2014-02-01 20:50:36 -03:00
parent bd19193cb6
commit 4b53160a74
4 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/redis/clients/jedis/BuilderFactory.java
View File

@@ -104,25 +104,6 @@ public class BuilderFactory {
}; };
public static final Builder<Map<String, Long>> STRING_LONG_MAP = new Builder<Map<String, Long>>() {
@SuppressWarnings("unchecked")
public Map<String, Long> build(Object data) {
final List<byte[]> flatHash = (List<byte[]>) data;
final Map<String, Long> hash = new HashMap<String, Long>();
final Iterator<byte[]> iterator = flatHash.iterator();
while (iterator.hasNext()) {
hash.put(SafeEncoder.encode(iterator.next()), Long.valueOf(SafeEncoder.encode(iterator.next())));
}
return hash;
}
public String toString() {
return "Map<String, Long>";
}
};
public static final Builder<Set<String>> STRING_SET = new Builder<Set<String>>() { public static final Builder<Set<String>> STRING_SET = new Builder<Set<String>>() {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public Set<String> build(Object data) { public Set<String> build(Object data) {

4
src/main/java/redis/clients/jedis/Jedis.java
View File

@@ -3245,10 +3245,10 @@ public class Jedis extends BinaryJedis implements JedisCommands,
return client.getIntegerReply(); return client.getIntegerReply();
} }
public Map<String, Long> pubSubNumSub(String... channels) { public Map<String, String> pubSubNumSub(String... channels) {
checkIsInMulti(); checkIsInMulti();
client.pubSubNumSub(channels); client.pubSubNumSub(channels);
return BuilderFactory.STRING_LONG_MAP return BuilderFactory.STRING_MAP
.build(client.getBinaryMultiBulkReply()); .build(client.getBinaryMultiBulkReply());
} }
} }

2
src/main/java/redis/clients/jedis/Protocol.java
View File

@@ -200,7 +200,7 @@ public final class Protocol {
} }
public static enum Command { public static enum Command {
PING, SET, GET, QUIT, EXISTS, DEL, TYPE, FLUSHDB, KEYS, RANDOMKEY, RENAME, RENAMENX, RENAMEX, DBSIZE, EXPIRE, EXPIREAT, TTL, SELECT, MOVE, FLUSHALL, GETSET, MGET, SETNX, SETEX, MSET, MSETNX, DECRBY, DECR, INCRBY, INCR, APPEND, SUBSTR, HSET, HGET, HSETNX, HMSET, HMGET, HINCRBY, HEXISTS, HDEL, HLEN, HKEYS, HVALS, HGETALL, RPUSH, LPUSH, LLEN, LRANGE, LTRIM, LINDEX, LSET, LREM, LPOP, RPOP, RPOPLPUSH, SADD, SMEMBERS, SREM, SPOP, SMOVE, SCARD, SISMEMBER, SINTER, SINTERSTORE, SUNION, SUNIONSTORE, SDIFF, SDIFFSTORE, SRANDMEMBER, ZADD, ZRANGE, ZREM, ZINCRBY, ZRANK, ZREVRANK, ZREVRANGE, ZCARD, ZSCORE, MULTI, DISCARD, EXEC, WATCH, UNWATCH, SORT, BLPOP, BRPOP, AUTH, SUBSCRIBE, PUBLISH, UNSUBSCRIBE, PSUBSCRIBE, PUNSUBSCRIBE, ZCOUNT, ZRANGEBYSCORE, ZREVRANGEBYSCORE, ZREMRANGEBYRANK, ZREMRANGEBYSCORE, ZUNIONSTORE, ZINTERSTORE, SAVE, BGSAVE, BGREWRITEAOF, LASTSAVE, SHUTDOWN, INFO, MONITOR, SLAVEOF, CONFIG, STRLEN, SYNC, LPUSHX, PERSIST, RPUSHX, ECHO, LINSERT, DEBUG, BRPOPLPUSH, SETBIT, GETBIT, SETRANGE, GETRANGE, EVAL, EVALSHA, SCRIPT, SLOWLOG, OBJECT, BITCOUNT, BITOP, SENTINEL, DUMP, RESTORE, PEXPIRE, PEXPIREAT, PTTL, INCRBYFLOAT, PSETEX, CLIENT, TIME, MIGRATE, HINCRBYFLOAT, SCAN, HSCAN, SSCAN, ZSCAN, WAIT, CLUSTER, ASKING; PING, SET, GET, QUIT, EXISTS, DEL, TYPE, FLUSHDB, KEYS, RANDOMKEY, RENAME, RENAMENX, RENAMEX, DBSIZE, EXPIRE, EXPIREAT, TTL, SELECT, MOVE, FLUSHALL, GETSET, MGET, SETNX, SETEX, MSET, MSETNX, DECRBY, DECR, INCRBY, INCR, APPEND, SUBSTR, HSET, HGET, HSETNX, HMSET, HMGET, HINCRBY, HEXISTS, HDEL, HLEN, HKEYS, HVALS, HGETALL, RPUSH, LPUSH, LLEN, LRANGE, LTRIM, LINDEX, LSET, LREM, LPOP, RPOP, RPOPLPUSH, SADD, SMEMBERS, SREM, SPOP, SMOVE, SCARD, SISMEMBER, SINTER, SINTERSTORE, SUNION, SUNIONSTORE, SDIFF, SDIFFSTORE, SRANDMEMBER, ZADD, ZRANGE, ZREM, ZINCRBY, ZRANK, ZREVRANK, ZREVRANGE, ZCARD, ZSCORE, MULTI, DISCARD, EXEC, WATCH, UNWATCH, SORT, BLPOP, BRPOP, AUTH, SUBSCRIBE, PUBLISH, UNSUBSCRIBE, PSUBSCRIBE, PUNSUBSCRIBE, PUBSUB, ZCOUNT, ZRANGEBYSCORE, ZREVRANGEBYSCORE, ZREMRANGEBYRANK, ZREMRANGEBYSCORE, ZUNIONSTORE, ZINTERSTORE, SAVE, BGSAVE, BGREWRITEAOF, LASTSAVE, SHUTDOWN, INFO, MONITOR, SLAVEOF, CONFIG, STRLEN, SYNC, LPUSHX, PERSIST, RPUSHX, ECHO, LINSERT, DEBUG, BRPOPLPUSH, SETBIT, GETBIT, SETRANGE, GETRANGE, EVAL, EVALSHA, SCRIPT, SLOWLOG, OBJECT, BITCOUNT, BITOP, SENTINEL, DUMP, RESTORE, PEXPIRE, PEXPIREAT, PTTL, INCRBYFLOAT, PSETEX, CLIENT, TIME, MIGRATE, HINCRBYFLOAT, SCAN, HSCAN, SSCAN, ZSCAN, WAIT, CLUSTER, ASKING;
public final byte[] raw; public final byte[] raw;

8
src/test/java/redis/clients/jedis/tests/commands/PublishSubscribeCommandsTest.java
View File

@@ -145,9 +145,9 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase {
@Test @Test
public void pubSubNumSub(){ public void pubSubNumSub(){
final Map<String, Long> expectedNumSub = new HashMap<String, Long>(); final Map<String, String> expectedNumSub = new HashMap<String, String>();
expectedNumSub.put("testchannel2", 1l); expectedNumSub.put("testchannel2", "1");
expectedNumSub.put("testchannel1", 1l); expectedNumSub.put("testchannel1", "1");
jedis.subscribe(new JedisPubSub() { jedis.subscribe(new JedisPubSub() {
private int count=0; private int count=0;
@Override @Override
@@ -159,7 +159,7 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase {
count++; count++;
if (count == 2) { if (count == 2) {
Jedis otherJedis = createJedis(); Jedis otherJedis = createJedis();
Map<String, Long> numSub = otherJedis.pubSubNumSub("testchannel1", "testchannel2"); Map<String, String> numSub = otherJedis.pubSubNumSub("testchannel1", "testchannel2");
assertEquals(expectedNumSub, numSub); assertEquals(expectedNumSub, numSub);
unsubscribe(); unsubscribe();
} }