DATAREDIS-528 - Polishing.

Extend date ranges in license headers. Add author tags. Update documentation. Original pull request: spring-projects#222.

Author: mp911de

src/main/asciidoc/new-features.adoc

@@ -8,6 +8,7 @@ New and noteworthy in the latest releases.
 
 * Support for Redis http://redis.io/commands#geo[GEO] commands.
 * Support for Geospatial Indexes using Spring Data Repository abstractions (see <<redis.repositories.indexes.geospatial>>).
+* Upgrade to `Lettuce` 4.2. Lettuce 4.2 requires Java 8.
 
 [[new-in-1.7.0]]
 == New in Spring Data Redis 1.7

src/main/java/org/springframework/data/redis/connection/lettuce/AuthenticatingRedisClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,16 +41,28 @@ public AuthenticatingRedisClient(String host, String password) {
 super(null, RedisURI.builder().withHost(host).withPassword(password).build());
 }
 
+/*
+ * (non-Javadoc)
+ * @see com.lambdaworks.redis.RedisClient#connect(com.lambdaworks.redis.codec.RedisCodec)
+ */
 @Override
 public <K, V> StatefulRedisConnection<K, V> connect(RedisCodec<K, V> codec) {
 return super.connect(codec);
 }
 
+/*
+ * (non-Javadoc)
+ * @see com.lambdaworks.redis.RedisClient#connectAsync(com.lambdaworks.redis.codec.RedisCodec)
+ */
 @Override
 public <K, V> RedisAsyncCommands<K, V> connectAsync(RedisCodec<K, V> codec) {
 return super.connectAsync(codec);
 }
 
