From 34640b6e697dad2adc1e935cf4f528d79ee8c038 Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Fri, 5 Nov 2010 12:08:43 +0200 Subject: [PATCH] + renamed charset to encoding --- .../redis/core/connection/RedisConnection.java | 2 +- .../redis/core/connection/jedis/JedisConnection.java | 2 +- .../redis/core/connection/jredis/JredisConnection.java | 10 +++++----- .../connection/jredis/JredisConnectionFactory.java | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/connection/RedisConnection.java b/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/connection/RedisConnection.java index 5985b9685..5858f0adb 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/connection/RedisConnection.java +++ b/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/connection/RedisConnection.java @@ -38,7 +38,7 @@ public interface RedisConnection extends RedisCommands, RedisHashCommands, Redis Object getNativeConnection(); - String getCharset(); + String getEncoding(); /** * Indicates whether the connection is in "queue"(or "MULTI") mode or not. diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/connection/jedis/JedisConnection.java b/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/connection/jedis/JedisConnection.java index 8586c0a71..a7ef2a484 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/connection/jedis/JedisConnection.java +++ b/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/connection/jedis/JedisConnection.java @@ -82,7 +82,7 @@ public class JedisConnection implements RedisConnection { } @Override - public String getCharset() { + public String getEncoding() { return "UTF-8"; } diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/connection/jredis/JredisConnection.java b/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/connection/jredis/JredisConnection.java index 15f7dc73b..6f52b364e 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/connection/jredis/JredisConnection.java +++ b/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/connection/jredis/JredisConnection.java @@ -31,11 +31,11 @@ import org.springframework.datastore.redis.core.connection.RedisConnection; public class JredisConnection implements RedisConnection { private final JRedis jredis; - private final String charset; + private final String encoding; - public JredisConnection(JRedis jredis, String charset) { + public JredisConnection(JRedis jredis, String encoding) { this.jredis = jredis; - this.charset = charset; + this.encoding = encoding; } protected DataAccessException convertJedisAccessException(Exception ex) { @@ -52,8 +52,8 @@ public class JredisConnection implements RedisConnection { } @Override - public String getCharset() { - return charset; + public String getEncoding() { + return encoding; } @Override diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/connection/jredis/JredisConnectionFactory.java b/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/connection/jredis/JredisConnectionFactory.java index b1453642f..799c4ebf5 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/connection/jredis/JredisConnectionFactory.java +++ b/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/connection/jredis/JredisConnectionFactory.java @@ -117,7 +117,7 @@ public class JredisConnectionFactory implements InitializingBean, DisposableBean @Override public RedisConnection getConnection() { - return new JredisConnection((usePool ? pool : new JRedisClient(connectionSpec))); + return new JredisConnection((usePool ? pool : new JRedisClient(connectionSpec)), getEncoding()); }