Conversation Manager API

Integration of lifecycle and JSF to CM API Session invalidation survival (load + save of BeanStores) Sync + asynch conversation manager
weld · Feb 27, 2010 · e81ad7d · e81ad7d
1 parent a41e2bc
commit e81ad7d
Show file tree

Hide file tree

Showing 18 changed files with 676 additions and 490 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/context/ContextLifecycle.java b/impl/src/main/java/org/jboss/weld/context/ContextLifecycle.java
@@ -35,6 +35,7 @@
 import org.jboss.weld.bootstrap.api.Service;
 import org.jboss.weld.context.api.BeanStore;
 import org.jboss.weld.context.api.helpers.ConcurrentHashMapBeanStore;
+import org.jboss.weld.context.beanstore.HashMapBeanStore;
 import org.slf4j.cal10n.LocLogger;
 
 /**
@@ -88,6 +89,7 @@ public void beginRequest(String id, BeanStore requestBeanStore)
       requestContext.setBeanStore(requestBeanStore);
       requestContext.setActive(true);
       dependentContext.setActive(true);
+      activateConversationContext();
    }
 
    public void endRequest(String id, BeanStore requestBeanStore)
@@ -98,6 +100,7 @@ public void endRequest(String id, BeanStore requestBeanStore)
       requestContext.destroy();
       requestContext.setActive(false);
       requestContext.setBeanStore(null);
+      deactivateConversationContext();
    }
 
    public boolean isRequestActive()
@@ -181,4 +184,16 @@ public DependentContext getDependentContext()
       return dependentContext;
    }
 
+   public void activateConversationContext()
+   {
+      conversationContext.setActive(true);
+      conversationContext.setBeanStore(new HashMapBeanStore());
+   }
+
+   public void deactivateConversationContext()
+   {
+      conversationContext.setActive(false);
+      conversationContext.setBeanStore(null);
+   }
+
 }
diff --git a/impl/src/main/java/org/jboss/weld/context/ConversationContext.java b/impl/src/main/java/org/jboss/weld/context/ConversationContext.java
@@ -24,22 +24,38 @@
 
 import javax.enterprise.context.ConversationScoped;
 
+import org.jboss.weld.context.api.BeanStore;
+
 /**
  * The conversation context
  * 
  * @author Nicklas Karlsson
  */
 public class ConversationContext extends AbstractThreadLocalMapContext
 {
-
-   /**
-    * Constructor
-    */
    public ConversationContext()
    {
       super(ConversationScoped.class);
    }
 
+   private void mergeBeanStores(BeanStore from, BeanStore to)
+   {
+      for (String id : from.getContextualIds())
+      {
+         to.put(id, from.get(id));
+      }
+   }
+
+   public void loadTransientBeanStore(BeanStore sourceBeanStore)
+   {
+      mergeBeanStores(sourceBeanStore, getBeanStore());
+   }
+
+   public void saveTransientBeanStore(BeanStore targetBeanStore)
+   {
+      mergeBeanStores(getBeanStore(), targetBeanStore);
+   }   
+
    @Override
    public String toString()
    {

diff --git a/impl/src/main/java/org/jboss/weld/context/beanstore/AbstractAttributeBackedBeanStore.java b/impl/src/main/java/org/jboss/weld/context/beanstore/AbstractAttributeBackedBeanStore.java
@@ -29,7 +29,6 @@
 
 import org.jboss.weld.context.api.BeanStore;
 import org.jboss.weld.context.api.ContextualInstance;
-import org.jboss.weld.util.Names;
 import org.jboss.weld.util.collections.EnumerationList;
 import org.slf4j.cal10n.LocLogger;
 

diff --git a/impl/src/main/java/org/jboss/weld/context/beanstore/HashMapBeanStore.java b/impl/src/main/java/org/jboss/weld/context/beanstore/HashMapBeanStore.java
@@ -21,8 +21,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.enterprise.context.spi.Contextual;
-
 import org.jboss.weld.context.api.ContextualInstance;
 import org.jboss.weld.context.api.helpers.AbstractMapBackedBeanStore;