+/*
+ * (non-Javadoc)
+ * @see com.lambdaworks.redis.RedisClient#connectPubSub(com.lambdaworks.redis.codec.RedisCodec)
+ */
 @Override
 public <K, V> StatefulRedisPubSubConnection<K, V> connectPubSub(RedisCodec<K, V> codec) {
 return super.connectPubSub(codec);

src/main/java/org/springframework/data/redis/connection/lettuce/DefaultLettucePool.java

@@ -103,6 +103,10 @@ public boolean isRedisSentinelAware() {
 return sentinelConfiguration != null;
 }
 
+/*
+ * (non-Javadoc)
+ * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
+ */
 @SuppressWarnings({ "rawtypes" })
 public void afterPropertiesSet() {
 
@@ -136,6 +140,11 @@ private RedisURI createSimpleHostRedisURI() {
 return RedisURI.Builder.redis(hostName, port).withTimeout(timeout, TimeUnit.MILLISECONDS).build();
 }
 
+/*
+ * (non-Javadoc)
+ * @see org.springframework.data.redis.connection.Pool#getResource()
+ */
+@Override
 @SuppressWarnings("unchecked")
 public StatefulConnection<byte[], byte[]> getResource() {
 try {
@@ -145,23 +154,41 @@ public StatefulConnection<byte[], byte[]> getResource() {
 }
 }
 
+/*
+ * (non-Javadoc)
+ * @see org.springframework.data.redis.connection.Pool#returnBrokenResource(java.lang.Object)
+ */
+@Override
 public void returnBrokenResource(final StatefulConnection<byte[], byte[]> resource) {
+
 try {
 internalPool.invalidateObject(resource);
 } catch (Exception e) {
 throw new PoolException("Could not invalidate the broken resource", e);
 }
 }
 
+/*
+ * (non-Javadoc)
+ * @see org.springframework.data.redis.connection.Pool#returnResource(java.lang.Object)
+ */
+@Override
 public void returnResource(final StatefulConnection<byte[], byte[]> resource) {
+
 try {
 internalPool.returnObject(resource);
 } catch (Exception e) {
 throw new PoolException("Could not return the resource to the pool", e);
 }
 }
 
+/*
+ * (non-Javadoc)
+ * @see org.springframework.data.redis.connection.Pool#destroy()
+ */
+@Override
 public void destroy() {
+
 try {
 client.shutdown();
 internalPool.close();
@@ -316,6 +343,10 @@ public LettuceFactory(RedisClient client, int dbIndex) {
 this.dbIndex = dbIndex;
 }
 
+/*
+ * (non-Javadoc)
+ * @see org.apache.commons.pool2.BasePooledObjectFactory#activateObject(org.apache.commons.pool2.PooledObject)
+ */
 @Override
 public void activateObject(PooledObject<StatefulConnection<byte[], byte[]>> pooledObject) throws Exception {
 
@@ -324,6 +355,11 @@ public void activateObject(PooledObject<StatefulConnection<byte[], byte[]>> pool
 }
 }
 
+/*
+ * (non-Javadoc)
+ * @see org.apache.commons.pool2.BasePooledObjectFactory#destroyObject(org.apache.commons.pool2.PooledObject)
+ */
+@Override
 public void destroyObject(final PooledObject<StatefulConnection<byte[], byte[]>> obj) throws Exception {
 try {
 obj.getObject().close();
@@ -332,6 +368,11 @@ public void destroyObject(final PooledObject<StatefulConnection<byte[], byte[]>>
 }
 }
 
+/*
+ * (non-Javadoc)
+ * @see org.apache.commons.pool2.BasePooledObjectFactory#validateObject(org.apache.commons.pool2.PooledObject)
+ */
+@Override
 public boolean validateObject(final PooledObject<StatefulConnection<byte[], byte[]>> obj) {
 try {
 if (obj.getObject() instanceof StatefulRedisConnection) {
@@ -343,11 +384,19 @@ public boolean validateObject(final PooledObject<StatefulConnection<byte[], byte
 }
 }
 
+/*
+ * (non-Javadoc)
+ * @see org.apache.commons.pool2.BasePooledObjectFactory#create()
+ */
 @Override
 public StatefulConnection<byte[], byte[]> create() throws Exception {
 return client.connect(LettuceConnection.CODEC);
 }
 
+/*
+ * (non-Javadoc)
+ * @see org.apache.commons.pool2.BasePooledObjectFactory#wrap(java.lang.Object)
+ */
 @Override
 public PooledObject<StatefulConnection<byte[], byte[]>> wrap(StatefulConnection<byte[], byte[]> obj) {
 return new DefaultPooledObject<StatefulConnection<byte[], byte[]>>(obj);

src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnection.java

@@ -298,7 +298,7 @@ public Long del(byte[]... keys) {
 
 Assert.noNullElements(keys, "Keys must not be null or contain null key!");
 
-// Routing for mget is handled by lettuce itself.
+// Routing for mget is handled by lettuce.
 return super.del(keys);
 }
 
@@ -876,7 +876,7 @@ public List<byte[]> mGet(byte[]... keys) {
 
 Assert.notNull(keys, "Keys must not be null!");
 
-// Routing for mget is handled by lettuce itself.
+// Routing for mget is handled by lettuce.
 return super.mGet(keys);
 }
 
@@ -889,7 +889,7 @@ public void mSet(Map<byte[], byte[]> tuples) {
 
 Assert.notNull(tuples, "Tuples must not be null!");
 
-// Routing for msetnx is handled by lettuce itself.
+// Routing for mset is handled by lettuce.
 super.mSet(tuples);
 }
 

src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java

@@ -459,16 +459,14 @@ public void openPipeline() {
 }
 
 public List<Object> closePipeline() {
+
 if (isPipelined) {
 isPipelined = false;
 List<com.lambdaworks.redis.protocol.RedisCommand<?, ?, ?>> futures = new ArrayList<com.lambdaworks.redis.protocol.RedisCommand<?, ?, ?>>();
 for (LettuceResult result : ppline) {
 futures.add(result.getResultHolder());
 }
 
-// boolean done = LettuceFutures.awaitAll(timeout, TimeUnit.MILLISECONDS,
-// futures.toArray(new Command[futures.size()]));
-
 try {
 boolean done = LettuceFutures.awaitAll(timeout, TimeUnit.MILLISECONDS,
 futures.toArray(new RedisFuture[futures.size()]));
@@ -479,14 +477,17 @@ public List<Object> closePipeline() {
 
 if (done) {
 for (LettuceResult result : ppline) {
+
 if (result.getResultHolder().getOutput().hasError()) {
+
 Exception err = new InvalidDataAccessApiUsageException(result.getResultHolder().getOutput().getError());
 // remember only the first error
 if (problem == null) {
 problem = err;
 }
 results.add(err);
 } else if (!convertPipelineAndTxResults || !(result.isStatus())) {
+
 try {
 results.add(result.get());
 } catch (DataAccessException e) {
@@ -3970,7 +3971,8 @@ protected RedisClusterAsyncCommands<byte[], byte[]> getAsyncDedicatedConnection(
 return ((StatefulRedisClusterConnection<byte[], byte[]>) asyncDedicatedConn).async();
 }
 
-throw new IllegalStateException(String.format("%s is not a supported connection type.", asyncDedicatedConn.getClass().getName()));
+throw new IllegalStateException(
+String.format("%s is not a supported connection type.", asyncDedicatedConn.getClass().getName()));
 }
 
 protected StatefulConnection<byte[], byte[]> doGetAsyncDedicatedConnection() {
@@ -4004,7 +4006,8 @@ private RedisClusterCommands<byte[], byte[]> getDedicatedConnection() {
 return ((StatefulRedisClusterConnection<byte[], byte[]>) asyncDedicatedConn).sync();
 }
 
-throw new IllegalStateException(String.format("%s is not a supported connection type.", asyncDedicatedConn.getClass().getName()));
+throw new IllegalStateException(
+String.format("%s is not a supported connection type.", asyncDedicatedConn.getClass().getName()));
 }
 
 private Future<Long> asyncBitOp(BitOperation op, byte[] destination, byte[]... keys) {

src/main/java/org/springframework/data/redis/connection/lettuce/LettucePool.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,19 +18,21 @@
 
 import org.springframework.data.redis.connection.Pool;
 
-import com.lambdaworks.redis.RedisClient;
+import com.lambdaworks.redis.AbstractRedisClient;
 import com.lambdaworks.redis.api.StatefulConnection;
 
 /**
  * Pool of Lettuce {@link StatefulConnection}s
  * 
  * @author Jennifer Hickey
+ * @author Christoph Strobl
+ * @author Mark Paluch
  */
 public interface LettucePool extends Pool<StatefulConnection<byte[], byte[]>> {
 
 /**
- * @return The {@link RedisClient} used to create pooled connections
+ * @return The {@link AbstractRedisClient} used to create pooled connections
  */
-RedisClient getClient();
+AbstractRedisClient getClient();
 
 }

src/main/java/org/springframework/data/redis/connection/lettuce/LettuceSentinelConnection.java

@@ -30,6 +30,7 @@
 import com.lambdaworks.redis.RedisURI.Builder;
 import com.lambdaworks.redis.resource.ClientResources;
 import com.lambdaworks.redis.sentinel.api.StatefulRedisSentinelConnection;
+import com.lambdaworks.redis.sentinel.api.sync.RedisSentinelCommands;
 
 /**
  * @author Christoph Strobl
@@ -116,7 +117,7 @@ public void failover(NamedNode master) {
 
 Assert.notNull(master, "Redis node master must not be 'null' for failover.");
 Assert.hasText(master.getName(), "Redis master name must not be 'null' or empty for failover.");
-connection.sync().failover(master.getName());
+getSentinelCommands().failover(master.getName());
 }
 
 /*
@@ -126,7 +127,7 @@ public void failover(NamedNode master) {
 @Override
 public List<RedisServer> masters() {
 try {
-return LettuceConverters.toListOfRedisServer(connection.sync().masters());
+return LettuceConverters.toListOfRedisServer(getSentinelCommands().masters());
 } catch (Exception e) {
 throw EXCEPTION_TRANSLATION.translate(e);
 }
@@ -152,7 +153,7 @@ public List<RedisServer> slaves(String masterName) {
 
 Assert.hasText(masterName, "Name of redis master cannot be 'null' or empty when loading slaves.");
 try {
-return LettuceConverters.toListOfRedisServer(connection.sync().slaves(masterName));
+return LettuceConverters.toListOfRedisServer(getSentinelCommands().slaves(masterName));
 } catch (Exception e) {
 throw EXCEPTION_TRANSLATION.translate(e);
 }
@@ -176,7 +177,7 @@ public void remove(NamedNode master) {
 public void remove(String masterName) {
 
 Assert.hasText(masterName, "Name of redis master cannot be 'null' or empty when trying to remove.");
-connection.sync().remove(masterName);
+getSentinelCommands().remove(masterName);
 }
 
 /*
@@ -191,7 +192,7 @@ public void monitor(RedisServer server) {
 Assert.hasText(server.getHost(), "Host must not be 'null' for server to monitor.");
 Assert.notNull(server.getPort(), "Port must not be 'null' for server to monitor.");
 Assert.notNull(server.getQuorum(), "Quorum must not be 'null' for server to monitor.");
-connection.sync().monitor(server.getName(), server.getHost(), server.getPort().intValue(),
+getSentinelCommands().monitor(server.getName(), server.getHost(), server.getPort().intValue(),
 server.getQuorum().intValue());
 }
 
@@ -215,6 +216,10 @@ private void init() {
 }
 }
 
+private RedisSentinelCommands<String, String> getSentinelCommands() {
+return connection.sync();
+}
+
 private StatefulRedisSentinelConnection<String, String> connectSentinel() {
 return redisClient.connectSentinel();
 }

src/test/java/org/springframework/data/redis/connection/lettuce/AuthenticatingRedisClientTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,22 +15,23 @@
  */
 package org.springframework.data.redis.connection.lettuce;
 
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
 import com.lambdaworks.redis.RedisAsyncConnection;
 import com.lambdaworks.redis.RedisClient;
 import com.lambdaworks.redis.RedisException;
 import com.lambdaworks.redis.api.StatefulRedisConnection;
 import com.lambdaworks.redis.pubsub.StatefulRedisPubSubConnection;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
 /**
  * Integration test of {@link AuthenticatingRedisClient}. Enable requirepass and comment out the @Ignore to run.
  * 
  * @author Jennifer Hickey
  * @author Thomas Darimont
+ * @author Christoph Strobl
  */
 @Ignore("Redis must have requirepass set to run this test")
 public class AuthenticatingRedisClientTests {

src/test/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionTests.java

@@ -119,7 +119,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests {
 public void setUp() {
 
 client = RedisClusterClient.create(LettuceTestClientResources.getSharedClientResources(),
-Builder.redis(CLUSTER_HOST, MASTER_NODE_1_PORT).withTimeout(100, TimeUnit.MILLISECONDS).build());
+Builder.redis(CLUSTER_HOST, MASTER_NODE_1_PORT).withTimeout(500, TimeUnit.MILLISECONDS).build());
 nativeConnection = client.connect().sync();
 clusterConnection = new LettuceClusterConnection(client);
 }

src/test/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionUnitTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 the original author or authors.
+ * Copyright 2015-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.