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/14 20:41:02 UTC
svn commit: r964128 - in /myfaces/extensions/cdi/trunk:
core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/
examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/
je...
Author: gpetracek
Date: Wed Jul 14 18:41:02 2010
New Revision: 964128
URL: http://svn.apache.org/viewvc?rev=964128&view=rev
Log:
EXTCDI-1, EXTCDI-2 and EXTCDI-3 ConversationAware refactoring
Removed:
myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ConversationAware.java
Modified:
myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/WindowContext.java
myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/ConversationDemoBean1.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/GroupedConversationContextAdapter.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/ConversationUtils.java
Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/WindowContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/WindowContext.java?rev=964128&r1=964127&r2=964128&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/WindowContext.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/WindowContext.java Wed Jul 14 18:41:02 2010
@@ -37,6 +37,7 @@ public interface WindowContext extends A
Long getId();
/**
+ * TODO move down
* @param conversationGroup group of the conversation in question
* @param qualifiers optional qualifiers for the conversation
* @return a new conversation for the given group
@@ -44,6 +45,7 @@ public interface WindowContext extends A
Conversation createConversation(Class conversationGroup, Annotation... qualifiers);
/**
+ * TODO move down
* @param conversationGroup group of the conversation in question
* @param qualifiers optional qualifiers for the conversation
* @return a new conversation for the given group
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/ConversationDemoBean1.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/ConversationDemoBean1.java?rev=964128&r1=964127&r2=964128&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/ConversationDemoBean1.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/ConversationDemoBean1.java Wed Jul 14 18:41:02 2010
@@ -22,7 +22,6 @@ import org.apache.myfaces.extensions.cdi
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationGroup;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowContext;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.Conversation;
-import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationAware;
import javax.inject.Named;
import javax.inject.Inject;
@@ -36,7 +35,7 @@ import java.util.Date;
@Named
@ConversationScoped
@ConversationGroup(ConversationGroup1.class)
-public class ConversationDemoBean1 implements Serializable, ConversationAware
+public class ConversationDemoBean1 implements Serializable
{
private String value = "Hello grouped conversation1! ";
private Date createdAt;
@@ -45,6 +44,7 @@ public class ConversationDemoBean1 imple
@Inject
private WindowContext windowContext;
+ @Inject
private Conversation conversation;
@PostConstruct
@@ -68,9 +68,4 @@ public class ConversationDemoBean1 imple
{
return value + createdAt.toLocaleString();
}
-
- public void setConversation(Conversation conversation)
- {
- this.conversation = conversation;
- }
}
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=964128&r1=964127&r2=964128&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 Wed Jul 14 18:41:02 2010
@@ -20,8 +20,6 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.core.api.resolver.ConfigResolver;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.Conversation;
-import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationAware;
-import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.UnscopeBeanEvent;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowContext;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowContextConfig;
import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.spi.WindowContextManager;
@@ -36,8 +34,11 @@ import org.apache.myfaces.extensions.cdi
import javax.annotation.PostConstruct;
import javax.enterprise.context.RequestScoped;
import javax.enterprise.context.SessionScoped;
+import javax.enterprise.context.Dependent;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.inject.spi.Bean;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.event.PhaseEvent;
@@ -45,9 +46,10 @@ import javax.inject.Inject;
import javax.inject.Named;
import java.util.Iterator;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicLong;
-import java.io.Serializable;
+import java.lang.annotation.Annotation;
/**
* TODO don't cleanup in case of partial requests (via RequestTypeResolver)
@@ -147,13 +149,39 @@ public class DefaultWindowContextManager
return getCurrentWindowContext();
}
- protected void cleanup(@Observes UnscopeBeanEvent unscopeBeanEvent)
+ @Produces
+ @Dependent
+ protected Conversation currentConversation(final InjectionPoint injectionPoint,
+ final WindowContextManager windowContextManager)
{
- Serializable beanInstance = unscopeBeanEvent.getBeanInstance();
- if(beanInstance instanceof ConversationAware)
+ //for @Inject Conversation conversation;
+ return new Conversation()
{
- ((ConversationAware)beanInstance).setConversation(null);
- }
+ private static final long serialVersionUID = 7754789230388003028L;
+
+ public void end()
+ {
+ findConversaiton().end();
+ }
+
+ public void restart()
+ {
+ findConversaiton().restart();
+ }
+
+ private Conversation findConversaiton()
+ {
+ Bean<?> bean = injectionPoint.getBean();
+ Class conversationGroup = ConversationUtils.getConversationGroup(bean);
+
+ Set<Annotation> qualifiers = bean.getQualifiers();
+
+ conversationGroup = ConversationUtils.convertViewAccessScope(bean, conversationGroup, qualifiers);
+
+ return windowContextManager.getCurrentWindowContext()
+ .getConversation(conversationGroup, qualifiers.toArray(new Annotation[qualifiers.size()]));
+ }
+ };
}
//TODO improve performance
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/GroupedConversationContextAdapter.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/GroupedConversationContextAdapter.java?rev=964128&r1=964127&r2=964128&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/GroupedConversationContextAdapter.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/GroupedConversationContextAdapter.java Wed Jul 14 18:41:02 2010
@@ -19,9 +19,6 @@
package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.Conversation;
-import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationAware;
-import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationGroup;
-import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowScoped;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ViewAccessScoped;
import org.apache.myfaces.extensions.cdi.core.api.tools.annotate.DefaultAnnotation;
import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.AbstractConversationContextAdapter;
@@ -85,13 +82,7 @@ public class GroupedConversationContextA
Conversation foundConversation = getConversation(conversationManager, beanDescriptor);
//noinspection unchecked
- T conversationScopedBean = (T)((EditableConversation)foundConversation).getBean(beanClass);
-
- if(conversationScopedBean instanceof ConversationAware)
- {
- ((ConversationAware)conversationScopedBean).setConversation(foundConversation);
- }
- return conversationScopedBean;
+ return (T)((EditableConversation)foundConversation).getBean(beanClass);
}
protected <T> void scopeBeanEntry(WindowContextManager conversationManager, BeanEntry<T> beanEntry)
@@ -102,75 +93,15 @@ public class GroupedConversationContextA
((EditableConversation) foundConversation).addBean(beanEntry);
}
- private Conversation getConversation(WindowContextManager conversationManager, Bean<?> bean)
+ private Conversation getConversation(WindowContextManager windowContextManager, Bean<?> bean)
{
- Class conversationGroup = getConversationGroup(bean);
+ Class conversationGroup = ConversationUtils.getConversationGroup(bean);
Set<Annotation> qualifiers = bean.getQualifiers();
- conversationGroup = tryToConvertViewAccessScope(bean, conversationGroup, qualifiers);
+ conversationGroup = ConversationUtils.convertViewAccessScope(bean, conversationGroup, qualifiers);
- return conversationManager.getCurrentWindowContext()
+ return windowContextManager.getCurrentWindowContext()
.getConversation(conversationGroup, qualifiers.toArray(new Annotation[qualifiers.size()]));
}
-
- private Class tryToConvertViewAccessScope(Bean<?> bean, Class conversationGroup, Set<Annotation> qualifiers)
- {
- //workaround to keep the existing api
- if(ViewAccessScoped.class.isAssignableFrom(conversationGroup))
- {
- //TODO maybe we have to add a real qualifier instead
- qualifiers.add(VIEW_ACCESS_SCOPED);
- conversationGroup = bean.getBeanClass();
- }
- return conversationGroup;
- }
-
- private Class getConversationGroup(Bean<?> bean)
- {
- if(bean.getStereotypes().contains(WindowScoped.class))
- {
- return WindowScoped.class;
- }
-
- if(bean.getStereotypes().contains(ViewAccessScoped.class))
- {
- return ViewAccessScoped.class;
- }
-
- ConversationGroup conversationGroupAnnotation = findConversationGroupAnnotation(bean);
-
- if(conversationGroupAnnotation == null)
- {
- return bean.getBeanClass();
- }
-
- Class groupClass = conversationGroupAnnotation.value();
-
- if(WindowScoped.class.isAssignableFrom(groupClass))
- {
- return WindowScoped.class;
- }
-
- if(ViewAccessScoped.class.isAssignableFrom(groupClass))
- {
- return ViewAccessScoped.class;
- }
-
- return groupClass;
- }
-
- private ConversationGroup findConversationGroupAnnotation(Bean<?> bean)
- {
- Set<Annotation> qualifiers = bean.getQualifiers();
-
- for(Annotation qualifier : qualifiers)
- {
- if(ConversationGroup.class.isAssignableFrom(qualifier.annotationType()))
- {
- return (ConversationGroup)qualifier;
- }
- }
- return null;
- }
}
\ No newline at end of file
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=964128&r1=964127&r2=964128&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 Wed Jul 14 18:41:02 2010
@@ -20,6 +20,9 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.core.api.manager.BeanManagerProvider;
import org.apache.myfaces.extensions.cdi.core.api.tools.annotate.DefaultAnnotation;
+import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ViewAccessScoped;
+import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowScoped;
+import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationGroup;
import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.spi.WindowContextManager;
import org.apache.myfaces.extensions.cdi.javaee.jsf.api.qualifier.Jsf;
import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.WindowContextIdHolderComponent;
@@ -31,12 +34,15 @@ import javax.faces.context.FacesContext;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.lang.annotation.Annotation;
/**
* @author Gerhard Petracek
*/
public class ConversationUtils
{
+ private static final ViewAccessScoped VIEW_ACCESS_SCOPED = DefaultAnnotation.of(ViewAccessScoped.class);
+
private static final Jsf JSF_QUALIFIER = DefaultAnnotation.of(Jsf.class);
/**
@@ -64,6 +70,66 @@ public class ConversationUtils
return (Bean<WindowContextManager>) conversationManagerBeans.iterator().next();
}
+ public static Class convertViewAccessScope(Bean<?> bean, Class conversationGroup, Set<Annotation> qualifiers)
+ {
+ //workaround to keep the existing api
+ if(ViewAccessScoped.class.isAssignableFrom(conversationGroup))
+ {
+ //TODO maybe we have to add a real qualifier instead
+ qualifiers.add(VIEW_ACCESS_SCOPED);
+ conversationGroup = bean.getBeanClass();
+ }
+ return conversationGroup;
+ }
+
+ public static Class getConversationGroup(Bean<?> bean)
+ {
+ if(bean.getStereotypes().contains(WindowScoped.class))
+ {
+ return WindowScoped.class;
+ }
+
+ if(bean.getStereotypes().contains(ViewAccessScoped.class))
+ {
+ return ViewAccessScoped.class;
+ }
+
+ ConversationGroup conversationGroupAnnotation = findConversationGroupAnnotation(bean);
+
+ if(conversationGroupAnnotation == null)
+ {
+ return bean.getBeanClass();
+ }
+
+ Class groupClass = conversationGroupAnnotation.value();
+
+ if(WindowScoped.class.isAssignableFrom(groupClass))
+ {
+ return WindowScoped.class;
+ }
+
+ if(ViewAccessScoped.class.isAssignableFrom(groupClass))
+ {
+ return ViewAccessScoped.class;
+ }
+
+ return groupClass;
+ }
+
+ private static ConversationGroup findConversationGroupAnnotation(Bean<?> bean)
+ {
+ Set<Annotation> qualifiers = bean.getQualifiers();
+
+ for(Annotation qualifier : qualifiers)
+ {
+ if(ConversationGroup.class.isAssignableFrom(qualifier.annotationType()))
+ {
+ return (ConversationGroup)qualifier;
+ }
+ }
+ return null;
+ }
+
/**
* @param beanManager current {@link javax.enterprise.inject.spi.BeanManager}
* @return the descriptor of the default