Proper global attribute names

Author: mkopylec

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

@@ -28,7 +28,7 @@ public class CouchbaseSession implements ExpiringSession, Serializable {
     public static final String CREATION_TIME_ATTRIBUTE = "$creationTime";
     public static final String LAST_ACCESSED_TIME_ATTRIBUTE = "$lastAccessedTime";
     public static final String MAX_INACTIVE_INTERVAL_ATTRIBUTE = "$maxInactiveInterval";
-    protected static final String GLOBAL_ATTRIBUTE_NAME_PREFIX = CouchbaseSession.class.getName() + ".global";
+    protected static final String GLOBAL_ATTRIBUTE_NAME_PREFIX = CouchbaseSession.class.getName() + ".global.";
 
     private static final Logger log = getLogger(CouchbaseSession.class);
 
@@ -111,7 +111,9 @@ public <T> T getAttribute(String attributeName) {
     @Override
     public Set<String> getAttributeNames() {
         Set<String> attributesNames = new HashSet<>();
-        attributesNames.addAll(globalAttributes.keySet());
+        for (String attributeName : globalAttributes.keySet()) {
+            attributesNames.add(globalAttributeName(attributeName));
+        }
         attributesNames.addAll(namespaceAttributes.keySet());
         return unmodifiableSet(attributesNames);
     }
@@ -180,7 +182,7 @@ protected void setCreationTime(long creationTime) {
 
     protected void checkAttributeName(String attributeName) {
         hasText(attributeName, "Empty HTTP session attribute name");
-        isTrue(!attributeName.equals(GLOBAL_ATTRIBUTE_NAME_PREFIX), "Empty HTTP session global attribute name");
+        isTrue(!attributeName.trim().equals(GLOBAL_ATTRIBUTE_NAME_PREFIX), "Empty HTTP session global attribute name");
     }
 
     protected boolean isGlobal(String attributeName) {

src/test/groovy/com/github/mkopylec/sessioncouchbase/BasicSpec.groovy

@@ -135,8 +135,12 @@ abstract class BasicSpec extends Specification {
         return post('session/principal', null, extraInstancePort, String).body
     }
 
-    protected ResponseEntity<Set<String>> getPrincipalSessions() {
-        return get('session/principal', Set, getPort())
+    protected ResponseEntity<List<String>> getPrincipalSessions() {
+        return get('session/principal', List, getPort())
+    }
+
+    protected ResponseEntity<List<String>> getSessionAttributeNames() {
+        return get('session/attribute/names', List, getPort())
     }
 
     protected void clearSessionCookie() {

src/test/groovy/com/github/mkopylec/sessioncouchbase/assertions/ResponseAssert.groovy

@@ -12,11 +12,11 @@ class ResponseAssert {
     }
 
     ResponseAssert hasSessionIds(String... sessionIds) {
-        assert actual.body != null
-        def actualSessionIds = actual.body as Set
-        assert actualSessionIds.size() == sessionIds.size()
-        assert actualSessionIds.containsAll(sessionIds)
-        return this
+        hasElements(sessionIds)
+    }
+
+    ResponseAssert hasSessionAttributeNames(String... attributeNames) {
+        return hasElements(attributeNames)
     }
 
     ResponseAssert hasNoSessionIds() {
@@ -35,4 +35,12 @@ class ResponseAssert {
         assert actual.body == null
         return this
     }
+
+    private ResponseAssert hasElements(String... elements) {
+        assert actual.body != null
+        def actualSessionIds = actual.body as List
+        assert actualSessionIds.size() == elements.size()
+        assert actualSessionIds.containsAll(elements)
+        return this
+    }
 }

src/test/groovy/com/github/mkopylec/sessioncouchbase/specification/PersistentSessionSpec.groovy

@@ -39,4 +39,24 @@ class PersistentSessionSpec extends SessionSpec {
         then:
         thrown HttpServerErrorException
     }
+
+    def "Should get global and application namespace HTTP session attribute names"() {
+        given:
+        def message = new Message(text: 'how do you do', number: 10)
+        setGlobalSessionAttribute message
+        setSessionAttribute message
+
+        when:
+        def response = getSessionAttributeNames()
+
+        then:
+        assertThat(response)
+                .hasSessionAttributeNames(
+                'attribute',
+                'com.github.mkopylec.sessioncouchbase.persistent.CouchbaseSession.global.attribute',
+                'com.github.mkopylec.sessioncouchbase.persistent.CouchbaseSession.global.$lastAccessedTime',
+                'com.github.mkopylec.sessioncouchbase.persistent.CouchbaseSession.global.$creationTime',
+                'com.github.mkopylec.sessioncouchbase.persistent.CouchbaseSession.global.$maxInactiveInterval'
+        )
+    }
 }

src/test/java/com/github/mkopylec/sessioncouchbase/SessionController.java

@@ -9,10 +9,12 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 import static com.github.mkopylec.sessioncouchbase.persistent.CouchbaseSession.globalAttributeName;
+import static java.util.Collections.list;
 import static org.springframework.session.FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME;
 import static org.springframework.web.bind.annotation.RequestMethod.DELETE;
 import static org.springframework.web.bind.annotation.RequestMethod.POST;
@@ -95,4 +97,9 @@ public Set<String> getPrincipalSessions() {
         Map<String, CouchbaseSession> sessionsById = sessionRepository.findByIndexNameAndIndexValue(PRINCIPAL_NAME_INDEX_NAME, PRINCIPAL_NAME);
         return sessionsById.keySet();
     }
+
+    @RequestMapping("attribute/names")
+    public List<String> getAttributeNames(HttpSession session) {
+        return list(session.getAttributeNames());
+    }
 }