You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/07/24 23:11:25 UTC
svn commit: r978937 - in
/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl:
scope/conversation/ util/
Author: gpetracek
Date: Sat Jul 24 21:11:25 2010
New Revision: 978937
URL: http://svn.apache.org/viewvc?rev=978937&view=rev
Log:
EXTCDI-33 cached conversations
Added:
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/PhaseCache.java
Modified:
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultConversation.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultWindowContextManager.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/JsfWindowContext.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/ConversationUtils.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/RequestCache.java
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultConversation.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultConversation.java?rev=978937&r1=978936&r2=978937&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultConversation.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultConversation.java Sat Jul 24 21:11:25 2010
@@ -22,6 +22,8 @@ import org.apache.myfaces.extensions.cdi
import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.spi.BeanEntry;
import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.spi.EditableConversation;
import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.spi.ConversationKey;
+import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.util.RequestCache;
+
import java.io.Serializable;
/**
@@ -69,6 +71,7 @@ public class DefaultConversation impleme
{
this.active = false;
this.beanStorage.resetStorage();
+ RequestCache.resetConversationCache();
}
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultWindowContextManager.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultWindowContextManager.java?rev=978937&r1=978936&r2=978937&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultWindowContextManager.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultWindowContextManager.java Sat Jul 24 21:11:25 2010
@@ -109,6 +109,7 @@ public class DefaultWindowContextManager
protected void recordCurrentViewAsOldViewId(@Observes @AfterPhase(PhaseId.RENDER_RESPONSE) PhaseEvent phaseEvent)
{
storeCurrentViewIdAsOldViewId(FacesContext.getCurrentInstance());
+ RequestCache.resetCache();
}
private boolean isPartialOrGetRequest(RequestTypeResolver requestTypeResolver)
@@ -118,21 +119,20 @@ public class DefaultWindowContextManager
private void cleanupInactiveConversations()
{
- for (WindowContext windowContext : this.windowContextMap.values())
+ //don't cleanup all window contexts (it would cause a side-effect with the access-scope and multiple windows
+ WindowContext windowContext = getCurrentWindowContext();
+
+ for (Conversation conversation : ((EditableWindowContext)windowContext).getConversations().values())
{
- for (Conversation conversation :
- ((EditableWindowContext)windowContext).getConversations().values())
+ //TODO
+ if (!((EditableConversation)conversation).isActive())
{
- //TODO
- if (!((EditableConversation)conversation).isActive())
- {
- conversation.end();
- }
+ conversation.end();
}
-
- //TODO
- ((EditableWindowContext)windowContext).removeInactiveConversations();
}
+
+ //TODO
+ ((EditableWindowContext)windowContext).removeInactiveConversations();
}
@Produces
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/JsfWindowContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/JsfWindowContext.java?rev=978937&r1=978936&r2=978937&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/JsfWindowContext.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/JsfWindowContext.java Sat Jul 24 21:11:25 2010
@@ -29,6 +29,7 @@ import org.apache.myfaces.extensions.cdi
import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.spi.JsfAwareWindowContextConfig;
import static org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation
.JsfAwareConversationFactory.ConversationPropertyKeys.TIMEOUT;
+import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.util.RequestCache;
import java.util.Collections;
import java.util.Iterator;
@@ -79,19 +80,26 @@ public class JsfWindowContext implements
{
ConversationKey conversationKey = new DefaultConversationKey(conversationGroupKey, qualifiers);
- Conversation conversation = this.groupedConversations.get(conversationKey);
+ Conversation conversation = RequestCache.getConversation(conversationKey);
- //TODO
- if (conversation != null && !((EditableConversation)conversation).isActive())
+ if(conversation == null)
{
- endAndRemoveConversation(conversationKey, conversation);
- conversation = null;
- }
+ conversation = this.groupedConversations.get(conversationKey);
- if (conversation == null)
- {
- conversation = createConversation(conversationGroupKey, qualifiers);
- this.groupedConversations.put(conversationKey, conversation);
+ //TODO
+ if (conversation != null && !((EditableConversation)conversation).isActive())
+ {
+ endAndRemoveConversation(conversationKey, conversation);
+ conversation = null;
+ }
+
+ if (conversation == null)
+ {
+ conversation = createConversation(conversationGroupKey, qualifiers);
+ this.groupedConversations.put(conversationKey, conversation);
+ }
+
+ RequestCache.setConversation(conversationKey, conversation);
}
return conversation;
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/ConversationUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/ConversationUtils.java?rev=978937&r1=978936&r2=978937&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/ConversationUtils.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/ConversationUtils.java Sat Jul 24 21:11:25 2010
@@ -329,6 +329,8 @@ public class ConversationUtils
{
storeCurrentViewIdAsOldViewId(FacesContext.getCurrentInstance());
+ RequestCache.resetCache();
+
if(redirectHandler != null)
{
redirectHandler.sendRedirect(
Added: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/PhaseCache.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/PhaseCache.java?rev=978937&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/PhaseCache.java (added)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/PhaseCache.java Sat Jul 24 21:11:25 2010
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.util;
+
+import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.spi.ConversationKey;
+import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.Conversation;
+
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * @author Gerhard Petracek
+ */
+class PhaseCache
+{
+ private static ThreadLocal<Map<ConversationKey, Conversation>> conversationCache
+ = new ThreadLocal<Map<ConversationKey, Conversation>>();
+
+ protected void reset()
+ {
+
+ }
+ public static Conversation getConversation(ConversationKey conversationKey)
+ {
+ return getConversationCache().get(conversationKey);
+ }
+
+ public static void setConversation(ConversationKey conversationKey, Conversation conversation)
+ {
+ getConversationCache().put(conversationKey, conversation);
+ }
+
+ private static Map<ConversationKey, Conversation> getConversationCache()
+ {
+ Map<ConversationKey, Conversation> conversationMap = conversationCache.get();
+
+ if(conversationMap == null)
+ {
+ conversationMap = new HashMap<ConversationKey, Conversation>();
+ conversationCache.set(conversationMap);
+ }
+ return conversationMap;
+ }
+}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/RequestCache.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/RequestCache.java?rev=978937&r1=978936&r2=978937&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/RequestCache.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/RequestCache.java Sat Jul 24 21:11:25 2010
@@ -20,8 +20,12 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.spi.WindowContextManager;
import org.apache.myfaces.extensions.cdi.core.impl.utils.CodiUtils;
+import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.Conversation;
+import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.spi.ConversationKey;
import javax.enterprise.inject.spi.Bean;
+import java.util.Map;
+import java.util.HashMap;
/**
* @author Gerhard Petracek
@@ -36,12 +40,20 @@ public class RequestCache
private static ThreadLocal<Bean<WindowContextManager>> windowContextManagerBeanCache
= new ThreadLocal<Bean<WindowContextManager>>();
+ private static ThreadLocal<Map<ConversationKey, Conversation>> conversationCache
+ = new ThreadLocal<Map<ConversationKey, Conversation>>();
public static void resetCache()
{
windowContextManagerCache.remove();
windowContextManagerBeanCache.remove();
windowIdCache.remove();
+ resetConversationCache();
+ }
+
+ public static void resetConversationCache()
+ {
+ conversationCache.remove();
}
public static WindowContextManager resolveWindowContextManager(Bean<WindowContextManager> windowContextManagerBean)
@@ -79,4 +91,26 @@ public class RequestCache
{
windowIdCache.set(windowId);
}
+
+ public static Conversation getConversation(ConversationKey conversationKey)
+ {
+ return getConversationCache().get(conversationKey);
+ }
+
+ public static void setConversation(ConversationKey conversationKey, Conversation conversation)
+ {
+ getConversationCache().put(conversationKey, conversation);
+ }
+
+ private static Map<ConversationKey, Conversation> getConversationCache()
+ {
+ Map<ConversationKey, Conversation> conversationMap = conversationCache.get();
+
+ if(conversationMap == null)
+ {
+ conversationMap = new HashMap<ConversationKey, Conversation>();
+ conversationCache.set(conversationMap);
+ }
+ return conversationMap;
+ }
}