svn commit: r1444463 - in /camel/trunk/components/camel-redis/src: main/java/org/apache/camel/component/redis/RedisClient.java main/java/org/apache/camel/component/redis/RedisConfiguration.java test/java/org/apache/camel/component/redis/RedisKeyTest.java

[bibryam]

Author: bibryam
Date: Sat Feb  9 23:15:59 2013
New Revision: 1444463

URL: http://svn.apache.org/r1444463
Log:
Cleanup redis component

Modified:
    
camel/trunk/components/camel-redis/src/main/java/org/apache/camel/component/redis/RedisClient.java
    
camel/trunk/components/camel-redis/src/main/java/org/apache/camel/component/redis/RedisConfiguration.java
    
camel/trunk/components/camel-redis/src/test/java/org/apache/camel/component/redis/RedisKeyTest.java

Modified: 
camel/trunk/components/camel-redis/src/main/java/org/apache/camel/component/redis/RedisClient.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-redis/src/main/java/org/apache/camel/component/redis/RedisClient.java?rev=1444463&r1=1444462&r2=1444463&view=diff
==============================================================================
--- 
camel/trunk/components/camel-redis/src/main/java/org/apache/camel/component/redis/RedisClient.java
 (original)
+++ 
camel/trunk/components/camel-redis/src/main/java/org/apache/camel/component/redis/RedisClient.java
 Sat Feb  9 23:15:59 2013
@@ -399,8 +399,8 @@ public class RedisClient {
         return redisTemplate.getExpire(key);
     }
 
-    public DataType type(String key) {
-        return redisTemplate.type(key);
+    public String type(String key) {
+        return redisTemplate.type(key).toString();
     }
 
     public List<Object> sort(String key) {

Modified: 
camel/trunk/components/camel-redis/src/main/java/org/apache/camel/component/redis/RedisConfiguration.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-redis/src/main/java/org/apache/camel/component/redis/RedisConfiguration.java?rev=1444463&r1=1444462&r2=1444463&view=diff
==============================================================================
--- 
camel/trunk/components/camel-redis/src/main/java/org/apache/camel/component/redis/RedisConfiguration.java
 (original)
+++ 
camel/trunk/components/camel-redis/src/main/java/org/apache/camel/component/redis/RedisConfiguration.java
 Sat Feb  9 23:15:59 2013
@@ -26,7 +26,6 @@ import org.springframework.data.redis.se
 public class RedisConfiguration {
     private String command;
     private String channels;
-    private Integer timeout;
     private String host;
     private Integer port;
     private RedisTemplate redisTemplate;
@@ -60,14 +59,6 @@ public class RedisConfiguration {
         this.host = host;
     }
 
-    public Integer getTimeout() {
-        return timeout;
-    }
-
-    public void setTimeout(Integer timeout) {
-        this.timeout = timeout;
-    }
-
     public RedisTemplate getRedisTemplate() {
         return redisTemplate != null ? redisTemplate : createDefaultTemplate();
     }

Modified: 
camel/trunk/components/camel-redis/src/test/java/org/apache/camel/component/redis/RedisKeyTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-redis/src/test/java/org/apache/camel/component/redis/RedisKeyTest.java?rev=1444463&r1=1444462&r2=1444463&view=diff
==============================================================================
--- 
camel/trunk/components/camel-redis/src/test/java/org/apache/camel/component/redis/RedisKeyTest.java
 (original)
+++ 
camel/trunk/components/camel-redis/src/test/java/org/apache/camel/component/redis/RedisKeyTest.java
 Sat Feb  9 23:15:59 2013
@@ -243,6 +243,6 @@ public class RedisKeyTest extends RedisT
                 RedisConstants.KEY, "key");
 
         verify(redisTemplate).type("key");
-        assertEquals(DataType.STRING, result);
+        assertEquals(DataType.STRING.toString(), result);
     }
 }