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

Code cleanup (final method params)

Browse Source
This commit is contained in:
Yaourt
2010-11-04 10:22:39 +01:00
parent daec806c5a
commit ddd3932906
2 changed files with 699 additions and 595 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,11 +15,11 @@ public class Client extends Connection {
return isInMulti;
}
public Client(String host) {
public Client(final String host) {
super(host);
}
public Client(String host, int port) {
public Client(final String host, final int port) {
super(host, port);
}
@@ -27,11 +27,11 @@ public class Client extends Connection {
sendCommand("PING");
}
public void set(String key, String value) {
public void set(final String key, final String value) {
sendCommand("SET", key, value);
}
public void get(String key) {
public void get(final String key) {
sendCommand("GET", key);
}
@@ -39,15 +39,15 @@ public class Client extends Connection {
sendCommand("QUIT");
}
public void exists(String key) {
public void exists(final String key) {
sendCommand("EXISTS", key);
}
public void del(String... keys) {
public void del(final String... keys) {
sendCommand("DEL", keys);
}
public void type(String key) {
public void type(final String key) {
sendCommand("TYPE", key);
}
@@ -55,7 +55,7 @@ public class Client extends Connection {
sendCommand("FLUSHDB");
}
public void keys(String pattern) {
public void keys(final String pattern) {
sendCommand("KEYS", pattern);
}
@@ -63,11 +63,11 @@ public class Client extends Connection {
sendCommand("RANDOMKEY");
}
public void rename(String oldkey, String newkey) {
public void rename(final String oldkey, final String newkey) {
sendCommand("RENAME", oldkey, newkey);
}
public void renamenx(String oldkey, String newkey) {
public void renamenx(final String oldkey, final String newkey) {
sendCommand("RENAMENX", oldkey, newkey);
}
@@ -75,23 +75,23 @@ public class Client extends Connection {
sendCommand("DBSIZE");
}
public void expire(String key, int seconds) {
public void expire(final String key, final int seconds) {
sendCommand("EXPIRE", key, String.valueOf(seconds));
}
public void expireAt(String key, long unixTime) {
public void expireAt(final String key, final long unixTime) {
sendCommand("EXPIREAT", key, String.valueOf(unixTime));
}
public void ttl(String key) {
public void ttl(final String key) {
sendCommand("TTL", key);
}
public void select(int index) {
public void select(final int index) {
sendCommand("SELECT", String.valueOf(index));
}
public void move(String key, int dbIndex) {
public void move(final String key, final int dbIndex) {
sendCommand("MOVE", key, String.valueOf(dbIndex));
}
@@ -99,265 +99,303 @@ public class Client extends Connection {
sendCommand("FLUSHALL");
}
public void getSet(String key, String value) {
public void getSet(final String key, final String value) {
sendCommand("GETSET", key, value);
}
public void mget(String... keys) {
public void mget(final String... keys) {
sendCommand("MGET", keys);
}
public void setnx(String key, String value) {
public void setnx(final String key, final String value) {
sendCommand("SETNX", key, value);
}
public void setex(String key, int seconds, String value) {
public void setex(
final String key,
final int seconds,
final String value) {
sendCommand("SETEX", key, String.valueOf(seconds), value);
}
public void mset(String... keysvalues) {
public void mset(final String... keysvalues) {
sendCommand("MSET", keysvalues);
}
public void msetnx(String... keysvalues) {
public void msetnx(final String... keysvalues) {
sendCommand("MSETNX", keysvalues);
}
public void decrBy(String key, int integer) {
public void decrBy(final String key, final int integer) {
sendCommand("DECRBY", key, String.valueOf(integer));
}
public void decr(String key) {
public void decr(final String key) {
sendCommand("DECR", key);
}
public void incrBy(String key, int integer) {
public void incrBy(final String key, final int integer) {
sendCommand("INCRBY", key, String.valueOf(integer));
}
public void incr(String key) {
public void incr(final String key) {
sendCommand("INCR", key);
}
public void append(String key, String value) {
public void append(final String key, final String value) {
sendCommand("APPEND", key, value);
}
public void substr(String key, int start, int end) {
public void substr(final String key, final int start, final int end) {
sendCommand("SUBSTR", key, String.valueOf(start), String.valueOf(end));
}
public void hset(String key, String field, String value) {
public void hset(
final String key,
final String field,
final String value) {
sendCommand("HSET", key, field, value);
}
public void hget(String key, String field) {
public void hget(final String key, final String field) {
sendCommand("HGET", key, field);
}
public void hsetnx(String key, String field, String value) {
public void hsetnx(
final String key,
final String field,
final String value) {
sendCommand("HSETNX", key, field, value);
}
public void hmset(String key, Map<String, String> hash) {
List<String> params = new ArrayList<String>();
public void hmset(final String key, final Map<String, String> hash) {
final List<String> params = new ArrayList<String>();
params.add(key);
for (String field : hash.keySet()) {
for (final String field : hash.keySet()) {
params.add(field);
params.add(hash.get(field));
}
sendCommand("HMSET", params.toArray(new String[params.size()]));
}
public void hmget(String key, String... fields) {
String[] params = new String[fields.length + 1];
public void hmget(final String key, final String... fields) {
final String[] params = new String[fields.length + 1];
params[0] = key;
System.arraycopy(fields, 0, params, 1, fields.length);
sendCommand("HMGET", params);
}
public void hincrBy(String key, String field, int value) {
public void hincrBy(final String key, final String field, final int value) {
sendCommand("HINCRBY", key, field, String.valueOf(value));
}
public void hexists(String key, String field) {
public void hexists(final String key, final String field) {
sendCommand("HEXISTS", key, field);
}
public void hdel(String key, String field) {
public void hdel(final String key, final String field) {
sendCommand("HDEL", key, field);
}
public void hlen(String key) {
public void hlen(final String key) {
sendCommand("HLEN", key);
}
public void hkeys(String key) {
public void hkeys(final String key) {
sendCommand("HKEYS", key);
}
public void hvals(String key) {
public void hvals(final String key) {
sendCommand("HVALS", key);
}
public void hgetAll(String key) {
public void hgetAll(final String key) {
sendCommand("HGETALL", key);
}
public void rpush(String key, String string) {
public void rpush(final String key, final String string) {
sendCommand("RPUSH", key, string);
}
public void lpush(String key, String string) {
public void lpush(final String key, final String string) {
sendCommand("LPUSH", key, string);
}
public void llen(String key) {
public void llen(final String key) {
sendCommand("LLEN", key);
}
public void lrange(String key, int start, int end) {
public void lrange(final String key, final int start, final int end) {
sendCommand("LRANGE", key, String.valueOf(start), String.valueOf(end));
}
public void ltrim(String key, int start, int end) {
public void ltrim(final String key, final int start, final int end) {
sendCommand("LTRIM", key, String.valueOf(start), String.valueOf(end));
}
public void lindex(String key, int index) {
public void lindex(final String key, final int index) {
sendCommand("LINDEX", key, String.valueOf(index));
}
public void lset(String key, int index, String value) {
public void lset(final String key, final int index, final String value) {
sendCommand("LSET", key, String.valueOf(index), value);
}
public void lrem(String key, int count, String value) {
public void lrem(final String key, int count, final String value) {
sendCommand("LREM", key, String.valueOf(count), value);
}
public void lpop(String key) {
public void lpop(final String key) {
sendCommand("LPOP", key);
}
public void rpop(String key) {
public void rpop(final String key) {
sendCommand("RPOP", key);
}
public void rpoplpush(String srckey, String dstkey) {
public void rpoplpush(final String srckey, final String dstkey) {
sendCommand("RPOPLPUSH", srckey, dstkey);
}
public void sadd(String key, String member) {
public void sadd(final String key, final String member) {
sendCommand("SADD", key, member);
}
public void smembers(String key) {
public void smembers(final String key) {
sendCommand("SMEMBERS", key);
}
public void srem(String key, String member) {
public void srem(final String key, final String member) {
sendCommand("SREM", key, member);
}
public void spop(String key) {
public void spop(final String key) {
sendCommand("SPOP", key);
}
public void smove(String srckey, String dstkey, String member) {
public void smove(
final String srckey,
final String dstkey,
final String member) {
sendCommand("SMOVE", srckey, dstkey, member);
}
public void scard(String key) {
public void scard(final String key) {
sendCommand("SCARD", key);
}
public void sismember(String key, String member) {
public void sismember(final String key, final String member) {
sendCommand("SISMEMBER", key, member);
}
public void sinter(String... keys) {
public void sinter(final String... keys) {
sendCommand("SINTER", keys);
}
public void sinterstore(String dstkey, String... keys) {
public void sinterstore(final String dstkey, final String... keys) {
String[] params = new String[keys.length + 1];
params[0] = dstkey;
System.arraycopy(keys, 0, params, 1, keys.length);
sendCommand("SINTERSTORE", params);
}
public void sunion(String... keys) {
public void sunion(final String... keys) {
sendCommand("SUNION", keys);
}
public void sunionstore(String dstkey, String... keys) {
public void sunionstore(final String dstkey, final String... keys) {
String[] params = new String[keys.length + 1];
params[0] = dstkey;
System.arraycopy(keys, 0, params, 1, keys.length);
sendCommand("SUNIONSTORE", params);
}
public void sdiff(String... keys) {
public void sdiff(final String... keys) {
sendCommand("SDIFF", keys);
}
public void sdiffstore(String dstkey, String... keys) {
public void sdiffstore(final String dstkey, final String... keys) {
String[] params = new String[keys.length + 1];
params[0] = dstkey;
System.arraycopy(keys, 0, params, 1, keys.length);
sendCommand("SDIFFSTORE", params);
}
public void srandmember(String key) {
public void srandmember(final String key) {
sendCommand("SRANDMEMBER", key);
}
public void zadd(String key, double score, String member) {
public void zadd(
final String key,
final double score,
final String member) {
sendCommand("ZADD", key, String.valueOf(score), member);
}
public void zrange(String key, int start, int end) {
public void zrange(final String key, final int start, final int end) {
sendCommand("ZRANGE", key, String.valueOf(start), String.valueOf(end));
}
public void zrem(String key, String member) {
public void zrem(final String key, final String member) {
sendCommand("ZREM", key, member);
}
public void zincrby(String key, double score, String member) {
public void zincrby(
final String key,
final double score,
final String member) {
sendCommand("ZINCRBY", key, String.valueOf(score), member);
}
public void zrank(String key, String member) {
public void zrank(final String key, final String member) {
sendCommand("ZRANK", key, member);
}
public void zrevrank(String key, String member) {
public void zrevrank(final String key, final String member) {
sendCommand("ZREVRANK", key, member);
}
public void zrevrange(String key, int start, int end) {
sendCommand("ZREVRANGE", key, String.valueOf(start), String
.valueOf(end));
public void zrevrange(
final String key,
final int start,
final int end) {
sendCommand(
"ZREVRANGE",
key,
String.valueOf(start),
String.valueOf(end));
}
public void zrangeWithScores(String key, int start, int end) {
sendCommand("ZRANGE", key, String.valueOf(start), String.valueOf(end),
public void zrangeWithScores(
final String key,
final int start,
final int end) {
sendCommand(
"ZRANGE",
key,
String.valueOf(start),
String.valueOf(end),
"WITHSCORES");
}
public void zrevrangeWithScores(String key, int start, int end) {
sendCommand("ZREVRANGE", key, String.valueOf(start), String
.valueOf(end), "WITHSCORES");
public void zrevrangeWithScores(
final String key,
final int start,
final int end) {
sendCommand(
"ZREVRANGE",
key,
String.valueOf(start),
String.valueOf(end),
"WITHSCORES");
}
public void zcard(String key) {
public void zcard(final String key) {
sendCommand("ZCARD", key);
}
public void zscore(String key, String member) {
public void zscore(final String key, final String member) {
sendCommand("ZSCORE", key, member);
}
@@ -376,7 +414,7 @@ public class Client extends Connection {
isInMulti = false;
}
public void watch(String key) {
public void watch(final String key) {
sendCommand("WATCH", key);
}
@@ -384,22 +422,25 @@ public class Client extends Connection {
sendCommand("UNWATCH");
}
public void sort(String key) {
public void sort(final String key) {
sendCommand("SORT", key);
}
public void sort(String key, SortingParams sortingParameters) {
public void sort(final String key, final SortingParams sortingParameters) {
List<String> args = new ArrayList<String>();
args.add(key);
args.addAll(sortingParameters.getParams());
sendCommand("SORT", args.toArray(new String[args.size()]));
}
public void blpop(String[] args) {
public void blpop(final String[] args) {
sendCommand("BLPOP", args);
}
public void sort(String key, SortingParams sortingParameters, String dstkey) {
public void sort(
final String key,
final SortingParams sortingParameters,
final String dstkey) {
List<String> args = new ArrayList<String>();
args.add(key);
args.addAll(sortingParameters.getParams());
@@ -408,23 +449,23 @@ public class Client extends Connection {
sendCommand("SORT", args.toArray(new String[args.size()]));
}
public void sort(String key, String dstkey) {
public void sort(final String key, final String dstkey) {
sendCommand("SORT", key, "STORE", dstkey);
}
public void brpop(String[] args) {
public void brpop(final String[] args) {
sendCommand("BRPOP", args);
}
public void auth(String password) {
public void auth(final String password) {
sendCommand("AUTH", password);
}
public void subscribe(String... channels) {
public void subscribe(final String... channels) {
sendCommand("SUBSCRIBE", channels);
}
public void publish(String channel, String message) {
public void publish(final String channel, final String message) {
sendCommand("PUBLISH", channel, message);
}
@@ -432,11 +473,11 @@ public class Client extends Connection {
sendCommand("UNSUBSCRIBE");
}
public void unsubscribe(String... channels) {
public void unsubscribe(final String... channels) {
sendCommand("UNSUBSCRIBE", channels);
}
public void psubscribe(String[] patterns) {
public void psubscribe(final String[] patterns) {
sendCommand("PSUBSCRIBE", patterns);
}
@@ -444,84 +485,135 @@ public class Client extends Connection {
sendCommand("PUNSUBSCRIBE");
}
public void punsubscribe(String... patterns) {
public void punsubscribe(final String... patterns) {
sendCommand("PUNSUBSCRIBE", patterns);
}
public void zcount(String key, double min, double max) {
public void zcount(final String key, final double min, final double max) {
sendCommand("ZCOUNT", key, String.valueOf(min), String.valueOf(max));
}
public void zrangeByScore(String key, double min, double max) {
sendCommand("ZRANGEBYSCORE", key, String.valueOf(min), String
.valueOf(max));
public void zrangeByScore(
final String key,
final double min,
final double max) {
sendCommand(
"ZRANGEBYSCORE",
key,
String.valueOf(min),
String.valueOf(max));
}
public void zrangeByScore(String key, String min, String max) {
public void zrangeByScore(
final String key,
final String min,
final String max) {
sendCommand("ZRANGEBYSCORE", key, min, max);
}
public void zrangeByScore(String key, double min, double max, int offset,
public void zrangeByScore(
final String key,
final double min,
final double max,
final int offset,
int count) {
sendCommand("ZRANGEBYSCORE", key, String.valueOf(min), String
.valueOf(max), "LIMIT", String.valueOf(offset), String
.valueOf(count));
sendCommand(
"ZRANGEBYSCORE",
key, String.valueOf(min),
String.valueOf(max),
"LIMIT",
String.valueOf(offset),
String.valueOf(count));
}
public void zrangeByScoreWithScores(String key, double min, double max) {
sendCommand("ZRANGEBYSCORE", key, String.valueOf(min), String
.valueOf(max), "WITHSCORES");
public void zrangeByScoreWithScores(
final String key,
final double min,
final double max) {
sendCommand(
"ZRANGEBYSCORE",
key,
String.valueOf(min),
String.valueOf(max),
"WITHSCORES");
}
public void zrangeByScoreWithScores(String key, double min, double max,
int offset, int count) {
sendCommand("ZRANGEBYSCORE", key, String.valueOf(min), String
.valueOf(max), "LIMIT", String.valueOf(offset), String
.valueOf(count), "WITHSCORES");
public void zrangeByScoreWithScores(
final String key,
final double min,
final double max,
final int offset,
final int count) {
sendCommand(
"ZRANGEBYSCORE",
key, String.valueOf(min),
String.valueOf(max),
"LIMIT",
String.valueOf(offset),
String.valueOf(count),
"WITHSCORES");
}
public void zremrangeByRank(String key, int start, int end) {
sendCommand("ZREMRANGEBYRANK", key, String.valueOf(start), String
.valueOf(end));
public void zremrangeByRank(
final String key,
final int start,
final int end) {
sendCommand(
"ZREMRANGEBYRANK",
key,
String.valueOf(start),
String.valueOf(end));
}
public void zremrangeByScore(String key, double start, double end) {
sendCommand("ZREMRANGEBYSCORE", key, String.valueOf(start), String
.valueOf(end));
public void zremrangeByScore(
final String key,
final double start,
final double end) {
sendCommand(
"ZREMRANGEBYSCORE",
key,
String.valueOf(start),
String.valueOf(end));
}
public void zunionstore(String dstkey, String... sets) {
String[] params = new String[sets.length + 2];
public void zunionstore(final String dstkey, final String... sets) {
final String[] params = new String[sets.length + 2];
params[0] = dstkey;
params[1] = String.valueOf(sets.length);
System.arraycopy(sets, 0, params, 2, sets.length);
sendCommand("ZUNIONSTORE", params);
}
public void zunionstore(String dstkey, ZParams params, String... sets) {
List<String> args = new ArrayList<String>();
public void zunionstore(
final String dstkey,
final ZParams params,
final String... sets) {
final List<String> args = new ArrayList<String>();
args.add(dstkey);
args.add(String.valueOf(sets.length));
for (String set : sets) {
for (final String set : sets) {
args.add(set);
}
args.addAll(params.getParams());
sendCommand("ZUNIONSTORE", args.toArray(new String[args.size()]));
}
public void zinterstore(String dstkey, String... sets) {
String[] params = new String[sets.length + 2];
public void zinterstore(final String dstkey, final String... sets) {
final String[] params = new String[sets.length + 2];
params[0] = dstkey;
params[1] = String.valueOf(sets.length);
System.arraycopy(sets, 0, params, 2, sets.length);
sendCommand("ZINTERSTORE", params);
}
public void zinterstore(String dstkey, ZParams params, String... sets) {
List<String> args = new ArrayList<String>();
public void zinterstore(
final String dstkey,
final ZParams params,
final String... sets) {
final List<String> args = new ArrayList<String>();
args.add(dstkey);
args.add(String.valueOf(sets.length));
for (String set : sets) {
for (final String set : sets) {
args.add(set);
}
args.addAll(params.getParams());
@@ -556,7 +648,7 @@ public class Client extends Connection {
sendCommand("MONITOR");
}
public void slaveof(String host, int port) {
public void slaveof(final String host, final int port) {
sendCommand("SLAVEOF", host, String.valueOf(port));
}
@@ -564,15 +656,15 @@ public class Client extends Connection {
sendCommand("SLAVEOF", "no", "one");
}
public void configGet(String pattern) {
public void configGet(final String pattern) {
sendCommand("CONFIG", "GET", pattern);
}
public void configSet(String parameter, String value) {
public void configSet(final String parameter, final String value) {
sendCommand("CONFIG", "SET", parameter, value);
}
public void strlen(String key) {
public void strlen(final String key) {
sendCommand("STRLEN", key);
}
@@ -580,28 +672,31 @@ public class Client extends Connection {
sendCommand("SYNC");
}
public void lpushx(String key, String string) {
public void lpushx(final String key, final String string) {
sendCommand("LPUSHX", key, string);
}
public void persist(String key) {
public void persist(final String key) {
sendCommand("PERSIST", key);
}
public void rpushx(String key, String string) {
public void rpushx(final String key, final String string) {
sendCommand("RPUSHX", key, string);
}
public void echo(String string) {
public void echo(final String string) {
sendCommand("ECHO", string);
}
public void linsert(String key, LIST_POSITION where, String pivot,
String value) {
public void linsert(
final String key,
final LIST_POSITION where,
final String pivot,
final String value) {
sendCommand("LINSERT", key, where.toString(), pivot, value);
}
public void debug(DebugParams params) {
public void debug(final DebugParams params) {
sendCommand("DEBUG", params.getCommand());
}
}

25
src/main/java/redis/clients/jedis/Connection.java
View File

@@ -24,7 +24,7 @@ public class Connection {
return timeout;
}
public void setTimeout(int timeout) {
public void setTimeout(final int timeout) {
this.timeout = timeout;
}
@@ -44,12 +44,12 @@ public class Connection {
}
}
public Connection(String host) {
public Connection(final String host) {
super();
this.host = host;
}
protected Connection sendCommand(String name, String... args) {
protected Connection sendCommand(final String name, final String... args) {
try {
connect();
} catch (UnknownHostException e) {
@@ -62,7 +62,7 @@ public class Connection {
return this;
}
public Connection(String host, int port) {
public Connection(final String host, final int port) {
super();
this.host = host;
this.port = port;
@@ -72,7 +72,7 @@ public class Connection {
return host;
}
public void setHost(String host) {
public void setHost(final String host) {
this.host = host;
}
@@ -80,7 +80,7 @@ public class Connection {
return port;
}
public void setPort(int port) {
public void setPort(final int port) {
this.port = port;
}
@@ -135,10 +135,19 @@ public class Connection {
return (Integer) protocol.read(inputStream);
}
@SuppressWarnings("unchecked")
public List<String> getMultiBulkReply() {
final List<byte[]> bresult = getBinaryMultiBulkReply();
final ArrayList<String> result = new ArrayList<String>(bresult.size());
for(final byte[] barray : bresult) {
result.add(new String(barray, Protocol.UTF8));
}
return result;
}
@SuppressWarnings("unchecked")
public List<byte[]> getBinaryMultiBulkReply() {
pipelinedCommands--;
return (List<String>) protocol.read(inputStream);
return (List<byte[]>) protocol.read(inputStream);
}
@SuppressWarnings("unchecked")