Added readMode property for RedissonSessionManager #974

redisson-tomcat/redisson-tomcat-6/src/main/java/org/redisson/tomcat/RedissonSession.java

@@ -23,6 +23,7 @@ import java.util.concurrent.TimeUnit;
 
 import org.apache.catalina.session.StandardSession;
 import org.redisson.api.RMap;
+import org.redisson.tomcat.RedissonSessionManager.ReadMode;
 
 /**
  * Redisson Session object for Apache Tomcat
@@ -35,10 +36,12 @@ public class RedissonSession extends StandardSession {
     private final RedissonSessionManager redissonManager;
     private final Map<String, Object> attrs;
     private RMap<String, Object> map;
+    private final RedissonSessionManager.ReadMode readMode;
     
-    public RedissonSession(RedissonSessionManager manager) {
+    public RedissonSession(RedissonSessionManager manager, RedissonSessionManager.ReadMode readMode) {
         super(manager);
         this.redissonManager = manager;
+        this.readMode = readMode;
         
         try {
             Field attr = StandardSession.class.getDeclaredField("attributes");
@@ -50,6 +53,15 @@ public class RedissonSession extends StandardSession {
 
     private static final long serialVersionUID = -2518607181636076487L;
 
+    @Override
+    public Object getAttribute(String name) {
+        if (readMode == ReadMode.REDIS) {
+            return map.get(name);
+        }
+
+        return super.getAttribute(name);
+    }
+    
     @Override
     public void setId(String id, boolean notify) {
         super.setId(id, notify);

redisson-tomcat/redisson-tomcat-6/src/main/java/org/redisson/tomcat/RedissonSessionManager.java

@@ -41,13 +41,24 @@ import org.redisson.config.Config;
  */
 public class RedissonSessionManager extends ManagerBase implements Lifecycle {
 
+    public enum ReadMode {REDIS, MEMORY}
+    
     private final Log log = LogFactory.getLog(RedissonSessionManager.class);
 
     protected LifecycleSupport lifecycle = new LifecycleSupport(this);
     
     private RedissonClient redisson;
     private String configPath;
+    private ReadMode readMode = ReadMode.MEMORY;
     
+    public String getReadMode() {
+        return readMode.toString();
+    }
+
+    public void setReadMode(String readMode) {
+        this.readMode = ReadMode.valueOf(readMode);
+    }
+
     public void setConfigPath(String configPath) {
         this.configPath = configPath;
     }
@@ -135,7 +146,7 @@ public class RedissonSessionManager extends ManagerBase implements Lifecycle {
     
     @Override
     public Session createEmptySession() {
-        return new RedissonSession(this);
+        return new RedissonSession(this, readMode);
     }
     
     @Override

redisson-tomcat/redisson-tomcat-7/src/main/java/org/redisson/tomcat/RedissonSession.java

@@ -23,6 +23,7 @@ import java.util.concurrent.TimeUnit;
 
 import org.apache.catalina.session.StandardSession;
 import org.redisson.api.RMap;
+import org.redisson.tomcat.RedissonSessionManager.ReadMode;
 
 /**
  * Redisson Session object for Apache Tomcat
@@ -35,10 +36,12 @@ public class RedissonSession extends StandardSession {
     private final RedissonSessionManager redissonManager;
     private final Map<String, Object> attrs;
     private RMap<String, Object> map;
+    private final RedissonSessionManager.ReadMode readMode;
     
-    public RedissonSession(RedissonSessionManager manager) {
+    public RedissonSession(RedissonSessionManager manager, RedissonSessionManager.ReadMode readMode) {
         super(manager);
         this.redissonManager = manager;
+        this.readMode = readMode;
         try {
             Field attr = StandardSession.class.getDeclaredField("attributes");
             attrs = (Map<String, Object>) attr.get(this);
@@ -49,6 +52,15 @@ public class RedissonSession extends StandardSession {
 
     private static final long serialVersionUID = -2518607181636076487L;
 
+    @Override
+    public Object getAttribute(String name) {
+        if (readMode == ReadMode.REDIS) {
+            return map.get(name);
+        }
+
+        return super.getAttribute(name);
+    }
+    
     @Override
     public void setId(String id, boolean notify) {
         super.setId(id, notify);

redisson-tomcat/redisson-tomcat-7/src/main/java/org/redisson/tomcat/RedissonSessionManager.java

@@ -40,11 +40,22 @@ import org.redisson.config.Config;
  */
 public class RedissonSessionManager extends ManagerBase {
 
+    public enum ReadMode {REDIS, MEMORY}
+    
     private final Log log = LogFactory.getLog(RedissonSessionManager.class);
     
     private RedissonClient redisson;
     private String configPath;
+    private ReadMode readMode = ReadMode.MEMORY;
     
+    public String getReadMode() {
+        return readMode.toString();
+    }
+
+    public void setReadMode(String readMode) {
+        this.readMode = ReadMode.valueOf(readMode);
+    }
+
     public void setConfigPath(String configPath) {
         this.configPath = configPath;
     }
@@ -113,7 +124,7 @@ public class RedissonSessionManager extends ManagerBase {
     
     @Override
     public Session createEmptySession() {
-        return new RedissonSession(this);
+        return new RedissonSession(this, readMode);
     }
     
     @Override

redisson-tomcat/redisson-tomcat-8/src/main/java/org/redisson/tomcat/RedissonSession.java

@@ -23,6 +23,7 @@ import java.util.concurrent.TimeUnit;
 
 import org.apache.catalina.session.StandardSession;
 import org.redisson.api.RMap;
+import org.redisson.tomcat.RedissonSessionManager.ReadMode;
 
 /**
  * Redisson Session object for Apache Tomcat
@@ -35,10 +36,13 @@ public class RedissonSession extends StandardSession {
     private final RedissonSessionManager redissonManager;
     private final Map<String, Object> attrs;
     private RMap<String, Object> map;
+    private final RedissonSessionManager.ReadMode readMode;
     
-    public RedissonSession(RedissonSessionManager manager) {
+    public RedissonSession(RedissonSessionManager manager, RedissonSessionManager.ReadMode readMode) {
         super(manager);
         this.redissonManager = manager;
+        this.readMode = readMode;
+        
         try {
             Field attr = StandardSession.class.getDeclaredField("attributes");
             attrs = (Map<String, Object>) attr.get(this);
@@ -49,6 +53,15 @@ public class RedissonSession extends StandardSession {
 
     private static final long serialVersionUID = -2518607181636076487L;
 
+    @Override
+    public Object getAttribute(String name) {
+        if (readMode == ReadMode.REDIS) {
+            return map.get(name);
+        }
+
+        return super.getAttribute(name);
+    }
+    
     @Override
     public void setId(String id, boolean notify) {
         super.setId(id, notify);

redisson-tomcat/redisson-tomcat-8/src/main/java/org/redisson/tomcat/RedissonSessionManager.java

@@ -39,11 +39,23 @@ import org.redisson.config.Config;
  */
 public class RedissonSessionManager extends ManagerBase {
 
+    public enum ReadMode {REDIS, MEMORY}
+    
     private final Log log = LogFactory.getLog(RedissonSessionManager.class);
     
     private RedissonClient redisson;
     private String configPath;
     
+    private ReadMode readMode = ReadMode.MEMORY;
+    
+    public String getReadMode() {
+        return readMode.toString();
+    }
+
+    public void setReadMode(String readMode) {
+        this.readMode = ReadMode.valueOf(readMode);
+    }
+    
     public void setConfigPath(String configPath) {
         this.configPath = configPath;
     }
@@ -112,7 +124,7 @@ public class RedissonSessionManager extends ManagerBase {
     
     @Override
     public Session createEmptySession() {
-        return new RedissonSession(this);
+        return new RedissonSession(this, readMode);
     }
     
     @Override