Saving namespace attributes only if they were changed. TTL delay.

Author: mkopylec

src/main/java/com/github/mkopylec/sessioncouchbase/persistent/CouchbaseSession.java

@@ -32,6 +32,7 @@ public class CouchbaseSession implements ExpiringSession, Serializable {
     protected String id = randomUUID().toString();
     protected Map<String, Object> globalAttributes = new HashMap<>();
     protected Map<String, Object> namespaceAttributes = new HashMap<>();
+    protected boolean namespacePersistenceRequired = false;
 
     public CouchbaseSession(int timeoutInSeconds) {
         long now = currentTimeMillis();
@@ -115,6 +116,7 @@ public void setAttribute(String attributeName, Object attributeValue) {
             globalAttributes.put(name, attributeValue);
         } else {
             log.trace("Setting application namespace HTTP session attribute named '{}'", attributeName);
+            namespacePersistenceRequired = true;
             namespaceAttributes.put(attributeName, attributeValue);
         }
     }
@@ -128,6 +130,7 @@ public void removeAttribute(String attributeName) {
             globalAttributes.remove(name);
         } else {
             log.trace("Removing application namespace HTTP session attribute named '{}'", attributeName);
+            namespacePersistenceRequired = true;
             namespaceAttributes.remove(attributeName);
         }
     }
@@ -140,6 +143,10 @@ public Map<String, Object> getNamespaceAttributes() {
         return namespaceAttributes;
     }
 
+    public boolean isNamespacePersistenceRequired() {
+        return namespacePersistenceRequired;
+    }
+
     protected void setCreationTime(long creationTime) {
         globalAttributes.put(CREATION_TIME_ATTRIBUTE, creationTime);
     }

src/main/java/com/github/mkopylec/sessioncouchbase/persistent/CouchbaseSessionRepository.java

@@ -17,6 +17,7 @@
 public class CouchbaseSessionRepository implements SessionRepository<CouchbaseSession> {
 
     protected static final String GLOBAL_NAMESPACE = "global";
+    protected static final int SESSION_ENTITY_EXPIRATION_DELAY_IN_SECONDS = 60;
 
     private static final Logger log = getLogger(CouchbaseSessionRepository.class);
 
@@ -49,7 +50,7 @@ public CouchbaseSession createSession() {
         sessionData.put(namespace, session.getNamespaceAttributes());
         SessionEntity sessionEntity = new SessionEntity(session.getId(), sessionData);
         dao.save(sessionEntity);
-        dao.updateExpirationTime(session.getId(), sessionTimeout);
+        dao.updateExpirationTime(session.getId(), getSessionEntityExpiration());
 
         return session;
     }
@@ -59,10 +60,14 @@ public void save(CouchbaseSession session) {
         log.debug("Saving HTTP session with ID {}", session.getId());
 
         Map<String, Object> serializedGlobal = serializer.serializeSessionAttributes(session.getGlobalAttributes());
-        Map<String, Object> serializedNamespace = serializer.serializeSessionAttributes(session.getNamespaceAttributes());
         dao.updateSession(from(serializedGlobal), GLOBAL_NAMESPACE, session.getId());
-        dao.updateSession(from(serializedNamespace), namespace, session.getId());
-        dao.updateExpirationTime(session.getId(), sessionTimeout);
+
+        if (session.isNamespacePersistenceRequired()) {
+            Map<String, Object> serializedNamespace = serializer.serializeSessionAttributes(session.getNamespaceAttributes());
+            dao.updateSession(from(serializedNamespace), namespace, session.getId());
+        }
+
+        dao.updateExpirationTime(session.getId(), getSessionEntityExpiration());
     }
 
     @Override
@@ -97,4 +102,8 @@ public void delete(String id) {
         log.debug("Deleting HTTP session with ID {}", id);
         dao.delete(id);
     }
+
+    protected int getSessionEntityExpiration() {
+        return sessionTimeout + SESSION_ENTITY_EXPIRATION_DELAY_IN_SECONDS;
+    }
 }

src/test/resources/application.yml

@@ -6,4 +6,6 @@ session-couchbase:
     bucket-name: default
     password:
   in-memory:
-    enabled: false
+    enabled: false
+
+logging.level.com.github.mkopylec.sessioncouchbase: trace