From f75cf494f6132bfbdc3f61e9ea6285fa6f3ff142 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Fri, 13 Jan 2017 08:10:22 +0100 Subject: [PATCH] DATAREDIS-564 - Polishing. Remove white spaces, update license header. Add ticket reference to existing testcase. Original Pull Request: #228 --- .../data/redis/connection/jedis/JedisConnection.java | 8 ++++---- .../connection/jedis/JedisConnectionIntegrationTests.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) 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 3f2698e04..8fa50eae5 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 @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 the original author or authors. + * Copyright 2011-2017 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. @@ -1036,7 +1036,7 @@ public class JedisConnection extends AbstractRedisConnection { } public Boolean pExpire(byte[] key, long millis) { - + Assert.notNull(key, "Key must not be null!"); try { @@ -1055,9 +1055,9 @@ public class JedisConnection extends AbstractRedisConnection { } public Boolean pExpireAt(byte[] key, long unixTimeInMillis) { - + Assert.notNull(key, "Key must not be null!"); - + try { if (isPipelined()) { pipeline(new JedisResult(pipeline.pexpireAt(key, unixTimeInMillis), JedisConverters.longToBoolean())); 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 cdaac01b6..9253d3888 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 @@ -356,7 +356,7 @@ public class JedisConnectionIntegrationTests extends AbstractConnectionIntegrati "cool".getBytes(), "supercalifragilisticexpialidocious".getBytes()))); } - @Test // DATAREDIS-286 + @Test // DATAREDIS-286, DATAREDIS-564 public void expireShouldSupportExiprationForValuesLargerThanInteger() { connection.set("expireKey", "foo");