DATAREDIS-286 - Avoid overflow in JedisConnection#expire / #pexpire.

Workaround Jedis issue redis/jedis#575.
We now delegate calls to expire(...) to pExpireAt(...) in case the seconds parameter is > than Integer.MAX_VALUE.
We query the server time to compute the new expiration date.

Original pull request: #52.

Author: Thomas Darimont

src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java

@@ -26,6 +26,7 @@
 import java.util.Properties;
 import java.util.Queue;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.dao.DataAccessException;
@@ -704,6 +705,18 @@ public Boolean exists(byte[] key) {
 	}
 
 	public Boolean expire(byte[] key, long seconds) {
+
+		/*
+		 *  @see DATAREDIS-286 to avoid overflow in Jedis
+		 *  
+		 *  TODO Remove this workaround when we upgrade to a Jedis version that contains a 
+		 *  fix for: https://github.com/xetorthio/jedis/pull/575
+		 */
+		if (seconds > Integer.MAX_VALUE) {
+
+			return pExpireAt(key, time() + TimeUnit.SECONDS.toMillis(seconds));
+		}
+
 		try {
 			if (isPipelined()) {
 				pipeline(new JedisResult(pipeline.expire(key, (int) seconds), JedisConverters.longToBoolean()));
@@ -879,6 +892,18 @@ public Long ttl(byte[] key) {
 	}
 
 	public Boolean pExpire(byte[] key, long millis) {
+
+		/*
+		 *  @see DATAREDIS-286 to avoid overflow in Jedis
+		 *  
+		 *  TODO Remove this workaround when we upgrade to a Jedis version that contains a 
+		 *  fix for: https://github.com/xetorthio/jedis/pull/575
+		 */
+		if (millis > Integer.MAX_VALUE) {
+
+			return pExpireAt(key, time() + millis);
+		}
+
 		try {
 			if (isPipelined()) {
 				pipeline(new JedisResult(pipeline.pexpire(key, (int) millis), JedisConverters.longToBoolean()));

src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionIntegrationTests.java

@@ -16,6 +16,7 @@
 
 package org.springframework.data.redis.connection.jedis;
 
+import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
 import java.util.HashSet;
@@ -333,4 +334,35 @@ public void testExecuteShouldConvertArrayReplyCorrectly() {
 				AllOf.allOf(IsInstanceOf.instanceOf(List.class), IsCollectionContaining.hasItems("awesome".getBytes(),
 						"cool".getBytes(), "supercalifragilisticexpialidocious".getBytes())));
 	}
+
+	/**
+	 * @see DATAREDIS-286
+	 */
+	@Test
+	public void expireShouldSupportExiprationForValuesLargerThanInteger() {
+
+		connection.set("expireKey", "foo");
+
+		long seconds = ((long) Integer.MAX_VALUE) + 1;
+		connection.expire("expireKey", seconds);
+		long ttl = connection.ttl("expireKey");
+
+		assertThat(ttl, is(seconds));
+	}
+
+	/**
+	 * @see DATAREDIS-286
+	 */
+	@Test
+	public void pExpireShouldSupportExiprationForValuesLargerThanInteger() {
+
+		connection.set("pexpireKey", "foo");
+
+		long millis = ((long) Integer.MAX_VALUE) + 10;
+		connection.pExpire("pexpireKey", millis);
+		long ttl = connection.pTtl("pexpireKey");
+
+		assertTrue(String.format("difference between millis=%s and ttl=%s should not be greater than 20ms but is %s",
+				millis, ttl, millis - ttl), millis - ttl < 20L);
+	}
 }