WFLY-6315 Session.invalidate() should not trigger session listeners i…

…f session is not valid.

clustering/web/infinispan/src/main/java/org/wildfly/clustering/web/infinispan/session/InfinispanImmutableSession.java

@@ -51,11 +51,6 @@ public ImmutableSessionAttributes getAttributes() {
         return this.attributes;
     }
 
-    @Override
-    public boolean isValid() {
-        return true;
-    }
-
     @Override
     public ImmutableSessionMetaData getMetaData() {
         return this.metaData;

clustering/web/infinispan/src/main/java/org/wildfly/clustering/web/infinispan/session/InfinispanSession.java

@@ -22,12 +22,10 @@
 package org.wildfly.clustering.web.infinispan.session;
 
 import java.time.Instant;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.wildfly.clustering.ee.infinispan.Remover;
 import org.wildfly.clustering.web.LocalContextFactory;
-import org.wildfly.clustering.web.infinispan.logging.InfinispanWebLogger;
 import org.wildfly.clustering.web.session.Session;
 import org.wildfly.clustering.web.session.SessionAttributes;
 import org.wildfly.clustering.web.session.SessionMetaData;
@@ -38,14 +36,13 @@
  */
 public class InfinispanSession<L> extends InfinispanImmutableSession implements Session<L> {
 
-    private final SessionMetaData metaData;
+    private final InvalidatableSessionMetaData metaData;
     private final SessionAttributes attributes;
     private final AtomicReference<L> localContext;
     private final LocalContextFactory<L> localContextFactory;
     private final Remover<String> remover;
-    private final AtomicBoolean valid = new AtomicBoolean(true);
 
-    public InfinispanSession(String id, SessionMetaData metaData, SessionAttributes attributes, AtomicReference<L> localContext, LocalContextFactory<L> localContextFactory, Remover<String> remover) {
+    public InfinispanSession(String id, InvalidatableSessionMetaData metaData, SessionAttributes attributes, AtomicReference<L> localContext, LocalContextFactory<L> localContextFactory, Remover<String> remover) {
         super(id, metaData, attributes);
         this.metaData = metaData;
         this.attributes = attributes;
@@ -61,15 +58,14 @@ public SessionAttributes getAttributes() {
 
     @Override
     public void invalidate() {
-        if (!this.valid.compareAndSet(true, false)) {
-            throw InfinispanWebLogger.ROOT_LOGGER.invalidSession(this.getId());
+        if (this.metaData.invalidate()) {
+            this.remover.remove(this.getId());
         }
-        this.remover.remove(this.getId());
     }
 
     @Override
     public boolean isValid() {
-        return this.valid.get();
+        return this.metaData.isValid();
     }
 
     @Override
@@ -79,7 +75,7 @@ public SessionMetaData getMetaData() {
 
     @Override
     public void close() {
-        if (this.valid.get()) {
+        if (this.metaData.isValid()) {
             this.metaData.setLastAccessedTime(Instant.now());
         }
     }

clustering/web/infinispan/src/main/java/org/wildfly/clustering/web/infinispan/session/InfinispanSessionFactory.java

@@ -32,7 +32,6 @@
 import org.wildfly.clustering.web.session.ImmutableSessionMetaData;
 import org.wildfly.clustering.web.session.Session;
 import org.wildfly.clustering.web.session.SessionAttributes;
-import org.wildfly.clustering.web.session.SessionMetaData;
 
 /**
  * @author Paul Ferraro
@@ -116,7 +115,7 @@ public SessionAttributesFactory<V> getAttributesFactory() {
     @Override
     public Session<L> createSession(String id, Map.Entry<InfinispanSessionMetaData<L>, V> entry) {
         InfinispanSessionMetaData<L> key = entry.getKey();
-        SessionMetaData metaData = this.metaDataFactory.createSessionMetaData(id, key);
+        InvalidatableSessionMetaData metaData = this.metaDataFactory.createSessionMetaData(id, key);
         SessionAttributes attributes = this.attributesFactory.createSessionAttributes(id, entry.getValue());
         return new InfinispanSession<>(id, metaData, attributes, key.getLocalContext(), this.localContextFactory, this);
     }

clustering/web/infinispan/src/main/java/org/wildfly/clustering/web/infinispan/session/InfinispanSessionManager.java

@@ -425,7 +425,7 @@ public String getId() {
 
         @Override
         public SessionMetaData getMetaData() {
-            if (!this.isValid()) {
+            if (!this.session.isValid()) {
                 throw InfinispanWebLogger.ROOT_LOGGER.invalidSession(this.getId());
             }
             return this.session.getMetaData();
@@ -438,12 +438,15 @@ public boolean isValid() {
 
         @Override
         public void invalidate() {
+            if (!this.session.isValid()) {
+                throw InfinispanWebLogger.ROOT_LOGGER.invalidSession(this.getId());
+            }
             this.session.invalidate();
         }
 
         @Override
         public SessionAttributes getAttributes() {
-            if (!this.isValid()) {
+            if (!this.session.isValid()) {
                 throw InfinispanWebLogger.ROOT_LOGGER.invalidSession(this.getId());
             }
             return this.session.getAttributes();

clustering/web/infinispan/src/main/java/org/wildfly/clustering/web/infinispan/session/InfinispanSessionMetaDataFactory.java

@@ -28,7 +28,6 @@
 import org.wildfly.clustering.ee.infinispan.Mutator;
 import org.wildfly.clustering.infinispan.spi.distribution.Key;
 import org.wildfly.clustering.web.session.ImmutableSessionMetaData;
-import org.wildfly.clustering.web.session.SessionMetaData;
 
 /**
  * @author Paul Ferraro
@@ -82,7 +81,7 @@ private InfinispanSessionMetaData<L> getValue(String id, Cache<SessionCreationMe
     }
 
     @Override
-    public SessionMetaData createSessionMetaData(String id, InfinispanSessionMetaData<L> entry) {
+    public InvalidatableSessionMetaData createSessionMetaData(String id, InfinispanSessionMetaData<L> entry) {
         SessionCreationMetaDataKey creationMetaDataKey = new SessionCreationMetaDataKey(id);
         Mutator creationMutator = this.transactional && this.creationMetaDataCache.getAdvancedCache().getCacheEntry(creationMetaDataKey).isCreated() ? Mutator.PASSIVE : new CacheEntryMutator<>(this.creationMetaDataCache, creationMetaDataKey, new SessionCreationMetaDataEntry<>(entry.getCreationMetaData(), entry.getLocalContext()));
         SessionCreationMetaData creationMetaData = new MutableSessionCreationMetaData(entry.getCreationMetaData(), creationMutator);

clustering/web/infinispan/src/main/java/org/wildfly/clustering/web/infinispan/session/InvalidatableSessionMetaData.java

@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2016, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.wildfly.clustering.web.infinispan.session;
+
+import org.wildfly.clustering.web.session.SessionMetaData;
+
+/**
+ * @author Paul Ferraro
+ */
+public interface InvalidatableSessionMetaData extends SessionMetaData {
+    /**
+     * Indicates whether or not this session is still valid.
+     * @return true, if this session is valid, false otherwise
+     */
+    boolean isValid();
+
+    /**
+     * Invalidates the session.
+     * @return true, if session was invalidated, false if it was already invalid.
+     */
+    boolean invalidate();
+}

clustering/web/infinispan/src/main/java/org/wildfly/clustering/web/infinispan/session/MutableSessionCreationMetaData.java

@@ -55,4 +55,14 @@ public void setMaxInactiveInterval(Duration duration) {
         this.metaData.setMaxInactiveInterval(duration);
         this.mutator.mutate();
     }
+
+    @Override
+    public boolean isValid() {
+        return this.metaData.isValid();
+    }
+
+    @Override
+    public boolean invalidate() {
+        return this.metaData.invalidate();
+    }
 }

clustering/web/infinispan/src/main/java/org/wildfly/clustering/web/infinispan/session/SessionCreationMetaData.java

@@ -31,4 +31,8 @@
 public interface SessionCreationMetaData extends ImmutableSessionCreationMetaData {
 
     void setMaxInactiveInterval(Duration duration);
+
+    boolean isValid();
+
+    boolean invalidate();
 }

clustering/web/infinispan/src/main/java/org/wildfly/clustering/web/infinispan/session/SessionMetaDataFactory.java

@@ -27,12 +27,11 @@
 import org.wildfly.clustering.ee.infinispan.Locator;
 import org.wildfly.clustering.ee.infinispan.Remover;
 import org.wildfly.clustering.web.session.ImmutableSessionMetaData;
-import org.wildfly.clustering.web.session.SessionMetaData;
 
 /**
  * @author Paul Ferraro
  */
 public interface SessionMetaDataFactory<V, L> extends Creator<String, V, Void>, Locator<String, V>, Remover<String>, Evictor<String> {
-    SessionMetaData createSessionMetaData(String id, V value);
+    InvalidatableSessionMetaData createSessionMetaData(String id, V value);
     ImmutableSessionMetaData createImmutableSessionMetaData(String id, V value);
 }

clustering/web/infinispan/src/main/java/org/wildfly/clustering/web/infinispan/session/SimpleImmutableSession.java

@@ -32,13 +32,11 @@
 public class SimpleImmutableSession implements ImmutableSession {
 
     private final String id;
-    private final boolean valid;
     private final ImmutableSessionMetaData metaData;
     private final ImmutableSessionAttributes attributes;
 
     public SimpleImmutableSession(ImmutableSession session) {
         this.id = session.getId();
-        this.valid = session.isValid();
         this.metaData = new SimpleImmutableSessionMetaData(session.getMetaData());
         this.attributes = new SimpleImmutableSessionAttributes(session.getAttributes());
     }
@@ -53,11 +51,6 @@ public ImmutableSessionMetaData getMetaData() {
         return this.metaData;
     }
 
-    @Override
-    public boolean isValid() {
-        return this.valid;
-    }
-
     @Override
     public ImmutableSessionAttributes getAttributes() {
         return this.attributes;

clustering/web/infinispan/src/main/java/org/wildfly/clustering/web/infinispan/session/SimpleSessionCreationMetaData.java

@@ -24,6 +24,7 @@
 
 import java.time.Duration;
 import java.time.Instant;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * @author Paul Ferraro
@@ -32,6 +33,7 @@ public class SimpleSessionCreationMetaData implements SessionCreationMetaData {
 
     private final Instant creationTime;
     private volatile Duration maxInactiveInterval = Duration.ZERO;
+    private final AtomicBoolean valid = new AtomicBoolean(true);
 
     public SimpleSessionCreationMetaData() {
         this(Instant.now());
@@ -55,4 +57,14 @@ public Duration getMaxInactiveInterval() {
     public void setMaxInactiveInterval(Duration duration) {
         this.maxInactiveInterval = duration;
     }
+
+    @Override
+    public boolean isValid() {
+        return this.valid.get();
+    }
+
+    @Override
+    public boolean invalidate() {
+        return this.valid.compareAndSet(true, false);
+    }
 }

clustering/web/infinispan/src/main/java/org/wildfly/clustering/web/infinispan/session/SimpleSessionMetaData.java

@@ -24,13 +24,11 @@
 import java.time.Duration;
 import java.time.Instant;
 
-import org.wildfly.clustering.web.session.SessionMetaData;
-
 /**
  * Composite view of the meta data of a session, combining volatile and static aspects.
  * @author Paul Ferraro
  */
-public class SimpleSessionMetaData extends AbstractImmutableSessionMetaData implements SessionMetaData {
+public class SimpleSessionMetaData extends AbstractImmutableSessionMetaData implements InvalidatableSessionMetaData {
 
     private final SessionCreationMetaData creationMetaData;
     private final SessionAccessMetaData accessMetaData;
@@ -46,6 +44,16 @@ public boolean isNew() {
         return this.accessMetaData.getLastAccessedDuration().isZero();
     }
 
+    @Override
+    public boolean isValid() {
+        return this.creationMetaData.isValid();
+    }
+
+    @Override
+    public boolean invalidate() {
+        return this.creationMetaData.invalidate();
+    }
+
     @Override
     public Instant getCreationTime() {
         return this.creationMetaData.getCreationTime();

clustering/web/infinispan/src/test/java/org/wildfly/clustering/web/infinispan/session/InfinispanSessionFactoryTestCase.java

@@ -35,7 +35,6 @@
 import org.wildfly.clustering.web.session.ImmutableSessionMetaData;
 import org.wildfly.clustering.web.session.Session;
 import org.wildfly.clustering.web.session.SessionAttributes;
-import org.wildfly.clustering.web.session.SessionMetaData;
 
 /**
  * @author Paul Ferraro
@@ -134,7 +133,7 @@ public void createSession() {
         Object localContext = new Object();
         InfinispanSessionMetaData<Object> metaDataValue = new InfinispanSessionMetaData<>(creationMetaData, accessMetaData, new AtomicReference<>(localContext));
         Object attributesValue = new Object();
-        SessionMetaData metaData = mock(SessionMetaData.class);
+        InvalidatableSessionMetaData metaData = mock(InvalidatableSessionMetaData.class);
         SessionAttributes attributes = mock(SessionAttributes.class);
         String id = "id";