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

Change pubSub to pubsub

Browse Source
This commit is contained in:
Marcos Nils
2014-02-03 12:44:40 -03:00
parent 4b53160a74
commit 4ab54d955d
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -561,7 +561,7 @@ public class BinaryClient extends Connection {
sendCommand(PUNSUBSCRIBE, patterns); sendCommand(PUNSUBSCRIBE, patterns);
} }
public void pubSub(final byte[]... args) { public void pubsub(final byte[]... args) {
sendCommand(PUBSUB, args); sendCommand(PUBSUB, args);
} }
public void zcount(final byte[] key, final double min, final double max) { public void zcount(final byte[] key, final double min, final double max) {

16
src/main/java/redis/clients/jedis/Client.java
View File

@@ -673,16 +673,16 @@ public class Client extends BinaryClient implements Commands {
subscribe(cs); subscribe(cs);
} }
public void pubSubChannels(String pattern) { public void pubsubChannels(String pattern) {
pubSub(Protocol.PUBSUB_CHANNELS, pattern); pubsub(Protocol.PUBSUB_CHANNELS, pattern);
} }
public void pubSubNumPat() { public void pubsubNumPat() {
pubSub(Protocol.PUBSUB_NUM_PAT); pubsub(Protocol.PUBSUB_NUM_PAT);
} }
public void pubSubNumSub(String... channels) { public void pubsubNumSub(String... channels) {
pubSub(Protocol.PUBSUB_NUMSUB, channels); pubsub(Protocol.PUBSUB_NUMSUB, channels);
} }
public void configSet(String parameter, String value) { public void configSet(String parameter, String value) {
@@ -854,13 +854,13 @@ public class Client extends BinaryClient implements Commands {
cluster(arg); cluster(arg);
} }
public void pubSub(final String subcommand, final String... args) { public void pubsub(final String subcommand, final String... args) {
final byte[][] arg = new byte[args.length+1][]; final byte[][] arg = new byte[args.length+1][];
for (int i = 1; i < arg.length; i++) { for (int i = 1; i < arg.length; i++) {
arg[i] = SafeEncoder.encode(args[i-1]); arg[i] = SafeEncoder.encode(args[i-1]);
} }
arg[0] = SafeEncoder.encode(subcommand); arg[0] = SafeEncoder.encode(subcommand);
pubSub(arg); pubsub(arg);
} }
public void cluster(final String subcommand, final String... args) { public void cluster(final String subcommand, final String... args) {

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

@@ -3233,21 +3233,21 @@ public class Jedis extends BinaryJedis implements JedisCommands,
return client.getStatusCodeReply(); return client.getStatusCodeReply();
} }
public List<String> pubSubChannels(String pattern) { public List<String> pubsubChannels(String pattern) {
checkIsInMulti(); checkIsInMulti();
client.pubSubChannels(pattern); client.pubsubChannels(pattern);
return client.getMultiBulkReply(); return client.getMultiBulkReply();
} }
public Long pubSubNumPat() { public Long pubsubNumPat() {
checkIsInMulti(); checkIsInMulti();
client.pubSubNumPat(); client.pubsubNumPat();
return client.getIntegerReply(); return client.getIntegerReply();
} }
public Map<String, String> pubSubNumSub(String... channels) { public Map<String, String> pubsubNumSub(String... channels) {
checkIsInMulti(); checkIsInMulti();
client.pubSubNumSub(channels); client.pubsubNumSub(channels);
return BuilderFactory.STRING_MAP return BuilderFactory.STRING_MAP
.build(client.getBinaryMultiBulkReply()); .build(client.getBinaryMultiBulkReply());
} }

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

@@ -82,7 +82,7 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase {
//All channels are subscribed //All channels are subscribed
if (count == 3) { if (count == 3) {
Jedis otherJedis = createJedis(); Jedis otherJedis = createJedis();
List<String> activeChannels = otherJedis.pubSubChannels("test*"); List<String> activeChannels = otherJedis.pubsubChannels("test*");
assertTrue(expectedActiveChannels.containsAll(activeChannels)); assertTrue(expectedActiveChannels.containsAll(activeChannels));
unsubscribe(); unsubscribe();
} }
@@ -127,7 +127,7 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase {
count++; count++;
if (count == 3) { if (count == 3) {
Jedis otherJedis = createJedis(); Jedis otherJedis = createJedis();
Long numPatterns = otherJedis.pubSubNumPat(); Long numPatterns = otherJedis.pubsubNumPat();
assertEquals(new Long(2l), numPatterns); assertEquals(new Long(2l), numPatterns);
punsubscribe(); punsubscribe();
} }
@@ -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, String> numSub = otherJedis.pubSubNumSub("testchannel1", "testchannel2"); Map<String, String> numSub = otherJedis.pubsubNumSub("testchannel1", "testchannel2");
assertEquals(expectedNumSub, numSub); assertEquals(expectedNumSub, numSub);
unsubscribe(); unsubscribe();
} }