#559 Use of pool in RedisCacheManager

Author: Igor Polevoy

activejdbc/src/main/java/org/javalite/activejdbc/cache/RedisCacheManager.java

@@ -4,8 +4,7 @@
 import org.javalite.activejdbc.InitException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import redis.clients.jedis.BinaryJedis;
-import redis.clients.jedis.Jedis;
+import redis.clients.jedis.JedisPool;
 
 import java.io.*;
 import java.util.Properties;
@@ -20,7 +19,7 @@
  * with two properties: <code>redist-host</code> and <code>redist-port</code>.
  * </p>
  * <p>
- *     The properties file needs to be at the root of classpath.
+ * The properties file needs to be at the root of classpath.
  * </p>
  * <p><strong>Limitation:</strong> Does not support {@link #flush(CacheEvent)} with value 'ALL'.</p>
  *
@@ -29,19 +28,20 @@
 public class RedisCacheManager extends CacheManager {
     private static final Logger LOGGER = LoggerFactory.getLogger(RedisCacheManager.class);
 
-    private BinaryJedis jedis;
+    private JedisPool jedis;
 
 
-    public RedisCacheManager()  {
+    public RedisCacheManager() {
         Properties props = new Properties();
         InputStream in = getClass().getResourceAsStream("/activejdbc-redis.properties");
-        if(in == null){
-          jedis = new Jedis("localhost");
-        }else{
+        if (in == null) {
+            jedis = new JedisPool("localhost");
+        } else {
             try {
-                props.load(in);String host = props.getProperty("redis-host");
+                props.load(in);
+                String host = props.getProperty("redis-host");
                 String port = props.getProperty("redis-port");
-                jedis = new Jedis(host, toInteger(port));
+                jedis = new JedisPool(host, toInteger(port));
             } catch (Exception e) {
                 throw new InitException("Failed to configure connection to Redis server", e);
             }
@@ -51,11 +51,11 @@ public RedisCacheManager()  {
     @Override
     public Object getCache(String group, String key) {
         try {
-            byte[] bytes = jedis.hget(group.getBytes(), key.getBytes());
+            byte[] bytes = jedis.getResource().hget(group.getBytes(), key.getBytes());
 
-            if(bytes == null){
+            if (bytes == null) {
                 return null;
-            }else{
+            } else {
                 ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes));
                 return in.readObject();
             }
@@ -73,18 +73,18 @@ public void addCache(String group, String key, Object cache) {
             objectOutput.writeObject(cache);
             objectOutput.close();
             byte[] bytes = bout.toByteArray();
-            jedis.hset(group.getBytes(), key.getBytes(), bytes);
+            jedis.getResource().hset(group.getBytes(), key.getBytes(), bytes);
         } catch (Exception e) {
             LOGGER.error("Failed to add object to cache with group: " + group + " and key: " + key, e);
         }
     }
 
     @Override
     public void doFlush(CacheEvent event) {
-        if(event.getType().equals(CacheEvent.CacheEventType.ALL)){
+        if (event.getType().equals(CacheEvent.CacheEventType.ALL)) {
             throw new UnsupportedOperationException("Flushing all caches not supported");
-        }else if (event.getType().equals(CacheEvent.CacheEventType.GROUP)) {
-            jedis.del(event.getGroup().getBytes());
+        } else if (event.getType().equals(CacheEvent.CacheEventType.GROUP)) {
+            jedis.getResource().del(event.getGroup().getBytes());
         }
     }