diff --git a/src/main/java/redis/clients/jedis/BinaryClient.java b/src/main/java/redis/clients/jedis/BinaryClient.java index e2bad8f..5855820 100644 --- a/src/main/java/redis/clients/jedis/BinaryClient.java +++ b/src/main/java/redis/clients/jedis/BinaryClient.java @@ -48,6 +48,10 @@ public class BinaryClient extends Connection { return isInWatch; } + public BinaryClient() { + super(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 6734bb5..fd39d18 100644 --- a/src/main/java/redis/clients/jedis/BinaryJedis.java +++ b/src/main/java/redis/clients/jedis/BinaryJedis.java @@ -27,6 +27,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 4863ac6..9126504 100644 --- a/src/main/java/redis/clients/jedis/Client.java +++ b/src/main/java/redis/clients/jedis/Client.java @@ -12,6 +12,11 @@ import redis.clients.jedis.JedisCluster.Reset; import redis.clients.util.SafeEncoder; public class Client extends BinaryClient implements Commands { + + public Client() { + super(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 361ac0d..57c8d1f 100644 --- a/src/main/java/redis/clients/jedis/Jedis.java +++ b/src/main/java/redis/clients/jedis/Jedis.java @@ -23,6 +23,8 @@ public class Jedis extends BinaryJedis implements JedisCommands, protected Pool dataSource = null; + public Jedis() {} + 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 c5e98d3..202fd3a 100644 --- a/src/main/java/redis/clients/jedis/JedisPool.java +++ b/src/main/java/redis/clients/jedis/JedisPool.java @@ -10,6 +10,10 @@ import redis.clients.util.Pool; public class JedisPool extends Pool { + 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, null, Protocol.DEFAULT_DATABASE, null); diff --git a/src/main/java/redis/clients/jedis/Protocol.java b/src/main/java/redis/clients/jedis/Protocol.java index cda3983..ddb4ad2 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;