From 4ecca016a5f45789ec9b733ddb046bafca4972d6 Mon Sep 17 00:00:00 2001 From: Jungtaek Lim Date: Tue, 4 Nov 2014 22:42:17 +0900 Subject: [PATCH 1/2] Introduce (Binary)JedisPubSubAdaptor * Actually it's in JedisSentinelPool but not exposed to users --- .../jedis/BinaryJedisPubSubAdaptor.java | 33 +++ .../clients/jedis/JedisPubSubAdaptor.java | 34 +++ .../clients/jedis/JedisSentinelPool.java | 28 +-- .../PublishSubscribeCommandsTest.java | 231 ++---------------- .../tests/utils/JedisSentinelTestUtil.java | 20 +- 5 files changed, 86 insertions(+), 260 deletions(-) create mode 100644 src/main/java/redis/clients/jedis/BinaryJedisPubSubAdaptor.java create mode 100644 src/main/java/redis/clients/jedis/JedisPubSubAdaptor.java diff --git a/src/main/java/redis/clients/jedis/BinaryJedisPubSubAdaptor.java b/src/main/java/redis/clients/jedis/BinaryJedisPubSubAdaptor.java new file mode 100644 index 0000000..ff826ce --- /dev/null +++ b/src/main/java/redis/clients/jedis/BinaryJedisPubSubAdaptor.java @@ -0,0 +1,33 @@ +package redis.clients.jedis; + +public class BinaryJedisPubSubAdaptor extends BinaryJedisPubSub { + @Override + public void onMessage(byte[] channel, byte[] message) { + + } + + @Override + public void onPMessage(byte[] pattern, byte[] channel, byte[] message) { + + } + + @Override + public void onSubscribe(byte[] channel, int subscribedChannels) { + + } + + @Override + public void onUnsubscribe(byte[] channel, int subscribedChannels) { + + } + + @Override + public void onPUnsubscribe(byte[] pattern, int subscribedChannels) { + + } + + @Override + public void onPSubscribe(byte[] pattern, int subscribedChannels) { + + } +} diff --git a/src/main/java/redis/clients/jedis/JedisPubSubAdaptor.java b/src/main/java/redis/clients/jedis/JedisPubSubAdaptor.java new file mode 100644 index 0000000..5281287 --- /dev/null +++ b/src/main/java/redis/clients/jedis/JedisPubSubAdaptor.java @@ -0,0 +1,34 @@ +package redis.clients.jedis; + +public class JedisPubSubAdaptor extends JedisPubSub { + + @Override + public void onMessage(String channel, String message) { + + } + + @Override + public void onPMessage(String pattern, String channel, String message) { + + } + + @Override + public void onSubscribe(String channel, int subscribedChannels) { + + } + + @Override + public void onUnsubscribe(String channel, int subscribedChannels) { + + } + + @Override + public void onPUnsubscribe(String pattern, int subscribedChannels) { + + } + + @Override + public void onPSubscribe(String pattern, int subscribedChannels) { + + } +} diff --git a/src/main/java/redis/clients/jedis/JedisSentinelPool.java b/src/main/java/redis/clients/jedis/JedisSentinelPool.java index a80ae02..c38fa3c 100644 --- a/src/main/java/redis/clients/jedis/JedisSentinelPool.java +++ b/src/main/java/redis/clients/jedis/JedisSentinelPool.java @@ -222,32 +222,6 @@ public class JedisSentinelPool extends Pool { } } - protected class JedisPubSubAdapter extends JedisPubSub { - @Override - public void onMessage(String channel, String message) { - } - - @Override - public void onPMessage(String pattern, String channel, String message) { - } - - @Override - public void onPSubscribe(String pattern, int subscribedChannels) { - } - - @Override - public void onPUnsubscribe(String pattern, int subscribedChannels) { - } - - @Override - public void onSubscribe(String channel, int subscribedChannels) { - } - - @Override - public void onUnsubscribe(String channel, int subscribedChannels) { - } - } - protected class MasterListener extends Thread { protected String masterName; @@ -281,7 +255,7 @@ public class JedisSentinelPool extends Pool { j = new Jedis(host, port); try { - j.subscribe(new JedisPubSubAdapter() { + j.subscribe(new JedisPubSubAdaptor() { @Override public void onMessage(String channel, String message) { log.fine("Sentinel " + host + ":" + port diff --git a/src/test/java/redis/clients/jedis/tests/commands/PublishSubscribeCommandsTest.java b/src/test/java/redis/clients/jedis/tests/commands/PublishSubscribeCommandsTest.java index 7d2976a..9499a53 100644 --- a/src/test/java/redis/clients/jedis/tests/commands/PublishSubscribeCommandsTest.java +++ b/src/test/java/redis/clients/jedis/tests/commands/PublishSubscribeCommandsTest.java @@ -10,9 +10,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.junit.Test; -import redis.clients.jedis.BinaryJedisPubSub; -import redis.clients.jedis.Jedis; -import redis.clients.jedis.JedisPubSub; +import redis.clients.jedis.*; import redis.clients.jedis.exceptions.JedisConnectionException; import redis.clients.util.SafeEncoder; @@ -33,7 +31,7 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { @Test public void subscribe() throws InterruptedException { - jedis.subscribe(new JedisPubSub() { + jedis.subscribe(new JedisPubSubAdaptor() { public void onMessage(String channel, String message) { assertEquals("foo", channel); assertEquals("exit", message); @@ -52,16 +50,6 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { assertEquals("foo", channel); assertEquals(0, subscribedChannels); } - - public void onPSubscribe(String pattern, int subscribedChannels) { - } - - public void onPUnsubscribe(String pattern, int subscribedChannels) { - } - - public void onPMessage(String pattern, String channel, - String message) { - } }, "foo"); } @@ -69,13 +57,9 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { public void pubSubChannels() { final List expectedActiveChannels = Arrays.asList("testchan1", "testchan2", "testchan3"); - jedis.subscribe(new JedisPubSub() { + jedis.subscribe(new JedisPubSubAdaptor() { private int count = 0; - @Override - public void onUnsubscribe(String channel, int subscribedChannels) { - } - @Override public void onSubscribe(String channel, int subscribedChannels) { count++; @@ -89,43 +73,14 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { unsubscribe(); } } - - @Override - public void onPUnsubscribe(String pattern, int subscribedChannels) { - } - - @Override - public void onPSubscribe(String pattern, int subscribedChannels) { - } - - @Override - public void onPMessage(String pattern, String channel, - String message) { - } - - @Override - public void onMessage(String channel, String message) { - } }, "testchan1", "testchan2", "testchan3"); } @Test public void pubSubNumPat() { - jedis.psubscribe(new JedisPubSub() { + jedis.psubscribe(new JedisPubSubAdaptor() { private int count = 0; - @Override - public void onUnsubscribe(String channel, int subscribedChannels) { - } - - @Override - public void onSubscribe(String channel, int subscribedChannels) { - } - - @Override - public void onPUnsubscribe(String pattern, int subscribedChannels) { - } - @Override public void onPSubscribe(String pattern, int subscribedChannels) { count++; @@ -137,14 +92,6 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { } } - @Override - public void onPMessage(String pattern, String channel, - String message) { - } - - @Override - public void onMessage(String channel, String message) { - } }, "test*", "test*", "chan*"); } @@ -153,13 +100,9 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { final Map expectedNumSub = new HashMap(); expectedNumSub.put("testchannel2", "1"); expectedNumSub.put("testchannel1", "1"); - jedis.subscribe(new JedisPubSub() { + jedis.subscribe(new JedisPubSubAdaptor() { private int count = 0; - @Override - public void onUnsubscribe(String channel, int subscribedChannels) { - } - @Override public void onSubscribe(String channel, int subscribedChannels) { count++; @@ -171,30 +114,13 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { unsubscribe(); } } - - @Override - public void onPUnsubscribe(String pattern, int subscribedChannels) { - } - - @Override - public void onPSubscribe(String pattern, int subscribedChannels) { - } - - @Override - public void onPMessage(String pattern, String channel, - String message) { - } - - @Override - public void onMessage(String channel, String message) { - } }, "testchannel1", "testchannel2"); } @Test public void subscribeMany() throws UnknownHostException, IOException, InterruptedException { - jedis.subscribe(new JedisPubSub() { + jedis.subscribe(new JedisPubSubAdaptor() { public void onMessage(String channel, String message) { unsubscribe(channel); } @@ -203,34 +129,13 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { publishOne(channel, "exit"); } - public void onUnsubscribe(String channel, int subscribedChannels) { - } - - public void onPSubscribe(String pattern, int subscribedChannels) { - } - - public void onPUnsubscribe(String pattern, int subscribedChannels) { - } - - public void onPMessage(String pattern, String channel, - String message) { - } }, "foo", "bar"); } @Test public void psubscribe() throws UnknownHostException, IOException, InterruptedException { - jedis.psubscribe(new JedisPubSub() { - public void onMessage(String channel, String message) { - } - - public void onSubscribe(String channel, int subscribedChannels) { - } - - public void onUnsubscribe(String channel, int subscribedChannels) { - } - + jedis.psubscribe(new JedisPubSubAdaptor() { public void onPSubscribe(String pattern, int subscribedChannels) { assertEquals("foo.*", pattern); assertEquals(1, subscribedChannels); @@ -256,23 +161,11 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { @Test public void psubscribeMany() throws UnknownHostException, IOException, InterruptedException { - jedis.psubscribe(new JedisPubSub() { - public void onMessage(String channel, String message) { - } - - public void onSubscribe(String channel, int subscribedChannels) { - } - - public void onUnsubscribe(String channel, int subscribedChannels) { - } - + jedis.psubscribe(new JedisPubSubAdaptor() { public void onPSubscribe(String pattern, int subscribedChannels) { publishOne(pattern.replace("*", "123"), "exit"); } - public void onPUnsubscribe(String pattern, int subscribedChannels) { - } - public void onPMessage(String pattern, String channel, String message) { punsubscribe(pattern); @@ -283,7 +176,7 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { @Test public void subscribeLazily() throws UnknownHostException, IOException, InterruptedException { - final JedisPubSub pubsub = new JedisPubSub() { + final JedisPubSub pubsub = new JedisPubSubAdaptor() { public void onMessage(String channel, String message) { unsubscribe(channel); } @@ -296,16 +189,10 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { } } - public void onUnsubscribe(String channel, int subscribedChannels) { - } - public void onPSubscribe(String pattern, int subscribedChannels) { publishOne(pattern.replace("*", "123"), "exit"); } - public void onPUnsubscribe(String pattern, int subscribedChannels) { - } - public void onPMessage(String pattern, String channel, String message) { punsubscribe(pattern); @@ -318,7 +205,7 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { @Test public void binarySubscribe() throws UnknownHostException, IOException, InterruptedException { - jedis.subscribe(new BinaryJedisPubSub() { + jedis.subscribe(new BinaryJedisPubSubAdaptor() { public void onMessage(byte[] channel, byte[] message) { assertTrue(Arrays.equals(SafeEncoder.encode("foo"), channel)); assertTrue(Arrays.equals(SafeEncoder.encode("exit"), message)); @@ -335,23 +222,13 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { assertTrue(Arrays.equals(SafeEncoder.encode("foo"), channel)); assertEquals(0, subscribedChannels); } - - public void onPSubscribe(byte[] pattern, int subscribedChannels) { - } - - public void onPUnsubscribe(byte[] pattern, int subscribedChannels) { - } - - public void onPMessage(byte[] pattern, byte[] channel, - byte[] message) { - } }, SafeEncoder.encode("foo")); } @Test public void binarySubscribeMany() throws UnknownHostException, IOException, InterruptedException { - jedis.subscribe(new BinaryJedisPubSub() { + jedis.subscribe(new BinaryJedisPubSubAdaptor() { public void onMessage(byte[] channel, byte[] message) { unsubscribe(channel); } @@ -359,35 +236,13 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { public void onSubscribe(byte[] channel, int subscribedChannels) { publishOne(SafeEncoder.encode(channel), "exit"); } - - public void onUnsubscribe(byte[] channel, int subscribedChannels) { - } - - public void onPSubscribe(byte[] pattern, int subscribedChannels) { - } - - public void onPUnsubscribe(byte[] pattern, int subscribedChannels) { - } - - public void onPMessage(byte[] pattern, byte[] channel, - byte[] message) { - } }, SafeEncoder.encode("foo"), SafeEncoder.encode("bar")); } @Test public void binaryPsubscribe() throws UnknownHostException, IOException, InterruptedException { - jedis.psubscribe(new BinaryJedisPubSub() { - public void onMessage(byte[] channel, byte[] message) { - } - - public void onSubscribe(byte[] channel, int subscribedChannels) { - } - - public void onUnsubscribe(byte[] channel, int subscribedChannels) { - } - + jedis.psubscribe(new BinaryJedisPubSubAdaptor() { public void onPSubscribe(byte[] pattern, int subscribedChannels) { assertTrue(Arrays.equals(SafeEncoder.encode("foo.*"), pattern)); assertEquals(1, subscribedChannels); @@ -414,24 +269,12 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { @Test public void binaryPsubscribeMany() throws UnknownHostException, IOException, InterruptedException { - jedis.psubscribe(new BinaryJedisPubSub() { - public void onMessage(byte[] channel, byte[] message) { - } - - public void onSubscribe(byte[] channel, int subscribedChannels) { - } - - public void onUnsubscribe(byte[] channel, int subscribedChannels) { - } - + jedis.psubscribe(new BinaryJedisPubSubAdaptor() { public void onPSubscribe(byte[] pattern, int subscribedChannels) { publishOne(SafeEncoder.encode(pattern).replace("*", "123"), "exit"); } - public void onPUnsubscribe(byte[] pattern, int subscribedChannels) { - } - public void onPMessage(byte[] pattern, byte[] channel, byte[] message) { punsubscribe(pattern); @@ -442,7 +285,7 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { @Test public void binarySubscribeLazily() throws UnknownHostException, IOException, InterruptedException { - final BinaryJedisPubSub pubsub = new BinaryJedisPubSub() { + final BinaryJedisPubSub pubsub = new BinaryJedisPubSubAdaptor() { public void onMessage(byte[] channel, byte[] message) { unsubscribe(channel); } @@ -456,17 +299,11 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { } } - public void onUnsubscribe(byte[] channel, int subscribedChannels) { - } - public void onPSubscribe(byte[] pattern, int subscribedChannels) { publishOne(SafeEncoder.encode(pattern).replace("*", "123"), "exit"); } - public void onPUnsubscribe(byte[] pattern, int subscribedChannels) { - } - public void onPMessage(byte[] pattern, byte[] channel, byte[] message) { punsubscribe(pattern); @@ -478,26 +315,7 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { @Test(expected = JedisConnectionException.class) public void unsubscribeWhenNotSusbscribed() throws InterruptedException { - JedisPubSub pubsub = new JedisPubSub() { - public void onMessage(String channel, String message) { - } - - public void onPMessage(String pattern, String channel, - String message) { - } - - public void onSubscribe(String channel, int subscribedChannels) { - } - - public void onUnsubscribe(String channel, int subscribedChannels) { - } - - public void onPUnsubscribe(String pattern, int subscribedChannels) { - } - - public void onPSubscribe(String pattern, int subscribedChannels) { - } - }; + JedisPubSub pubsub = new JedisPubSubAdaptor(); pubsub.unsubscribe(); } @@ -533,7 +351,7 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { }); t.start(); try { - jedis.subscribe(new JedisPubSub() { + jedis.subscribe(new JedisPubSubAdaptor() { public void onMessage(String channel, String message) { try { // wait 0.5 secs to slow down subscribe and @@ -550,23 +368,6 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { fail(e.getMessage()); } } - - public void onSubscribe(String channel, int subscribedChannels) { - } - - public void onUnsubscribe(String channel, int subscribedChannels) { - } - - public void onPSubscribe(String pattern, int subscribedChannels) { - } - - public void onPUnsubscribe(String pattern, - int subscribedChannels) { - } - - public void onPMessage(String pattern, String channel, - String message) { - } }, "foo"); } finally { // exit the publisher thread. if exception is thrown, thread might diff --git a/src/test/java/redis/clients/jedis/tests/utils/JedisSentinelTestUtil.java b/src/test/java/redis/clients/jedis/tests/utils/JedisSentinelTestUtil.java index 919f63c..0e13892 100644 --- a/src/test/java/redis/clients/jedis/tests/utils/JedisSentinelTestUtil.java +++ b/src/test/java/redis/clients/jedis/tests/utils/JedisSentinelTestUtil.java @@ -4,7 +4,7 @@ import java.util.concurrent.atomic.AtomicReference; import redis.clients.jedis.HostAndPort; import redis.clients.jedis.Jedis; -import redis.clients.jedis.JedisPubSub; +import redis.clients.jedis.JedisPubSubAdaptor; public class JedisSentinelTestUtil { public static HostAndPort waitForNewPromotedMaster(final String masterName, @@ -14,11 +14,7 @@ public class JedisSentinelTestUtil { final AtomicReference newmaster = new AtomicReference( ""); - sentinelJedis.psubscribe(new JedisPubSub() { - - @Override - public void onMessage(String channel, String message) { - } + sentinelJedis.psubscribe(new JedisPubSubAdaptor() { @Override public void onPMessage(String pattern, String channel, @@ -34,18 +30,6 @@ public class JedisSentinelTestUtil { } } - @Override - public void onSubscribe(String channel, int subscribedChannels) { - } - - @Override - public void onUnsubscribe(String channel, int subscribedChannels) { - } - - @Override - public void onPUnsubscribe(String pattern, int subscribedChannels) { - } - @Override public void onPSubscribe(String pattern, int subscribedChannels) { commandJedis.sentinelFailover(masterName); From 8a33ab6e9a8fd470dfa646718d14a73b5d11ff06 Mon Sep 17 00:00:00 2001 From: Jungtaek Lim Date: Fri, 7 Nov 2014 23:11:43 +0900 Subject: [PATCH 2/2] Remove Adaptor and update their own class (PubSub) --- .../clients/jedis/BinaryJedisPubSub.java | 13 ++++--- .../jedis/BinaryJedisPubSubAdaptor.java | 33 ------------------ .../java/redis/clients/jedis/JedisPubSub.java | 13 ++++--- .../clients/jedis/JedisPubSubAdaptor.java | 34 ------------------- .../clients/jedis/JedisSentinelPool.java | 2 +- .../PublishSubscribeCommandsTest.java | 30 ++++++++-------- .../tests/utils/JedisSentinelTestUtil.java | 4 +-- 7 files changed, 30 insertions(+), 99 deletions(-) delete mode 100644 src/main/java/redis/clients/jedis/BinaryJedisPubSubAdaptor.java delete mode 100644 src/main/java/redis/clients/jedis/JedisPubSubAdaptor.java diff --git a/src/main/java/redis/clients/jedis/BinaryJedisPubSub.java b/src/main/java/redis/clients/jedis/BinaryJedisPubSub.java index c271305..9d36ae0 100644 --- a/src/main/java/redis/clients/jedis/BinaryJedisPubSub.java +++ b/src/main/java/redis/clients/jedis/BinaryJedisPubSub.java @@ -16,18 +16,17 @@ public abstract class BinaryJedisPubSub { private int subscribedChannels = 0; private Client client; - public abstract void onMessage(byte[] channel, byte[] message); + public void onMessage(byte[] channel, byte[] message) {} - public abstract void onPMessage(byte[] pattern, byte[] channel, - byte[] message); + public void onPMessage(byte[] pattern, byte[] channel, byte[] message) {} - public abstract void onSubscribe(byte[] channel, int subscribedChannels); + public void onSubscribe(byte[] channel, int subscribedChannels) {} - public abstract void onUnsubscribe(byte[] channel, int subscribedChannels); + public void onUnsubscribe(byte[] channel, int subscribedChannels) {} - public abstract void onPUnsubscribe(byte[] pattern, int subscribedChannels); + public void onPUnsubscribe(byte[] pattern, int subscribedChannels) {} - public abstract void onPSubscribe(byte[] pattern, int subscribedChannels); + public void onPSubscribe(byte[] pattern, int subscribedChannels) {} public void unsubscribe() { client.unsubscribe(); diff --git a/src/main/java/redis/clients/jedis/BinaryJedisPubSubAdaptor.java b/src/main/java/redis/clients/jedis/BinaryJedisPubSubAdaptor.java deleted file mode 100644 index ff826ce..0000000 --- a/src/main/java/redis/clients/jedis/BinaryJedisPubSubAdaptor.java +++ /dev/null @@ -1,33 +0,0 @@ -package redis.clients.jedis; - -public class BinaryJedisPubSubAdaptor extends BinaryJedisPubSub { - @Override - public void onMessage(byte[] channel, byte[] message) { - - } - - @Override - public void onPMessage(byte[] pattern, byte[] channel, byte[] message) { - - } - - @Override - public void onSubscribe(byte[] channel, int subscribedChannels) { - - } - - @Override - public void onUnsubscribe(byte[] channel, int subscribedChannels) { - - } - - @Override - public void onPUnsubscribe(byte[] pattern, int subscribedChannels) { - - } - - @Override - public void onPSubscribe(byte[] pattern, int subscribedChannels) { - - } -} diff --git a/src/main/java/redis/clients/jedis/JedisPubSub.java b/src/main/java/redis/clients/jedis/JedisPubSub.java index 2ded002..fb892c3 100644 --- a/src/main/java/redis/clients/jedis/JedisPubSub.java +++ b/src/main/java/redis/clients/jedis/JedisPubSub.java @@ -18,18 +18,17 @@ public abstract class JedisPubSub { private int subscribedChannels = 0; private volatile Client client; - public abstract void onMessage(String channel, String message); + public void onMessage(String channel, String message) {} - public abstract void onPMessage(String pattern, String channel, - String message); + public void onPMessage(String pattern, String channel, String message) {} - public abstract void onSubscribe(String channel, int subscribedChannels); + public void onSubscribe(String channel, int subscribedChannels) {} - public abstract void onUnsubscribe(String channel, int subscribedChannels); + public void onUnsubscribe(String channel, int subscribedChannels) {} - public abstract void onPUnsubscribe(String pattern, int subscribedChannels); + public void onPUnsubscribe(String pattern, int subscribedChannels) {} - public abstract void onPSubscribe(String pattern, int subscribedChannels); + public void onPSubscribe(String pattern, int subscribedChannels) {} public void unsubscribe() { if (client == null) { diff --git a/src/main/java/redis/clients/jedis/JedisPubSubAdaptor.java b/src/main/java/redis/clients/jedis/JedisPubSubAdaptor.java deleted file mode 100644 index 5281287..0000000 --- a/src/main/java/redis/clients/jedis/JedisPubSubAdaptor.java +++ /dev/null @@ -1,34 +0,0 @@ -package redis.clients.jedis; - -public class JedisPubSubAdaptor extends JedisPubSub { - - @Override - public void onMessage(String channel, String message) { - - } - - @Override - public void onPMessage(String pattern, String channel, String message) { - - } - - @Override - public void onSubscribe(String channel, int subscribedChannels) { - - } - - @Override - public void onUnsubscribe(String channel, int subscribedChannels) { - - } - - @Override - public void onPUnsubscribe(String pattern, int subscribedChannels) { - - } - - @Override - public void onPSubscribe(String pattern, int subscribedChannels) { - - } -} diff --git a/src/main/java/redis/clients/jedis/JedisSentinelPool.java b/src/main/java/redis/clients/jedis/JedisSentinelPool.java index c38fa3c..8c0c1c8 100644 --- a/src/main/java/redis/clients/jedis/JedisSentinelPool.java +++ b/src/main/java/redis/clients/jedis/JedisSentinelPool.java @@ -255,7 +255,7 @@ public class JedisSentinelPool extends Pool { j = new Jedis(host, port); try { - j.subscribe(new JedisPubSubAdaptor() { + j.subscribe(new JedisPubSub() { @Override public void onMessage(String channel, String message) { log.fine("Sentinel " + host + ":" + port diff --git a/src/test/java/redis/clients/jedis/tests/commands/PublishSubscribeCommandsTest.java b/src/test/java/redis/clients/jedis/tests/commands/PublishSubscribeCommandsTest.java index 9499a53..8dd55c3 100644 --- a/src/test/java/redis/clients/jedis/tests/commands/PublishSubscribeCommandsTest.java +++ b/src/test/java/redis/clients/jedis/tests/commands/PublishSubscribeCommandsTest.java @@ -31,7 +31,7 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { @Test public void subscribe() throws InterruptedException { - jedis.subscribe(new JedisPubSubAdaptor() { + jedis.subscribe(new JedisPubSub() { public void onMessage(String channel, String message) { assertEquals("foo", channel); assertEquals("exit", message); @@ -57,7 +57,7 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { public void pubSubChannels() { final List expectedActiveChannels = Arrays.asList("testchan1", "testchan2", "testchan3"); - jedis.subscribe(new JedisPubSubAdaptor() { + jedis.subscribe(new JedisPubSub() { private int count = 0; @Override @@ -78,7 +78,7 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { @Test public void pubSubNumPat() { - jedis.psubscribe(new JedisPubSubAdaptor() { + jedis.psubscribe(new JedisPubSub() { private int count = 0; @Override @@ -100,7 +100,7 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { final Map expectedNumSub = new HashMap(); expectedNumSub.put("testchannel2", "1"); expectedNumSub.put("testchannel1", "1"); - jedis.subscribe(new JedisPubSubAdaptor() { + jedis.subscribe(new JedisPubSub() { private int count = 0; @Override @@ -120,7 +120,7 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { @Test public void subscribeMany() throws UnknownHostException, IOException, InterruptedException { - jedis.subscribe(new JedisPubSubAdaptor() { + jedis.subscribe(new JedisPubSub() { public void onMessage(String channel, String message) { unsubscribe(channel); } @@ -135,7 +135,7 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { @Test public void psubscribe() throws UnknownHostException, IOException, InterruptedException { - jedis.psubscribe(new JedisPubSubAdaptor() { + jedis.psubscribe(new JedisPubSub() { public void onPSubscribe(String pattern, int subscribedChannels) { assertEquals("foo.*", pattern); assertEquals(1, subscribedChannels); @@ -161,7 +161,7 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { @Test public void psubscribeMany() throws UnknownHostException, IOException, InterruptedException { - jedis.psubscribe(new JedisPubSubAdaptor() { + jedis.psubscribe(new JedisPubSub() { public void onPSubscribe(String pattern, int subscribedChannels) { publishOne(pattern.replace("*", "123"), "exit"); } @@ -176,7 +176,7 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { @Test public void subscribeLazily() throws UnknownHostException, IOException, InterruptedException { - final JedisPubSub pubsub = new JedisPubSubAdaptor() { + final JedisPubSub pubsub = new JedisPubSub() { public void onMessage(String channel, String message) { unsubscribe(channel); } @@ -205,7 +205,7 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { @Test public void binarySubscribe() throws UnknownHostException, IOException, InterruptedException { - jedis.subscribe(new BinaryJedisPubSubAdaptor() { + jedis.subscribe(new BinaryJedisPubSub() { public void onMessage(byte[] channel, byte[] message) { assertTrue(Arrays.equals(SafeEncoder.encode("foo"), channel)); assertTrue(Arrays.equals(SafeEncoder.encode("exit"), message)); @@ -228,7 +228,7 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { @Test public void binarySubscribeMany() throws UnknownHostException, IOException, InterruptedException { - jedis.subscribe(new BinaryJedisPubSubAdaptor() { + jedis.subscribe(new BinaryJedisPubSub() { public void onMessage(byte[] channel, byte[] message) { unsubscribe(channel); } @@ -242,7 +242,7 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { @Test public void binaryPsubscribe() throws UnknownHostException, IOException, InterruptedException { - jedis.psubscribe(new BinaryJedisPubSubAdaptor() { + jedis.psubscribe(new BinaryJedisPubSub() { public void onPSubscribe(byte[] pattern, int subscribedChannels) { assertTrue(Arrays.equals(SafeEncoder.encode("foo.*"), pattern)); assertEquals(1, subscribedChannels); @@ -269,7 +269,7 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { @Test public void binaryPsubscribeMany() throws UnknownHostException, IOException, InterruptedException { - jedis.psubscribe(new BinaryJedisPubSubAdaptor() { + jedis.psubscribe(new BinaryJedisPubSub() { public void onPSubscribe(byte[] pattern, int subscribedChannels) { publishOne(SafeEncoder.encode(pattern).replace("*", "123"), "exit"); @@ -285,7 +285,7 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { @Test public void binarySubscribeLazily() throws UnknownHostException, IOException, InterruptedException { - final BinaryJedisPubSub pubsub = new BinaryJedisPubSubAdaptor() { + final BinaryJedisPubSub pubsub = new BinaryJedisPubSub() { public void onMessage(byte[] channel, byte[] message) { unsubscribe(channel); } @@ -315,7 +315,7 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { @Test(expected = JedisConnectionException.class) public void unsubscribeWhenNotSusbscribed() throws InterruptedException { - JedisPubSub pubsub = new JedisPubSubAdaptor(); + JedisPubSub pubsub = new JedisPubSub() {}; pubsub.unsubscribe(); } @@ -351,7 +351,7 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase { }); t.start(); try { - jedis.subscribe(new JedisPubSubAdaptor() { + jedis.subscribe(new JedisPubSub() { public void onMessage(String channel, String message) { try { // wait 0.5 secs to slow down subscribe and diff --git a/src/test/java/redis/clients/jedis/tests/utils/JedisSentinelTestUtil.java b/src/test/java/redis/clients/jedis/tests/utils/JedisSentinelTestUtil.java index 0e13892..cde2fe6 100644 --- a/src/test/java/redis/clients/jedis/tests/utils/JedisSentinelTestUtil.java +++ b/src/test/java/redis/clients/jedis/tests/utils/JedisSentinelTestUtil.java @@ -4,7 +4,7 @@ import java.util.concurrent.atomic.AtomicReference; import redis.clients.jedis.HostAndPort; import redis.clients.jedis.Jedis; -import redis.clients.jedis.JedisPubSubAdaptor; +import redis.clients.jedis.JedisPubSub; public class JedisSentinelTestUtil { public static HostAndPort waitForNewPromotedMaster(final String masterName, @@ -14,7 +14,7 @@ public class JedisSentinelTestUtil { final AtomicReference newmaster = new AtomicReference( ""); - sentinelJedis.psubscribe(new JedisPubSubAdaptor() { + sentinelJedis.psubscribe(new JedisPubSub() { @Override public void onPMessage(String pattern, String channel,