From 7adeeaee2441b3b441486b38b6b9ab201046b0d1 Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Mon, 29 Nov 2010 21:10:10 +0200 Subject: [PATCH] + fix compilation error on javac compilers --- .../data/keyvalue/redis/core/RedisTemplate.java | 2 +- .../keyvalue/redis/serializer/SimpleRedisSerializer.java | 4 ++-- .../data/keyvalue/redis/util/AbstractRedisMapTests.java | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisTemplate.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisTemplate.java index 795d127b4..260a02968 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisTemplate.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisTemplate.java @@ -960,7 +960,7 @@ public class RedisTemplate extends RedisAccessor implements RedisOperation } }, true); - return deserializeHashValue(rawHashValue); + return (HV) deserializeHashValue(rawHashValue); } @Override diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/serializer/SimpleRedisSerializer.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/serializer/SimpleRedisSerializer.java index 1741e38e5..a9edfc0aa 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/serializer/SimpleRedisSerializer.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/serializer/SimpleRedisSerializer.java @@ -31,8 +31,8 @@ public class SimpleRedisSerializer implements RedisSerializer { private Converter serializer = new SerializingConverter(); private Converter deserializer = new DeserializingConverter(); - private sun.misc.BASE64Encoder encoder = new sun.misc.BASE64Encoder(); - private sun.misc.BASE64Decoder decoder = new sun.misc.BASE64Decoder(); + // private sun.misc.BASE64Encoder encoder = new sun.misc.BASE64Encoder(); + // private sun.misc.BASE64Decoder decoder = new sun.misc.BASE64Decoder(); @SuppressWarnings("unchecked") @Override diff --git a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisMapTests.java b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisMapTests.java index 857f271ff..5ad668e4f 100644 --- a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisMapTests.java +++ b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisMapTests.java @@ -343,4 +343,9 @@ public abstract class AbstractRedisMapTests { assertEquals(3, values.size()); assertThat(values, hasItems(v1, v2, v3)); } + + @Test(expected = UnsupportedOperationException.class) + public void testEntrySet() { + map.entrySet(); + } } \ No newline at end of file