Merge pull request #12 from mkopylec/feature

Default application namespace

Author: mkopylec

README.md

@@ -38,13 +38,6 @@ public class Application {
 }
 ```
 
-Set an HTTP session application [namespace](#namespaces) in _application.yml_ file:
-
-```yaml
-session-couchbase:
-    application-namespace: <application_namespace>
-```
-
 Simply use `HttpSession` interface to control HTTP session. For example:
 
 ```java
@@ -101,6 +94,13 @@ The mode is useful for integration tests when you don't want to communicate with
 
 ## Namespaces
 The starter supports HTTP session namespaces.
+The name of the namespace can be set in _application.yml_ file:
+
+```yaml
+session-couchbase:
+    application-namespace: <application_namespace>
+```
+
 Each web application in a distributed system has one application namespace under which the session attributes are stored.
 Every web application can also access global session attributes which are visible across the whole distributed system.
 Namespaces prevent conflicts in attributes names between different web applications in the system.

src/main/java/com/github/mkopylec/sessioncouchbase/configuration/SessionCouchbaseAutoConfiguration.java

@@ -28,7 +28,7 @@ public class SessionCouchbaseAutoConfiguration {
     @Bean
     @ConditionalOnMissingBean
     public MultiHttpSessionStrategy multiHttpSessionStrategy(SessionDao dao) {
-        return new DelegatingSessionStrategy(new CookieHttpSessionStrategy(), dao, sessionCouchbase);
+        return new DelegatingSessionStrategy(new CookieHttpSessionStrategy(), dao);
     }
 
     @Bean

src/main/java/com/github/mkopylec/sessioncouchbase/configuration/SessionCouchbaseProperties.java

@@ -19,7 +19,7 @@ public class SessionCouchbaseProperties {
     /**
      * HTTP session application namespace under which session data must be stored.
      */
-    private String applicationNamespace;
+    private String applicationNamespace = "default";
     /**
      * Properties responsible for managing principal HTTP sessions.
      */

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

@@ -64,12 +64,12 @@ public static String globalAttributeName(String attributeName) {
 
     @Override
     public long getCreationTime() {
-        return ((Number) globalAttributes.get(CREATION_TIME_ATTRIBUTE)).longValue();
+        return getNumericGlobalAttributeValue(CREATION_TIME_ATTRIBUTE);
     }
 
     @Override
     public long getLastAccessedTime() {
-        return ((Number) globalAttributes.get(LAST_ACCESSED_TIME_ATTRIBUTE)).longValue();
+        return getNumericGlobalAttributeValue(LAST_ACCESSED_TIME_ATTRIBUTE);
     }
 
     public void setLastAccessedTime(long lastAccessedTime) {
@@ -238,4 +238,8 @@ protected String getNameFromGlobalName(String globalAttributeName) {
     protected boolean containsPrincipalAttribute() {
         return globalAttributes.containsKey(PRINCIPAL_NAME_INDEX_NAME) || namespaceAttributes.containsKey(PRINCIPAL_NAME_INDEX_NAME);
     }
+
+    protected long getNumericGlobalAttributeValue(String attributeName) {
+        return ((Number) globalAttributes.get(attributeName)).longValue();
+    }
 }

src/main/java/com/github/mkopylec/sessioncouchbase/core/DelegatingSessionStrategy.java

@@ -1,6 +1,5 @@
 package com.github.mkopylec.sessioncouchbase.core;
 
-import com.github.mkopylec.sessioncouchbase.configuration.SessionCouchbaseProperties;
 import com.github.mkopylec.sessioncouchbase.data.SessionDao;
 import org.springframework.session.Session;
 import org.springframework.session.web.http.CookieHttpSessionStrategy;
@@ -13,12 +12,10 @@ public class DelegatingSessionStrategy implements MultiHttpSessionStrategy {
 
     protected final CookieHttpSessionStrategy sessionStrategy;
     protected final SessionDao dao;
-    protected final String namespace;
 
-    public DelegatingSessionStrategy(CookieHttpSessionStrategy sessionStrategy, SessionDao dao, SessionCouchbaseProperties sessionCouchbase) {
+    public DelegatingSessionStrategy(CookieHttpSessionStrategy sessionStrategy, SessionDao dao) {
         this.sessionStrategy = sessionStrategy;
         this.dao = dao;
-        namespace = sessionCouchbase.getApplicationNamespace();
     }
 
     @Override
@@ -38,7 +35,7 @@ public void onInvalidateSession(HttpServletRequest request, HttpServletResponse
 
     @Override
     public HttpServletRequest wrapRequest(HttpServletRequest request, HttpServletResponse response) {
-        RequestWrapper wrapper = new RequestWrapper(request, dao, namespace);
+        RequestWrapper wrapper = new RequestWrapper(request, dao);
         return sessionStrategy.wrapRequest(wrapper, response);
     }
 

src/main/java/com/github/mkopylec/sessioncouchbase/core/RequestWrapper.java

@@ -22,18 +22,16 @@ public class RequestWrapper extends HttpServletRequestWrapper {
     private static final Logger log = getLogger(RequestWrapper.class);
 
     protected final SessionDao dao;
-    protected final String namespace;
 
-    public RequestWrapper(HttpServletRequest request, SessionDao dao, String namespace) {
+    public RequestWrapper(HttpServletRequest request, SessionDao dao) {
         super(request);
         this.dao = dao;
-        this.namespace = namespace;
     }
 
     @Override
     public String changeSessionId() {
         SessionDocument oldDocument = dao.findById(getRequestedSessionId());
-        notNull(oldDocument, "Cannot change HTTP session ID, because Couchbase document with ID '" + getRequestedSessionId() + "' does not exist");
+        notNull(oldDocument, "Cannot change HTTP session ID, because session document with ID '" + getRequestedSessionId() + "' does not exist in data storage");
         HttpSession oldSession = getSession(false);
         notNull(oldSession, "Cannot change HTTP session ID, because session with ID '" + getRequestedSessionId() + "' does not exist");
 

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

@@ -119,10 +119,6 @@ abstract class BasicSpec extends Specification {
         post('session/attribute', attribute, getPort())
     }
 
-    protected void setSecondSessionAttribute(Message attribute) {
-        post('session/attribute/second', attribute, getPort())
-    }
-
     protected void setGlobalSessionAttribute(Message attribute) {
         post('session/attribute/global', attribute, getPort())
     }

src/test/groovy/com/github/mkopylec/sessioncouchbase/specification/session/InMemorySessionSpec.groovy

@@ -1,7 +1,27 @@
 package com.github.mkopylec.sessioncouchbase.specification.session
 
+import com.github.mkopylec.sessioncouchbase.Message
 import org.springframework.test.context.ActiveProfiles
 
+import static com.github.mkopylec.sessioncouchbase.assertions.Assertions.assertThat
+
 @ActiveProfiles('in-memory')
 class InMemorySessionSpec extends SessionSpec {
+
+    def "Should copy HTTP session attributes when session ID was changed"() {
+        given:
+        def message = new Message(text: 'i cannot disappear!', number: 13)
+        setSessionAttribute message
+        def globalMessage = new Message(text: 'i cannot disappear too!', number: 12222)
+        setGlobalSessionAttribute globalMessage
+
+        when:
+        changeSessionId()
+
+        then:
+        assertThat(getSessionAttribute())
+                .hasBody(message)
+        assertThat(getGlobalSessionAttribute())
+                .hasBody(globalMessage)
+    }
 }

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

@@ -39,11 +39,6 @@ public void setAttribute(@RequestBody Message dto, HttpSession session) {
         session.setAttribute(SESSION_ATTRIBUTE_NAME, dto);
     }
 
-    @PostMapping("attribute/second")
-    public void setSecondAttribute(@RequestBody Message dto, HttpSession session) {
-        session.setAttribute(SECOND_SESSION_ATTRIBUTE_NAME, dto);
-    }
-
     @PostMapping("attribute/global")
     public void setGlobalAttribute(@RequestBody Message dto, HttpSession session) {
         session.setAttribute(globalAttributeName(SESSION_ATTRIBUTE_NAME), dto);