diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 0ffbb7451..7b602c1bc 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,13 +1,12 @@ -# -#Tue Oct 25 11:46:27 EEST 2011 -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.debug.lineNumber=generate +#Tue Nov 01 18:44:46 EET 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/build.gradle b/build.gradle index 71bb3ec94..136964259 100644 --- a/build.gradle +++ b/build.gradle @@ -100,7 +100,7 @@ dependencies { javaprojects = rootProject -sourceCompatibility = 1.6 +sourceCompatibility = 1.5 targetCompatibility = 1.5 javadoc { diff --git a/src/main/java/org/springframework/data/redis/cache/DefaultRedisCachePrefix.java b/src/main/java/org/springframework/data/redis/cache/DefaultRedisCachePrefix.java index ba670fa30..f36ce3bd9 100644 --- a/src/main/java/org/springframework/data/redis/cache/DefaultRedisCachePrefix.java +++ b/src/main/java/org/springframework/data/redis/cache/DefaultRedisCachePrefix.java @@ -37,7 +37,6 @@ public class DefaultRedisCachePrefix implements RedisCachePrefix { this.delimiter = delimiter; } - @Override public byte[] prefix(String cacheName) { return serializer.serialize((delimiter != null ? cacheName.concat(":") : cacheName)); } diff --git a/src/main/java/org/springframework/data/redis/cache/RedisCache.java b/src/main/java/org/springframework/data/redis/cache/RedisCache.java index ba054ce69..8d1e38ba0 100644 --- a/src/main/java/org/springframework/data/redis/cache/RedisCache.java +++ b/src/main/java/org/springframework/data/redis/cache/RedisCache.java @@ -67,12 +67,10 @@ class RedisCache implements Cache { this.cacheLockName = stringSerializer.serialize(name + "~lock"); } - @Override public String getName() { return name; } - @Override /** * {@inheritDoc} * @@ -83,10 +81,10 @@ class RedisCache implements Cache { return template; } - @Override + public ValueWrapper get(final Object key) { return (ValueWrapper) template.execute(new RedisCallback() { - @Override + public ValueWrapper doInRedis(RedisConnection connection) throws DataAccessException { waitForLock(connection); byte[] bs = connection.get(computeKey(key)); @@ -95,7 +93,7 @@ class RedisCache implements Cache { }, true); } - @Override + public void put(final Object key, final Object value) { final byte[] k = computeKey(key); @@ -112,7 +110,7 @@ class RedisCache implements Cache { }, true); } - @Override + public void evict(Object key) { final byte[] k = computeKey(key); @@ -126,7 +124,7 @@ class RedisCache implements Cache { }, true); } - @Override + public void clear() { // need to del each key individually template.execute(new RedisCallback() { diff --git a/src/main/java/org/springframework/data/redis/config/RedisCollectionParser.java b/src/main/java/org/springframework/data/redis/config/RedisCollectionParser.java index bd0fecb5c..f1d79c9bd 100644 --- a/src/main/java/org/springframework/data/redis/config/RedisCollectionParser.java +++ b/src/main/java/org/springframework/data/redis/config/RedisCollectionParser.java @@ -28,12 +28,12 @@ import org.w3c.dom.Element; */ public class RedisCollectionParser extends AbstractSimpleBeanDefinitionParser { - @Override + protected Class getBeanClass(Element element) { return RedisCollectionFactoryBean.class; } - @Override + protected void postProcess(BeanDefinitionBuilder beanDefinition, Element element) { String template = element.getAttribute("template"); if (StringUtils.hasText(template)) { @@ -41,7 +41,7 @@ public class RedisCollectionParser extends AbstractSimpleBeanDefinitionParser { } } - @Override + protected boolean isEligibleAttribute(String attributeName) { return super.isEligibleAttribute(attributeName) && (!"template".equals(attributeName)); } diff --git a/src/main/java/org/springframework/data/redis/config/RedisListenerContainerParser.java b/src/main/java/org/springframework/data/redis/config/RedisListenerContainerParser.java index d28f5ba77..5de0ac2e4 100644 --- a/src/main/java/org/springframework/data/redis/config/RedisListenerContainerParser.java +++ b/src/main/java/org/springframework/data/redis/config/RedisListenerContainerParser.java @@ -43,13 +43,13 @@ import org.w3c.dom.NamedNodeMap; */ class RedisListenerContainerParser extends AbstractSimpleBeanDefinitionParser { - @Override + protected Class getBeanClass(Element element) { return RedisMessageListenerContainer.class; } @SuppressWarnings("unchecked") - @Override + protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { // parse attributes (but replace the value assignment with references) NamedNodeMap attributes = element.getAttributes(); @@ -87,7 +87,7 @@ class RedisListenerContainerParser extends AbstractSimpleBeanDefinitionParser { } } - @Override + protected boolean isEligibleAttribute(String attributeName) { return (!"phase".equals(attributeName)); } @@ -132,7 +132,7 @@ class RedisListenerContainerParser extends AbstractSimpleBeanDefinitionParser { return ret; } - @Override + protected boolean shouldGenerateId() { return true; } diff --git a/src/main/java/org/springframework/data/redis/config/RedisNamespaceHandler.java b/src/main/java/org/springframework/data/redis/config/RedisNamespaceHandler.java index c9cf6d13a..8ba446e22 100644 --- a/src/main/java/org/springframework/data/redis/config/RedisNamespaceHandler.java +++ b/src/main/java/org/springframework/data/redis/config/RedisNamespaceHandler.java @@ -25,7 +25,7 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport; */ class RedisNamespaceHandler extends NamespaceHandlerSupport { - @Override + public void init() { registerBeanDefinitionParser("listener-container", new RedisListenerContainerParser()); registerBeanDefinitionParser("collection", new RedisCollectionParser()); diff --git a/src/main/java/org/springframework/data/redis/connection/DefaultMessage.java b/src/main/java/org/springframework/data/redis/connection/DefaultMessage.java index a32242964..0ea6f3138 100644 --- a/src/main/java/org/springframework/data/redis/connection/DefaultMessage.java +++ b/src/main/java/org/springframework/data/redis/connection/DefaultMessage.java @@ -32,17 +32,17 @@ public class DefaultMessage implements Message { this.channel = channel; } - @Override + public byte[] getChannel() { return (channel != null ? channel.clone() : null); } - @Override + public byte[] getBody() { return (body != null ? body.clone() : null); } - @Override + public String toString() { if (toString == null){ toString = new String(body); diff --git a/src/main/java/org/springframework/data/redis/connection/DefaultSortParameters.java b/src/main/java/org/springframework/data/redis/connection/DefaultSortParameters.java index 198b23760..c2d9894c3 100644 --- a/src/main/java/org/springframework/data/redis/connection/DefaultSortParameters.java +++ b/src/main/java/org/springframework/data/redis/connection/DefaultSortParameters.java @@ -68,7 +68,7 @@ public class DefaultSortParameters implements SortParameters { setGetPattern(getPattern); } - @Override + public byte[] getByPattern() { return byPattern; } @@ -77,7 +77,7 @@ public class DefaultSortParameters implements SortParameters { this.byPattern = byPattern; } - @Override + public Range getLimit() { return limit; } @@ -86,7 +86,7 @@ public class DefaultSortParameters implements SortParameters { this.limit = limit; } - @Override + public byte[][] getGetPattern() { return getPattern.toArray(new byte[getPattern.size()][]); } @@ -103,7 +103,7 @@ public class DefaultSortParameters implements SortParameters { } } - @Override + public Order getOrder() { return order; } @@ -112,7 +112,7 @@ public class DefaultSortParameters implements SortParameters { this.order = order; } - @Override + public Boolean isAlphabetic() { return alphabetic; } diff --git a/src/main/java/org/springframework/data/redis/connection/DefaultStringRedisConnection.java b/src/main/java/org/springframework/data/redis/connection/DefaultStringRedisConnection.java index da018c541..191b87cfc 100644 --- a/src/main/java/org/springframework/data/redis/connection/DefaultStringRedisConnection.java +++ b/src/main/java/org/springframework/data/redis/connection/DefaultStringRedisConnection.java @@ -637,518 +637,518 @@ public class DefaultStringRedisConnection implements StringRedisConnection { return result; } - @Override + public Long append(String key, String value) { return delegate.append(serialize(key), serialize(value)); } - @Override + public List bLPop(int timeout, String... keys) { return deserialize(delegate.bLPop(timeout, serializeMulti(keys))); } - @Override + public List bRPop(int timeout, String... keys) { return deserialize(delegate.bRPop(timeout, serializeMulti(keys))); } - @Override + public String bRPopLPush(int timeout, String srcKey, String dstKey) { return deserialize(delegate.bRPopLPush(timeout, serialize(srcKey), serialize(dstKey))); } - @Override + public Long decr(String key) { return delegate.decr(serialize(key)); } - @Override + public Long decrBy(String key, long value) { return delegate.decrBy(serialize(key), value); } - @Override + public Long del(String... keys) { return delegate.del(serializeMulti(keys)); } - @Override + public String echo(String message) { return deserialize(delegate.echo(serialize(message))); } - @Override + public Boolean exists(String key) { return delegate.exists(serialize(key)); } - @Override + public Boolean expire(String key, long seconds) { return delegate.expire(serialize(key), seconds); } - @Override + public Boolean expireAt(String key, long unixTime) { return delegate.expireAt(serialize(key), unixTime); } - @Override + public String get(String key) { return deserialize(delegate.get(serialize(key))); } - @Override + public Boolean getBit(String key, long offset) { return delegate.getBit(serialize(key), offset); } - @Override + public String getRange(String key, long start, long end) { return deserialize(delegate.getRange(serialize(key), start, end)); } - @Override + public String getSet(String key, String value) { return deserialize(delegate.getSet(serialize(key), serialize(value))); } - @Override + public Boolean hDel(String key, String field) { return delegate.hDel(serialize(key), serialize(field)); } - @Override + public Boolean hExists(String key, String field) { return delegate.hExists(serialize(key), serialize(field)); } - @Override + public String hGet(String key, String field) { return deserialize(delegate.hGet(serialize(key), serialize(field))); } - @Override + public Map hGetAll(String key) { throw new UnsupportedOperationException(); } - @Override + public Long hIncrBy(String key, String field, long delta) { return delegate.hIncrBy(serialize(key), serialize(field), delta); } - @Override + public Set hKeys(String key) { return deserialize(delegate.hKeys(serialize(key))); } - @Override + public Long hLen(String key) { return delegate.hLen(serialize(key)); } - @Override + public List hMGet(String key, String... fields) { return deserialize(delegate.hMGet(serialize(key), serializeMulti(fields))); } - @Override + public void hMSet(String key, Map hashes) { delegate.hMSet(serialize(key), serialize(hashes)); } - @Override + public Boolean hSet(String key, String field, String value) { return delegate.hSet(serialize(key), serialize(field), serialize(value)); } - @Override + public Boolean hSetNX(String key, String field, String value) { return delegate.hSetNX(serialize(key), serialize(field), serialize(value)); } - @Override + public List hVals(String key) { return deserialize(delegate.hVals(serialize(key))); } - @Override + public Long incr(String key) { return delegate.incr(serialize(key)); } - @Override + public Long incrBy(String key, long value) { return delegate.incrBy(serialize(key), value); } - @Override + public Collection keys(String pattern) { return deserialize(delegate.keys(serialize(pattern))); } - @Override + public String lIndex(String key, long index) { return deserialize(delegate.lIndex(serialize(key), index)); } - @Override + public Long lInsert(String key, Position where, String pivot, String value) { return delegate.lInsert(serialize(key), where, serialize(pivot), serialize(value)); } - @Override + public Long lLen(String key) { return delegate.lLen(serialize(key)); } - @Override + public String lPop(String key) { return deserialize(delegate.lPop(serialize(key))); } - @Override + public Long lPush(String key, String value) { return delegate.lPush(serialize(key), serialize(value)); } - @Override + public Long lPushX(String key, String value) { return delegate.lPushX(serialize(key), serialize(value)); } - @Override + public List lRange(String key, long start, long end) { return deserialize(delegate.lRange(serialize(key), start, end)); } - @Override + public Long lRem(String key, long count, String value) { return delegate.lRem(serialize(key), count, serialize(value)); } - @Override + public void lSet(String key, long index, String value) { delegate.lSet(serialize(key), index, serialize(value)); } - @Override + public void lTrim(String key, long start, long end) { delegate.lTrim(serialize(key), start, end); } - @Override + public List mGet(String... keys) { return deserialize(delegate.mGet(serializeMulti(keys))); } - @Override + public void mSetNXString(Map tuple) { delegate.mSetNX(serialize(tuple)); } - @Override + public void mSetString(Map tuple) { delegate.mSet(serialize(tuple)); } - @Override + public Boolean persist(String key) { return delegate.persist(serialize(key)); } - @Override + public Boolean move(String key, int dbIndex) { return delegate.move(serialize(key), dbIndex); } - @Override + public void pSubscribe(MessageListener listener, String... patterns) { delegate.pSubscribe(listener, serializeMulti(patterns)); } - @Override + public Long publish(String channel, String message) { return delegate.publish(serialize(channel), serialize(message)); } - @Override + public void rename(String oldName, String newName) { delegate.rename(serialize(oldName), serialize(newName)); } - @Override + public Boolean renameNX(String oldName, String newName) { return delegate.renameNX(serialize(oldName), serialize(newName)); } - @Override + public String rPop(String key) { return deserialize(delegate.rPop(serialize(key))); } - @Override + public String rPopLPush(String srcKey, String dstKey) { return deserialize(delegate.rPopLPush(serialize(srcKey), serialize(dstKey))); } - @Override + public Long rPush(String key, String value) { return delegate.rPush(serialize(key), serialize(value)); } - @Override + public Long rPushX(String key, String value) { return delegate.rPushX(serialize(key), serialize(value)); } - @Override + public Boolean sAdd(String key, String value) { return delegate.sAdd(serialize(key), serialize(value)); } - @Override + public Long sCard(String key) { return delegate.sCard(serialize(key)); } - @Override + public Set sDiff(String... keys) { return deserialize(delegate.sDiff(serializeMulti(keys))); } - @Override + public void sDiffStore(String destKey, String... keys) { delegate.sDiffStore(serialize(destKey), serializeMulti(keys)); } - @Override + public void set(String key, String value) { delegate.set(serialize(key), serialize(value)); } - @Override + public void setBit(String key, long offset, boolean value) { delegate.setBit(serialize(key), offset, value); } - @Override + public void setEx(String key, long seconds, String value) { delegate.setEx(serialize(key), seconds, serialize(value)); } - @Override + public Boolean setNX(String key, String value) { return delegate.setNX(serialize(key), serialize(value)); } - @Override + public void setRange(String key, String value, long start) { delegate.setRange(serialize(key), serialize(value), start); } - @Override + public Set sInter(String... keys) { return deserialize(delegate.sInter(serializeMulti(keys))); } - @Override + public void sInterStore(String destKey, String... keys) { delegate.sInterStore(serialize(destKey), serializeMulti(keys)); } - @Override + public Boolean sIsMember(String key, String value) { return delegate.sIsMember(serialize(key), serialize(value)); } - @Override + public Set sMembers(String key) { return deserialize(delegate.sMembers(serialize(key))); } - @Override + public Boolean sMove(String srcKey, String destKey, String value) { return delegate.sMove(serialize(srcKey), serialize(destKey), serialize(value)); } - @Override + public Long sort(String key, SortParameters params, String storeKey) { return delegate.sort(serialize(key), params, serialize(storeKey)); } - @Override + public List sort(String key, SortParameters params) { return deserialize(delegate.sort(serialize(key), params)); } - @Override + public String sPop(String key) { return deserialize(delegate.sPop(serialize(key))); } - @Override + public String sRandMember(String key) { return deserialize(delegate.sRandMember(serialize(key))); } - @Override + public Boolean sRem(String key, String value) { return delegate.sRem(serialize(key), serialize(value)); } - @Override + public Long strLen(String key) { return delegate.strLen(serialize(key)); } - @Override + public void subscribe(MessageListener listener, String... channels) { delegate.subscribe(listener, serializeMulti(channels)); } - @Override + public Set sUnion(String... keys) { return deserialize(delegate.sUnion(serializeMulti(keys))); } - @Override + public void sUnionStore(String destKey, String... keys) { delegate.sUnionStore(serialize(destKey), serializeMulti(keys)); } - @Override + public Long ttl(String key) { return delegate.ttl(serialize(key)); } - @Override + public DataType type(String key) { return delegate.type(serialize(key)); } - @Override + public Boolean zAdd(String key, double score, String value) { return delegate.zAdd(serialize(key), score, serialize(value)); } - @Override + public Long zCard(String key) { return delegate.zCard(serialize(key)); } - @Override + public Long zCount(String key, double min, double max) { return delegate.zCount(serialize(key), min, max); } - @Override + public Double zIncrBy(String key, double increment, String value) { return delegate.zIncrBy(serialize(key), increment, serialize(value)); } - @Override + public Long zInterStore(String destKey, Aggregate aggregate, int[] weights, String... sets) { return delegate.zInterStore(serialize(destKey), aggregate, weights, serializeMulti(sets)); } - @Override + public Long zInterStore(String destKey, String... sets) { return delegate.zInterStore(serialize(destKey), serializeMulti(sets)); } - @Override + public Set zRange(String key, long start, long end) { return deserialize(delegate.zRange(serialize(key), start, end)); } - @Override + public Set zRangeByScore(String key, double min, double max, long offset, long count) { return deserialize(delegate.zRangeByScore(serialize(key), min, max, offset, count)); } - @Override + public Set zRangeByScore(String key, double min, double max) { return deserialize(delegate.zRangeByScore(serialize(key), min, max)); } - @Override + public Set zRangeByScoreWithScores(String key, double min, double max, long offset, long count) { return deserializeTuple(delegate.zRangeByScoreWithScores(serialize(key), min, max, offset, count)); } - @Override + public Set zRangeByScoreWithScores(String key, double min, double max) { return deserializeTuple(delegate.zRangeByScoreWithScores(serialize(key), min, max)); } - @Override + public Set zRangeWithScores(String key, long start, long end) { return deserializeTuple(delegate.zRangeWithScores(serialize(key), start, end)); } - @Override + public Long zRank(String key, String value) { return delegate.zRank(serialize(key), serialize(value)); } - @Override + public Boolean zRem(String key, String value) { return delegate.zRem(serialize(key), serialize(value)); } - @Override + public Long zRemRange(String key, long start, long end) { return delegate.zRemRange(serialize(key), start, end); } - @Override + public Long zRemRangeByScore(String key, double min, double max) { return delegate.zRemRangeByScore(serialize(key), min, max); } - @Override + public Set zRevRange(String key, long start, long end) { return deserialize(delegate.zRevRange(serialize(key), start, end)); } - @Override + public Set zRevRangeWithScores(String key, long start, long end) { return deserializeTuple(delegate.zRevRangeWithScores(serialize(key), start, end)); } - @Override + public Long zRevRank(String key, String value) { return delegate.zRevRank(serialize(key), serialize(value)); } - @Override + public Double zScore(String key, String value) { return delegate.zScore(serialize(key), serialize(value)); } - @Override + public Long zUnionStore(String destKey, Aggregate aggregate, int[] weights, String... sets) { return delegate.zUnionStore(serialize(destKey), aggregate, weights, serializeMulti(sets)); } - @Override + public Long zUnionStore(String destKey, String... sets) { return delegate.zUnionStore(serialize(destKey), serializeMulti(sets)); } - @Override + public List closePipeline() { return delegate.closePipeline(); } - @Override + public boolean isPipelined() { return delegate.isPipelined(); } - @Override + public void openPipeline() { delegate.openPipeline(); } diff --git a/src/main/java/org/springframework/data/redis/connection/DefaultStringTuple.java b/src/main/java/org/springframework/data/redis/connection/DefaultStringTuple.java index d99b6bb6e..4c7248758 100644 --- a/src/main/java/org/springframework/data/redis/connection/DefaultStringTuple.java +++ b/src/main/java/org/springframework/data/redis/connection/DefaultStringTuple.java @@ -50,12 +50,12 @@ public class DefaultStringTuple extends DefaultTuple implements StringTuple { this.valueAsString = valueAsString; } - @Override + public String getValueAsString() { return valueAsString; } - @Override + public int hashCode() { final int prime = 31; int result = super.hashCode(); @@ -63,7 +63,7 @@ public class DefaultStringTuple extends DefaultTuple implements StringTuple { return result; } - @Override + public boolean equals(Object obj) { if (super.equals(obj)) { if (!(obj instanceof DefaultStringTuple)) diff --git a/src/main/java/org/springframework/data/redis/connection/DefaultTuple.java b/src/main/java/org/springframework/data/redis/connection/DefaultTuple.java index 3eb71b94d..ec83f45b2 100644 --- a/src/main/java/org/springframework/data/redis/connection/DefaultTuple.java +++ b/src/main/java/org/springframework/data/redis/connection/DefaultTuple.java @@ -41,17 +41,17 @@ public class DefaultTuple implements Tuple { this.value = value; } - @Override + public Double getScore() { return score; } - @Override + public byte[] getValue() { return value; } - @Override + public boolean equals(Object obj) { if (this == obj) return true; @@ -71,7 +71,7 @@ public class DefaultTuple implements Tuple { return true; } - @Override + public int hashCode() { final int prime = 31; int result = 1; @@ -80,7 +80,7 @@ public class DefaultTuple implements Tuple { return result; } - @Override + public int compareTo(Double o) { Double d = (score == null ? Double.valueOf(0.0d) : score); Double a = (o == null ? Double.valueOf(0.0d) : o); diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java index 281adef27..7899ab558 100644 --- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java +++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java @@ -119,7 +119,7 @@ public class JedisConnection implements RedisConnection { return new RedisSystemException("Unknown jedis exception", ex); } - @Override + public void close() throws DataAccessException { // return the connection to the pool try { @@ -158,12 +158,12 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Jedis getNativeConnection() { return jedis; } - @Override + public boolean isClosed() { try { return !jedis.isConnected(); @@ -172,17 +172,17 @@ public class JedisConnection implements RedisConnection { } } - @Override + public boolean isQueueing() { return client.isInMulti(); } - @Override + public boolean isPipelined() { return (pipeline != null); } - @Override + public void openPipeline() { if (pipeline == null) { pipeline = jedis.pipelined(); @@ -190,7 +190,7 @@ public class JedisConnection implements RedisConnection { } @SuppressWarnings("unchecked") - @Override + public List closePipeline() { if (pipeline != null) { List execute = pipeline.syncAndReturnAll(); @@ -201,7 +201,7 @@ public class JedisConnection implements RedisConnection { return Collections.emptyList(); } - @Override + public List sort(byte[] key, SortParameters params) { SortingParams sortParams = JedisUtils.convertSortParams(params); @@ -233,7 +233,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Long sort(byte[] key, SortParameters params, byte[] sortKey) { SortingParams sortParams = JedisUtils.convertSortParams(params); @@ -265,7 +265,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Long dbSize() { try { if (isQueueing()) { @@ -281,7 +281,7 @@ public class JedisConnection implements RedisConnection { } - @Override + public void flushDb() { try { if (isQueueing()) { @@ -296,7 +296,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public void flushAll() { try { if (isQueueing()) { @@ -311,7 +311,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public void bgSave() { try { if (isQueueing()) { @@ -327,7 +327,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public void bgWriteAof() { try { if (isQueueing()) { @@ -343,7 +343,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public void save() { try { if (isQueueing()) { @@ -359,7 +359,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public List getConfig(String param) { try { if (isQueueing()) { @@ -375,7 +375,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Properties info() { try { if (isQueueing()) { @@ -390,7 +390,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Long lastSave() { try { if (isQueueing()) { @@ -406,7 +406,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public void setConfig(String param, String value) { try { if (isQueueing()) { @@ -423,7 +423,7 @@ public class JedisConnection implements RedisConnection { } - @Override + public void resetConfigStats() { try { if (isQueueing()) { @@ -439,7 +439,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public void shutdown() { try { if (isQueueing()) { @@ -454,7 +454,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public byte[] echo(byte[] message) { try { if (isQueueing()) { @@ -470,7 +470,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public String ping() { try { if (isQueueing()) { @@ -485,7 +485,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Long del(byte[]... keys) { try { if (isQueueing()) { @@ -502,7 +502,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public void discard() { try { client.discard(); @@ -511,7 +511,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public List exec() { try { if (isPipelined()) { @@ -524,7 +524,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Boolean exists(byte[] key) { try { if (isQueueing()) { @@ -541,7 +541,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Boolean expire(byte[] key, long seconds) { try { if (isQueueing()) { @@ -558,7 +558,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Boolean expireAt(byte[] key, long unixTime) { try { if (isQueueing()) { @@ -575,7 +575,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Set keys(byte[] pattern) { try { if (isQueueing()) { @@ -592,7 +592,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public void multi() { if (isQueueing()) { return; @@ -608,7 +608,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Boolean persist(byte[] key) { try { if (isQueueing()) { @@ -625,7 +625,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Boolean move(byte[] key, int dbIndex) { try { if (isQueueing()) { @@ -642,7 +642,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public byte[] randomKey() { try { if (isQueueing()) { @@ -657,7 +657,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public void rename(byte[] oldName, byte[] newName) { try { if (isQueueing()) { @@ -674,7 +674,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Boolean renameNX(byte[] oldName, byte[] newName) { try { if (isQueueing()) { @@ -691,7 +691,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public void select(int dbIndex) { try { if (isQueueing()) { @@ -706,7 +706,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Long ttl(byte[] key) { try { if (isQueueing()) { @@ -723,7 +723,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public DataType type(byte[] key) { try { if (isQueueing()) { @@ -740,7 +740,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public void unwatch() { try { jedis.unwatch(); @@ -749,11 +749,10 @@ public class JedisConnection implements RedisConnection { } } - @Override + public void watch(byte[]... keys) { if (isQueueing()) { - // ignore (as watch not allowed in multi) - return; + throw new UnsupportedOperationException(); } try { for (byte[] key : keys) { @@ -773,7 +772,7 @@ public class JedisConnection implements RedisConnection { // String commands // - @Override + public byte[] get(byte[] key) { try { if (isQueueing()) { @@ -791,7 +790,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public void set(byte[] key, byte[] value) { try { if (isQueueing()) { @@ -809,7 +808,7 @@ public class JedisConnection implements RedisConnection { } - @Override + public byte[] getSet(byte[] key, byte[] value) { try { if (isQueueing()) { @@ -826,7 +825,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Long append(byte[] key, byte[] value) { try { if (isQueueing()) { @@ -843,7 +842,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public List mGet(byte[]... keys) { try { if (isQueueing()) { @@ -860,7 +859,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public void mSet(Map tuples) { try { if (isQueueing()) { @@ -877,7 +876,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public void mSetNX(Map tuples) { try { if (isQueueing()) { @@ -894,7 +893,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public void setEx(byte[] key, long time, byte[] value) { try { if (isQueueing()) { @@ -911,7 +910,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Boolean setNX(byte[] key, byte[] value) { try { if (isQueueing()) { @@ -928,7 +927,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public byte[] getRange(byte[] key, long start, long end) { try { if (isQueueing()) { @@ -945,7 +944,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Long decr(byte[] key) { try { if (isQueueing()) { @@ -962,7 +961,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Long decrBy(byte[] key, long value) { try { if (isQueueing()) { @@ -979,7 +978,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Long incr(byte[] key) { try { if (isQueueing()) { @@ -996,7 +995,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Long incrBy(byte[] key, long value) { try { if (isQueueing()) { @@ -1013,7 +1012,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Boolean getBit(byte[] key, long offset) { try { if (isQueueing()) { @@ -1028,7 +1027,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public void setBit(byte[] key, long offset, boolean value) { try { if (isQueueing()) { @@ -1043,7 +1042,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public void setRange(byte[] key, byte[] value, long start) { try { if (isQueueing()) { @@ -1058,7 +1057,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Long strLen(byte[] key) { try { if (isQueueing()) { @@ -1079,7 +1078,7 @@ public class JedisConnection implements RedisConnection { // List commands // - @Override + public Long lPush(byte[] key, byte[] value) { try { if (isQueueing()) { @@ -1096,7 +1095,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Long rPush(byte[] key, byte[] value) { try { if (isQueueing()) { @@ -1113,7 +1112,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public List bLPop(int timeout, byte[]... keys) { try { if (isQueueing()) { @@ -1130,7 +1129,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public List bRPop(int timeout, byte[]... keys) { try { if (isQueueing()) { @@ -1146,7 +1145,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public byte[] lIndex(byte[] key, long index) { try { if (isQueueing()) { @@ -1163,7 +1162,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Long lInsert(byte[] key, Position where, byte[] pivot, byte[] value) { try { if (isQueueing()) { @@ -1180,7 +1179,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Long lLen(byte[] key) { try { if (isQueueing()) { @@ -1197,7 +1196,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public byte[] lPop(byte[] key) { try { if (isQueueing()) { @@ -1214,7 +1213,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public List lRange(byte[] key, long start, long end) { try { if (isQueueing()) { @@ -1231,7 +1230,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Long lRem(byte[] key, long count, byte[] value) { try { if (isQueueing()) { @@ -1248,7 +1247,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public void lSet(byte[] key, long index, byte[] value) { try { if (isQueueing()) { @@ -1265,7 +1264,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public void lTrim(byte[] key, long start, long end) { try { if (isQueueing()) { @@ -1282,7 +1281,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public byte[] rPop(byte[] key) { try { if (isQueueing()) { @@ -1299,7 +1298,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public byte[] rPopLPush(byte[] srcKey, byte[] dstKey) { try { if (isQueueing()) { @@ -1316,7 +1315,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public byte[] bRPopLPush(int timeout, byte[] srcKey, byte[] dstKey) { try { if (isQueueing()) { @@ -1333,7 +1332,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Long lPushX(byte[] key, byte[] value) { try { if (isQueueing()) { @@ -1350,7 +1349,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Long rPushX(byte[] key, byte[] value) { try { if (isQueueing()) { @@ -1372,7 +1371,7 @@ public class JedisConnection implements RedisConnection { // Set commands // - @Override + public Boolean sAdd(byte[] key, byte[] value) { try { if (isQueueing()) { @@ -1389,7 +1388,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Long sCard(byte[] key) { try { if (isQueueing()) { @@ -1406,7 +1405,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Set sDiff(byte[]... keys) { try { if (isQueueing()) { @@ -1423,7 +1422,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public void sDiffStore(byte[] destKey, byte[]... keys) { try { if (isQueueing()) { @@ -1440,7 +1439,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Set sInter(byte[]... keys) { try { if (isQueueing()) { @@ -1457,7 +1456,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public void sInterStore(byte[] destKey, byte[]... keys) { try { if (isQueueing()) { @@ -1474,7 +1473,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Boolean sIsMember(byte[] key, byte[] value) { try { if (isQueueing()) { @@ -1491,7 +1490,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Set sMembers(byte[] key) { try { if (isQueueing()) { @@ -1508,7 +1507,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Boolean sMove(byte[] srcKey, byte[] destKey, byte[] value) { try { if (isQueueing()) { @@ -1525,7 +1524,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public byte[] sPop(byte[] key) { try { if (isQueueing()) { @@ -1542,7 +1541,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public byte[] sRandMember(byte[] key) { try { if (isQueueing()) { @@ -1559,7 +1558,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Boolean sRem(byte[] key, byte[] value) { try { if (isQueueing()) { @@ -1576,7 +1575,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Set sUnion(byte[]... keys) { try { if (isQueueing()) { @@ -1593,7 +1592,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public void sUnionStore(byte[] destKey, byte[]... keys) { try { if (isQueueing()) { @@ -1614,7 +1613,7 @@ public class JedisConnection implements RedisConnection { // ZSet commands // - @Override + public Boolean zAdd(byte[] key, double score, byte[] value) { try { if (isQueueing()) { @@ -1631,7 +1630,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Long zCard(byte[] key) { try { if (isQueueing()) { @@ -1648,7 +1647,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Long zCount(byte[] key, double min, double max) { try { if (isQueueing()) { @@ -1665,7 +1664,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Double zIncrBy(byte[] key, double increment, byte[] value) { try { if (isQueueing()) { @@ -1682,7 +1681,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Long zInterStore(byte[] destKey, Aggregate aggregate, int[] weights, byte[]... sets) { try { ZParams zparams = new ZParams().weights(weights).aggregate( @@ -1702,7 +1701,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Long zInterStore(byte[] destKey, byte[]... sets) { try { if (isQueueing()) { @@ -1719,7 +1718,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Set zRange(byte[] key, long start, long end) { try { if (isQueueing()) { @@ -1736,7 +1735,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Set zRangeWithScores(byte[] key, long start, long end) { try { if (isQueueing()) { @@ -1753,7 +1752,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Set zRangeByScore(byte[] key, double min, double max) { try { if (isQueueing()) { @@ -1770,7 +1769,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Set zRangeByScoreWithScores(byte[] key, double min, double max) { try { if (isQueueing()) { @@ -1787,7 +1786,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Set zRevRangeWithScores(byte[] key, long start, long end) { try { if (isQueueing()) { @@ -1804,7 +1803,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Set zRangeByScore(byte[] key, double min, double max, long offset, long count) { try { if (isQueueing()) { @@ -1821,7 +1820,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Set zRangeByScoreWithScores(byte[] key, double min, double max, long offset, long count) { try { if (isQueueing()) { @@ -1838,7 +1837,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Set zRevRangeByScore(byte[] key, double min, double max, long offset, long count) { try { if (isQueueing()) { @@ -1853,7 +1852,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Set zRevRangeByScore(byte[] key, double min, double max) { try { if (isQueueing()) { @@ -1868,7 +1867,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Set zRevRangeByScoreWithScores(byte[] key, double min, double max, long offset, long count) { try { if (isQueueing()) { @@ -1883,7 +1882,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Set zRevRangeByScoreWithScores(byte[] key, double min, double max) { try { if (isQueueing()) { @@ -1898,7 +1897,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Long zRank(byte[] key, byte[] value) { try { if (isQueueing()) { @@ -1915,7 +1914,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Boolean zRem(byte[] key, byte[] value) { try { if (isQueueing()) { @@ -1932,7 +1931,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Long zRemRange(byte[] key, long start, long end) { try { if (isQueueing()) { @@ -1949,7 +1948,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Long zRemRangeByScore(byte[] key, double min, double max) { try { if (isQueueing()) { @@ -1966,7 +1965,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Set zRevRange(byte[] key, long start, long end) { try { if (isQueueing()) { @@ -1983,7 +1982,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Long zRevRank(byte[] key, byte[] value) { try { if (isQueueing()) { @@ -2000,7 +1999,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Double zScore(byte[] key, byte[] value) { try { if (isQueueing()) { @@ -2017,7 +2016,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Long zUnionStore(byte[] destKey, Aggregate aggregate, int[] weights, byte[]... sets) { try { ZParams zparams = new ZParams().weights(weights).aggregate( @@ -2037,7 +2036,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Long zUnionStore(byte[] destKey, byte[]... sets) { try { if (isQueueing()) { @@ -2058,7 +2057,7 @@ public class JedisConnection implements RedisConnection { // Hash commands // - @Override + public Boolean hSet(byte[] key, byte[] field, byte[] value) { try { if (isQueueing()) { @@ -2075,7 +2074,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Boolean hSetNX(byte[] key, byte[] field, byte[] value) { try { if (isQueueing()) { @@ -2092,7 +2091,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Boolean hDel(byte[] key, byte[] field) { try { if (isQueueing()) { @@ -2109,7 +2108,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Boolean hExists(byte[] key, byte[] field) { try { if (isQueueing()) { @@ -2126,7 +2125,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public byte[] hGet(byte[] key, byte[] field) { try { if (isQueueing()) { @@ -2143,7 +2142,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Map hGetAll(byte[] key) { try { if (isQueueing()) { @@ -2160,7 +2159,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Long hIncrBy(byte[] key, byte[] field, long delta) { try { if (isQueueing()) { @@ -2177,7 +2176,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Set hKeys(byte[] key) { try { if (isQueueing()) { @@ -2194,7 +2193,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Long hLen(byte[] key) { try { if (isQueueing()) { @@ -2211,7 +2210,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public List hMGet(byte[] key, byte[]... fields) { try { if (isQueueing()) { @@ -2228,7 +2227,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public void hMSet(byte[] key, Map tuple) { try { if (isQueueing()) { @@ -2245,7 +2244,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public List hVals(byte[] key) { try { if (isQueueing()) { @@ -2266,7 +2265,7 @@ public class JedisConnection implements RedisConnection { // // Pub/Sub functionality // - @Override + public Long publish(byte[] channel, byte[] message) { try { if (isQueueing()) { @@ -2282,17 +2281,17 @@ public class JedisConnection implements RedisConnection { } } - @Override + public Subscription getSubscription() { return subscription; } - @Override + public boolean isSubscribed() { return (subscription != null && subscription.isAlive()); } - @Override + public void pSubscribe(MessageListener listener, byte[]... patterns) { if (isSubscribed()) { throw new RedisSubscribedConnectionException( @@ -2317,7 +2316,7 @@ public class JedisConnection implements RedisConnection { } } - @Override + public void subscribe(MessageListener listener, byte[]... channels) { if (isSubscribed()) { throw new RedisSubscribedConnectionException( diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactory.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactory.java index a5bd088e9..3474621a9 100644 --- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactory.java +++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactory.java @@ -150,7 +150,7 @@ public class JedisConnectionFactory implements InitializingBean, DisposableBean, null, dbIndex))); } - @Override + public DataAccessException translateExceptionIfPossible(RuntimeException ex) { return JedisUtils.convertJedisAccessException(ex); } diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisMessageListener.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisMessageListener.java index e9f373c06..e11874882 100644 --- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisMessageListener.java +++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisMessageListener.java @@ -35,32 +35,32 @@ class JedisMessageListener extends BinaryJedisPubSub { this.listener = listener; } - @Override + public void onMessage(byte[] channel, byte[] message) { listener.onMessage(new DefaultMessage(channel, message), null); } - @Override + public void onPMessage(byte[] pattern, byte[] channel, byte[] message) { listener.onMessage(new DefaultMessage(channel, message), pattern); } - @Override + public void onPSubscribe(byte[] pattern, int subscribedChannels) { // no-op } - @Override + public void onPUnsubscribe(byte[] pattern, int subscribedChannels) { // no-op } - @Override + public void onSubscribe(byte[] channel, int subscribedChannels) { // no-op } - @Override + public void onUnsubscribe(byte[] channel, int subscribedChannels) { // no-op } diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisSubscription.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisSubscription.java index b512a6057..9e3f13d9b 100644 --- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisSubscription.java +++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisSubscription.java @@ -34,18 +34,18 @@ class JedisSubscription extends AbstractSubscription { this.jedisPubSub = jedisPubSub; } - @Override + protected void doClose() { jedisPubSub.unsubscribe(); jedisPubSub.punsubscribe(); } - @Override + protected void doPsubscribe(byte[]... patterns) { jedisPubSub.psubscribe(patterns); } - @Override + protected void doPUnsubscribe(boolean all, byte[]... patterns) { if (all) { jedisPubSub.punsubscribe(); @@ -55,12 +55,12 @@ class JedisSubscription extends AbstractSubscription { } } - @Override + protected void doSubscribe(byte[]... channels) { jedisPubSub.subscribe(channels); } - @Override + protected void doUnsubscribe(boolean all, byte[]... channels) { if (all) { jedisPubSub.unsubscribe(); diff --git a/src/main/java/org/springframework/data/redis/connection/jredis/JredisConnection.java b/src/main/java/org/springframework/data/redis/connection/jredis/JredisConnection.java index debbe8599..e7d4a3a92 100644 --- a/src/main/java/org/springframework/data/redis/connection/jredis/JredisConnection.java +++ b/src/main/java/org/springframework/data/redis/connection/jredis/JredisConnection.java @@ -73,7 +73,7 @@ public class JredisConnection implements RedisConnection { return new RedisSystemException("Unknown JRedis exception", ex); } - @Override + public void close() throws RedisSystemException { isClosed = true; @@ -88,37 +88,37 @@ public class JredisConnection implements RedisConnection { } } - @Override + public JRedis getNativeConnection() { return jredis; } - @Override + public boolean isClosed() { return isClosed; } - @Override + public boolean isQueueing() { return false; } - @Override + public boolean isPipelined() { return false; } - @Override + public void openPipeline() { throw new UnsupportedOperationException("Pipelining not supported by JRedis"); } - @Override + public List closePipeline() { return Collections.emptyList(); } - @Override + public List sort(byte[] key, SortParameters params) { Sort sort = jredis.sort(JredisUtils.decode(key)); JredisUtils.applySortingParams(sort, params, null); @@ -129,7 +129,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Long sort(byte[] key, SortParameters params, byte[] storeKey) { Sort sort = jredis.sort(JredisUtils.decode(key)); JredisUtils.applySortingParams(sort, params, null); @@ -140,7 +140,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Long dbSize() { try { return jredis.dbsize(); @@ -149,7 +149,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public void flushDb() { try { jredis.flushdb(); @@ -158,7 +158,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public void flushAll() { try { jredis.flushall(); @@ -167,7 +167,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public byte[] echo(byte[] message) { try { return jredis.echo(message); @@ -176,7 +176,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public String ping() { try { jredis.ping(); @@ -186,7 +186,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public void bgSave() { try { jredis.bgsave(); @@ -195,7 +195,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public void bgWriteAof() { try { jredis.bgrewriteaof(); @@ -204,7 +204,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public void save() { try { jredis.save(); @@ -213,12 +213,12 @@ public class JredisConnection implements RedisConnection { } } - @Override + public List getConfig(String pattern) { throw new UnsupportedOperationException(); } - @Override + public Properties info() { try { return JredisUtils.info(jredis.info()); @@ -227,7 +227,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Long lastSave() { try { return jredis.lastsave(); @@ -236,22 +236,22 @@ public class JredisConnection implements RedisConnection { } } - @Override + public void setConfig(String param, String value) { throw new UnsupportedOperationException(); } - @Override + public void resetConfigStats() { throw new UnsupportedOperationException(); } - @Override + public void shutdown() { throw new UnsupportedOperationException(); } - @Override + public Long del(byte[]... keys) { try { return jredis.del(JredisUtils.decodeMultiple(keys)); @@ -260,7 +260,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public void discard() { try { jredis.discard(); @@ -269,12 +269,12 @@ public class JredisConnection implements RedisConnection { } } - @Override + public List exec() { throw new UnsupportedOperationException(); } - @Override + public Boolean exists(byte[] key) { try { return jredis.exists(JredisUtils.decode(key)); @@ -283,7 +283,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Boolean expire(byte[] key, long seconds) { try { return jredis.expire(JredisUtils.decode(key), (int) seconds); @@ -292,7 +292,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Boolean expireAt(byte[] key, long unixTime) { try { return jredis.expireat(JredisUtils.decode(key), unixTime); @@ -301,7 +301,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Set keys(byte[] pattern) { try { return JredisUtils.convertToSet(jredis.keys(JredisUtils.decode(pattern))); @@ -310,18 +310,18 @@ public class JredisConnection implements RedisConnection { } } - @Override + public void multi() { throw new UnsupportedOperationException(); } - @Override + public Boolean persist(byte[] key) { throw new UnsupportedOperationException(); } - @Override + public Boolean move(byte[] key, int dbIndex) { try { return jredis.move(JredisUtils.decode(key), dbIndex); @@ -330,7 +330,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public byte[] randomKey() { try { return JredisUtils.encode(jredis.randomkey()); @@ -339,7 +339,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public void rename(byte[] oldName, byte[] newName) { try { jredis.rename(JredisUtils.decode(oldName), JredisUtils.decode(newName)); @@ -348,7 +348,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Boolean renameNX(byte[] oldName, byte[] newName) { try { return jredis.renamenx(JredisUtils.decode(oldName), JredisUtils.decode(newName)); @@ -357,12 +357,12 @@ public class JredisConnection implements RedisConnection { } } - @Override + public void select(int dbIndex) { throw new UnsupportedOperationException(); } - @Override + public Long ttl(byte[] key) { try { return jredis.ttl(JredisUtils.decode(key)); @@ -371,7 +371,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public DataType type(byte[] key) { try { return JredisUtils.convertDataType(jredis.type(JredisUtils.decode(key))); @@ -380,12 +380,12 @@ public class JredisConnection implements RedisConnection { } } - @Override + public void unwatch() { throw new UnsupportedOperationException(); } - @Override + public void watch(byte[]... keys) { throw new UnsupportedOperationException(); } @@ -394,7 +394,7 @@ public class JredisConnection implements RedisConnection { // String operations // - @Override + public byte[] get(byte[] key) { try { return jredis.get(JredisUtils.decode(key)); @@ -403,7 +403,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public void set(byte[] key, byte[] value) { try { jredis.set(JredisUtils.decode(key), value); @@ -412,7 +412,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public byte[] getSet(byte[] key, byte[] value) { try { return jredis.getset(JredisUtils.decode(key), value); @@ -421,7 +421,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Long append(byte[] key, byte[] value) { try { return jredis.append(JredisUtils.decode(key), value); @@ -430,7 +430,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public List mGet(byte[]... keys) { try { return jredis.mget(JredisUtils.decodeMultiple(keys)); @@ -439,7 +439,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public void mSet(Map tuple) { try { jredis.mset(JredisUtils.decodeMap(tuple)); @@ -448,7 +448,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public void mSetNX(Map tuple) { try { jredis.msetnx(JredisUtils.decodeMap(tuple)); @@ -457,12 +457,12 @@ public class JredisConnection implements RedisConnection { } } - @Override + public void setEx(byte[] key, long seconds, byte[] value) { throw new UnsupportedOperationException(); } - @Override + public Boolean setNX(byte[] key, byte[] value) { try { return jredis.setnx(JredisUtils.decode(key), value); @@ -471,7 +471,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public byte[] getRange(byte[] key, long start, long end) { try { return jredis.substr(JredisUtils.decode(key), start, end); @@ -480,7 +480,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Long decr(byte[] key) { try { return jredis.decr(JredisUtils.decode(key)); @@ -489,7 +489,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Long decrBy(byte[] key, long value) { try { return jredis.decrby(JredisUtils.decode(key), (int) value); @@ -498,7 +498,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Long incr(byte[] key) { try { return jredis.incr(JredisUtils.decode(key)); @@ -507,7 +507,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Long incrBy(byte[] key, long value) { try { return jredis.incrby(JredisUtils.decode(key), (int) value); @@ -516,22 +516,22 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Boolean getBit(byte[] key, long offset) { throw new UnsupportedOperationException(); } - @Override + public void setBit(byte[] key, long offset, boolean value) { throw new UnsupportedOperationException(); } - @Override + public void setRange(byte[] key, byte[] value, long start) { throw new UnsupportedOperationException(); } - @Override + public Long strLen(byte[] key) { throw new UnsupportedOperationException(); } @@ -540,17 +540,17 @@ public class JredisConnection implements RedisConnection { // List commands // - @Override + public List bLPop(int timeout, byte[]... keys) { throw new UnsupportedOperationException(); } - @Override + public List bRPop(int timeout, byte[]... keys) { throw new UnsupportedOperationException(); } - @Override + public byte[] lIndex(byte[] key, long index) { try { return jredis.lindex(JredisUtils.decode(key), index); @@ -559,7 +559,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Long lLen(byte[] key) { try { return jredis.llen(JredisUtils.decode(key)); @@ -568,7 +568,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public byte[] lPop(byte[] key) { try { return jredis.lpop(JredisUtils.decode(key)); @@ -577,7 +577,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Long lPush(byte[] key, byte[] value) { try { jredis.lpush(JredisUtils.decode(key), value); @@ -587,7 +587,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public List lRange(byte[] key, long start, long end) { try { List lrange = jredis.lrange(JredisUtils.decode(key), start, end); @@ -598,7 +598,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Long lRem(byte[] key, long count, byte[] value) { try { return jredis.lrem(JredisUtils.decode(key), value, (int) count); @@ -607,7 +607,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public void lSet(byte[] key, long index, byte[] value) { try { jredis.lset(JredisUtils.decode(key), index, value); @@ -616,7 +616,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public void lTrim(byte[] key, long start, long end) { try { jredis.ltrim(JredisUtils.decode(key), start, end); @@ -625,7 +625,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public byte[] rPop(byte[] key) { try { return jredis.rpop(JredisUtils.decode(key)); @@ -634,7 +634,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public byte[] rPopLPush(byte[] srcKey, byte[] dstKey) { try { return jredis.rpoplpush(JredisUtils.decode(srcKey), JredisUtils.decode(dstKey)); @@ -643,7 +643,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Long rPush(byte[] key, byte[] value) { try { jredis.rpush(JredisUtils.decode(key), value); @@ -653,22 +653,22 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Long lInsert(byte[] key, Position where, byte[] pivot, byte[] value) { throw new UnsupportedOperationException(); } - @Override + public byte[] bRPopLPush(int timeout, byte[] srcKey, byte[] dstKey) { throw new UnsupportedOperationException(); } - @Override + public Long lPushX(byte[] key, byte[] value) { throw new UnsupportedOperationException(); } - @Override + public Long rPushX(byte[] key, byte[] value) { throw new UnsupportedOperationException(); } @@ -678,7 +678,7 @@ public class JredisConnection implements RedisConnection { // Set commands // - @Override + public Boolean sAdd(byte[] key, byte[] value) { try { return jredis.sadd(JredisUtils.decode(key), value); @@ -687,7 +687,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Long sCard(byte[] key) { try { return jredis.scard(JredisUtils.decode(key)); @@ -696,7 +696,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Set sDiff(byte[]... keys) { String destKey = JredisUtils.decode(keys[0]); String[] sets = JredisUtils.decodeMultiple(Arrays.copyOfRange(keys, 1, keys.length)); @@ -709,7 +709,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public void sDiffStore(byte[] destKey, byte[]... keys) { String destSet = JredisUtils.decode(destKey); String[] sets = JredisUtils.decodeMultiple(keys); @@ -721,7 +721,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Set sInter(byte[]... keys) { String set1 = JredisUtils.decode(keys[0]); String[] sets = JredisUtils.decodeMultiple(Arrays.copyOfRange(keys, 1, keys.length)); @@ -734,7 +734,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public void sInterStore(byte[] destKey, byte[]... keys) { String destSet = JredisUtils.decode(destKey); String[] sets = JredisUtils.decodeMultiple(keys); @@ -746,7 +746,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Boolean sIsMember(byte[] key, byte[] value) { try { return jredis.sismember(JredisUtils.decode(key), value); @@ -755,7 +755,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Set sMembers(byte[] key) { try { return new LinkedHashSet(jredis.smembers(JredisUtils.decode(key))); @@ -764,7 +764,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Boolean sMove(byte[] srcKey, byte[] destKey, byte[] value) { try { return jredis.smove(JredisUtils.decode(srcKey), JredisUtils.decode(destKey), value); @@ -773,7 +773,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public byte[] sPop(byte[] key) { try { return jredis.spop(JredisUtils.decode(key)); @@ -782,7 +782,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public byte[] sRandMember(byte[] key) { try { return jredis.srandmember(JredisUtils.decode(key)); @@ -791,7 +791,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Boolean sRem(byte[] key, byte[] value) { try { return jredis.srem(JredisUtils.decode(key), value); @@ -800,7 +800,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Set sUnion(byte[]... keys) { String set1 = JredisUtils.decode(keys[0]); String[] sets = JredisUtils.decodeMultiple(Arrays.copyOfRange(keys, 1, keys.length)); @@ -812,7 +812,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public void sUnionStore(byte[] destKey, byte[]... keys) { String destSet = JredisUtils.decode(destKey); String[] sets = JredisUtils.decodeMultiple(keys); @@ -829,7 +829,7 @@ public class JredisConnection implements RedisConnection { // ZSet commands // - @Override + public Boolean zAdd(byte[] key, double score, byte[] value) { try { return jredis.zadd(JredisUtils.decode(key), score, value); @@ -838,7 +838,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Long zCard(byte[] key) { try { return jredis.zcard(JredisUtils.decode(key)); @@ -847,7 +847,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Long zCount(byte[] key, double min, double max) { try { return jredis.zcount(JredisUtils.decode(key), min, max); @@ -856,7 +856,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Double zIncrBy(byte[] key, double increment, byte[] value) { try { return jredis.zincrby(JredisUtils.decode(key), increment, value); @@ -865,17 +865,17 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Long zInterStore(byte[] destKey, Aggregate aggregate, int[] weights, byte[]... sets) { throw new UnsupportedOperationException(); } - @Override + public Long zInterStore(byte[] destKey, byte[]... sets) { throw new UnsupportedOperationException(); } - @Override + public Set zRange(byte[] key, long start, long end) { try { return new LinkedHashSet(jredis.zrange(JredisUtils.decode(key), start, end)); @@ -884,12 +884,12 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Set zRangeWithScores(byte[] key, long start, long end) { throw new UnsupportedOperationException(); } - @Override + public Set zRangeByScore(byte[] key, double min, double max) { try { return new LinkedHashSet(jredis.zrangebyscore(JredisUtils.decode(key), min, max)); @@ -898,42 +898,42 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Set zRangeByScoreWithScores(byte[] key, double min, double max) { throw new UnsupportedOperationException(); } - @Override + public Set zRangeByScore(byte[] key, double min, double max, long offset, long count) { throw new UnsupportedOperationException(); } - @Override + public Set zRangeByScoreWithScores(byte[] key, double min, double max, long offset, long count) { throw new UnsupportedOperationException(); } - @Override + public Set zRevRangeByScore(byte[] key, double min, double max, long offset, long count) { throw new UnsupportedOperationException(); } - @Override + public Set zRevRangeByScore(byte[] key, double min, double max) { throw new UnsupportedOperationException(); } - @Override + public Set zRevRangeByScoreWithScores(byte[] key, double min, double max, long offset, long count) { throw new UnsupportedOperationException(); } - @Override + public Set zRevRangeByScoreWithScores(byte[] key, double min, double max) { throw new UnsupportedOperationException(); } - @Override + public Long zRank(byte[] key, byte[] value) { try { return jredis.zrank(JredisUtils.decode(key), value); @@ -942,7 +942,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Boolean zRem(byte[] key, byte[] value) { try { return jredis.zrem(JredisUtils.decode(key), value); @@ -951,7 +951,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Long zRemRange(byte[] key, long start, long end) { try { return jredis.zremrangebyrank(JredisUtils.decode(key), start, end); @@ -960,7 +960,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Long zRemRangeByScore(byte[] key, double min, double max) { try { return jredis.zremrangebyscore(JredisUtils.decode(key), min, max); @@ -969,7 +969,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Set zRevRange(byte[] key, long start, long end) { try { return new LinkedHashSet(jredis.zrevrange(JredisUtils.decode(key), start, end)); @@ -978,12 +978,12 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Set zRevRangeWithScores(byte[] key, long start, long end) { throw new UnsupportedOperationException(); } - @Override + public Long zRevRank(byte[] key, byte[] value) { try { return jredis.zrevrank(JredisUtils.decode(key), value); @@ -992,7 +992,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Double zScore(byte[] key, byte[] value) { try { return jredis.zscore(JredisUtils.decode(key), value); @@ -1006,17 +1006,17 @@ public class JredisConnection implements RedisConnection { // Hash commands // - @Override + public Long zUnionStore(byte[] destKey, Aggregate aggregate, int[] weights, byte[]... sets) { throw new UnsupportedOperationException(); } - @Override + public Long zUnionStore(byte[] destKey, byte[]... sets) { throw new UnsupportedOperationException(); } - @Override + public Boolean hDel(byte[] key, byte[] field) { try { return jredis.hdel(JredisUtils.decode(key), JredisUtils.decode(field)); @@ -1025,7 +1025,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Boolean hExists(byte[] key, byte[] field) { try { return jredis.hexists(JredisUtils.decode(key), JredisUtils.decode(field)); @@ -1034,7 +1034,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public byte[] hGet(byte[] key, byte[] field) { try { return jredis.hget(JredisUtils.decode(key), JredisUtils.decode(field)); @@ -1043,7 +1043,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Map hGetAll(byte[] key) { try { return JredisUtils.encodeMap(jredis.hgetall(JredisUtils.decode(key))); @@ -1052,12 +1052,12 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Long hIncrBy(byte[] key, byte[] field, long delta) { throw new UnsupportedOperationException(); } - @Override + public Set hKeys(byte[] key) { try { return new LinkedHashSet(JredisUtils.convertToSet(jredis.hkeys(JredisUtils.decode(key)))); @@ -1066,7 +1066,7 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Long hLen(byte[] key) { try { return jredis.hlen(JredisUtils.decode(key)); @@ -1075,17 +1075,17 @@ public class JredisConnection implements RedisConnection { } } - @Override + public List hMGet(byte[] key, byte[]... fields) { throw new UnsupportedOperationException(); } - @Override + public void hMSet(byte[] key, Map values) { throw new UnsupportedOperationException(); } - @Override + public Boolean hSet(byte[] key, byte[] field, byte[] value) { try { return jredis.hset(JredisUtils.decode(key), JredisUtils.decode(field), value); @@ -1094,12 +1094,12 @@ public class JredisConnection implements RedisConnection { } } - @Override + public Boolean hSetNX(byte[] key, byte[] field, byte[] value) { throw new UnsupportedOperationException(); } - @Override + public List hVals(byte[] key) { try { return jredis.hvals(JredisUtils.decode(key)); @@ -1112,27 +1112,27 @@ public class JredisConnection implements RedisConnection { // PubSub commands // - @Override + public Subscription getSubscription() { return null; } - @Override + public boolean isSubscribed() { return false; } - @Override + public void pSubscribe(MessageListener listener, byte[]... patterns) { throw new UnsupportedOperationException(); } - @Override + public Long publish(byte[] channel, byte[] message) { throw new UnsupportedOperationException(); } - @Override + public void subscribe(MessageListener listener, byte[]... channels) { throw new UnsupportedOperationException(); } diff --git a/src/main/java/org/springframework/data/redis/connection/jredis/JredisConnectionFactory.java b/src/main/java/org/springframework/data/redis/connection/jredis/JredisConnectionFactory.java index 873314b61..2bd3e0aa0 100644 --- a/src/main/java/org/springframework/data/redis/connection/jredis/JredisConnectionFactory.java +++ b/src/main/java/org/springframework/data/redis/connection/jredis/JredisConnectionFactory.java @@ -72,7 +72,7 @@ public class JredisConnectionFactory implements InitializingBean, DisposableBean this.connectionSpec = connectionSpec; } - @Override + public void afterPropertiesSet() { if (connectionSpec == null) { Assert.hasText(hostName); @@ -95,7 +95,7 @@ public class JredisConnectionFactory implements InitializingBean, DisposableBean } - @Override + public void destroy() { if (usePool && pool != null) { pool.quit(); @@ -104,7 +104,7 @@ public class JredisConnectionFactory implements InitializingBean, DisposableBean } - @Override + public RedisConnection getConnection() { return postProcessConnection(new JredisConnection((usePool ? pool : new JRedisClient(connectionSpec)))); } @@ -122,7 +122,7 @@ public class JredisConnectionFactory implements InitializingBean, DisposableBean return connection; } - @Override + public DataAccessException translateExceptionIfPossible(RuntimeException ex) { if (ex instanceof ClientRuntimeException) { return JredisUtils.convertJredisAccessException((ClientRuntimeException) ex); diff --git a/src/main/java/org/springframework/data/redis/connection/rjc/RjcConnection.java b/src/main/java/org/springframework/data/redis/connection/rjc/RjcConnection.java index 198fddaf8..19c7a6fc6 100644 --- a/src/main/java/org/springframework/data/redis/connection/rjc/RjcConnection.java +++ b/src/main/java/org/springframework/data/redis/connection/rjc/RjcConnection.java @@ -76,7 +76,7 @@ public class RjcConnection implements RedisConnection { return new RedisSystemException("Unknown rjc exception", ex); } - @Override + public void close() throws DataAccessException { isClosed = true; @@ -94,27 +94,27 @@ public class RjcConnection implements RedisConnection { } - @Override + public boolean isClosed() { return isClosed; } - @Override + public Session getNativeConnection() { return session; } - @Override + public boolean isQueueing() { return client.isInMulti(); } - @Override + public boolean isPipelined() { return (pipeline != null); } - @Override + public void openPipeline() { if (pipeline == null) { pipeline = client; @@ -122,7 +122,7 @@ public class RjcConnection implements RedisConnection { } @SuppressWarnings("unchecked") - @Override + public List closePipeline() { if (pipeline != null) { List execute = client.getAll(); @@ -133,7 +133,7 @@ public class RjcConnection implements RedisConnection { return Collections.emptyList(); } - @Override + public List sort(byte[] key, SortParameters params) { SortingParams sortParams = RjcUtils.convertSortParams(params); @@ -157,7 +157,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Long sort(byte[] key, SortParameters params, byte[] sortKey) { SortingParams sortParams = RjcUtils.convertSortParams(params); @@ -182,7 +182,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Long dbSize() { try { if (isPipelined()) { @@ -196,7 +196,7 @@ public class RjcConnection implements RedisConnection { } - @Override + public void flushDb() { try { if (isPipelined()) { @@ -209,7 +209,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public void flushAll() { try { if (isPipelined()) { @@ -222,7 +222,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public void bgSave() { try { if (isPipelined()) { @@ -235,7 +235,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public void bgWriteAof() { try { if (isPipelined()) { @@ -248,7 +248,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public void save() { try { if (isPipelined()) { @@ -261,7 +261,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public List getConfig(String param) { try { if (isPipelined()) { @@ -274,7 +274,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Properties info() { try { if (isPipelined()) { @@ -287,7 +287,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Long lastSave() { try { if (isPipelined()) { @@ -300,7 +300,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public void setConfig(String param, String value) { try { if (isPipelined()) { @@ -314,7 +314,7 @@ public class RjcConnection implements RedisConnection { } - @Override + public void resetConfigStats() { try { if (isPipelined()) { @@ -328,7 +328,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public void shutdown() { try { if (isPipelined()) { @@ -341,7 +341,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public byte[] echo(byte[] message) { String stringMsg = RjcUtils.decode(message); try { @@ -355,7 +355,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public String ping() { try { if (isPipelined()) { @@ -367,7 +367,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Long del(byte[]... keys) { String[] stringKeys = RjcUtils.decodeMultiple(keys); @@ -382,7 +382,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public void discard() { try { if (isPipelined()) { @@ -396,7 +396,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public List exec() { try { if (isPipelined()) { @@ -409,7 +409,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Boolean exists(byte[] key) { String stringKey = RjcUtils.decode(key); @@ -424,7 +424,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Boolean expire(byte[] key, long seconds) { String stringKey = RjcUtils.decode(key); @@ -439,7 +439,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Boolean expireAt(byte[] key, long unixTime) { String stringKey = RjcUtils.decode(key); @@ -454,7 +454,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Set keys(byte[] pattern) { String stringKey = RjcUtils.decode(pattern); @@ -469,7 +469,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public void multi() { if (isQueueing()) { return; @@ -485,7 +485,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Boolean persist(byte[] key) { String stringKey = RjcUtils.decode(key); @@ -500,7 +500,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Boolean move(byte[] key, int dbIndex) { String stringKey = RjcUtils.decode(key); @@ -515,7 +515,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public byte[] randomKey() { try { if (isPipelined()) { @@ -528,7 +528,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public void rename(byte[] oldName, byte[] newName) { String stringOldKey = RjcUtils.decode(oldName); String stringNewKey = RjcUtils.decode(newName); @@ -544,7 +544,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Boolean renameNX(byte[] oldName, byte[] newName) { String stringOldKey = RjcUtils.decode(oldName); String stringNewKey = RjcUtils.decode(newName); @@ -560,7 +560,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public void select(int dbIndex) { try { if (isPipelined()) { @@ -573,7 +573,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Long ttl(byte[] key) { String stringKey = RjcUtils.decode(key); @@ -588,7 +588,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public DataType type(byte[] key) { String stringKey = RjcUtils.decode(key); @@ -603,7 +603,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public void unwatch() { try { if (isPipelined()) { @@ -617,7 +617,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public void watch(byte[]... keys) { String[] stringKeys = RjcUtils.decodeMultiple(keys); @@ -641,7 +641,7 @@ public class RjcConnection implements RedisConnection { // String commands // - @Override + public byte[] get(byte[] key) { String stringKey = RjcUtils.decode(key); @@ -657,7 +657,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public void set(byte[] key, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -674,7 +674,7 @@ public class RjcConnection implements RedisConnection { } - @Override + public byte[] getSet(byte[] key, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -690,7 +690,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Long append(byte[] key, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -706,7 +706,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public List mGet(byte[]... keys) { String[] stringKeys = RjcUtils.decodeMultiple(keys); @@ -721,7 +721,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public void mSet(Map tuples) { String[] decodeMap = RjcUtils.flatten(tuples); @@ -736,7 +736,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public void mSetNX(Map tuples) { String[] decodeMap = RjcUtils.flatten(tuples); @@ -752,7 +752,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public void setEx(byte[] key, long time, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -768,7 +768,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Boolean setNX(byte[] key, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -784,7 +784,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public byte[] getRange(byte[] key, long start, long end) { String stringKey = RjcUtils.decode(key); @@ -799,7 +799,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Long decr(byte[] key) { String stringKey = RjcUtils.decode(key); try { @@ -814,7 +814,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Long decrBy(byte[] key, long value) { String stringKey = RjcUtils.decode(key); try { @@ -829,7 +829,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Long incr(byte[] key) { String stringKey = RjcUtils.decode(key); @@ -845,7 +845,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Long incrBy(byte[] key, long value) { String stringKey = RjcUtils.decode(key); @@ -861,7 +861,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Boolean getBit(byte[] key, long offset) { String stringKey = RjcUtils.decode(key); @@ -876,7 +876,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public void setBit(byte[] key, long offset, boolean value) { String stringKey = RjcUtils.decode(key); @@ -891,7 +891,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public void setRange(byte[] key, byte[] value, long offset) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -907,7 +907,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Long strLen(byte[] key) { String stringKey = RjcUtils.decode(key); @@ -926,7 +926,7 @@ public class RjcConnection implements RedisConnection { // List commands // - @Override + public Long lPush(byte[] key, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -942,7 +942,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Long rPush(byte[] key, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -959,7 +959,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public List bLPop(int timeout, byte[]... keys) { String[] stringKeys = RjcUtils.decodeMultiple(keys); @@ -974,7 +974,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public List bRPop(int timeout, byte[]... keys) { String[] stringKeys = RjcUtils.decodeMultiple(keys); @@ -989,7 +989,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public byte[] lIndex(byte[] key, long index) { String stringKey = RjcUtils.decode(key); @@ -1005,7 +1005,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Long lInsert(byte[] key, Position where, byte[] pivot, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -1023,7 +1023,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Long lLen(byte[] key) { String stringKey = RjcUtils.decode(key); @@ -1039,7 +1039,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public byte[] lPop(byte[] key) { String stringKey = RjcUtils.decode(key); @@ -1055,7 +1055,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public List lRange(byte[] key, long start, long end) { String stringKey = RjcUtils.decode(key); @@ -1071,7 +1071,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Long lRem(byte[] key, long count, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -1088,7 +1088,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public void lSet(byte[] key, long index, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -1104,7 +1104,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public void lTrim(byte[] key, long start, long end) { String stringKey = RjcUtils.decode(key); @@ -1120,7 +1120,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public byte[] rPop(byte[] key) { String stringKey = RjcUtils.decode(key); @@ -1136,7 +1136,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public byte[] rPopLPush(byte[] srcKey, byte[] dstKey) { String stringKey = RjcUtils.decode(srcKey); String stringDest = RjcUtils.decode(dstKey); @@ -1153,7 +1153,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public byte[] bRPopLPush(int timeout, byte[] srcKey, byte[] dstKey) { String stringKey = RjcUtils.decode(srcKey); String stringDest = RjcUtils.decode(dstKey); @@ -1169,7 +1169,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Long lPushX(byte[] key, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -1184,7 +1184,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Long rPushX(byte[] key, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -1204,7 +1204,7 @@ public class RjcConnection implements RedisConnection { // Set commands // - @Override + public Boolean sAdd(byte[] key, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -1221,7 +1221,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Long sCard(byte[] key) { String stringKey = RjcUtils.decode(key); @@ -1237,7 +1237,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Set sDiff(byte[]... keys) { String[] stringKeys = RjcUtils.decodeMultiple(keys); @@ -1253,7 +1253,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public void sDiffStore(byte[] destKey, byte[]... keys) { String stringKey = RjcUtils.decode(destKey); String[] stringKeys = RjcUtils.decodeMultiple(keys); @@ -1270,7 +1270,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Set sInter(byte[]... keys) { String[] stringKeys = RjcUtils.decodeMultiple(keys); try { @@ -1285,7 +1285,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public void sInterStore(byte[] destKey, byte[]... keys) { String stringKey = RjcUtils.decode(destKey); String[] stringKeys = RjcUtils.decodeMultiple(keys); @@ -1301,7 +1301,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Boolean sIsMember(byte[] key, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -1318,7 +1318,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Set sMembers(byte[] key) { String stringKey = RjcUtils.decode(key); try { @@ -1333,7 +1333,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Boolean sMove(byte[] srcKey, byte[] destKey, byte[] value) { String stringSrc = RjcUtils.decode(srcKey); String stringDest = RjcUtils.decode(destKey); @@ -1351,7 +1351,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public byte[] sPop(byte[] key) { String stringKey = RjcUtils.decode(key); try { @@ -1366,7 +1366,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public byte[] sRandMember(byte[] key) { String stringKey = RjcUtils.decode(key); try { @@ -1381,7 +1381,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Boolean sRem(byte[] key, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -1398,7 +1398,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Set sUnion(byte[]... keys) { String[] stringKeys = RjcUtils.decodeMultiple(keys); @@ -1414,7 +1414,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public void sUnionStore(byte[] destKey, byte[]... keys) { String stringKey = RjcUtils.decode(destKey); String[] stringKeys = RjcUtils.decodeMultiple(keys); @@ -1435,7 +1435,7 @@ public class RjcConnection implements RedisConnection { // ZSet commands // - @Override + public Boolean zAdd(byte[] key, double score, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -1451,7 +1451,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Long zCard(byte[] key) { String stringKey = RjcUtils.decode(key); @@ -1466,7 +1466,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Long zCount(byte[] key, double min, double max) { String stringKey = RjcUtils.decode(key); try { @@ -1481,7 +1481,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Double zIncrBy(byte[] key, double increment, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -1497,7 +1497,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Long zInterStore(byte[] destKey, Aggregate aggregate, int[] weights, byte[]... sets) { String stringKey = RjcUtils.decode(destKey); String[] stringKeys = RjcUtils.decodeMultiple(sets); @@ -1515,7 +1515,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Long zInterStore(byte[] destKey, byte[]... sets) { String stringKey = RjcUtils.decode(destKey); String[] stringKeys = RjcUtils.decodeMultiple(sets); @@ -1531,7 +1531,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Set zRange(byte[] key, long start, long end) { String stringKey = RjcUtils.decode(key); try { @@ -1546,7 +1546,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Set zRangeWithScores(byte[] key, long start, long end) { String stringKey = RjcUtils.decode(key); try { @@ -1561,7 +1561,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Set zRangeByScore(byte[] key, double min, double max) { String stringKey = RjcUtils.decode(key); String minString = Double.toString(min); @@ -1578,7 +1578,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Set zRangeByScore(byte[] key, double min, double max, long offset, long count) { String stringKey = RjcUtils.decode(key); String minString = Double.toString(min); @@ -1597,7 +1597,7 @@ public class RjcConnection implements RedisConnection { } - @Override + public Set zRevRangeByScore(byte[] key, double min, double max, long offset, long count) { String stringKey = RjcUtils.decode(key); String minString = Double.toString(min); @@ -1615,7 +1615,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Set zRevRangeByScore(byte[] key, double min, double max) { String stringKey = RjcUtils.decode(key); String minString = Double.toString(min); @@ -1632,7 +1632,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Set zRangeByScoreWithScores(byte[] key, double min, double max) { String stringKey = RjcUtils.decode(key); String minString = Double.toString(min); @@ -1649,7 +1649,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Set zRevRangeWithScores(byte[] key, long start, long end) { String stringKey = RjcUtils.decode(key); String minString = Long.toString(start); @@ -1667,7 +1667,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Set zRangeByScoreWithScores(byte[] key, double min, double max, long offset, long count) { String stringKey = RjcUtils.decode(key); String minString = Double.toString(min); @@ -1686,7 +1686,7 @@ public class RjcConnection implements RedisConnection { } - @Override + public Set zRevRangeByScoreWithScores(byte[] key, double min, double max, long offset, long count) { String stringKey = RjcUtils.decode(key); String minString = Double.toString(min); @@ -1705,7 +1705,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Set zRevRangeByScoreWithScores(byte[] key, double min, double max) { String stringKey = RjcUtils.decode(key); String minString = Double.toString(min); @@ -1723,7 +1723,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Long zRank(byte[] key, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -1739,7 +1739,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Boolean zRem(byte[] key, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -1755,7 +1755,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Long zRemRange(byte[] key, long start, long end) { String stringKey = RjcUtils.decode(key); try { @@ -1769,7 +1769,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Long zRemRangeByScore(byte[] key, double min, double max) { String stringKey = RjcUtils.decode(key); String minString = Double.toString(min); @@ -1786,7 +1786,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Set zRevRange(byte[] key, long start, long end) { String stringKey = RjcUtils.decode(key); try { @@ -1801,7 +1801,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Long zRevRank(byte[] key, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -1817,7 +1817,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Double zScore(byte[] key, byte[] value) { String stringKey = RjcUtils.decode(key); String stringValue = RjcUtils.decode(value); @@ -1833,7 +1833,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Long zUnionStore(byte[] destKey, Aggregate aggregate, int[] weights, byte[]... sets) { String stringKey = RjcUtils.decode(destKey); String[] stringKeys = RjcUtils.decodeMultiple(destKey); @@ -1851,7 +1851,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Long zUnionStore(byte[] destKey, byte[]... sets) { String stringKey = RjcUtils.decode(destKey); String[] stringKeys = RjcUtils.decodeMultiple(sets); @@ -1871,7 +1871,7 @@ public class RjcConnection implements RedisConnection { // Hash commands // - @Override + public Boolean hSet(byte[] key, byte[] field, byte[] value) { String stringKey = RjcUtils.decode(key); String stringField = RjcUtils.decode(field); @@ -1888,7 +1888,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Boolean hSetNX(byte[] key, byte[] field, byte[] value) { String stringKey = RjcUtils.decode(key); String stringField = RjcUtils.decode(field); @@ -1905,7 +1905,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Boolean hDel(byte[] key, byte[] field) { String stringKey = RjcUtils.decode(key); String stringField = RjcUtils.decode(field); @@ -1921,7 +1921,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Boolean hExists(byte[] key, byte[] field) { String stringKey = RjcUtils.decode(key); String stringField = RjcUtils.decode(field); @@ -1937,7 +1937,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public byte[] hGet(byte[] key, byte[] field) { String stringKey = RjcUtils.decode(key); String stringField = RjcUtils.decode(field); @@ -1953,7 +1953,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Map hGetAll(byte[] key) { String stringKey = RjcUtils.decode(key); @@ -1968,7 +1968,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Long hIncrBy(byte[] key, byte[] field, long delta) { String stringKey = RjcUtils.decode(key); String stringField = RjcUtils.decode(field); @@ -1984,7 +1984,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Set hKeys(byte[] key) { String stringKey = RjcUtils.decode(key); try { @@ -1998,7 +1998,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Long hLen(byte[] key) { String stringKey = RjcUtils.decode(key); try { @@ -2012,7 +2012,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public List hMGet(byte[] key, byte[]... fields) { String stringKey = RjcUtils.decode(key); String[] stringKeys = RjcUtils.decodeMultiple(fields); @@ -2028,7 +2028,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public void hMSet(byte[] key, Map tuple) { String stringKey = RjcUtils.decode(key); Map stringTuple = RjcUtils.decodeMap(tuple); @@ -2044,7 +2044,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public List hVals(byte[] key) { String stringKey = RjcUtils.decode(key); try { @@ -2063,7 +2063,7 @@ public class RjcConnection implements RedisConnection { // // Pub/Sub functionality // - @Override + public Long publish(byte[] channel, byte[] message) { try { if (isQueueing()) { @@ -2078,17 +2078,17 @@ public class RjcConnection implements RedisConnection { } } - @Override + public Subscription getSubscription() { return subscription; } - @Override + public boolean isSubscribed() { return (subscription != null && subscription.isAlive()); } - @Override + public void pSubscribe(MessageListener listener, byte[]... patterns) { if (isSubscribed()) { throw new RedisSubscribedConnectionException( @@ -2112,7 +2112,7 @@ public class RjcConnection implements RedisConnection { } } - @Override + public void subscribe(MessageListener listener, byte[]... channels) { if (isSubscribed()) { throw new RedisSubscribedConnectionException( diff --git a/src/main/java/org/springframework/data/redis/connection/rjc/RjcConnectionFactory.java b/src/main/java/org/springframework/data/redis/connection/rjc/RjcConnectionFactory.java index 96a087615..2ab910d90 100644 --- a/src/main/java/org/springframework/data/redis/connection/rjc/RjcConnectionFactory.java +++ b/src/main/java/org/springframework/data/redis/connection/rjc/RjcConnectionFactory.java @@ -85,7 +85,7 @@ public class RjcConnectionFactory implements InitializingBean, DisposableBean, R } } - @Override + public RedisConnection getConnection() { return postProcessConnection(new RjcConnection(dataSource.getConnection(), dbIndex)); } @@ -102,7 +102,7 @@ public class RjcConnectionFactory implements InitializingBean, DisposableBean, R return connection; } - @Override + public DataAccessException translateExceptionIfPossible(RuntimeException ex) { return RjcUtils.convertRjcAccessException(ex); } diff --git a/src/main/java/org/springframework/data/redis/connection/rjc/RjcMessageListener.java b/src/main/java/org/springframework/data/redis/connection/rjc/RjcMessageListener.java index 995f6ecb2..0402bfaf6 100644 --- a/src/main/java/org/springframework/data/redis/connection/rjc/RjcMessageListener.java +++ b/src/main/java/org/springframework/data/redis/connection/rjc/RjcMessageListener.java @@ -32,12 +32,12 @@ class RjcMessageListener implements MessageListener, PMessageListener { this.listener = messageListener; } - @Override + public void onMessage(String channel, String message) { listener.onMessage(new DefaultMessage(RjcUtils.encode(channel), RjcUtils.encode(message)), null); } - @Override + public void onMessage(String pattern, String channel, String message) { listener.onMessage(new DefaultMessage(RjcUtils.encode(channel), RjcUtils.encode(message)), RjcUtils.encode(pattern)); diff --git a/src/main/java/org/springframework/data/redis/connection/rjc/RjcSubscription.java b/src/main/java/org/springframework/data/redis/connection/rjc/RjcSubscription.java index a9882fb76..5abe7cebf 100644 --- a/src/main/java/org/springframework/data/redis/connection/rjc/RjcSubscription.java +++ b/src/main/java/org/springframework/data/redis/connection/rjc/RjcSubscription.java @@ -35,27 +35,27 @@ class RjcSubscription extends AbstractSubscription { subscriber.setPMessageListener(new RjcMessageListener(listener)); } - @Override + protected void doClose() { subscriber.close(); } - @Override + protected void doPsubscribe(byte[]... patterns) { subscriber.psubscribe(RjcUtils.decodeMultiple(patterns)); } - @Override + protected void doPUnsubscribe(boolean all, byte[]... patterns) { subscriber.punsubscribe(RjcUtils.decodeMultiple(patterns)); } - @Override + protected void doSubscribe(byte[]... channels) { subscriber.subscribe(RjcUtils.decodeMultiple(channels)); } - @Override + protected void doUnsubscribe(boolean all, byte[]... channels) { subscriber.punsubscribe(RjcUtils.decodeMultiple(channels)); } diff --git a/src/main/java/org/springframework/data/redis/connection/rjc/SingleDataSource.java b/src/main/java/org/springframework/data/redis/connection/rjc/SingleDataSource.java index 9fae4baa4..78c2f7637 100644 --- a/src/main/java/org/springframework/data/redis/connection/rjc/SingleDataSource.java +++ b/src/main/java/org/springframework/data/redis/connection/rjc/SingleDataSource.java @@ -31,7 +31,7 @@ class SingleDataSource implements DataSource { this.connection = connection; } - @Override + public RedisConnection getConnection() { return connection; } diff --git a/src/main/java/org/springframework/data/redis/connection/util/AbstractSubscription.java b/src/main/java/org/springframework/data/redis/connection/util/AbstractSubscription.java index 10eb6f4c3..7b2ebf992 100644 --- a/src/main/java/org/springframework/data/redis/connection/util/AbstractSubscription.java +++ b/src/main/java/org/springframework/data/redis/connection/util/AbstractSubscription.java @@ -98,26 +98,26 @@ public abstract class AbstractSubscription implements Subscription { */ protected abstract void doClose(); - @Override + public MessageListener getListener() { return listener; } - @Override + public Collection getChannels() { synchronized (channels) { return clone(channels); } } - @Override + public Collection getPatterns() { synchronized (patterns) { return clone(patterns); } } - @Override + public void pSubscribe(byte[]... patterns) { checkPulse(); @@ -130,13 +130,13 @@ public abstract class AbstractSubscription implements Subscription { doPsubscribe(patterns); } - @Override + public void pUnsubscribe() { pUnsubscribe((byte[][]) null); } - @Override + public void subscribe(byte[]... channels) { checkPulse(); @@ -149,12 +149,12 @@ public abstract class AbstractSubscription implements Subscription { doSubscribe(channels); } - @Override + public void unsubscribe() { unsubscribe((byte[][]) null); } - @Override + public void pUnsubscribe(byte[]... patts) { if (!isAlive()) { return; @@ -184,7 +184,7 @@ public abstract class AbstractSubscription implements Subscription { } } - @Override + public void unsubscribe(byte[]... chans) { if (!isAlive()) { return; @@ -214,7 +214,7 @@ public abstract class AbstractSubscription implements Subscription { } } - @Override + public boolean isAlive() { return alive.get(); } diff --git a/src/main/java/org/springframework/data/redis/connection/util/ByteArrayWrapper.java b/src/main/java/org/springframework/data/redis/connection/util/ByteArrayWrapper.java index 4f074b665..2160bc07c 100644 --- a/src/main/java/org/springframework/data/redis/connection/util/ByteArrayWrapper.java +++ b/src/main/java/org/springframework/data/redis/connection/util/ByteArrayWrapper.java @@ -32,7 +32,7 @@ public class ByteArrayWrapper { this.hashCode = Arrays.hashCode(array); } - @Override + public boolean equals(Object obj) { if (obj instanceof ByteArrayWrapper) { return Arrays.equals(array, ((ByteArrayWrapper) obj).array); @@ -41,7 +41,7 @@ public class ByteArrayWrapper { return false; } - @Override + public int hashCode() { return hashCode; } diff --git a/src/main/java/org/springframework/data/redis/core/AbstractOperations.java b/src/main/java/org/springframework/data/redis/core/AbstractOperations.java index 2a0e27433..85013edc3 100644 --- a/src/main/java/org/springframework/data/redis/core/AbstractOperations.java +++ b/src/main/java/org/springframework/data/redis/core/AbstractOperations.java @@ -44,7 +44,7 @@ abstract class AbstractOperations { this.key = key; } - @Override + public final V doInRedis(RedisConnection connection) { byte[] result = inRedis(rawKey(key), connection); return deserializeValue(result); diff --git a/src/main/java/org/springframework/data/redis/core/DefaultBoundHashOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultBoundHashOperations.java index 6e5acb8d7..4ae4bdfa4 100644 --- a/src/main/java/org/springframework/data/redis/core/DefaultBoundHashOperations.java +++ b/src/main/java/org/springframework/data/redis/core/DefaultBoundHashOperations.java @@ -41,72 +41,72 @@ class DefaultBoundHashOperations extends DefaultBoundKeyOperations this.ops = operations.opsForHash(); } - @Override + public void delete(Object key) { ops.delete(getKey(), key); } - @Override + public HV get(Object key) { return ops.get(getKey(), key); } - @Override + public Collection multiGet(Collection hashKeys) { return ops.multiGet(getKey(), hashKeys); } - @Override + public RedisOperations getOperations() { return ops.getOperations(); } - @Override + public boolean hasKey(Object key) { return ops.hasKey(getKey(), key); } - @Override + public Long increment(HK key, long delta) { return ops.increment(getKey(), key, delta); } - @Override + public Set keys() { return ops.keys(getKey()); } - @Override + public Long size() { return ops.size(getKey()); } - @Override + public void putAll(Map m) { ops.putAll(getKey(), m); } - @Override + public void put(HK key, HV value) { ops.put(getKey(), key, value); } - @Override + public Boolean putIfAbsent(HK key, HV value) { return ops.putIfAbsent(getKey(), key, value); } - @Override + public Collection values() { return ops.values(getKey()); } - @Override + public Map entries() { return ops.entries(getKey()); } - @Override + public DataType getType() { return DataType.HASH; } diff --git a/src/main/java/org/springframework/data/redis/core/DefaultBoundKeyOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultBoundKeyOperations.java index ec0f8d43e..bb64ccab9 100644 --- a/src/main/java/org/springframework/data/redis/core/DefaultBoundKeyOperations.java +++ b/src/main/java/org/springframework/data/redis/core/DefaultBoundKeyOperations.java @@ -35,7 +35,7 @@ abstract class DefaultBoundKeyOperations implements BoundKeyOperations { this.ops = operations; } - @Override + public K getKey() { return key; } @@ -44,27 +44,27 @@ abstract class DefaultBoundKeyOperations implements BoundKeyOperations { this.key = key; } - @Override + public Boolean expire(long timeout, TimeUnit unit) { return ops.expire(key, timeout, unit); } - @Override + public Boolean expireAt(Date date) { return ops.expireAt(key, date); } - @Override + public Long getExpire() { return ops.getExpire(key); } - @Override + public Boolean persist() { return ops.persist(key); } - @Override + public void rename(K newKey) { if (ops.hasKey(key)) { ops.rename(key, newKey); diff --git a/src/main/java/org/springframework/data/redis/core/DefaultBoundListOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultBoundListOperations.java index 117816bf1..bacfa599a 100644 --- a/src/main/java/org/springframework/data/redis/core/DefaultBoundListOperations.java +++ b/src/main/java/org/springframework/data/redis/core/DefaultBoundListOperations.java @@ -42,92 +42,92 @@ class DefaultBoundListOperations extends DefaultBoundKeyOperations impl } - @Override + public RedisOperations getOperations() { return ops.getOperations(); } - @Override + public V index(long index) { return ops.index(getKey(), index); } - @Override + public V leftPop() { return ops.leftPop(getKey()); } - @Override + public V leftPop(long timeout, TimeUnit unit) { return ops.leftPop(getKey(), timeout, unit); } - @Override + public Long leftPush(V value) { return ops.leftPush(getKey(), value); } - @Override + public Long leftPushIfPresent(V value) { return ops.leftPushIfPresent(getKey(), value); } - @Override + public Long leftPush(V pivot, V value) { return ops.leftPush(getKey(), pivot, value); } - @Override + public Long size() { return ops.size(getKey()); } - @Override + public List range(long start, long end) { return ops.range(getKey(), start, end); } - @Override + public Long remove(long i, Object value) { return ops.remove(getKey(), i, value); } - @Override + public V rightPop() { return ops.rightPop(getKey()); } - @Override + public V rightPop(long timeout, TimeUnit unit) { return ops.rightPop(getKey(), timeout, unit); } - @Override + public Long rightPushIfPresent(V value) { return ops.rightPushIfPresent(getKey(), value); } - @Override + public Long rightPush(V value) { return ops.rightPush(getKey(), value); } - @Override + public Long rightPush(V pivot, V value) { return ops.rightPush(getKey(), pivot, value); } - @Override + public void trim(long start, long end) { ops.trim(getKey(), start, end); } - @Override + public void set(long index, V value) { ops.set(getKey(), index, value); } - @Override + public DataType getType() { return DataType.LIST; } diff --git a/src/main/java/org/springframework/data/redis/core/DefaultBoundSetOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultBoundSetOperations.java index 0bfc7d9dd..9848e71f9 100644 --- a/src/main/java/org/springframework/data/redis/core/DefaultBoundSetOperations.java +++ b/src/main/java/org/springframework/data/redis/core/DefaultBoundSetOperations.java @@ -42,114 +42,114 @@ class DefaultBoundSetOperations extends DefaultBoundKeyOperations imple this.ops = operations.opsForSet(); } - @Override + public Boolean add(V value) { return ops.add(getKey(), value); } - @Override + public Set diff(K key) { return ops.difference(getKey(), key); } - @Override + public Set diff(Collection keys) { return ops.difference(getKey(), keys); } - @Override + public void diffAndStore(K key, K destKey) { ops.differenceAndStore(getKey(), key, destKey); } - @Override + public void diffAndStore(Collection keys, K destKey) { ops.differenceAndStore(getKey(), keys, destKey); } - @Override + public RedisOperations getOperations() { return ops.getOperations(); } - @Override + public Set intersect(K key) { return ops.intersect(getKey(), key); } - @Override + public Set intersect(Collection keys) { return ops.intersect(getKey(), keys); } - @Override + public void intersectAndStore(K key, K destKey) { ops.intersectAndStore(getKey(), key, destKey); } - @Override + public void intersectAndStore(Collection keys, K destKey) { ops.intersectAndStore(getKey(), keys, destKey); } - @Override + public Boolean isMember(Object o) { return ops.isMember(getKey(), o); } - @Override + public Set members() { return ops.members(getKey()); } - @Override + public Boolean move(K destKey, V value) { return ops.move(getKey(), value, destKey); } - @Override + public V randomMember() { return ops.randomMember(getKey()); } - @Override + public Boolean remove(Object o) { return ops.remove(getKey(), o); } - @Override + public V pop() { return ops.pop(getKey()); } - @Override + public Long size() { return ops.size(getKey()); } - @Override + public Set union(K key) { return ops.union(getKey(), key); } - @Override + public Set union(Collection keys) { return ops.union(getKey(), keys); } - @Override + public void unionAndStore(K key, K destKey) { ops.unionAndStore(getKey(), key, destKey); } - @Override + public void unionAndStore(Collection keys, K destKey) { ops.unionAndStore(getKey(), keys, destKey); } - @Override + public DataType getType() { return DataType.SET; } diff --git a/src/main/java/org/springframework/data/redis/core/DefaultBoundValueOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultBoundValueOperations.java index b5030c330..e1575d6ab 100644 --- a/src/main/java/org/springframework/data/redis/core/DefaultBoundValueOperations.java +++ b/src/main/java/org/springframework/data/redis/core/DefaultBoundValueOperations.java @@ -37,62 +37,62 @@ class DefaultBoundValueOperations extends DefaultBoundKeyOperations imp this.ops = operations.opsForValue(); } - @Override + public V get() { return ops.get(getKey()); } - @Override + public V getAndSet(V value) { return ops.getAndSet(getKey(), value); } - @Override + public Long increment(long delta) { return ops.increment(getKey(), delta); } - @Override + public Integer append(String value) { return ops.append(getKey(), value); } - @Override + public String get(long start, long end) { return ops.get(getKey(), start, end); } - @Override + public void set(V value, long timeout, TimeUnit unit) { ops.set(getKey(), value, timeout, unit); } - @Override + public void set(V value) { ops.set(getKey(), value); } - @Override + public Boolean setIfAbsent(V value) { return ops.setIfAbsent(getKey(), value); } - @Override + public void set(V value, long offset) { ops.set(getKey(), value, offset); } - @Override + public Long size() { return ops.size(getKey()); } - @Override + public RedisOperations getOperations() { return ops.getOperations(); } - @Override + public DataType getType() { return DataType.STRING; } diff --git a/src/main/java/org/springframework/data/redis/core/DefaultBoundZSetOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultBoundZSetOperations.java index 5763abc98..968da3221 100644 --- a/src/main/java/org/springframework/data/redis/core/DefaultBoundZSetOperations.java +++ b/src/main/java/org/springframework/data/redis/core/DefaultBoundZSetOperations.java @@ -42,122 +42,122 @@ class DefaultBoundZSetOperations extends DefaultBoundKeyOperations impl this.ops = operations.opsForZSet(); } - @Override + public Boolean add(V value, double score) { return ops.add(getKey(), value, score); } - @Override + public Double incrementScore(V value, double delta) { return ops.incrementScore(getKey(), value, delta); } - @Override + public RedisOperations getOperations() { return ops.getOperations(); } - @Override + public void intersectAndStore(K destKey, K otherKey) { ops.intersectAndStore(getKey(), otherKey, destKey); } - @Override + public void intersectAndStore(Collection otherKeys, K destKey) { ops.intersectAndStore(getKey(), otherKeys, destKey); } - @Override + public Set range(long start, long end) { return ops.range(getKey(), start, end); } - @Override + public Set rangeByScore(double min, double max) { return ops.rangeByScore(getKey(), min, max); } - @Override + public Set> rangeByScoreWithScores(double min, double max) { return ops.rangeByScoreWithScores(getKey(), min, max); } - @Override + public Set> rangeWithScores(long start, long end) { return ops.rangeWithScores(getKey(), start, end); } - @Override + public Set reverseRangeByScore(double min, double max) { return ops.reverseRangeByScore(getKey(), min, max); } - @Override + public Set> reverseRangeByScoreWithScores(double min, double max) { return ops.reverseRangeByScoreWithScores(getKey(), min, max); } - @Override + public Set> reverseRangeWithScores(long start, long end) { return ops.reverseRangeWithScores(getKey(), start, end); } - @Override + public Long rank(Object o) { return ops.rank(getKey(), o); } - @Override + public Long reverseRank(Object o) { return ops.reverseRank(getKey(), o); } - @Override + public Double score(Object o) { return ops.score(getKey(), o); } - @Override + public Boolean remove(Object o) { return ops.remove(getKey(), o); } - @Override + public void removeRange(long start, long end) { ops.removeRange(getKey(), start, end); } - @Override + public void removeRangeByScore(double min, double max) { ops.removeRangeByScore(getKey(), min, max); } - @Override + public Set reverseRange(long start, long end) { return ops.reverseRange(getKey(), start, end); } - @Override + public Long count(double min, double max) { return ops.count(getKey(), min, max); } - @Override + public Long size() { return ops.size(getKey()); } - @Override + public void unionAndStore(K otherKey, K destKey) { ops.unionAndStore(getKey(), otherKey, destKey); } - @Override + public void unionAndStore(Collection otherKeys, K destKey) { ops.unionAndStore(getKey(), otherKeys, destKey); } - @Override + public DataType getType() { return DataType.ZSET; } diff --git a/src/main/java/org/springframework/data/redis/core/DefaultHashOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultHashOperations.java index 5a7a49f42..c2186d258 100644 --- a/src/main/java/org/springframework/data/redis/core/DefaultHashOperations.java +++ b/src/main/java/org/springframework/data/redis/core/DefaultHashOperations.java @@ -37,13 +37,13 @@ class DefaultHashOperations extends AbstractOperations imp } @SuppressWarnings("unchecked") - @Override + public HV get(K key, Object hashKey) { final byte[] rawKey = rawKey(key); final byte[] rawHashKey = rawHashKey(hashKey); byte[] rawHashValue = execute(new RedisCallback() { - @Override + public byte[] doInRedis(RedisConnection connection) { return connection.hGet(rawKey, rawHashKey); } @@ -52,26 +52,26 @@ class DefaultHashOperations extends AbstractOperations imp return (HV) deserializeHashValue(rawHashValue); } - @Override + public Boolean hasKey(K key, Object hashKey) { final byte[] rawKey = rawKey(key); final byte[] rawHashKey = rawHashKey(hashKey); return execute(new RedisCallback() { - @Override + public Boolean doInRedis(RedisConnection connection) { return connection.hExists(rawKey, rawHashKey); } }, true); } - @Override + public Long increment(K key, HK hashKey, final long delta) { final byte[] rawKey = rawKey(key); final byte[] rawHashKey = rawHashKey(hashKey); return execute(new RedisCallback() { - @Override + public Long doInRedis(RedisConnection connection) { return connection.hIncrBy(rawKey, rawHashKey, delta); } @@ -79,12 +79,12 @@ class DefaultHashOperations extends AbstractOperations imp } - @Override + public Set keys(K key) { final byte[] rawKey = rawKey(key); Set rawValues = execute(new RedisCallback>() { - @Override + public Set doInRedis(RedisConnection connection) { return connection.hKeys(rawKey); } @@ -93,19 +93,19 @@ class DefaultHashOperations extends AbstractOperations imp return deserializeHashKeys(rawValues); } - @Override + public Long size(K key) { final byte[] rawKey = rawKey(key); return execute(new RedisCallback() { - @Override + public Long doInRedis(RedisConnection connection) { return connection.hLen(rawKey); } }, true); } - @Override + public void putAll(K key, Map m) { if (m.isEmpty()) { return; @@ -120,7 +120,7 @@ class DefaultHashOperations extends AbstractOperations imp } execute(new RedisCallback() { - @Override + public Object doInRedis(RedisConnection connection) { connection.hMSet(rawKey, hashes); return null; @@ -129,7 +129,7 @@ class DefaultHashOperations extends AbstractOperations imp } - @Override + public Collection multiGet(K key, Collection fields) { if (fields.isEmpty()) { return Collections.emptyList(); @@ -145,7 +145,7 @@ class DefaultHashOperations extends AbstractOperations imp } List rawValues = execute(new RedisCallback>() { - @Override + public List doInRedis(RedisConnection connection) { return connection.hMGet(rawKey, rawHashKeys); } @@ -154,14 +154,14 @@ class DefaultHashOperations extends AbstractOperations imp return deserializeHashValues(rawValues); } - @Override + public void put(K key, HK hashKey, HV value) { final byte[] rawKey = rawKey(key); final byte[] rawHashKey = rawHashKey(hashKey); final byte[] rawHashValue = rawHashValue(value); execute(new RedisCallback() { - @Override + public Object doInRedis(RedisConnection connection) { connection.hSet(rawKey, rawHashKey, rawHashValue); return null; @@ -169,14 +169,14 @@ class DefaultHashOperations extends AbstractOperations imp }, true); } - @Override + public Boolean putIfAbsent(K key, HK hashKey, HV value) { final byte[] rawKey = rawKey(key); final byte[] rawHashKey = rawHashKey(hashKey); final byte[] rawHashValue = rawHashValue(value); return execute(new RedisCallback() { - @Override + public Boolean doInRedis(RedisConnection connection) { return connection.hSetNX(rawKey, rawHashKey, rawHashValue); } @@ -184,12 +184,12 @@ class DefaultHashOperations extends AbstractOperations imp } - @Override + public List values(K key) { final byte[] rawKey = rawKey(key); List rawValues = execute(new RedisCallback>() { - @Override + public List doInRedis(RedisConnection connection) { return connection.hVals(rawKey); } @@ -198,13 +198,13 @@ class DefaultHashOperations extends AbstractOperations imp return deserializeHashValues(rawValues); } - @Override + public void delete(K key, Object hashKey) { final byte[] rawKey = rawKey(key); final byte[] rawHashKey = rawHashKey(hashKey); execute(new RedisCallback() { - @Override + public Object doInRedis(RedisConnection connection) { connection.hDel(rawKey, rawHashKey); return null; @@ -212,12 +212,12 @@ class DefaultHashOperations extends AbstractOperations imp }, true); } - @Override + public Map entries(K key) { final byte[] rawKey = rawKey(key); Map entries = execute(new RedisCallback>() { - @Override + public Map doInRedis(RedisConnection connection) { return connection.hGetAll(rawKey); } diff --git a/src/main/java/org/springframework/data/redis/core/DefaultListOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultListOperations.java index 37aef6419..47db5bed0 100644 --- a/src/main/java/org/springframework/data/redis/core/DefaultListOperations.java +++ b/src/main/java/org/springframework/data/redis/core/DefaultListOperations.java @@ -33,32 +33,32 @@ class DefaultListOperations extends AbstractOperations implements Li super(template); } - @Override + public V index(K key, final long index) { return execute(new ValueDeserializingRedisCallback(key) { - @Override + protected byte[] inRedis(byte[] rawKey, RedisConnection connection) { return connection.lIndex(rawKey, index); } }, true); } - @Override + public V leftPop(K key) { return execute(new ValueDeserializingRedisCallback(key) { - @Override + protected byte[] inRedis(byte[] rawKey, RedisConnection connection) { return connection.lPop(rawKey); } }, true); } - @Override + public V leftPop(K key, long timeout, TimeUnit unit) { final int tm = (int) unit.toSeconds(timeout); return execute(new ValueDeserializingRedisCallback(key) { - @Override + protected byte[] inRedis(byte[] rawKey, RedisConnection connection) { List lPop = connection.bLPop(tm, rawKey); return (CollectionUtils.isEmpty(lPop) ? null : lPop.get(1)); @@ -66,94 +66,94 @@ class DefaultListOperations extends AbstractOperations implements Li }, true); } - @Override + public Long leftPush(K key, V value) { final byte[] rawKey = rawKey(key); final byte[] rawValue = rawValue(value); return execute(new RedisCallback() { - @Override + public Long doInRedis(RedisConnection connection) { return connection.lPush(rawKey, rawValue); } }, true); } - @Override + public Long leftPushIfPresent(K key, V value) { final byte[] rawKey = rawKey(key); final byte[] rawValue = rawValue(value); return execute(new RedisCallback() { - @Override + public Long doInRedis(RedisConnection connection) { return connection.lPushX(rawKey, rawValue); } }, true); } - @Override + public Long leftPush(K key, V pivot, V value) { final byte[] rawKey = rawKey(key); final byte[] rawPivot = rawValue(pivot); final byte[] rawValue = rawValue(value); return execute(new RedisCallback() { - @Override + public Long doInRedis(RedisConnection connection) { return connection.lInsert(rawKey, Position.BEFORE, rawPivot, rawValue); } }, true); } - @Override + public Long size(K key) { final byte[] rawKey = rawKey(key); return execute(new RedisCallback() { - @Override + public Long doInRedis(RedisConnection connection) { return connection.lLen(rawKey); } }, true); } - @Override + public List range(K key, final long start, final long end) { final byte[] rawKey = rawKey(key); return execute(new RedisCallback>() { @SuppressWarnings("unchecked") - @Override + public List doInRedis(RedisConnection connection) { return deserializeValues(connection.lRange(rawKey, start, end)); } }, true); } - @Override + public Long remove(K key, final long count, Object value) { final byte[] rawKey = rawKey(key); final byte[] rawValue = rawValue(value); return execute(new RedisCallback() { - @Override + public Long doInRedis(RedisConnection connection) { return connection.lRem(rawKey, count, rawValue); } }, true); } - @Override + public V rightPop(K key) { return execute(new ValueDeserializingRedisCallback(key) { - @Override + protected byte[] inRedis(byte[] rawKey, RedisConnection connection) { return connection.rPop(rawKey); } }, true); } - @Override + public V rightPop(K key, long timeout, TimeUnit unit) { final int tm = (int) unit.toSeconds(timeout); return execute(new ValueDeserializingRedisCallback(key) { - @Override + protected byte[] inRedis(byte[] rawKey, RedisConnection connection) { List bRPop = connection.bRPop(tm, rawKey); return (CollectionUtils.isEmpty(bRPop) ? null : bRPop.get(1)); @@ -161,74 +161,74 @@ class DefaultListOperations extends AbstractOperations implements Li }, true); } - @Override + public Long rightPush(K key, V value) { final byte[] rawKey = rawKey(key); final byte[] rawValue = rawValue(value); return execute(new RedisCallback() { - @Override + public Long doInRedis(RedisConnection connection) { return connection.rPush(rawKey, rawValue); } }, true); } - @Override + public Long rightPushIfPresent(K key, V value) { final byte[] rawKey = rawKey(key); final byte[] rawValue = rawValue(value); return execute(new RedisCallback() { - @Override + public Long doInRedis(RedisConnection connection) { return connection.rPushX(rawKey, rawValue); } }, true); } - @Override + public Long rightPush(K key, V pivot, V value) { final byte[] rawKey = rawKey(key); final byte[] rawPivot = rawValue(pivot); final byte[] rawValue = rawValue(value); return execute(new RedisCallback() { - @Override + public Long doInRedis(RedisConnection connection) { return connection.lInsert(rawKey, Position.AFTER, rawPivot, rawValue); } }, true); } - @Override + public V rightPopAndLeftPush(K sourceKey, K destinationKey) { final byte[] rawDestKey = rawKey(destinationKey); return execute(new ValueDeserializingRedisCallback(sourceKey) { - @Override + protected byte[] inRedis(byte[] rawSourceKey, RedisConnection connection) { return connection.rPopLPush(rawSourceKey, rawDestKey); } }, true); } - @Override + public V rightPopAndLeftPush(K sourceKey, K destinationKey, long timeout, TimeUnit unit) { final int tm = (int) unit.toSeconds(timeout); final byte[] rawDestKey = rawKey(destinationKey); return execute(new ValueDeserializingRedisCallback(sourceKey) { - @Override + protected byte[] inRedis(byte[] rawSourceKey, RedisConnection connection) { return connection.bRPopLPush(tm, rawSourceKey, rawDestKey); } }, true); } - @Override + public void set(K key, final long index, V value) { final byte[] rawValue = rawValue(value); execute(new ValueDeserializingRedisCallback(key) { - @Override + protected byte[] inRedis(byte[] rawKey, RedisConnection connection) { connection.lSet(rawKey, index, rawValue); return null; @@ -236,10 +236,10 @@ class DefaultListOperations extends AbstractOperations implements Li }, true); } - @Override + public void trim(K key, final long start, final long end) { execute(new ValueDeserializingRedisCallback(key) { - @Override + protected byte[] inRedis(byte[] rawKey, RedisConnection connection) { connection.lTrim(rawKey, start, end); return null; diff --git a/src/main/java/org/springframework/data/redis/core/DefaultSetOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultSetOperations.java index 6159ee92d..4e330c4f9 100644 --- a/src/main/java/org/springframework/data/redis/core/DefaultSetOperations.java +++ b/src/main/java/org/springframework/data/redis/core/DefaultSetOperations.java @@ -32,29 +32,29 @@ class DefaultSetOperations extends AbstractOperations implements Set super(template); } - @Override + public Boolean add(K key, V value) { final byte[] rawKey = rawKey(key); final byte[] rawValue = rawValue(value); return execute(new RedisCallback() { - @Override + public Boolean doInRedis(RedisConnection connection) { return connection.sAdd(rawKey, rawValue); } }, true); } - @Override + public Set difference(K key, K otherKey) { return difference(key, Collections.singleton(otherKey)); } @SuppressWarnings("unchecked") - @Override + public Set difference(final K key, final Collection otherKeys) { final byte[][] rawKeys = rawKeys(key, otherKeys); Set rawValues = execute(new RedisCallback>() { - @Override + public Set doInRedis(RedisConnection connection) { return connection.sDiff(rawKeys); } @@ -63,17 +63,17 @@ class DefaultSetOperations extends AbstractOperations implements Set return deserializeValues(rawValues); } - @Override + public void differenceAndStore(K key, K otherKey, K destKey) { differenceAndStore(key, Collections.singleton(otherKey), destKey); } - @Override + public void differenceAndStore(final K key, final Collection otherKeys, K destKey) { final byte[][] rawKeys = rawKeys(key, otherKeys); final byte[] rawDestKey = rawKey(destKey); execute(new RedisCallback() { - @Override + public Object doInRedis(RedisConnection connection) { connection.sDiffStore(rawDestKey, rawKeys); return null; @@ -81,17 +81,17 @@ class DefaultSetOperations extends AbstractOperations implements Set }, true); } - @Override + public Set intersect(K key, K otherKey) { return intersect(key, Collections.singleton(otherKey)); } @SuppressWarnings("unchecked") - @Override + public Set intersect(K key, Collection otherKeys) { final byte[][] rawKeys = rawKeys(key, otherKeys); Set rawValues = execute(new RedisCallback>() { - @Override + public Set doInRedis(RedisConnection connection) { return connection.sInter(rawKeys); } @@ -100,17 +100,17 @@ class DefaultSetOperations extends AbstractOperations implements Set return deserializeValues(rawValues); } - @Override + public void intersectAndStore(K key, K otherKey, K destKey) { intersectAndStore(key, Collections.singleton(otherKey), destKey); } - @Override + public void intersectAndStore(K key, Collection otherKeys, K destKey) { final byte[][] rawKeys = rawKeys(key, otherKeys); final byte[] rawDestKey = rawKey(destKey); execute(new RedisCallback() { - @Override + public Object doInRedis(RedisConnection connection) { connection.sInterStore(rawDestKey, rawKeys); return null; @@ -118,12 +118,12 @@ class DefaultSetOperations extends AbstractOperations implements Set }, true); } - @Override + public Boolean isMember(K key, Object o) { final byte[] rawKey = rawKey(key); final byte[] rawValue = rawValue(o); return execute(new RedisCallback() { - @Override + public Boolean doInRedis(RedisConnection connection) { return connection.sIsMember(rawKey, rawValue); } @@ -131,11 +131,11 @@ class DefaultSetOperations extends AbstractOperations implements Set } @SuppressWarnings("unchecked") - @Override + public Set members(K key) { final byte[] rawKey = rawKey(key); Set rawValues = execute(new RedisCallback>() { - @Override + public Set doInRedis(RedisConnection connection) { return connection.sMembers(rawKey); } @@ -144,75 +144,75 @@ class DefaultSetOperations extends AbstractOperations implements Set return deserializeValues(rawValues); } - @Override + public Boolean move(K key, V value, K destKey) { final byte[] rawKey = rawKey(key); final byte[] rawDestKey = rawKey(destKey); final byte[] rawValue = rawValue(value); return execute(new RedisCallback() { - @Override + public Boolean doInRedis(RedisConnection connection) { return connection.sMove(rawKey, rawDestKey, rawValue); } }, true); } - @Override + public V randomMember(K key) { return execute(new ValueDeserializingRedisCallback(key) { - @Override + protected byte[] inRedis(byte[] rawKey, RedisConnection connection) { return connection.randomKey(); } }, true); } - @Override + public Boolean remove(K key, Object o) { final byte[] rawKey = rawKey(key); final byte[] rawValue = rawValue(o); return execute(new RedisCallback() { - @Override + public Boolean doInRedis(RedisConnection connection) { return connection.sRem(rawKey, rawValue); } }, true); } - @Override + public V pop(K key) { return execute(new ValueDeserializingRedisCallback(key) { - @Override + protected byte[] inRedis(byte[] rawKey, RedisConnection connection) { return connection.sPop(rawKey); } }, true); } - @Override + public Long size(K key) { final byte[] rawKey = rawKey(key); return execute(new RedisCallback() { - @Override + public Long doInRedis(RedisConnection connection) { return connection.sCard(rawKey); } }, true); } - @Override + public Set union(K key, K otherKey) { return union(key, Collections.singleton(otherKey)); } @SuppressWarnings("unchecked") - @Override + public Set union(K key, Collection otherKeys) { final byte[][] rawKeys = rawKeys(key, otherKeys); Set rawValues = execute(new RedisCallback>() { - @Override + public Set doInRedis(RedisConnection connection) { return connection.sUnion(rawKeys); } @@ -221,17 +221,17 @@ class DefaultSetOperations extends AbstractOperations implements Set return deserializeValues(rawValues); } - @Override + public void unionAndStore(K key, K otherKey, K destKey) { unionAndStore(key, Collections.singleton(otherKey), destKey); } - @Override + public void unionAndStore(K key, Collection otherKeys, K destKey) { final byte[][] rawKeys = rawKeys(key, otherKeys); final byte[] rawDestKey = rawKey(destKey); execute(new RedisCallback() { - @Override + public Object doInRedis(RedisConnection connection) { connection.sUnionStore(rawDestKey, rawKeys); return null; diff --git a/src/main/java/org/springframework/data/redis/core/DefaultTypedTuple.java b/src/main/java/org/springframework/data/redis/core/DefaultTypedTuple.java index d26630d28..2776b46e5 100644 --- a/src/main/java/org/springframework/data/redis/core/DefaultTypedTuple.java +++ b/src/main/java/org/springframework/data/redis/core/DefaultTypedTuple.java @@ -38,17 +38,17 @@ class DefaultTypedTuple implements TypedTuple { this.value = value; } - @Override + public Double getScore() { return score; } - @Override + public V getValue() { return value; } - @Override + public int hashCode() { final int prime = 31; int result = 1; @@ -57,7 +57,7 @@ class DefaultTypedTuple implements TypedTuple { return result; } - @Override + public boolean equals(Object obj) { if (this == obj) return true; @@ -81,7 +81,7 @@ class DefaultTypedTuple implements TypedTuple { return true; } - @Override + public int compareTo(Double o) { Double d = (score == null ? Double.valueOf(0) : score); Double a = (o == null ? Double.valueOf(0) : o); diff --git a/src/main/java/org/springframework/data/redis/core/DefaultValueOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultValueOperations.java index 89300952a..133158b63 100644 --- a/src/main/java/org/springframework/data/redis/core/DefaultValueOperations.java +++ b/src/main/java/org/springframework/data/redis/core/DefaultValueOperations.java @@ -36,34 +36,34 @@ class DefaultValueOperations extends AbstractOperations implements V super(template); } - @Override + public V get(final Object key) { return execute(new ValueDeserializingRedisCallback(key) { - @Override + protected byte[] inRedis(byte[] rawKey, RedisConnection connection) { return connection.get(rawKey); } }, true); } - @Override + public V getAndSet(K key, V newValue) { final byte[] rawValue = rawValue(newValue); return execute(new ValueDeserializingRedisCallback(key) { - @Override + protected byte[] inRedis(byte[] rawKey, RedisConnection connection) { return connection.getSet(rawKey, rawValue); } }, true); } - @Override + public Long increment(K key, final long delta) { final byte[] rawKey = rawKey(key); // TODO add conversion service in here ? return execute(new RedisCallback() { - @Override + public Long doInRedis(RedisConnection connection) { if (delta == 1) { return connection.incr(rawKey); @@ -82,25 +82,25 @@ class DefaultValueOperations extends AbstractOperations implements V }, true); } - @Override + public Integer append(K key, String value) { final byte[] rawKey = rawKey(key); final byte[] rawString = rawString(value); return execute(new RedisCallback() { - @Override + public Integer doInRedis(RedisConnection connection) { return connection.append(rawKey, rawString).intValue(); } }, true); } - @Override + public String get(K key, final long start, final long end) { final byte[] rawKey = rawKey(key); byte[] rawReturn = execute(new RedisCallback() { - @Override + public byte[] doInRedis(RedisConnection connection) { return connection.getRange(rawKey, start, end); } @@ -110,7 +110,7 @@ class DefaultValueOperations extends AbstractOperations implements V } @SuppressWarnings("unchecked") - @Override + public List multiGet(Collection keys) { if (keys.isEmpty()) { return Collections.emptyList(); @@ -124,7 +124,7 @@ class DefaultValueOperations extends AbstractOperations implements V } List rawValues = execute(new RedisCallback>() { - @Override + public List doInRedis(RedisConnection connection) { return connection.mGet(rawKeys); } @@ -133,7 +133,7 @@ class DefaultValueOperations extends AbstractOperations implements V return deserializeValues(rawValues); } - @Override + public void multiSet(Map m) { if (m.isEmpty()) { return; @@ -146,7 +146,7 @@ class DefaultValueOperations extends AbstractOperations implements V } execute(new RedisCallback() { - @Override + public Object doInRedis(RedisConnection connection) { connection.mSet(rawKeys); return null; @@ -154,7 +154,7 @@ class DefaultValueOperations extends AbstractOperations implements V }, true); } - @Override + public void multiSetIfAbsent(Map m) { if (m.isEmpty()) { return; @@ -167,7 +167,7 @@ class DefaultValueOperations extends AbstractOperations implements V } execute(new RedisCallback() { - @Override + public Object doInRedis(RedisConnection connection) { connection.mSetNX(rawKeys); return null; @@ -175,11 +175,11 @@ class DefaultValueOperations extends AbstractOperations implements V }, true); } - @Override + public void set(K key, V value) { final byte[] rawValue = rawValue(value); execute(new ValueDeserializingRedisCallback(key) { - @Override + protected byte[] inRedis(byte[] rawKey, RedisConnection connection) { connection.set(rawKey, rawValue); return null; @@ -187,14 +187,14 @@ class DefaultValueOperations extends AbstractOperations implements V }, true); } - @Override + public void set(K key, V value, long timeout, TimeUnit unit) { final byte[] rawKey = rawKey(key); final byte[] rawValue = rawValue(value); final long rawTimeout = unit.toSeconds(timeout); execute(new RedisCallback() { - @Override + public Object doInRedis(RedisConnection connection) throws DataAccessException { connection.setEx(rawKey, (int) rawTimeout, rawValue); return null; @@ -202,13 +202,13 @@ class DefaultValueOperations extends AbstractOperations implements V }, true); } - @Override + public Boolean setIfAbsent(K key, V value) { final byte[] rawKey = rawKey(key); final byte[] rawValue = rawValue(value); return execute(new RedisCallback() { - @Override + public Boolean doInRedis(RedisConnection connection) throws DataAccessException { return connection.setNX(rawKey, rawValue); } @@ -216,13 +216,13 @@ class DefaultValueOperations extends AbstractOperations implements V } - @Override + public void set(K key, final V value, final long offset) { final byte[] rawKey = rawKey(key); final byte[] rawValue = rawValue(value); execute(new RedisCallback() { - @Override + public Object doInRedis(RedisConnection connection) { connection.setRange(rawKey, rawValue, offset); return null; @@ -230,12 +230,12 @@ class DefaultValueOperations extends AbstractOperations implements V }, true); } - @Override + public Long size(K key) { final byte[] rawKey = rawKey(key); return execute(new RedisCallback() { - @Override + public Long doInRedis(RedisConnection connection) { return connection.strLen(rawKey); } diff --git a/src/main/java/org/springframework/data/redis/core/DefaultZSetOperations.java b/src/main/java/org/springframework/data/redis/core/DefaultZSetOperations.java index e34080377..5cf540faa 100644 --- a/src/main/java/org/springframework/data/redis/core/DefaultZSetOperations.java +++ b/src/main/java/org/springframework/data/redis/core/DefaultZSetOperations.java @@ -33,43 +33,43 @@ class DefaultZSetOperations extends AbstractOperations implements ZS super(template); } - @Override + public Boolean add(final K key, final V value, final double score) { final byte[] rawKey = rawKey(key); final byte[] rawValue = rawValue(value); return execute(new RedisCallback() { - @Override + public Boolean doInRedis(RedisConnection connection) { return connection.zAdd(rawKey, score, rawValue); } }, true); } - @Override + public Double incrementScore(K key, V value, final double delta) { final byte[] rawKey = rawKey(key); final byte[] rawValue = rawValue(value); return execute(new RedisCallback() { - @Override + public Double doInRedis(RedisConnection connection) { return connection.zIncrBy(rawKey, delta, rawValue); } }, true); } - @Override + public void intersectAndStore(K key, K otherKey, K destKey) { intersectAndStore(key, Collections.singleton(otherKey), destKey); } - @Override + public void intersectAndStore(K key, Collection otherKeys, K destKey) { final byte[][] rawKeys = rawKeys(key, otherKeys); final byte[] rawDestKey = rawKey(destKey); execute(new RedisCallback() { - @Override + public Object doInRedis(RedisConnection connection) { connection.zInterStore(rawDestKey, rawKeys); return null; @@ -77,12 +77,12 @@ class DefaultZSetOperations extends AbstractOperations implements ZS }, true); } - @Override + public Set range(K key, final long start, final long end) { final byte[] rawKey = rawKey(key); Set rawValues = execute(new RedisCallback>() { - @Override + public Set doInRedis(RedisConnection connection) { return connection.zRange(rawKey, start, end); } @@ -91,12 +91,12 @@ class DefaultZSetOperations extends AbstractOperations implements ZS return deserializeValues(rawValues); } - @Override + public Set reverseRange(K key, final long start, final long end) { final byte[] rawKey = rawKey(key); Set rawValues = execute(new RedisCallback>() { - @Override + public Set doInRedis(RedisConnection connection) { return connection.zRevRange(rawKey, start, end); } @@ -105,12 +105,12 @@ class DefaultZSetOperations extends AbstractOperations implements ZS return deserializeValues(rawValues); } - @Override + public Set> rangeWithScores(K key, final long start, final long end) { final byte[] rawKey = rawKey(key); Set rawValues = execute(new RedisCallback>() { - @Override + public Set doInRedis(RedisConnection connection) { return connection.zRangeWithScores(rawKey, start, end); } @@ -119,12 +119,12 @@ class DefaultZSetOperations extends AbstractOperations implements ZS return deserializeTupleValues(rawValues); } - @Override + public Set> reverseRangeWithScores(K key, final long start, final long end) { final byte[] rawKey = rawKey(key); Set rawValues = execute(new RedisCallback>() { - @Override + public Set doInRedis(RedisConnection connection) { return connection.zRevRangeWithScores(rawKey, start, end); } @@ -133,12 +133,12 @@ class DefaultZSetOperations extends AbstractOperations implements ZS return deserializeTupleValues(rawValues); } - @Override + public Set rangeByScore(K key, final double min, final double max) { final byte[] rawKey = rawKey(key); Set rawValues = execute(new RedisCallback>() { - @Override + public Set doInRedis(RedisConnection connection) { return connection.zRangeByScore(rawKey, min, max); } @@ -148,12 +148,12 @@ class DefaultZSetOperations extends AbstractOperations implements ZS } - @Override + public Set reverseRangeByScore(K key, final double min, final double max) { final byte[] rawKey = rawKey(key); Set rawValues = execute(new RedisCallback>() { - @Override + public Set doInRedis(RedisConnection connection) { return connection.zRevRangeByScore(rawKey, min, max); } @@ -162,12 +162,12 @@ class DefaultZSetOperations extends AbstractOperations implements ZS return deserializeValues(rawValues); } - @Override + public Set> rangeByScoreWithScores(K key, final double min, final double max) { final byte[] rawKey = rawKey(key); Set rawValues = execute(new RedisCallback>() { - @Override + public Set doInRedis(RedisConnection connection) { return connection.zRangeByScoreWithScores(rawKey, min, max); } @@ -176,12 +176,12 @@ class DefaultZSetOperations extends AbstractOperations implements ZS return deserializeTupleValues(rawValues); } - @Override + public Set> reverseRangeByScoreWithScores(K key, final double min, final double max) { final byte[] rawKey = rawKey(key); Set rawValues = execute(new RedisCallback>() { - @Override + public Set doInRedis(RedisConnection connection) { return connection.zRevRangeByScoreWithScores(rawKey, min, max); @@ -191,13 +191,13 @@ class DefaultZSetOperations extends AbstractOperations implements ZS return deserializeTupleValues(rawValues); } - @Override + public Long rank(K key, Object o) { final byte[] rawKey = rawKey(key); final byte[] rawValue = rawValue(o); return execute(new RedisCallback() { - @Override + public Long doInRedis(RedisConnection connection) { Long zRank = connection.zRank(rawKey, rawValue); return (zRank != null && zRank.longValue() >= 0 ? zRank : null); @@ -205,13 +205,13 @@ class DefaultZSetOperations extends AbstractOperations implements ZS }, true); } - @Override + public Long reverseRank(K key, Object o) { final byte[] rawKey = rawKey(key); final byte[] rawValue = rawValue(o); return execute(new RedisCallback() { - @Override + public Long doInRedis(RedisConnection connection) { Long zRank = connection.zRevRank(rawKey, rawValue); return (zRank != null && zRank.longValue() >= 0 ? zRank : null); @@ -219,24 +219,24 @@ class DefaultZSetOperations extends AbstractOperations implements ZS }, true); } - @Override + public Boolean remove(K key, Object o) { final byte[] rawKey = rawKey(key); final byte[] rawValue = rawValue(o); return execute(new RedisCallback() { - @Override + public Boolean doInRedis(RedisConnection connection) { return connection.zRem(rawKey, rawValue); } }, true); } - @Override + public void removeRange(K key, final long start, final long end) { final byte[] rawKey = rawKey(key); execute(new RedisCallback() { - @Override + public Object doInRedis(RedisConnection connection) { connection.zRemRange(rawKey, start, end); return null; @@ -244,11 +244,11 @@ class DefaultZSetOperations extends AbstractOperations implements ZS }, true); } - @Override + public void removeRangeByScore(K key, final double min, final double max) { final byte[] rawKey = rawKey(key); execute(new RedisCallback() { - @Override + public Object doInRedis(RedisConnection connection) { connection.zRemRangeByScore(rawKey, min, max); return null; @@ -256,54 +256,54 @@ class DefaultZSetOperations extends AbstractOperations implements ZS }, true); } - @Override + public Double score(K key, Object o) { final byte[] rawKey = rawKey(key); final byte[] rawValue = rawValue(o); return execute(new RedisCallback() { - @Override + public Double doInRedis(RedisConnection connection) { return connection.zScore(rawKey, rawValue); } }, true); } - @Override + public Long count(K key, final double min, final double max) { final byte[] rawKey = rawKey(key); return execute(new RedisCallback() { - @Override + public Long doInRedis(RedisConnection connection) { return connection.zCount(rawKey, min, max); } }, true); } - @Override + public Long size(K key) { final byte[] rawKey = rawKey(key); return execute(new RedisCallback() { - @Override + public Long doInRedis(RedisConnection connection) { return connection.zCard(rawKey); } }, true); } - @Override + public void unionAndStore(K key, K otherKey, K destKey) { unionAndStore(key, Collections.singleton(otherKey), destKey); } - @Override + public void unionAndStore(K key, Collection otherKeys, K destKey) { final byte[][] rawKeys = rawKeys(key, otherKeys); final byte[] rawDestKey = rawKey(destKey); execute(new RedisCallback() { - @Override + public Object doInRedis(RedisConnection connection) { connection.zUnionStore(rawDestKey, rawKeys); return null; diff --git a/src/main/java/org/springframework/data/redis/core/HashOperationsEditor.java b/src/main/java/org/springframework/data/redis/core/HashOperationsEditor.java index 6afaac283..8a52a1e98 100644 --- a/src/main/java/org/springframework/data/redis/core/HashOperationsEditor.java +++ b/src/main/java/org/springframework/data/redis/core/HashOperationsEditor.java @@ -25,7 +25,7 @@ import java.beans.PropertyEditorSupport; */ class HashOperationsEditor extends PropertyEditorSupport { - @Override + public void setValue(Object value) { if (value instanceof RedisOperations) { super.setValue(((RedisOperations) value).opsForHash()); diff --git a/src/main/java/org/springframework/data/redis/core/ListOperationsEditor.java b/src/main/java/org/springframework/data/redis/core/ListOperationsEditor.java index 3f0a60368..4a75bf3ca 100644 --- a/src/main/java/org/springframework/data/redis/core/ListOperationsEditor.java +++ b/src/main/java/org/springframework/data/redis/core/ListOperationsEditor.java @@ -24,7 +24,7 @@ import java.beans.PropertyEditorSupport; * @author Costin Leau */ class ListOperationsEditor extends PropertyEditorSupport { - @Override + public void setValue(Object value) { if (value instanceof RedisOperations) { super.setValue(((RedisOperations) value).opsForList()); diff --git a/src/main/java/org/springframework/data/redis/core/RedisConnectionUtils.java b/src/main/java/org/springframework/data/redis/core/RedisConnectionUtils.java index 6bd9844c7..02feabe07 100644 --- a/src/main/java/org/springframework/data/redis/core/RedisConnectionUtils.java +++ b/src/main/java/org/springframework/data/redis/core/RedisConnectionUtils.java @@ -153,12 +153,12 @@ public abstract class RedisConnectionUtils { this.newRedisConnection = newRedisConnection; } - @Override + protected boolean shouldUnbindAtCompletion() { return this.newRedisConnection; } - @Override + protected void releaseResource(RedisConnectionHolder resourceHolder, RedisConnectionFactory resourceKey) { releaseConnection(resourceHolder.getConnection(), resourceKey); } @@ -173,7 +173,7 @@ public abstract class RedisConnectionUtils { this.conn = conn; } - @Override + public boolean isVoid() { return isVoid; } @@ -182,12 +182,12 @@ public abstract class RedisConnectionUtils { return conn; } - @Override + public void reset() { // no-op } - @Override + public void unbound() { this.isVoid = true; } diff --git a/src/main/java/org/springframework/data/redis/core/RedisTemplate.java b/src/main/java/org/springframework/data/redis/core/RedisTemplate.java index 93f2e33f5..cf9c54964 100644 --- a/src/main/java/org/springframework/data/redis/core/RedisTemplate.java +++ b/src/main/java/org/springframework/data/redis/core/RedisTemplate.java @@ -87,7 +87,7 @@ public class RedisTemplate extends RedisAccessor implements RedisOperation public RedisTemplate() { } - @Override + public void afterPropertiesSet() { super.afterPropertiesSet(); boolean defaultUsed = false; @@ -116,7 +116,7 @@ public class RedisTemplate extends RedisAccessor implements RedisOperation } } - @Override + public T execute(RedisCallback action) { return execute(action, isExposeConnection()); } @@ -174,7 +174,7 @@ public class RedisTemplate extends RedisAccessor implements RedisOperation } - @Override + public T execute(SessionCallback session) { RedisConnectionFactory factory = getConnectionFactory(); // bind connection @@ -407,23 +407,23 @@ public class RedisTemplate extends RedisAccessor implements RedisOperation // // RedisOperations // - @Override + public List exec() { return execute(new RedisCallback>() { - @Override + public List doInRedis(RedisConnection connection) throws DataAccessException { return connection.exec(); } }); } - @Override + public void delete(K key) { final byte[] rawKey = rawKey(key); execute(new RedisCallback() { - @Override + public Object doInRedis(RedisConnection connection) { connection.del(rawKey); return null; @@ -431,12 +431,12 @@ public class RedisTemplate extends RedisAccessor implements RedisOperation }, true); } - @Override + public void delete(Collection keys) { final byte[][] rawKeys = rawKeys(keys); execute(new RedisCallback() { - @Override + public Object doInRedis(RedisConnection connection) { connection.del(rawKeys); return null; @@ -444,45 +444,45 @@ public class RedisTemplate extends RedisAccessor implements RedisOperation }, true); } - @Override + public Boolean hasKey(K key) { final byte[] rawKey = rawKey(key); return execute(new RedisCallback() { - @Override + public Boolean doInRedis(RedisConnection connection) { return connection.exists(rawKey); } }, true); } - @Override + public Boolean expire(K key, long timeout, TimeUnit unit) { final byte[] rawKey = rawKey(key); final long rawTimeout = unit.toSeconds(timeout); return execute(new RedisCallback() { - @Override + public Boolean doInRedis(RedisConnection connection) { return connection.expire(rawKey, rawTimeout); } }, true); } - @Override + public Boolean expireAt(K key, Date date) { final byte[] rawKey = rawKey(key); final long rawTimeout = date.getTime() / 1000; return execute(new RedisCallback() { - @Override + public Boolean doInRedis(RedisConnection connection) { return connection.expireAt(rawKey, rawTimeout); } }, true); } - @Override + public void convertAndSend(String channel, Object message) { Assert.hasText(channel, "a non-empty channel is required"); @@ -490,7 +490,7 @@ public class RedisTemplate extends RedisAccessor implements RedisOperation final byte[] rawMessage = rawValue(message); execute(new RedisCallback() { - @Override + public Object doInRedis(RedisConnection connection) { connection.publish(rawChannel, rawMessage); return null; @@ -503,12 +503,12 @@ public class RedisTemplate extends RedisAccessor implements RedisOperation // Value operations // - @Override + public Long getExpire(K key) { final byte[] rawKey = rawKey(key); return execute(new RedisCallback() { - @Override + public Long doInRedis(RedisConnection connection) { return Long.valueOf(connection.ttl(rawKey)); } @@ -516,12 +516,12 @@ public class RedisTemplate extends RedisAccessor implements RedisOperation } @SuppressWarnings("unchecked") - @Override + public Set keys(K pattern) { final byte[] rawKey = rawKey(pattern); Set rawKeys = execute(new RedisCallback>() { - @Override + public Set doInRedis(RedisConnection connection) { return connection.keys(rawKey); } @@ -530,34 +530,34 @@ public class RedisTemplate extends RedisAccessor implements RedisOperation return SerializationUtils.deserialize(rawKeys, keySerializer); } - @Override + public Boolean persist(K key) { final byte[] rawKey = rawKey(key); return execute(new RedisCallback() { - @Override + public Boolean doInRedis(RedisConnection connection) { return connection.persist(rawKey); } }, true); } - @Override + public Boolean move(K key, final int dbIndex) { final byte[] rawKey = rawKey(key); return execute(new RedisCallback() { - @Override + public Boolean doInRedis(RedisConnection connection) { return connection.move(rawKey, dbIndex); } }, true); } - @Override + public K randomKey() { byte[] rawKey = execute(new RedisCallback() { - @Override + public byte[] doInRedis(RedisConnection connection) { return connection.randomKey(); } @@ -566,13 +566,13 @@ public class RedisTemplate extends RedisAccessor implements RedisOperation return deserializeKey(rawKey); } - @Override + public void rename(K oldKey, K newKey) { final byte[] rawOldKey = rawKey(oldKey); final byte[] rawNewKey = rawKey(newKey); execute(new RedisCallback() { - @Override + public Object doInRedis(RedisConnection connection) { connection.rename(rawOldKey, rawNewKey); return null; @@ -580,35 +580,35 @@ public class RedisTemplate extends RedisAccessor implements RedisOperation }, true); } - @Override + public Boolean renameIfAbsent(K oldKey, K newKey) { final byte[] rawOldKey = rawKey(oldKey); final byte[] rawNewKey = rawKey(newKey); return execute(new RedisCallback() { - @Override + public Boolean doInRedis(RedisConnection connection) { return connection.renameNX(rawOldKey, rawNewKey); } }, true); } - @Override + public DataType type(K key) { final byte[] rawKey = rawKey(key); return execute(new RedisCallback() { - @Override + public DataType doInRedis(RedisConnection connection) { return connection.type(rawKey); } }, true); } - @Override + public void multi() { execute(new RedisCallback() { - @Override + public Object doInRedis(RedisConnection connection) throws DataAccessException { connection.multi(); return null; @@ -616,11 +616,11 @@ public class RedisTemplate extends RedisAccessor implements RedisOperation }, true); } - @Override + public void discard() { execute(new RedisCallback() { - @Override + public Object doInRedis(RedisConnection connection) throws DataAccessException { connection.discard(); return null; @@ -628,12 +628,12 @@ public class RedisTemplate extends RedisAccessor implements RedisOperation }, true); } - @Override + public void watch(K key) { final byte[] rawKey = rawKey(key); execute(new RedisCallback() { - @Override + public Object doInRedis(RedisConnection connection) { connection.watch(rawKey); return null; @@ -641,12 +641,12 @@ public class RedisTemplate extends RedisAccessor implements RedisOperation }, true); } - @Override + public void watch(Collection keys) { final byte[][] rawKeys = rawKeys(keys); execute(new RedisCallback() { - @Override + public Object doInRedis(RedisConnection connection) { connection.watch(rawKeys); return null; @@ -654,10 +654,10 @@ public class RedisTemplate extends RedisAccessor implements RedisOperation }, true); } - @Override + public void unwatch() { execute(new RedisCallback() { - @Override + public Object doInRedis(RedisConnection connection) throws DataAccessException { connection.unwatch(); return null; @@ -668,18 +668,18 @@ public class RedisTemplate extends RedisAccessor implements RedisOperation // Sort operations @SuppressWarnings("unchecked") - @Override + public List sort(SortQuery query) { return sort(query, valueSerializer); } - @Override + public List sort(SortQuery query, RedisSerializer resultSerializer) { final byte[] rawKey = rawKey(query.getKey()); final SortParameters params = QueryUtils.convertQuery(query, stringSerializer); List vals = execute(new RedisCallback>() { - @Override + public List doInRedis(RedisConnection connection) throws DataAccessException { return connection.sort(rawKey, params); } @@ -689,12 +689,12 @@ public class RedisTemplate extends RedisAccessor implements RedisOperation } @SuppressWarnings("unchecked") - @Override + public List sort(SortQuery query, BulkMapper bulkMapper) { return sort(query, bulkMapper, valueSerializer); } - @Override + public List sort(SortQuery query, BulkMapper bulkMapper, RedisSerializer resultSerializer) { List values = sort(query, resultSerializer); @@ -719,26 +719,26 @@ public class RedisTemplate extends RedisAccessor implements RedisOperation return result; } - @Override + public Long sort(SortQuery query, K storeKey) { final byte[] rawStoreKey = rawKey(storeKey); final byte[] rawKey = rawKey(query.getKey()); final SortParameters params = QueryUtils.convertQuery(query, stringSerializer); return execute(new RedisCallback() { - @Override + public Long doInRedis(RedisConnection connection) throws DataAccessException { return connection.sort(rawKey, params, rawStoreKey); } }, true); } - @Override + public BoundValueOperations boundValueOps(K key) { return new DefaultBoundValueOperations(key, this); } - @Override + public ValueOperations opsForValue() { if (valueOps == null) { valueOps = new DefaultValueOperations(this); @@ -746,7 +746,7 @@ public class RedisTemplate extends RedisAccessor implements RedisOperation return valueOps; } - @Override + public ListOperations opsForList() { if (listOps == null) { listOps = new DefaultListOperations(this); @@ -754,17 +754,17 @@ public class RedisTemplate extends RedisAccessor implements RedisOperation return listOps; } - @Override + public BoundListOperations boundListOps(K key) { return new DefaultBoundListOperations(key, this); } - @Override + public BoundSetOperations boundSetOps(K key) { return new DefaultBoundSetOperations(key, this); } - @Override + public SetOperations opsForSet() { if (setOps == null) { setOps = new DefaultSetOperations(this); @@ -772,12 +772,12 @@ public class RedisTemplate extends RedisAccessor implements RedisOperation return setOps; } - @Override + public BoundZSetOperations boundZSetOps(K key) { return new DefaultBoundZSetOperations(key, this); } - @Override + public ZSetOperations opsForZSet() { if (zSetOps == null) { zSetOps = new DefaultZSetOperations(this); @@ -785,12 +785,12 @@ public class RedisTemplate extends RedisAccessor implements RedisOperation return zSetOps; } - @Override + public BoundHashOperations boundHashOps(K key) { return new DefaultBoundHashOperations(key, this); } - @Override + public HashOperations opsForHash() { return new DefaultHashOperations(this); } diff --git a/src/main/java/org/springframework/data/redis/core/SetOperationsEditor.java b/src/main/java/org/springframework/data/redis/core/SetOperationsEditor.java index 7aa0eaafd..a155f3907 100644 --- a/src/main/java/org/springframework/data/redis/core/SetOperationsEditor.java +++ b/src/main/java/org/springframework/data/redis/core/SetOperationsEditor.java @@ -25,7 +25,7 @@ import java.beans.PropertyEditorSupport; */ class SetOperationsEditor extends PropertyEditorSupport { - @Override + public void setValue(Object value) { if (value instanceof RedisOperations) { super.setValue(((RedisOperations) value).opsForSet()); diff --git a/src/main/java/org/springframework/data/redis/core/StringRedisTemplate.java b/src/main/java/org/springframework/data/redis/core/StringRedisTemplate.java index e042d7dcd..ca4f25984 100644 --- a/src/main/java/org/springframework/data/redis/core/StringRedisTemplate.java +++ b/src/main/java/org/springframework/data/redis/core/StringRedisTemplate.java @@ -58,7 +58,7 @@ public class StringRedisTemplate extends RedisTemplate { afterPropertiesSet(); } - @Override + protected RedisConnection preProcessConnection(RedisConnection connection, boolean existingConnection) { return new DefaultStringRedisConnection(connection); } diff --git a/src/main/java/org/springframework/data/redis/core/ValueOperationsEditor.java b/src/main/java/org/springframework/data/redis/core/ValueOperationsEditor.java index f8654628c..b4ff84083 100644 --- a/src/main/java/org/springframework/data/redis/core/ValueOperationsEditor.java +++ b/src/main/java/org/springframework/data/redis/core/ValueOperationsEditor.java @@ -25,7 +25,7 @@ import java.beans.PropertyEditorSupport; */ class ValueOperationsEditor extends PropertyEditorSupport { - @Override + public void setValue(Object value) { if (value instanceof RedisOperations) { super.setValue(((RedisOperations) value).opsForValue()); diff --git a/src/main/java/org/springframework/data/redis/core/ZSetOperationsEditor.java b/src/main/java/org/springframework/data/redis/core/ZSetOperationsEditor.java index 6c410a138..5b949e294 100644 --- a/src/main/java/org/springframework/data/redis/core/ZSetOperationsEditor.java +++ b/src/main/java/org/springframework/data/redis/core/ZSetOperationsEditor.java @@ -25,7 +25,7 @@ import java.beans.PropertyEditorSupport; */ class ZSetOperationsEditor extends PropertyEditorSupport { - @Override + public void setValue(Object value) { if (value instanceof RedisOperations) { super.setValue(((RedisOperations) value).opsForZSet()); diff --git a/src/main/java/org/springframework/data/redis/core/query/DefaultSortCriterion.java b/src/main/java/org/springframework/data/redis/core/query/DefaultSortCriterion.java index 2902de563..a7e80f82f 100644 --- a/src/main/java/org/springframework/data/redis/core/query/DefaultSortCriterion.java +++ b/src/main/java/org/springframework/data/redis/core/query/DefaultSortCriterion.java @@ -40,36 +40,36 @@ class DefaultSortCriterion implements SortCriterion { this.key = key; } - @Override + public SortCriterion alphabetical(boolean alpha) { this.alpha = Boolean.valueOf(alpha); return this; } - @Override + public SortQuery build() { return new DefaultSortQuery(key, by, limit, order, alpha, getKeys); } - @Override + public SortCriterion limit(long offset, long count) { this.limit = new Range(offset, count); return this; } - @Override + public SortCriterion limit(Range range) { this.limit = range; return this; } - @Override + public SortCriterion order(Order order) { this.order = order; return this; } - @Override + public SortCriterion get(String getPattern) { this.getKeys.add(getPattern); return this; diff --git a/src/main/java/org/springframework/data/redis/core/query/DefaultSortQuery.java b/src/main/java/org/springframework/data/redis/core/query/DefaultSortQuery.java index 84576ba61..32ccdeb99 100644 --- a/src/main/java/org/springframework/data/redis/core/query/DefaultSortQuery.java +++ b/src/main/java/org/springframework/data/redis/core/query/DefaultSortQuery.java @@ -43,37 +43,37 @@ class DefaultSortQuery implements SortQuery { this.gets = gets; } - @Override + public String getBy() { return by; } - @Override + public Range getLimit() { return limit; } - @Override + public Order getOrder() { return order; } - @Override + public Boolean isAlphabetic() { return alpha; } - @Override + public K getKey() { return key; } - @Override + public List getGetPattern() { return gets; } - @Override + public String toString() { return "DefaultSortQuery [alpha=" + alpha + ", by=" + by + ", gets=" + gets + ", key=" + key + ", limit=" + limit + ", order=" + order + "]"; diff --git a/src/main/java/org/springframework/data/redis/hash/BeanUtilsHashMapper.java b/src/main/java/org/springframework/data/redis/hash/BeanUtilsHashMapper.java index d0385f74e..03965bafc 100644 --- a/src/main/java/org/springframework/data/redis/hash/BeanUtilsHashMapper.java +++ b/src/main/java/org/springframework/data/redis/hash/BeanUtilsHashMapper.java @@ -32,7 +32,7 @@ public class BeanUtilsHashMapper implements HashMapper { this.type = type; } - @Override + public T fromHash(Map hash) { T instance = org.springframework.beans.BeanUtils.instantiate(type); try { @@ -43,7 +43,7 @@ public class BeanUtilsHashMapper implements HashMapper { return instance; } - @Override + public Map toHash(T object) { try { return BeanUtils.describe(object); diff --git a/src/main/java/org/springframework/data/redis/hash/DecoratingStringHashMapper.java b/src/main/java/org/springframework/data/redis/hash/DecoratingStringHashMapper.java index c447dfa47..0251d7c86 100644 --- a/src/main/java/org/springframework/data/redis/hash/DecoratingStringHashMapper.java +++ b/src/main/java/org/springframework/data/redis/hash/DecoratingStringHashMapper.java @@ -33,13 +33,13 @@ public class DecoratingStringHashMapper implements HashMapper hash) { Map h = hash; return delegate.fromHash(h); } - @Override + public Map toHash(T object) { Map hash = delegate.toHash(object); Map flatten = new LinkedHashMap(hash.size()); diff --git a/src/main/java/org/springframework/data/redis/hash/JacksonHashMapper.java b/src/main/java/org/springframework/data/redis/hash/JacksonHashMapper.java index 84075c7d0..465fa82c4 100644 --- a/src/main/java/org/springframework/data/redis/hash/JacksonHashMapper.java +++ b/src/main/java/org/springframework/data/redis/hash/JacksonHashMapper.java @@ -42,12 +42,12 @@ public class JacksonHashMapper implements HashMapper { } @SuppressWarnings("unchecked") - @Override + public T fromHash(Map hash) { return (T) mapper.convertValue(hash, userType); } - @Override + public Map toHash(T object) { return mapper.convertValue(object, mapType); } diff --git a/src/main/java/org/springframework/data/redis/listener/RedisMessageListenerContainer.java b/src/main/java/org/springframework/data/redis/listener/RedisMessageListenerContainer.java index 3d21ef6e3..a9a8cd7ea 100644 --- a/src/main/java/org/springframework/data/redis/listener/RedisMessageListenerContainer.java +++ b/src/main/java/org/springframework/data/redis/listener/RedisMessageListenerContainer.java @@ -110,7 +110,7 @@ public class RedisMessageListenerContainer implements InitializingBean, Disposab private volatile RedisSerializer serializer = new StringRedisSerializer(); - @Override + public void afterPropertiesSet() { if (taskExecutor == null) { manageExecutor = true; @@ -137,7 +137,7 @@ public class RedisMessageListenerContainer implements InitializingBean, Disposab return new SimpleAsyncTaskExecutor(threadNamePrefix); } - @Override + public void destroy() throws Exception { initialized = false; @@ -154,29 +154,29 @@ public class RedisMessageListenerContainer implements InitializingBean, Disposab } } - @Override + public boolean isAutoStartup() { return true; } - @Override + public void stop(Runnable callback) { stop(); callback.run(); } - @Override + public int getPhase() { // start the latest return Integer.MAX_VALUE; } - @Override + public boolean isRunning() { return running; } - @Override + public void start() { if (!running) { running = true; @@ -198,7 +198,7 @@ public class RedisMessageListenerContainer implements InitializingBean, Disposab } } - @Override + public void stop() { if (isRunning()) { running = false; @@ -302,7 +302,7 @@ public class RedisMessageListenerContainer implements InitializingBean, Disposab this.connectionFactory = connectionFactory; } - @Override + public void setBeanName(String name) { this.beanName = name; } @@ -511,12 +511,12 @@ public class RedisMessageListenerContainer implements InitializingBean, Disposab private long WAIT = 500; private long ROUNDS = 3; - @Override + public boolean isLongLived() { return false; } - @Override + public void run() { // wait for subscription to be initialized boolean done = false; @@ -544,12 +544,12 @@ public class RedisMessageListenerContainer implements InitializingBean, Disposab private volatile RedisConnection connection; private final Object localMonitor = new Object(); - @Override + public boolean isLongLived() { return true; } - @Override + public void run() { connection = connectionFactory.getConnection(); try { @@ -696,7 +696,7 @@ public class RedisMessageListenerContainer implements InitializingBean, Disposab */ private class DispatchMessageListener implements MessageListener { - @Override + public void onMessage(Message message, byte[] pattern) { // do channel matching first byte[] channel = message.getChannel(); @@ -721,7 +721,7 @@ public class RedisMessageListenerContainer implements InitializingBean, Disposab private void dispatchChannels(Collection ch, final Message message) { for (final MessageListener messageListener : ch) { taskExecutor.execute(new Runnable() { - @Override + public void run() { processMessage(messageListener, message, null); } @@ -732,7 +732,7 @@ public class RedisMessageListenerContainer implements InitializingBean, Disposab private void dispatchPatterns(Collection pt, final Message message, final byte[] pattern) { for (final MessageListener messageListener : pt) { taskExecutor.execute(new Runnable() { - @Override + public void run() { processMessage(messageListener, message, pattern.clone()); } diff --git a/src/main/java/org/springframework/data/redis/listener/adapter/MessageListenerAdapter.java b/src/main/java/org/springframework/data/redis/listener/adapter/MessageListenerAdapter.java index adcd95e15..a1d404fae 100644 --- a/src/main/java/org/springframework/data/redis/listener/adapter/MessageListenerAdapter.java +++ b/src/main/java/org/springframework/data/redis/listener/adapter/MessageListenerAdapter.java @@ -275,7 +275,7 @@ public class MessageListenerAdapter implements InitializingBean, MessageListener this.stringSerializer = serializer; } - @Override + public void afterPropertiesSet() { String methodName = getDefaultListenerMethod(); @@ -299,7 +299,7 @@ public class MessageListenerAdapter implements InitializingBean, MessageListener * the incoming Redis message * @see #handleListenerException */ - @Override + public void onMessage(Message message, byte[] pattern) { try { // Check whether the delegate is a MessageListener impl itself. diff --git a/src/main/java/org/springframework/data/redis/serializer/GenericToStringSerializer.java b/src/main/java/org/springframework/data/redis/serializer/GenericToStringSerializer.java index 0ca76fa11..652999f21 100644 --- a/src/main/java/org/springframework/data/redis/serializer/GenericToStringSerializer.java +++ b/src/main/java/org/springframework/data/redis/serializer/GenericToStringSerializer.java @@ -64,7 +64,7 @@ public class GenericToStringSerializer implements RedisSerializer, BeanFac converter = new Converter(typeConverter); } - @Override + public T deserialize(byte[] bytes) { if (bytes == null) { return null; @@ -74,7 +74,7 @@ public class GenericToStringSerializer implements RedisSerializer, BeanFac return converter.convert(string, type); } - @Override + public byte[] serialize(T object) { if (object == null) { return null; @@ -83,7 +83,7 @@ public class GenericToStringSerializer implements RedisSerializer, BeanFac return string.getBytes(charset); } - @Override + public void setBeanFactory(BeanFactory beanFactory) throws BeansException { if (converter == null && beanFactory instanceof ConfigurableBeanFactory) { ConfigurableBeanFactory cFB = (ConfigurableBeanFactory) beanFactory; diff --git a/src/main/java/org/springframework/data/redis/serializer/JacksonJsonRedisSerializer.java b/src/main/java/org/springframework/data/redis/serializer/JacksonJsonRedisSerializer.java index 6c76f11eb..ab7ae4977 100644 --- a/src/main/java/org/springframework/data/redis/serializer/JacksonJsonRedisSerializer.java +++ b/src/main/java/org/springframework/data/redis/serializer/JacksonJsonRedisSerializer.java @@ -44,7 +44,7 @@ public class JacksonJsonRedisSerializer implements RedisSerializer { } @SuppressWarnings("unchecked") - @Override + public T deserialize(byte[] bytes) throws SerializationException { if (SerializationUtils.isEmpty(bytes)) { return null; @@ -56,7 +56,7 @@ public class JacksonJsonRedisSerializer implements RedisSerializer { } } - @Override + public byte[] serialize(Object t) throws SerializationException { if (t == null) { return SerializationUtils.EMPTY_ARRAY; diff --git a/src/main/java/org/springframework/data/redis/serializer/JdkSerializationRedisSerializer.java b/src/main/java/org/springframework/data/redis/serializer/JdkSerializationRedisSerializer.java index 8a5a56d4e..f10ab702e 100644 --- a/src/main/java/org/springframework/data/redis/serializer/JdkSerializationRedisSerializer.java +++ b/src/main/java/org/springframework/data/redis/serializer/JdkSerializationRedisSerializer.java @@ -32,7 +32,7 @@ public class JdkSerializationRedisSerializer implements RedisSerializer private Converter deserializer = new DeserializingConverter(); @SuppressWarnings("unchecked") - @Override + public Object deserialize(byte[] bytes) { if (SerializationUtils.isEmpty(bytes)) { return null; @@ -45,7 +45,7 @@ public class JdkSerializationRedisSerializer implements RedisSerializer } } - @Override + public byte[] serialize(Object object) { if (object == null) { return SerializationUtils.EMPTY_ARRAY; diff --git a/src/main/java/org/springframework/data/redis/serializer/OxmSerializer.java b/src/main/java/org/springframework/data/redis/serializer/OxmSerializer.java index 23f5f41b7..63953f076 100644 --- a/src/main/java/org/springframework/data/redis/serializer/OxmSerializer.java +++ b/src/main/java/org/springframework/data/redis/serializer/OxmSerializer.java @@ -50,7 +50,7 @@ public class OxmSerializer implements InitializingBean, RedisSerializer afterPropertiesSet(); } - @Override + public void afterPropertiesSet() { Assert.notNull(marshaller, "non-null marshaller required"); Assert.notNull(unmarshaller, "non-null unmarshaller required"); @@ -70,7 +70,7 @@ public class OxmSerializer implements InitializingBean, RedisSerializer this.unmarshaller = unmarshaller; } - @Override + public Object deserialize(byte[] bytes) throws SerializationException { if (SerializationUtils.isEmpty(bytes)) { return null; @@ -83,7 +83,7 @@ public class OxmSerializer implements InitializingBean, RedisSerializer } } - @Override + public byte[] serialize(Object t) throws SerializationException { if (t == null) { return SerializationUtils.EMPTY_ARRAY; diff --git a/src/main/java/org/springframework/data/redis/serializer/StringRedisSerializer.java b/src/main/java/org/springframework/data/redis/serializer/StringRedisSerializer.java index 4ca4d7f01..730a23d75 100644 --- a/src/main/java/org/springframework/data/redis/serializer/StringRedisSerializer.java +++ b/src/main/java/org/springframework/data/redis/serializer/StringRedisSerializer.java @@ -42,12 +42,12 @@ public class StringRedisSerializer implements RedisSerializer { this.charset = charset; } - @Override + public String deserialize(byte[] bytes) { return (bytes == null ? null : new String(bytes, charset)); } - @Override + public byte[] serialize(String string) { return (string == null ? null : string.getBytes(charset)); } diff --git a/src/main/java/org/springframework/data/redis/support/atomic/RedisAtomicInteger.java b/src/main/java/org/springframework/data/redis/support/atomic/RedisAtomicInteger.java index 1032e38c3..28a89968c 100644 --- a/src/main/java/org/springframework/data/redis/support/atomic/RedisAtomicInteger.java +++ b/src/main/java/org/springframework/data/redis/support/atomic/RedisAtomicInteger.java @@ -127,7 +127,7 @@ public class RedisAtomicInteger extends Number implements Serializable, BoundKey return generalOps.execute(new SessionCallback() { @SuppressWarnings("unchecked") - @Override + public Boolean execute(RedisOperations operations) { for (;;) { operations.watch(Collections.singleton(key)); @@ -225,38 +225,38 @@ public class RedisAtomicInteger extends Number implements Serializable, BoundKey return (double) get(); } - @Override + public String getKey() { return key; } - @Override + public Boolean expire(long timeout, TimeUnit unit) { return generalOps.expire(key, timeout, unit); } - @Override + public Boolean expireAt(Date date) { return generalOps.expireAt(key, date); } - @Override + public Long getExpire() { return generalOps.getExpire(key); } - @Override + public Boolean persist() { return generalOps.persist(key); } - @Override + public void rename(String newKey) { generalOps.rename(key, newKey); key = newKey; } - @Override + public DataType getType() { return DataType.STRING; } diff --git a/src/main/java/org/springframework/data/redis/support/atomic/RedisAtomicLong.java b/src/main/java/org/springframework/data/redis/support/atomic/RedisAtomicLong.java index 63633bab8..a66752aa9 100644 --- a/src/main/java/org/springframework/data/redis/support/atomic/RedisAtomicLong.java +++ b/src/main/java/org/springframework/data/redis/support/atomic/RedisAtomicLong.java @@ -128,7 +128,7 @@ public class RedisAtomicLong extends Number implements Serializable, BoundKeyOpe return generalOps.execute(new SessionCallback() { @SuppressWarnings("unchecked") - @Override + public Boolean execute(RedisOperations operations) { for (;;) { operations.watch(Collections.singleton(key)); @@ -229,38 +229,38 @@ public class RedisAtomicLong extends Number implements Serializable, BoundKeyOpe return (double) get(); } - @Override + public String getKey() { return key; } - @Override + public Boolean expire(long timeout, TimeUnit unit) { return generalOps.expire(key, timeout, unit); } - @Override + public Boolean expireAt(Date date) { return generalOps.expireAt(key, date); } - @Override + public Long getExpire() { return generalOps.getExpire(key); } - @Override + public Boolean persist() { return generalOps.persist(key); } - @Override + public void rename(String newKey) { generalOps.rename(key, newKey); key = newKey; } - @Override + public DataType getType() { return DataType.STRING; } diff --git a/src/main/java/org/springframework/data/redis/support/collections/AbstractRedisCollection.java b/src/main/java/org/springframework/data/redis/support/collections/AbstractRedisCollection.java index e668cc73b..596bd963c 100644 --- a/src/main/java/org/springframework/data/redis/support/collections/AbstractRedisCollection.java +++ b/src/main/java/org/springframework/data/redis/support/collections/AbstractRedisCollection.java @@ -40,17 +40,17 @@ public abstract class AbstractRedisCollection extends AbstractCollection i this.operations = operations; } - @Override + public String getKey() { return key; } - @Override + public RedisOperations getOperations() { return operations; } - @Override + public boolean addAll(Collection c) { boolean modified = false; for (E e : c) { @@ -63,7 +63,7 @@ public abstract class AbstractRedisCollection extends AbstractCollection i public abstract void clear(); - @Override + public boolean containsAll(Collection c) { boolean contains = true; for (Object object : c) { @@ -75,7 +75,7 @@ public abstract class AbstractRedisCollection extends AbstractCollection i public abstract boolean remove(Object o); - @Override + public boolean removeAll(Collection c) { boolean modified = false; for (Object object : c) { @@ -88,7 +88,7 @@ public abstract class AbstractRedisCollection extends AbstractCollection i throw new UnsupportedOperationException(); } - @Override + public boolean equals(Object o) { if (o == this) return true; @@ -103,7 +103,7 @@ public abstract class AbstractRedisCollection extends AbstractCollection i return false; } - @Override + public int hashCode() { int result = 17 + getClass().hashCode(); result = result * 31 + key.hashCode(); @@ -111,7 +111,7 @@ public abstract class AbstractRedisCollection extends AbstractCollection i } - @Override + public String toString() { StringBuilder sb = new StringBuilder(); sb.append("RedisStore for key:"); @@ -119,27 +119,27 @@ public abstract class AbstractRedisCollection extends AbstractCollection i return sb.toString(); } - @Override + public Boolean expire(long timeout, TimeUnit unit) { return operations.expire(key, timeout, unit); } - @Override + public Boolean expireAt(Date date) { return operations.expireAt(key, date); } - @Override + public Long getExpire() { return operations.getExpire(key); } - @Override + public Boolean persist() { return operations.persist(key); } - @Override + public void rename(final String newKey) { CollectionUtils.rename(key, newKey, operations); key = newKey; diff --git a/src/main/java/org/springframework/data/redis/support/collections/CollectionUtils.java b/src/main/java/org/springframework/data/redis/support/collections/CollectionUtils.java index 534143652..ce080e0dd 100644 --- a/src/main/java/org/springframework/data/redis/support/collections/CollectionUtils.java +++ b/src/main/java/org/springframework/data/redis/support/collections/CollectionUtils.java @@ -56,7 +56,7 @@ abstract class CollectionUtils { static void rename(final K key, final K newKey, RedisOperations operations) { operations.execute(new SessionCallback() { @SuppressWarnings("unchecked") - @Override + public Object execute(RedisOperations operations) throws DataAccessException { do { operations.watch(key); @@ -77,7 +77,7 @@ abstract class CollectionUtils { static Boolean renameIfAbsent(final K key, final K newKey, RedisOperations operations) { return operations.execute(new SessionCallback() { @SuppressWarnings("unchecked") - @Override + public Boolean execute(RedisOperations operations) throws DataAccessException { List exec = null; do { diff --git a/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisList.java b/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisList.java index 40f05bf6f..0ee569a72 100644 --- a/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisList.java +++ b/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisList.java @@ -55,7 +55,7 @@ public class DefaultRedisList extends AbstractRedisCollection implements R super(delegate); } - @Override + protected void removeFromRedisStorage(E item) { DefaultRedisList.this.remove(item); } @@ -102,12 +102,12 @@ public class DefaultRedisList extends AbstractRedisCollection implements R capped = (maxSize > 0); } - @Override + public List range(long start, long end) { return listOps.range(start, end); } - @Override + public RedisList trim(int start, int end) { listOps.trim(start, end); return this; @@ -124,36 +124,36 @@ public class DefaultRedisList extends AbstractRedisCollection implements R } - @Override + public Iterator iterator() { return new DefaultRedisListIterator(content().iterator()); } - @Override + public int size() { return listOps.size().intValue(); } - @Override + public boolean add(E value) { listOps.rightPush(value); cap(); return true; } - @Override + public void clear() { listOps.trim(size() + 1, 0); } - @Override + public boolean remove(Object o) { Long result = listOps.remove(1, o); return (result != null && result.longValue() > 0); } - @Override + public void add(int index, E element) { if (index == 0) { listOps.leftPush(element); @@ -176,7 +176,7 @@ public class DefaultRedisList extends AbstractRedisCollection implements R throw new IllegalArgumentException("Redis supports insertion only at the beginning or the end of the list"); } - @Override + public boolean addAll(int index, Collection c) { // insert collection in reverse if (index == 0) { @@ -206,7 +206,7 @@ public class DefaultRedisList extends AbstractRedisCollection implements R throw new IllegalArgumentException("Redis supports insertion only at the beginning or the end of the list"); } - @Override + public E get(int index) { if (index < 0 || index > size()) { throw new IndexOutOfBoundsException(); @@ -214,40 +214,40 @@ public class DefaultRedisList extends AbstractRedisCollection implements R return listOps.index(index); } - @Override + public int indexOf(Object o) { throw new UnsupportedOperationException(); } - @Override + public int lastIndexOf(Object o) { throw new UnsupportedOperationException(); } - @Override + public ListIterator listIterator() { throw new UnsupportedOperationException(); } - @Override + public ListIterator listIterator(int index) { throw new UnsupportedOperationException(); } - @Override + public E remove(int index) { throw new UnsupportedOperationException(); } - @Override + public E set(int index, E e) { E object = get(index); listOps.set(index, e); return object; } - @Override + public List subList(int fromIndex, int toIndex) { throw new UnsupportedOperationException(); } @@ -256,7 +256,7 @@ public class DefaultRedisList extends AbstractRedisCollection implements R // Queue methods // - @Override + public E element() { E value = peek(); if (value == null) @@ -266,7 +266,7 @@ public class DefaultRedisList extends AbstractRedisCollection implements R } - @Override + public boolean offer(E e) { listOps.rightPush(e); cap(); @@ -274,19 +274,19 @@ public class DefaultRedisList extends AbstractRedisCollection implements R } - @Override + public E peek() { return listOps.index(0); } - @Override + public E poll() { return listOps.leftPop(); } - @Override + public E remove() { E value = poll(); if (value == null) @@ -299,30 +299,30 @@ public class DefaultRedisList extends AbstractRedisCollection implements R // Dequeue // - @Override + public void addFirst(E e) { listOps.leftPush(e); cap(); } - @Override + public void addLast(E e) { add(e); } - @Override + public Iterator descendingIterator() { List content = content(); Collections.reverse(content); return new DefaultRedisListIterator(content.iterator()); } - @Override + public E getFirst() { return element(); } - @Override + public E getLast() { E e = peekLast(); if (e == null) { @@ -331,39 +331,39 @@ public class DefaultRedisList extends AbstractRedisCollection implements R return e; } - @Override + public boolean offerFirst(E e) { addFirst(e); return true; } - @Override + public boolean offerLast(E e) { addLast(e); return true; } - @Override + public E peekFirst() { return peek(); } - @Override + public E peekLast() { return listOps.index(-1); } - @Override + public E pollFirst() { return poll(); } - @Override + public E pollLast() { return listOps.rightPop(); } - @Override + public E pop() { E e = poll(); if (e == null) { @@ -372,22 +372,22 @@ public class DefaultRedisList extends AbstractRedisCollection implements R return e; } - @Override + public void push(E e) { addFirst(e); } - @Override + public E removeFirst() { return pop(); } - @Override + public boolean removeFirstOccurrence(Object o) { return remove(o); } - @Override + public E removeLast() { E e = pollLast(); if (e == null) { @@ -396,7 +396,7 @@ public class DefaultRedisList extends AbstractRedisCollection implements R return e; } - @Override + public boolean removeLastOccurrence(Object o) { Long result = listOps.remove(-1, o); return (result != null && result.longValue() > 0); @@ -407,7 +407,7 @@ public class DefaultRedisList extends AbstractRedisCollection implements R // BlockingQueue // - @Override + public int drainTo(Collection c, int maxElements) { if (this.equals(c)) { throw new IllegalArgumentException("Cannot drain a queue to itself"); @@ -423,33 +423,33 @@ public class DefaultRedisList extends AbstractRedisCollection implements R return loop; } - @Override + public int drainTo(Collection c) { return drainTo(c, size()); } - @Override + public boolean offer(E e, long timeout, TimeUnit unit) throws InterruptedException { return offer(e); } - @Override + public E poll(long timeout, TimeUnit unit) throws InterruptedException { E element = listOps.leftPop(timeout, unit); return (element == null ? null : element); } - @Override + public void put(E e) throws InterruptedException { offer(e); } - @Override + public int remainingCapacity() { return Integer.MAX_VALUE; } - @Override + public E take() throws InterruptedException { return poll(0, TimeUnit.SECONDS); } @@ -459,48 +459,48 @@ public class DefaultRedisList extends AbstractRedisCollection implements R // BlockingDeque // - @Override + public boolean offerFirst(E e, long timeout, TimeUnit unit) throws InterruptedException { return offerFirst(e); } - @Override + public boolean offerLast(E e, long timeout, TimeUnit unit) throws InterruptedException { return offerLast(e); } - @Override + public E pollFirst(long timeout, TimeUnit unit) throws InterruptedException { return poll(timeout, unit); } - @Override + public E pollLast(long timeout, TimeUnit unit) throws InterruptedException { E element = listOps.rightPop(timeout, unit); return (element == null ? null : element); } - @Override + public void putFirst(E e) throws InterruptedException { add(e); } - @Override + public void putLast(E e) throws InterruptedException { put(e); } - @Override + public E takeFirst() throws InterruptedException { return take(); } - @Override + public E takeLast() throws InterruptedException { return pollLast(0, TimeUnit.SECONDS); } - @Override + public DataType getType() { return DataType.LIST; } diff --git a/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisMap.java b/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisMap.java index dfc57cfb0..03405faad 100644 --- a/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisMap.java +++ b/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisMap.java @@ -50,17 +50,17 @@ public class DefaultRedisMap implements RedisMap { this.value = value; } - @Override + public K getKey() { return key; } - @Override + public V getValue() { return value; } - @Override + public V setValue(V value) { throw new UnsupportedOperationException(); } @@ -85,32 +85,32 @@ public class DefaultRedisMap implements RedisMap { this.hashOps = boundOps; } - @Override + public Long increment(K key, long delta) { return hashOps.increment(key, delta); } - @Override + public RedisOperations getOperations() { return hashOps.getOperations(); } - @Override + public void clear() { getOperations().delete(Collections.singleton(getKey())); } - @Override + public boolean containsKey(Object key) { return hashOps.hasKey(key); } - @Override + public boolean containsValue(Object value) { throw new UnsupportedOperationException(); } - @Override + public Set> entrySet() { Set keySet = keySet(); Collection multiGet = hashOps.multiGet(keySet); @@ -126,51 +126,51 @@ public class DefaultRedisMap implements RedisMap { return entries; } - @Override + public V get(Object key) { return hashOps.get(key); } - @Override + public boolean isEmpty() { return size() == 0; } - @Override + public Set keySet() { return hashOps.keys(); } - @Override + public V put(K key, V value) { V oldV = get(key); hashOps.put(key, value); return oldV; } - @Override + public void putAll(Map m) { hashOps.putAll(m); } - @Override + public V remove(Object key) { V v = get(key); hashOps.delete(key); return v; } - @Override + public int size() { return hashOps.size().intValue(); } - @Override + public Collection values() { return hashOps.values(); } - @Override + public boolean equals(Object o) { if (o == this) return true; @@ -181,7 +181,7 @@ public class DefaultRedisMap implements RedisMap { return false; } - @Override + public int hashCode() { int result = 17 + getClass().hashCode(); result = result * 31 + getKey().hashCode(); @@ -189,7 +189,7 @@ public class DefaultRedisMap implements RedisMap { } - @Override + public String toString() { StringBuilder sb = new StringBuilder(); sb.append("RedisStore for key:"); @@ -197,7 +197,7 @@ public class DefaultRedisMap implements RedisMap { return sb.toString(); } - @Override + public V putIfAbsent(K key, V value) { return (hashOps.putIfAbsent(key, value) ? null : get(key)); @@ -219,7 +219,7 @@ public class DefaultRedisMap implements RedisMap { // } } - @Override + public boolean remove(Object key, Object value) { throw new UnsupportedOperationException(); @@ -245,7 +245,7 @@ public class DefaultRedisMap implements RedisMap { // } } - @Override + public boolean replace(K key, V oldValue, V newValue) { throw new UnsupportedOperationException(); @@ -271,7 +271,7 @@ public class DefaultRedisMap implements RedisMap { // } } - @Override + public V replace(K key, V value) { throw new UnsupportedOperationException(); @@ -297,38 +297,38 @@ public class DefaultRedisMap implements RedisMap { // } } - @Override + public Boolean expire(long timeout, TimeUnit unit) { return hashOps.expire(timeout, unit); } - @Override + public Boolean expireAt(Date date) { return hashOps.expireAt(date); } - @Override + public Long getExpire() { return hashOps.getExpire(); } - @Override + public Boolean persist() { return hashOps.persist(); } - @Override + public String getKey() { return hashOps.getKey(); } - @Override + public void rename(String newKey) { hashOps.rename(newKey); } - @Override + public DataType getType() { return hashOps.getType(); } diff --git a/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisSet.java b/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisSet.java index 15d74f23d..ec7de8667 100644 --- a/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisSet.java +++ b/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisSet.java @@ -40,7 +40,7 @@ public class DefaultRedisSet extends AbstractRedisCollection implements Re super(delegate); } - @Override + protected void removeFromRedisStorage(E item) { DefaultRedisSet.this.remove(item); } @@ -68,79 +68,79 @@ public class DefaultRedisSet extends AbstractRedisCollection implements Re } - @Override + public Set diff(RedisSet set) { return boundSetOps.diff(set.getKey()); } - @Override + public Set diff(Collection> sets) { return boundSetOps.diff(CollectionUtils.extractKeys(sets)); } - @Override + public RedisSet diffAndStore(RedisSet set, String destKey) { boundSetOps.diffAndStore(set.getKey(), destKey); return new DefaultRedisSet(boundSetOps.getOperations().boundSetOps(destKey)); } - @Override + public RedisSet diffAndStore(Collection> sets, String destKey) { boundSetOps.diffAndStore(CollectionUtils.extractKeys(sets), destKey); return new DefaultRedisSet(boundSetOps.getOperations().boundSetOps(destKey)); } - @Override + public Set intersect(RedisSet set) { return boundSetOps.intersect(set.getKey()); } - @Override + public Set intersect(Collection> sets) { return boundSetOps.intersect(CollectionUtils.extractKeys(sets)); } - @Override + public RedisSet intersectAndStore(RedisSet set, String destKey) { boundSetOps.intersectAndStore(set.getKey(), destKey); return new DefaultRedisSet(boundSetOps.getOperations().boundSetOps(destKey)); } - @Override + public RedisSet intersectAndStore(Collection> sets, String destKey) { boundSetOps.intersectAndStore(CollectionUtils.extractKeys(sets), destKey); return new DefaultRedisSet(boundSetOps.getOperations().boundSetOps(destKey)); } - @Override + public Set union(RedisSet set) { return boundSetOps.union(set.getKey()); } - @Override + public Set union(Collection> sets) { return boundSetOps.union(CollectionUtils.extractKeys(sets)); } - @Override + public RedisSet unionAndStore(RedisSet set, String destKey) { boundSetOps.unionAndStore(set.getKey(), destKey); return new DefaultRedisSet(boundSetOps.getOperations().boundSetOps(destKey)); } - @Override + public RedisSet unionAndStore(Collection> sets, String destKey) { boundSetOps.unionAndStore(CollectionUtils.extractKeys(sets), destKey); return new DefaultRedisSet(boundSetOps.getOperations().boundSetOps(destKey)); } - @Override + public boolean add(E e) { return boundSetOps.add(e); } - @Override + public void clear() { // intersect the set with a non existing one // TODO: find a safer way to clean the set @@ -148,27 +148,27 @@ public class DefaultRedisSet extends AbstractRedisCollection implements Re boundSetOps.intersectAndStore(Collections.singleton(randomKey), getKey()); } - @Override + public boolean contains(Object o) { return boundSetOps.isMember(o); } - @Override + public Iterator iterator() { return new DefaultRedisSetIterator(boundSetOps.members().iterator()); } - @Override + public boolean remove(Object o) { return boundSetOps.remove(o); } - @Override + public int size() { return boundSetOps.size().intValue(); } - @Override + public DataType getType() { return DataType.SET; } diff --git a/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisZSet.java b/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisZSet.java index e00806e6c..a0e660954 100644 --- a/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisZSet.java +++ b/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisZSet.java @@ -41,7 +41,7 @@ public class DefaultRedisZSet extends AbstractRedisCollection implements R super(delegate); } - @Override + protected void removeFromRedisStorage(E item) { DefaultRedisZSet.this.remove(item); } @@ -92,123 +92,121 @@ public class DefaultRedisZSet extends AbstractRedisCollection implements R this.defaultScore = defaultScore; } - @Override + public RedisZSet intersectAndStore(RedisZSet set, String destKey) { boundZSetOps.intersectAndStore(set.getKey(), destKey); return new DefaultRedisZSet(boundZSetOps.getOperations().boundZSetOps(destKey), getDefaultScore()); } - @Override + public RedisZSet intersectAndStore(Collection> sets, String destKey) { boundZSetOps.intersectAndStore(CollectionUtils.extractKeys(sets), destKey); return new DefaultRedisZSet(boundZSetOps.getOperations().boundZSetOps(destKey), getDefaultScore()); } - @Override + public Set range(long start, long end) { return boundZSetOps.range(start, end); } - @Override + public Set reverseRange(long start, long end) { return boundZSetOps.reverseRange(start, end); } - @Override + public Set rangeByScore(double min, double max) { return boundZSetOps.rangeByScore(min, max); } - @Override + public Set reverseRangeByScore(double min, double max) { return boundZSetOps.reverseRangeByScore(min, max); } - @Override + public Set> rangeByScoreWithScores(double min, double max) { return boundZSetOps.rangeByScoreWithScores(min, max); } - @Override + public Set> rangeWithScores(long start, long end) { return boundZSetOps.rangeWithScores(start, end); } - @Override + public Set> reverseRangeByScoreWithScores(double min, double max) { return boundZSetOps.reverseRangeByScoreWithScores(min, max); } - @Override + public Set> reverseRangeWithScores(long start, long end) { return boundZSetOps.reverseRangeWithScores(start, end); } - @Override + public RedisZSet remove(long start, long end) { boundZSetOps.removeRange(start, end); return this; } - @Override + public RedisZSet removeByScore(double min, double max) { boundZSetOps.removeRangeByScore(min, max); return this; } - @Override + public RedisZSet unionAndStore(RedisZSet set, String destKey) { boundZSetOps.unionAndStore(set.getKey(), destKey); return new DefaultRedisZSet(boundZSetOps.getOperations().boundZSetOps(destKey), getDefaultScore()); } - @Override public RedisZSet unionAndStore(Collection> sets, String destKey) { boundZSetOps.unionAndStore(CollectionUtils.extractKeys(sets), destKey); return new DefaultRedisZSet(boundZSetOps.getOperations().boundZSetOps(destKey), getDefaultScore()); } - @Override + public boolean add(E e) { return add(e, getDefaultScore()); } - @Override public boolean add(E e, double score) { return boundZSetOps.add(e, score); } - @Override + public void clear() { boundZSetOps.removeRange(0, -1); } - @Override + public boolean contains(Object o) { return (boundZSetOps.rank(o) != null); } - @Override + public Iterator iterator() { return new DefaultRedisSortedSetIterator(boundZSetOps.range(0, -1).iterator()); } - @Override + public boolean remove(Object o) { return boundZSetOps.remove(o); } - @Override + public int size() { return boundZSetOps.size().intValue(); } - @Override + public Double getDefaultScore() { return defaultScore; } - @Override + public E first() { Iterator iterator = boundZSetOps.range(0, 0).iterator(); if (iterator.hasNext()) @@ -216,7 +214,7 @@ public class DefaultRedisZSet extends AbstractRedisCollection implements R throw new NoSuchElementException(); } - @Override + public E last() { Iterator iterator = boundZSetOps.reverseRange(0, 0).iterator(); if (iterator.hasNext()) @@ -224,22 +222,22 @@ public class DefaultRedisZSet extends AbstractRedisCollection implements R throw new NoSuchElementException(); } - @Override + public Long rank(Object o) { return boundZSetOps.rank(o); } - @Override + public Long reverseRank(Object o) { return boundZSetOps.reverseRank(o); } - @Override + public Double score(Object o) { return boundZSetOps.score(o); } - @Override + public DataType getType() { return DataType.ZSET; } diff --git a/src/main/java/org/springframework/data/redis/support/collections/RedisCollectionFactoryBean.java b/src/main/java/org/springframework/data/redis/support/collections/RedisCollectionFactoryBean.java index 8b248964d..8397fdbc7 100644 --- a/src/main/java/org/springframework/data/redis/support/collections/RedisCollectionFactoryBean.java +++ b/src/main/java/org/springframework/data/redis/support/collections/RedisCollectionFactoryBean.java @@ -39,31 +39,31 @@ public class RedisCollectionFactoryBean implements InitializingBean, BeanNameAwa */ public enum CollectionType { LIST { - @Override + public DataType dataType() { return DataType.LIST; } }, SET { - @Override + public DataType dataType() { return DataType.SET; } }, ZSET { - @Override + public DataType dataType() { return DataType.ZSET; } }, MAP { - @Override + public DataType dataType() { return DataType.HASH; } }, PROPERTIES { - @Override + public DataType dataType() { return DataType.HASH; } @@ -79,7 +79,7 @@ public class RedisCollectionFactoryBean implements InitializingBean, BeanNameAwa private String key; private String beanName; - @Override + public void afterPropertiesSet() { if (!StringUtils.hasText(key)) { key = beanName; @@ -124,22 +124,22 @@ public class RedisCollectionFactoryBean implements InitializingBean, BeanNameAwa return null; } - @Override + public RedisStore getObject() { return store; } - @Override + public Class getObjectType() { return (store != null ? store.getClass() : RedisStore.class); } - @Override + public boolean isSingleton() { return true; } - @Override + public void setBeanName(String name) { this.beanName = name; } diff --git a/src/main/java/org/springframework/data/redis/support/collections/RedisProperties.java b/src/main/java/org/springframework/data/redis/support/collections/RedisProperties.java index bde029c84..4ceac6c4a 100644 --- a/src/main/java/org/springframework/data/redis/support/collections/RedisProperties.java +++ b/src/main/java/org/springframework/data/redis/support/collections/RedisProperties.java @@ -89,23 +89,23 @@ public class RedisProperties extends Properties implements RedisMap boundHashOps(key)); } - @Override + public synchronized Object get(Object key) { return delegate.get(key); } - @Override + public synchronized Object put(Object key, Object value) { return delegate.put((String) key, (String) value); } @SuppressWarnings("unchecked") - @Override + public synchronized void putAll(Map t) { delegate.putAll((Map) t); } - @Override + public Enumeration propertyNames() { Set keys = new LinkedHashSet(delegate.keySet()); if (defaults != null) { @@ -114,46 +114,46 @@ public class RedisProperties extends Properties implements RedisMap elements() { Collection values = delegate.values(); return Collections.enumeration(values); } - @Override + @SuppressWarnings("unchecked") public Set> entrySet() { Set entries = delegate.entrySet(); return entries; } - @Override + public synchronized boolean equals(Object o) { if (o == this) return true; @@ -164,118 +164,118 @@ public class RedisProperties extends Properties implements RedisMap keys() { Set keys = keySet(); return Collections.enumeration(keys); } @SuppressWarnings("unchecked") - @Override + public Set keySet() { Set keys = delegate.keySet(); return keys; } - @Override + public synchronized Object remove(Object key) { return delegate.remove(key); } - @Override + public synchronized int size() { return delegate.size(); } @SuppressWarnings("unchecked") - @Override + public Collection values() { Collection vals = delegate.values(); return vals; } - @Override + public Long increment(Object key, long delta) { return hashOps.increment((String) key, delta); } - @Override + public RedisOperations getOperations() { return hashOps.getOperations(); } - @Override + public Boolean expire(long timeout, TimeUnit unit) { return hashOps.expire(timeout, unit); } - @Override + public Boolean expireAt(Date date) { return hashOps.expireAt(date); } - @Override + public Long getExpire() { return hashOps.getExpire(); } - @Override + public String getKey() { return hashOps.getKey(); } - @Override + public DataType getType() { return hashOps.getType(); } - @Override + public Boolean persist() { return hashOps.persist(); } - @Override + public void rename(String newKey) { hashOps.rename(newKey); } - @Override + public Object putIfAbsent(Object key, Object value) { return (hashOps.putIfAbsent((String) key, (String) value) ? null : get(key)); } - @Override + public boolean remove(Object key, Object value) { throw new UnsupportedOperationException(); } - @Override + public boolean replace(Object key, Object oldValue, Object newValue) { throw new UnsupportedOperationException(); } - @Override + public Object replace(Object key, Object value) { throw new UnsupportedOperationException(); } - @Override + public synchronized void storeToXML(OutputStream os, String comment, String encoding) throws IOException { throw new UnsupportedOperationException(); } - @Override + public synchronized void storeToXML(OutputStream os, String comment) throws IOException { throw new UnsupportedOperationException(); } diff --git a/src/test/java/org/springframework/data/redis/Address.java b/src/test/java/org/springframework/data/redis/Address.java index ffeda9fd6..07a0f1e8d 100644 --- a/src/test/java/org/springframework/data/redis/Address.java +++ b/src/test/java/org/springframework/data/redis/Address.java @@ -78,7 +78,7 @@ public class Address implements Serializable { this.number = number; } - @Override + public int hashCode() { final int prime = 31; int result = 1; @@ -87,7 +87,7 @@ public class Address implements Serializable { return result; } - @Override + public boolean equals(Object obj) { if (this == obj) return true; diff --git a/src/test/java/org/springframework/data/redis/Person.java b/src/test/java/org/springframework/data/redis/Person.java index b602d584a..01dc7161c 100644 --- a/src/test/java/org/springframework/data/redis/Person.java +++ b/src/test/java/org/springframework/data/redis/Person.java @@ -80,7 +80,7 @@ public class Person implements Serializable { this.address = address; } - @Override + public int hashCode() { final int prime = 31; int result = 1; @@ -91,7 +91,7 @@ public class Person implements Serializable { return result; } - @Override + public boolean equals(Object obj) { if (this == obj) return true; diff --git a/src/test/java/org/springframework/data/redis/cache/RedisCacheTest.java b/src/test/java/org/springframework/data/redis/cache/RedisCacheTest.java index 4d8e307a1..7780e5ce3 100644 --- a/src/test/java/org/springframework/data/redis/cache/RedisCacheTest.java +++ b/src/test/java/org/springframework/data/redis/cache/RedisCacheTest.java @@ -16,9 +16,10 @@ package org.springframework.data.redis.cache; -import static org.junit.Assert.*; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import java.util.Collection; import java.util.concurrent.TimeUnit; @@ -57,12 +58,12 @@ public class RedisCacheTest extends AbstractNativeCacheTest { return CollectionTestParams.testParams(); } - @Override + protected Cache createCache(RedisTemplate nativeCache) { return new RedisCache(CACHE_NAME, CACHE_NAME.concat(":").getBytes(), nativeCache); } - @Override + protected RedisTemplate createNativeCache() throws Exception { return template; } @@ -79,7 +80,7 @@ public class RedisCacheTest extends AbstractNativeCacheTest { ConnectionFactoryTracker.cleanUp(); } - @Override + protected Object getObject() { return objFactory.instance(); } @@ -98,7 +99,7 @@ public class RedisCacheTest extends AbstractNativeCacheTest { final Object monitor = new Object(); Thread th = new Thread(new Runnable() { - @Override + public void run() { synchronized (monitor) { monitor.notify(); diff --git a/src/test/java/org/springframework/data/redis/config/NamespaceTest.java b/src/test/java/org/springframework/data/redis/config/NamespaceTest.java index c750ec861..acb5d2f5c 100644 --- a/src/test/java/org/springframework/data/redis/config/NamespaceTest.java +++ b/src/test/java/org/springframework/data/redis/config/NamespaceTest.java @@ -49,7 +49,7 @@ public class NamespaceTest { public void testSanityTest() throws Exception { RedisMessageListenerContainer container = ctx.getBean(RedisMessageListenerContainer.class); assertTrue(container.isRunning()); - Thread.sleep(TimeUnit.SECONDS.toMillis(2)); + Thread.sleep(TimeUnit.SECONDS.toMillis(8)); } @Test @@ -57,7 +57,7 @@ public class NamespaceTest { StringRedisTemplate template = ctx.getBean(StringRedisTemplate.class); template.convertAndSend("x1", "[X]test"); template.convertAndSend("z1", "[Z]test"); - Thread.sleep(TimeUnit.SECONDS.toMillis(5)); + Thread.sleep(TimeUnit.SECONDS.toMillis(8)); } public void testErrorHandler() throws Exception { diff --git a/src/test/java/org/springframework/data/redis/config/StubErrorHandler.java b/src/test/java/org/springframework/data/redis/config/StubErrorHandler.java index 965d36d58..d79c74344 100644 --- a/src/test/java/org/springframework/data/redis/config/StubErrorHandler.java +++ b/src/test/java/org/springframework/data/redis/config/StubErrorHandler.java @@ -27,7 +27,7 @@ public class StubErrorHandler implements ErrorHandler { public BlockingDeque throwables = new LinkedBlockingDeque(); - @Override + public void handleError(Throwable t) { throwables.add(t); } diff --git a/src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java index 91bb6f6b8..216be63be 100644 --- a/src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java @@ -201,7 +201,7 @@ public abstract class AbstractConnectionIntegrationTests { final BlockingDeque queue = new LinkedBlockingDeque(); final MessageListener ml = new MessageListener() { - @Override + public void onMessage(Message message, byte[] pattern) { queue.add(message); System.out.println("received message"); @@ -217,7 +217,7 @@ public abstract class AbstractConnectionIntegrationTests { final AtomicBoolean flag = new AtomicBoolean(true); Runnable listener = new Runnable() { - @Override + public void run() { subConn.subscribe(ml, channel); System.out.println("Subscribed"); @@ -256,7 +256,7 @@ public abstract class AbstractConnectionIntegrationTests { MessageListener listener = new MessageListener() { - @Override + public void onMessage(Message message, byte[] pattern) { assertArrayEquals(expectedChannel, message.getChannel()); assertArrayEquals(expectedMessage, message.getBody()); @@ -264,7 +264,7 @@ public abstract class AbstractConnectionIntegrationTests { }; Thread th = new Thread(new Runnable() { - @Override + public void run() { // sleep 1 second to let the registration happen try { @@ -293,7 +293,7 @@ public abstract class AbstractConnectionIntegrationTests { MessageListener listener = new MessageListener() { - @Override + public void onMessage(Message message, byte[] pattern) { assertArrayEquals(expectedPattern, pattern); assertArrayEquals(expectedMessage, message.getBody()); @@ -302,7 +302,7 @@ public abstract class AbstractConnectionIntegrationTests { }; Thread th = new Thread(new Runnable() { - @Override + public void run() { // sleep 1 second to let the registration happen try { diff --git a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionIntegrationTests.java index 040257dfe..2561bd532 100644 --- a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionIntegrationTests.java @@ -39,7 +39,7 @@ public class JedisConnectionIntegrationTests extends AbstractConnectionIntegrati factory.afterPropertiesSet(); } - @Override + protected RedisConnectionFactory getConnectionFactory() { return factory; } diff --git a/src/test/java/org/springframework/data/redis/connection/jredis/JRedisConnectionIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/jredis/JRedisConnectionIntegrationTests.java index 1f2ca6c19..6ddc7df89 100644 --- a/src/test/java/org/springframework/data/redis/connection/jredis/JRedisConnectionIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/jredis/JRedisConnectionIntegrationTests.java @@ -37,7 +37,7 @@ public class JRedisConnectionIntegrationTests extends AbstractConnectionIntegrat factory.afterPropertiesSet(); } - @Override + protected RedisConnectionFactory getConnectionFactory() { return factory; } diff --git a/src/test/java/org/springframework/data/redis/connection/rjc/RjcConnectionIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/rjc/RjcConnectionIntegrationTests.java index b5528c237..0c0df06f5 100644 --- a/src/test/java/org/springframework/data/redis/connection/rjc/RjcConnectionIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/rjc/RjcConnectionIntegrationTests.java @@ -38,7 +38,7 @@ public class RjcConnectionIntegrationTests extends AbstractConnectionIntegration factory.afterPropertiesSet(); } - @Override + protected RedisConnectionFactory getConnectionFactory() { return factory; } diff --git a/src/test/java/org/springframework/data/redis/core/SessionTest.java b/src/test/java/org/springframework/data/redis/core/SessionTest.java index 9066bfeff..41143d4c0 100644 --- a/src/test/java/org/springframework/data/redis/core/SessionTest.java +++ b/src/test/java/org/springframework/data/redis/core/SessionTest.java @@ -42,7 +42,7 @@ public class SessionTest { final StringRedisTemplate template = new StringRedisTemplate(factory); template.execute(new SessionCallback() { - @Override + public Object execute(RedisOperations operations) { checkConnection(template, conn); template.discard(); @@ -56,7 +56,7 @@ public class SessionTest { private void checkConnection(RedisTemplate template, final RedisConnection expectedConnection) { template.execute(new RedisCallback() { - @Override + public Object doInRedis(RedisConnection connection) throws DataAccessException { assertSame(expectedConnection, connection); return null; diff --git a/src/test/java/org/springframework/data/redis/listener/adapter/MessageListenerTest.java b/src/test/java/org/springframework/data/redis/listener/adapter/MessageListenerTest.java index ca75c80cc..2fc9bf2fd 100644 --- a/src/test/java/org/springframework/data/redis/listener/adapter/MessageListenerTest.java +++ b/src/test/java/org/springframework/data/redis/listener/adapter/MessageListenerTest.java @@ -85,7 +85,7 @@ public class MessageListenerTest { MessageListenerAdapter adapter = new MessageListenerAdapter(mock) { - @Override + protected void handleListenerException(Throwable ex) { throw new IllegalStateException(ex); } diff --git a/src/test/java/org/springframework/data/redis/listener/adapter/ThrowableMessageListener.java b/src/test/java/org/springframework/data/redis/listener/adapter/ThrowableMessageListener.java index 433fd4010..0d54f71b4 100644 --- a/src/test/java/org/springframework/data/redis/listener/adapter/ThrowableMessageListener.java +++ b/src/test/java/org/springframework/data/redis/listener/adapter/ThrowableMessageListener.java @@ -24,7 +24,6 @@ import org.springframework.data.redis.connection.MessageListener; */ public class ThrowableMessageListener implements MessageListener { - @Override public void onMessage(Message message, byte[] pattern) { throw new IllegalStateException("throwing exception for message " + message); } diff --git a/src/test/java/org/springframework/data/redis/mapping/BeanUtilsHashMapperTest.java b/src/test/java/org/springframework/data/redis/mapping/BeanUtilsHashMapperTest.java index 0aeb339e5..8412ef427 100644 --- a/src/test/java/org/springframework/data/redis/mapping/BeanUtilsHashMapperTest.java +++ b/src/test/java/org/springframework/data/redis/mapping/BeanUtilsHashMapperTest.java @@ -24,7 +24,7 @@ import org.springframework.data.redis.hash.HashMapper; */ public class BeanUtilsHashMapperTest extends AbstractHashMapperTest { - @Override + protected HashMapper mapperFor(Class t) { return new BeanUtilsHashMapper(t); } diff --git a/src/test/java/org/springframework/data/redis/mapping/JacksonHashMapperTest.java b/src/test/java/org/springframework/data/redis/mapping/JacksonHashMapperTest.java index 7ce7aa74b..58f06f31a 100644 --- a/src/test/java/org/springframework/data/redis/mapping/JacksonHashMapperTest.java +++ b/src/test/java/org/springframework/data/redis/mapping/JacksonHashMapperTest.java @@ -20,7 +20,7 @@ import org.springframework.data.redis.hash.JacksonHashMapper; public class JacksonHashMapperTest extends AbstractHashMapperTest { - @Override + protected HashMapper mapperFor(Class t) { return new JacksonHashMapper(t); } diff --git a/src/test/java/org/springframework/data/redis/serializer/SimpleRedisSerializerTests.java b/src/test/java/org/springframework/data/redis/serializer/SimpleRedisSerializerTests.java index b81de9dda..3ed767970 100644 --- a/src/test/java/org/springframework/data/redis/serializer/SimpleRedisSerializerTests.java +++ b/src/test/java/org/springframework/data/redis/serializer/SimpleRedisSerializerTests.java @@ -37,7 +37,7 @@ public class SimpleRedisSerializerTests { private static class A implements Serializable { private Integer value = Integer.valueOf(30); - @Override + public int hashCode() { final int prime = 31; int result = 1; @@ -45,7 +45,7 @@ public class SimpleRedisSerializerTests { return result; } - @Override + public boolean equals(Object obj) { if (this == obj) return true; @@ -68,7 +68,7 @@ public class SimpleRedisSerializerTests { private String name = getClass().getName(); private A a = new A(); - @Override + public int hashCode() { final int prime = 31; int result = 1; @@ -77,7 +77,7 @@ public class SimpleRedisSerializerTests { return result; } - @Override + public boolean equals(Object obj) { if (this == obj) return true; diff --git a/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisCollectionTests.java b/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisCollectionTests.java index ad4aa6064..370e550c4 100644 --- a/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisCollectionTests.java +++ b/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisCollectionTests.java @@ -93,7 +93,7 @@ public abstract class AbstractRedisCollectionTests { collection.getOperations().delete(Collections.singleton(collection.getKey())); template.execute(new RedisCallback() { - @Override + public Object doInRedis(RedisConnection connection) { connection.flushDb(); return null; diff --git a/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisMapTests.java b/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisMapTests.java index 191b89c5b..2d24021a9 100644 --- a/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisMapTests.java +++ b/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisMapTests.java @@ -100,7 +100,7 @@ public abstract class AbstractRedisMapTests { map.getOperations().delete(Collections.singleton(map.getKey())); template.execute(new RedisCallback() { - @Override + public Object doInRedis(RedisConnection connection) { connection.flushDb(); return null; diff --git a/src/test/java/org/springframework/data/redis/support/collections/PersonObjectFactory.java b/src/test/java/org/springframework/data/redis/support/collections/PersonObjectFactory.java index 49e62c7d8..9a855e39a 100644 --- a/src/test/java/org/springframework/data/redis/support/collections/PersonObjectFactory.java +++ b/src/test/java/org/springframework/data/redis/support/collections/PersonObjectFactory.java @@ -27,7 +27,7 @@ public class PersonObjectFactory implements ObjectFactory { private int counter = 0; - @Override + public Person instance() { String uuid = UUID.randomUUID().toString(); return new Person(uuid, uuid, ++counter, new Address(uuid, counter)); diff --git a/src/test/java/org/springframework/data/redis/support/collections/RedisCollectionFactoryBeanTests.java b/src/test/java/org/springframework/data/redis/support/collections/RedisCollectionFactoryBeanTests.java index 997c5af5a..86800d571 100644 --- a/src/test/java/org/springframework/data/redis/support/collections/RedisCollectionFactoryBeanTests.java +++ b/src/test/java/org/springframework/data/redis/support/collections/RedisCollectionFactoryBeanTests.java @@ -67,7 +67,7 @@ public class RedisCollectionFactoryBeanTests { // clean up the whole db template.execute(new RedisCallback() { - @Override + public Object doInRedis(RedisConnection connection) { connection.flushDb(); return null; diff --git a/src/test/java/org/springframework/data/redis/support/collections/RedisListTests.java b/src/test/java/org/springframework/data/redis/support/collections/RedisListTests.java index 51a38acec..aa67c5da2 100644 --- a/src/test/java/org/springframework/data/redis/support/collections/RedisListTests.java +++ b/src/test/java/org/springframework/data/redis/support/collections/RedisListTests.java @@ -37,12 +37,12 @@ public class RedisListTests extends AbstractRedisListTests { super(factory, template); } - @Override + RedisStore copyStore(RedisStore store) { return new DefaultRedisList(store.getKey().toString(), store.getOperations()); } - @Override + AbstractRedisCollection createCollection() { String redisName = getClass().getName(); return new DefaultRedisList(redisName, template); diff --git a/src/test/java/org/springframework/data/redis/support/collections/RedisMapTests.java b/src/test/java/org/springframework/data/redis/support/collections/RedisMapTests.java index c0896de9f..79fc283a3 100644 --- a/src/test/java/org/springframework/data/redis/support/collections/RedisMapTests.java +++ b/src/test/java/org/springframework/data/redis/support/collections/RedisMapTests.java @@ -42,7 +42,7 @@ public class RedisMapTests extends AbstractRedisMapTests { super(keyFactory, valueFactory, template); } - @Override + RedisMap createMap() { String redisName = getClass().getSimpleName(); return new DefaultRedisMap(redisName, template); diff --git a/src/test/java/org/springframework/data/redis/support/collections/RedisPropertiesTests.java b/src/test/java/org/springframework/data/redis/support/collections/RedisPropertiesTests.java index b1bc7af56..8726b0ceb 100644 --- a/src/test/java/org/springframework/data/redis/support/collections/RedisPropertiesTests.java +++ b/src/test/java/org/springframework/data/redis/support/collections/RedisPropertiesTests.java @@ -66,14 +66,14 @@ public class RedisPropertiesTests extends RedisMapTests { super(keyFactory, valueFactory, template); } - @Override + RedisMap createMap() { String redisName = getClass().getSimpleName(); props = new RedisProperties(defaults, redisName, new StringRedisTemplate(template.getConnectionFactory())); return props; } - @Override + protected RedisStore copyStore(RedisStore store) { return new RedisProperties(store.getKey(), store.getOperations()); } diff --git a/src/test/java/org/springframework/data/redis/support/collections/RedisSetTests.java b/src/test/java/org/springframework/data/redis/support/collections/RedisSetTests.java index 14c79747e..64b8f8b47 100644 --- a/src/test/java/org/springframework/data/redis/support/collections/RedisSetTests.java +++ b/src/test/java/org/springframework/data/redis/support/collections/RedisSetTests.java @@ -37,12 +37,12 @@ public class RedisSetTests extends AbstractRedisSetTests { super(factory, template); } - @Override + RedisStore copyStore(RedisStore store) { return new DefaultRedisSet(store.getKey().toString(), store.getOperations()); } - @Override + AbstractRedisCollection createCollection() { String redisName = getClass().getName(); return new DefaultRedisSet(redisName, template); diff --git a/src/test/java/org/springframework/data/redis/support/collections/RedisZSetTests.java b/src/test/java/org/springframework/data/redis/support/collections/RedisZSetTests.java index dda0ec570..396ddb30e 100644 --- a/src/test/java/org/springframework/data/redis/support/collections/RedisZSetTests.java +++ b/src/test/java/org/springframework/data/redis/support/collections/RedisZSetTests.java @@ -37,12 +37,12 @@ public class RedisZSetTests extends AbstractRedisZSetTest { super(factory, template); } - @Override + RedisStore copyStore(RedisStore store) { return new DefaultRedisZSet(store.getKey().toString(), store.getOperations()); } - @Override + AbstractRedisCollection createCollection() { String redisName = getClass().getName(); return new DefaultRedisZSet(redisName, template); diff --git a/src/test/java/org/springframework/data/redis/support/collections/StringObjectFactory.java b/src/test/java/org/springframework/data/redis/support/collections/StringObjectFactory.java index 926a93854..6b61cdbdd 100644 --- a/src/test/java/org/springframework/data/redis/support/collections/StringObjectFactory.java +++ b/src/test/java/org/springframework/data/redis/support/collections/StringObjectFactory.java @@ -24,7 +24,7 @@ import java.util.UUID; */ public class StringObjectFactory implements ObjectFactory { - @Override + public String instance() { return UUID.randomUUID().toString(); }