From a3f7e888dabfd8237724977b44b0d0488e70b961 Mon Sep 17 00:00:00 2001 From: Nykolas Lima Date: Fri, 19 Sep 2014 16:54:49 -0300 Subject: [PATCH 1/4] making Jedis compatible with CDI --- src/main/java/redis/clients/jedis/Jedis.java | 23 +++++++++++++++---- .../java/redis/clients/jedis/JedisPool.java | 6 +++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java index 1f4fcde..d6633c3 100644 --- a/src/main/java/redis/clients/jedis/Jedis.java +++ b/src/main/java/redis/clients/jedis/Jedis.java @@ -1,20 +1,35 @@ package redis.clients.jedis; +import java.net.URI; +import java.util.AbstractMap; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + import redis.clients.jedis.BinaryClient.LIST_POSITION; import redis.clients.util.Pool; import redis.clients.util.SafeEncoder; import redis.clients.util.Slowlog; -import java.net.URI; -import java.util.*; -import java.util.Map.Entry; - public class Jedis extends BinaryJedis implements JedisCommands, MultiKeyCommands, AdvancedJedisCommands, ScriptingCommands, BasicCommands, ClusterCommands { protected Pool dataSource = null; + /** + * CDI eyes only + * @deprecated CDI eyes only + */ + public Jedis() { + super((String)null); + } + public Jedis(final String host) { super(host); } diff --git a/src/main/java/redis/clients/jedis/JedisPool.java b/src/main/java/redis/clients/jedis/JedisPool.java index 0fbfdfe..2976f4c 100644 --- a/src/main/java/redis/clients/jedis/JedisPool.java +++ b/src/main/java/redis/clients/jedis/JedisPool.java @@ -9,6 +9,12 @@ import redis.clients.util.Pool; public class JedisPool extends Pool { + /** + * CDI eyes only + * @deprecated CDI eyes only + */ + public JedisPool() {} + public JedisPool(final GenericObjectPoolConfig poolConfig, final String host) { this(poolConfig, host, Protocol.DEFAULT_PORT, Protocol.DEFAULT_TIMEOUT, null, Protocol.DEFAULT_DATABASE, null); From f065b80ab0e16b059d49308f6743b24ef3c9d0cc Mon Sep 17 00:00:00 2001 From: Nykolas Lima Date: Fri, 19 Sep 2014 17:09:27 -0300 Subject: [PATCH 2/4] we can't pass null because it will throw an exception. Using localhost instead --- src/main/java/redis/clients/jedis/Jedis.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java index d6633c3..0899abc 100644 --- a/src/main/java/redis/clients/jedis/Jedis.java +++ b/src/main/java/redis/clients/jedis/Jedis.java @@ -27,7 +27,7 @@ public class Jedis extends BinaryJedis implements JedisCommands, * @deprecated CDI eyes only */ public Jedis() { - super((String)null); + super("localhost"); } public Jedis(final String host) { From 833065b6708dd19fd83111f1c2586ac6f73a52bf Mon Sep 17 00:00:00 2001 From: Nykolas Lima Date: Sat, 27 Sep 2014 13:37:42 -0300 Subject: [PATCH 3/4] changing default constructor to use default host and port (localhost) --- .../redis/clients/jedis/BinaryClient.java | 30 ++++++++++++------- .../java/redis/clients/jedis/BinaryJedis.java | 4 +++ src/main/java/redis/clients/jedis/Client.java | 5 ++++ .../java/redis/clients/jedis/Connection.java | 30 +++++++++---------- src/main/java/redis/clients/jedis/Jedis.java | 6 +--- .../java/redis/clients/jedis/JedisPool.java | 8 ++--- .../java/redis/clients/jedis/Protocol.java | 1 + 7 files changed, 47 insertions(+), 37 deletions(-) diff --git a/src/main/java/redis/clients/jedis/BinaryClient.java b/src/main/java/redis/clients/jedis/BinaryClient.java index 16a9da8..7c53cb6 100644 --- a/src/main/java/redis/clients/jedis/BinaryClient.java +++ b/src/main/java/redis/clients/jedis/BinaryClient.java @@ -1,22 +1,26 @@ package redis.clients.jedis; -import redis.clients.jedis.Protocol.Command; -import redis.clients.jedis.Protocol.Keyword; -import redis.clients.util.SafeEncoder; +import static redis.clients.jedis.Protocol.toByteArray; +import static redis.clients.jedis.Protocol.Command.*; +import static redis.clients.jedis.Protocol.Keyword.ENCODING; +import static redis.clients.jedis.Protocol.Keyword.IDLETIME; +import static redis.clients.jedis.Protocol.Keyword.LEN; +import static redis.clients.jedis.Protocol.Keyword.LIMIT; +import static redis.clients.jedis.Protocol.Keyword.NO; +import static redis.clients.jedis.Protocol.Keyword.ONE; +import static redis.clients.jedis.Protocol.Keyword.REFCOUNT; +import static redis.clients.jedis.Protocol.Keyword.RESET; +import static redis.clients.jedis.Protocol.Keyword.STORE; +import static redis.clients.jedis.Protocol.Keyword.WITHSCORES; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import static redis.clients.jedis.Protocol.Command.*; -import static redis.clients.jedis.Protocol.Command.EXISTS; -import static redis.clients.jedis.Protocol.Command.PSUBSCRIBE; -import static redis.clients.jedis.Protocol.Command.PUNSUBSCRIBE; -import static redis.clients.jedis.Protocol.Command.SUBSCRIBE; -import static redis.clients.jedis.Protocol.Command.UNSUBSCRIBE; -import static redis.clients.jedis.Protocol.Keyword.*; -import static redis.clients.jedis.Protocol.toByteArray; +import redis.clients.jedis.Protocol.Command; +import redis.clients.jedis.Protocol.Keyword; +import redis.clients.util.SafeEncoder; public class BinaryClient extends Connection { public enum LIST_POSITION { @@ -44,6 +48,10 @@ public class BinaryClient extends Connection { return isInWatch; } + public BinaryClient() { + this(Protocol.DEFAULT_HOST, Protocol.DEFAULT_PORT); + } + public BinaryClient(final String host) { super(host); } diff --git a/src/main/java/redis/clients/jedis/BinaryJedis.java b/src/main/java/redis/clients/jedis/BinaryJedis.java index 49c2603..fa6f6e8 100644 --- a/src/main/java/redis/clients/jedis/BinaryJedis.java +++ b/src/main/java/redis/clients/jedis/BinaryJedis.java @@ -26,6 +26,10 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands, protected Transaction transaction = null; protected Pipeline pipeline = null; + public BinaryJedis() { + this(Protocol.DEFAULT_HOST, Protocol.DEFAULT_PORT); + } + public BinaryJedis(final String host) { URI uri = URI.create(host); if (uri.getScheme() != null && uri.getScheme().equals("redis")) { diff --git a/src/main/java/redis/clients/jedis/Client.java b/src/main/java/redis/clients/jedis/Client.java index 59a4464..a6fa111 100644 --- a/src/main/java/redis/clients/jedis/Client.java +++ b/src/main/java/redis/clients/jedis/Client.java @@ -11,6 +11,11 @@ import java.util.Map.Entry; import redis.clients.util.SafeEncoder; public class Client extends BinaryClient implements Commands { + + public Client() { + this(Protocol.DEFAULT_HOST, Protocol.DEFAULT_PORT); + } + public Client(final String host) { super(host); } diff --git a/src/main/java/redis/clients/jedis/Connection.java b/src/main/java/redis/clients/jedis/Connection.java index c57b170..68f97e0 100644 --- a/src/main/java/redis/clients/jedis/Connection.java +++ b/src/main/java/redis/clients/jedis/Connection.java @@ -16,14 +16,27 @@ import redis.clients.util.RedisOutputStream; import redis.clients.util.SafeEncoder; public class Connection implements Closeable { + private String host; private int port = Protocol.DEFAULT_PORT; private Socket socket; private RedisOutputStream outputStream; private RedisInputStream inputStream; private int timeout = Protocol.DEFAULT_TIMEOUT; - private boolean broken = false; + + public Connection() { + this(Protocol.DEFAULT_HOST, Protocol.DEFAULT_PORT); + } + + public Connection(final String host) { + this.host = host; + } + + public Connection(final String host, final int port) { + this.host = host; + this.port = port; + } public Socket getSocket() { return socket; @@ -60,11 +73,6 @@ public class Connection implements Closeable { } } - public Connection(final String host) { - super(); - this.host = host; - } - protected Connection sendCommand(final Command cmd, final String... args) { final byte[][] bargs = new byte[args.length][]; for (int i = 0; i < args.length; i++) { @@ -97,12 +105,6 @@ public class Connection implements Closeable { } } - public Connection(final String host, final int port) { - super(); - this.host = host; - this.port = port; - } - public String getHost() { return host; } @@ -119,10 +121,6 @@ public class Connection implements Closeable { this.port = port; } - public Connection() { - - } - public void connect() { if (!isConnected()) { try { diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java index 0899abc..2353f7b 100644 --- a/src/main/java/redis/clients/jedis/Jedis.java +++ b/src/main/java/redis/clients/jedis/Jedis.java @@ -22,12 +22,8 @@ public class Jedis extends BinaryJedis implements JedisCommands, protected Pool dataSource = null; - /** - * CDI eyes only - * @deprecated CDI eyes only - */ public Jedis() { - super("localhost"); + super(Protocol.DEFAULT_HOST, Protocol.DEFAULT_PORT); } public Jedis(final String host) { diff --git a/src/main/java/redis/clients/jedis/JedisPool.java b/src/main/java/redis/clients/jedis/JedisPool.java index 2976f4c..c8d6d80 100644 --- a/src/main/java/redis/clients/jedis/JedisPool.java +++ b/src/main/java/redis/clients/jedis/JedisPool.java @@ -9,11 +9,9 @@ import redis.clients.util.Pool; public class JedisPool extends Pool { - /** - * CDI eyes only - * @deprecated CDI eyes only - */ - public JedisPool() {} + public JedisPool() { + this(Protocol.DEFAULT_HOST, Protocol.DEFAULT_PORT); + } public JedisPool(final GenericObjectPoolConfig poolConfig, final String host) { this(poolConfig, host, Protocol.DEFAULT_PORT, Protocol.DEFAULT_TIMEOUT, diff --git a/src/main/java/redis/clients/jedis/Protocol.java b/src/main/java/redis/clients/jedis/Protocol.java index 83d0fba..f7c1acd 100644 --- a/src/main/java/redis/clients/jedis/Protocol.java +++ b/src/main/java/redis/clients/jedis/Protocol.java @@ -18,6 +18,7 @@ public final class Protocol { private static final String ASK_RESPONSE = "ASK"; private static final String MOVED_RESPONSE = "MOVED"; private static final String CLUSTERDOWN_RESPONSE = "CLUSTERDOWN"; + public static final String DEFAULT_HOST = "localhost"; public static final int DEFAULT_PORT = 6379; public static final int DEFAULT_SENTINEL_PORT = 26379; public static final int DEFAULT_TIMEOUT = 2000; From f7789213df7f68700ac91f535553a031469de949 Mon Sep 17 00:00:00 2001 From: Nykolas Lima Date: Wed, 8 Oct 2014 17:37:29 -0300 Subject: [PATCH 4/4] using super instead of this to keep the code style --- src/main/java/redis/clients/jedis/BinaryClient.java | 2 +- src/main/java/redis/clients/jedis/Client.java | 2 +- src/main/java/redis/clients/jedis/Jedis.java | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/redis/clients/jedis/BinaryClient.java b/src/main/java/redis/clients/jedis/BinaryClient.java index 7c53cb6..3658f8c 100644 --- a/src/main/java/redis/clients/jedis/BinaryClient.java +++ b/src/main/java/redis/clients/jedis/BinaryClient.java @@ -49,7 +49,7 @@ public class BinaryClient extends Connection { } public BinaryClient() { - this(Protocol.DEFAULT_HOST, Protocol.DEFAULT_PORT); + super(Protocol.DEFAULT_HOST, Protocol.DEFAULT_PORT); } public BinaryClient(final String host) { diff --git a/src/main/java/redis/clients/jedis/Client.java b/src/main/java/redis/clients/jedis/Client.java index a6fa111..b06eca8 100644 --- a/src/main/java/redis/clients/jedis/Client.java +++ b/src/main/java/redis/clients/jedis/Client.java @@ -13,7 +13,7 @@ import redis.clients.util.SafeEncoder; public class Client extends BinaryClient implements Commands { public Client() { - this(Protocol.DEFAULT_HOST, Protocol.DEFAULT_PORT); + super(Protocol.DEFAULT_HOST, Protocol.DEFAULT_PORT); } public Client(final String host) { diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java index 2353f7b..b07d080 100644 --- a/src/main/java/redis/clients/jedis/Jedis.java +++ b/src/main/java/redis/clients/jedis/Jedis.java @@ -22,9 +22,7 @@ public class Jedis extends BinaryJedis implements JedisCommands, protected Pool dataSource = null; - public Jedis() { - super(Protocol.DEFAULT_HOST, Protocol.DEFAULT_PORT); - } + public Jedis() {} public Jedis(final String host) { super(host);