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 2011/04/06 12:51:22 UTC
svn commit: r1089398 - in /myfaces/extensions/cdi/trunk/jee-modules:
jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/
jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/
jsf20-module/im...
Author: gpetracek
Date: Wed Apr 6 10:51:21 2011
New Revision: 1089398
URL: http://svn.apache.org/viewvc?rev=1089398&view=rev
Log:
EXTCDI-100 cleanup
Added:
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/ConversationRequiredUtils.java
Modified:
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/CodiLifecycleWrapper.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/JsfUtils.java
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/phase/CodiLifecycleWrapper.java
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/CodiLifecycleWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/CodiLifecycleWrapper.java?rev=1089398&r1=1089397&r2=1089398&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/CodiLifecycleWrapper.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/CodiLifecycleWrapper.java Wed Apr 6 10:51:21 2011
@@ -24,8 +24,8 @@ import org.apache.myfaces.extensions.cdi
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.WindowHandler;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.LifecycleAwareWindowHandler;
import org.apache.myfaces.extensions.cdi.core.impl.util.CodiUtils;
+import org.apache.myfaces.extensions.cdi.jsf.impl.util.ConversationRequiredUtils;
import org.apache.myfaces.extensions.cdi.jsf.impl.util.ConversationUtils;
-import org.apache.myfaces.extensions.cdi.jsf.impl.util.JsfUtils;
import javax.faces.lifecycle.Lifecycle;
import javax.faces.event.PhaseListener;
@@ -116,7 +116,7 @@ class CodiLifecycleWrapper extends Lifec
*/
public void render(FacesContext facesContext)
{
- JsfUtils.ensureExistingConversation(facesContext);
+ ConversationRequiredUtils.ensureExistingConversation(facesContext);
wrapped.render(facesContext);
Added: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/ConversationRequiredUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/ConversationRequiredUtils.java?rev=1089398&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/ConversationRequiredUtils.java (added)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/ConversationRequiredUtils.java Wed Apr 6 10:51:21 2011
@@ -0,0 +1,222 @@
+/*
+ * 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.jsf.impl.util;
+
+import org.apache.myfaces.extensions.cdi.core.api.config.view.ViewConfig;
+import org.apache.myfaces.extensions.cdi.core.api.provider.BeanManagerProvider;
+import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationRequired;
+import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.config.ConversationConfig;
+import org.apache.myfaces.extensions.cdi.core.impl.util.AnyLiteral;
+import org.apache.myfaces.extensions.cdi.core.impl.util.CodiUtils;
+import org.apache.myfaces.extensions.cdi.jsf.api.config.view.PageBeanDescriptor;
+import org.apache.myfaces.extensions.cdi.jsf.api.config.view.ViewConfigDescriptor;
+import org.apache.myfaces.extensions.cdi.jsf.impl.config.view.ViewConfigCache;
+import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.EditableWindowContext;
+
+import javax.enterprise.inject.Typed;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.faces.component.UIViewRoot;
+import javax.faces.context.FacesContext;
+import java.lang.annotation.Annotation;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @author Gerhard Petracek
+ */
+@Typed()
+public abstract class ConversationRequiredUtils
+{
+ private ConversationRequiredUtils()
+ {
+ }
+
+ /**
+ * Checks if the page-bean for the current view hosts
+ * {@link org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationRequired}
+ * and the conversation has been started or the current page is an allowed entry-point for the conversation.
+ * If a violation is detected, the default-entry-point
+ * (specified by {@link org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationRequired})
+ * will be used as new view which will be rendered.
+ *
+ * @param facesContext current faces-context
+ */
+ public static void ensureExistingConversation(FacesContext facesContext)
+ {
+ UIViewRoot uiViewRoot = facesContext.getViewRoot();
+
+ if(uiViewRoot == null)
+ {
+ return;
+ }
+
+ String oldViewId = uiViewRoot.getViewId();
+
+ if(oldViewId == null)
+ {
+ return;
+ }
+
+ ViewConfigDescriptor entry = ViewConfigCache.getViewConfigDescriptor(oldViewId);
+
+ if(entry == null)
+ {
+ return;
+ }
+
+ BeanManager beanManager = BeanManagerProvider.getInstance().getBeanManager();
+
+ ConversationConfig conversationConfig =
+ CodiUtils.getContextualReferenceByClass(beanManager, ConversationConfig.class);
+
+ if(!conversationConfig.isConversationRequiredEnabled())
+ {
+ return;
+ }
+
+ String newViewId = checkConversationRequired(beanManager, uiViewRoot, entry);
+
+ if(newViewId != null && !oldViewId.equals(newViewId))
+ {
+ UIViewRoot newViewRoot = facesContext.getApplication().getViewHandler().createView(facesContext, newViewId);
+
+ if(newViewRoot != null)
+ {
+ facesContext.setViewRoot(newViewRoot);
+ }
+ }
+ }
+
+ private static String checkConversationRequired(BeanManager beanManager,
+ UIViewRoot uiViewRoot,
+ ViewConfigDescriptor viewConfigDescriptor)
+ {
+ Class<? extends ViewConfig> currentView =
+ ViewConfigCache.getViewConfigDescriptor(uiViewRoot.getViewId()).getViewConfig();
+
+ if(currentView == null)
+ {
+ return null;
+ }
+
+ List<PageBeanDescriptor> pageBeanDescriptorList = viewConfigDescriptor.getPageBeanDescriptors();
+ for(PageBeanDescriptor pageBeanDescriptor : pageBeanDescriptorList)
+ {
+ Class<?> pageBeanClass = pageBeanDescriptor.getBeanClass();
+
+ ConversationRequired conversationRequired =
+ resolveConversationRequiredAnnotation(viewConfigDescriptor, pageBeanDescriptorList, pageBeanClass);
+
+ if(conversationRequired == null)
+ {
+ continue;
+ }
+
+ if(!isEntryPoint(currentView, conversationRequired.defaultEntryPoint(), conversationRequired.entryPoints()))
+ {
+ EditableWindowContext editableWindowContext =
+ (EditableWindowContext)ConversationUtils.getWindowContextManager().getCurrentWindowContext();
+
+ Set<? extends Bean> foundBeans =
+ beanManager.getBeans(pageBeanDescriptor.getBeanClass(), new AnyLiteral());
+
+ Bean<?> foundBean;
+ Set<Bean<?>> beanSet;
+ Class<?> conversationGroup;
+ for(Bean<?> currentBean : foundBeans)
+ {
+ beanSet = new HashSet<Bean<?>>(1);
+ beanSet.add(currentBean);
+ foundBean = beanManager.resolve(beanSet);
+
+ //only page-beans are supported -> we have to compare them by bean-name
+ if(!pageBeanDescriptor.getBeanName().equals(foundBean.getName()))
+ {
+ continue;
+ }
+
+ conversationGroup = getConversationGroup(conversationRequired, foundBean);
+
+ if(!editableWindowContext.isConversationActive(conversationGroup,
+ foundBean.getQualifiers().toArray(new Annotation[foundBean.getQualifiers().size()])))
+ {
+ return ViewConfigCache
+ .getViewConfigDescriptor(conversationRequired.defaultEntryPoint()).getViewId();
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+ private static Class<?> getConversationGroup(ConversationRequired conversationRequired, Bean<?> foundBean)
+ {
+ Class<?> conversationGroup;
+ if(ConversationRequired.class.equals(conversationRequired.conversationGroup()))
+ {
+ conversationGroup = ConversationUtils.getConversationGroup(foundBean);
+ }
+ else
+ {
+ conversationGroup = conversationRequired.conversationGroup();
+ }
+ return conversationGroup;
+ }
+
+ private static ConversationRequired resolveConversationRequiredAnnotation(ViewConfigDescriptor viewConfigDescriptor,
+ List<PageBeanDescriptor> pageBeanDescriptorList, Class<?> pageBeanClass)
+ {
+ ConversationRequired conversationRequired = pageBeanClass.getAnnotation(ConversationRequired.class);
+
+ //here we support just simple constellations
+ //TODO handle unsupported constellations
+ if(conversationRequired == null && pageBeanDescriptorList.size() == 1)
+ {
+ List<ConversationRequired> conversationRequiredMetaData =
+ viewConfigDescriptor.getMetaData(ConversationRequired.class);
+
+ if(conversationRequiredMetaData.size() == 1)
+ {
+ conversationRequired = conversationRequiredMetaData.iterator().next();
+ }
+ }
+ return conversationRequired;
+ }
+
+ private static boolean isEntryPoint(Class<? extends ViewConfig> currentView,
+ Class<? extends ViewConfig> defaultEntryPoint,
+ Class<? extends ViewConfig>[] entryPoints)
+ {
+ if(currentView.equals(defaultEntryPoint))
+ {
+ return true;
+ }
+
+ for(Class<? extends ViewConfig> entryPoint : entryPoints)
+ {
+ if(currentView.equals(entryPoint))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/JsfUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/JsfUtils.java?rev=1089398&r1=1089397&r2=1089398&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/JsfUtils.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/JsfUtils.java Wed Apr 6 10:51:21 2011
@@ -18,34 +18,18 @@
*/
package org.apache.myfaces.extensions.cdi.jsf.impl.util;
-import org.apache.myfaces.extensions.cdi.core.api.config.view.ViewConfig;
-import org.apache.myfaces.extensions.cdi.core.api.provider.BeanManagerProvider;
-import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationRequired;
-import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.config.ConversationConfig;
-import org.apache.myfaces.extensions.cdi.core.impl.util.AnyLiteral;
-import org.apache.myfaces.extensions.cdi.core.impl.util.CodiUtils;
-import org.apache.myfaces.extensions.cdi.jsf.api.config.view.PageBeanDescriptor;
-import org.apache.myfaces.extensions.cdi.jsf.api.config.view.ViewConfigDescriptor;
-import org.apache.myfaces.extensions.cdi.jsf.impl.config.view.ViewConfigCache;
-import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.EditableWindowContext;
-
import javax.enterprise.inject.Typed;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
import javax.faces.FactoryFinder;
import javax.faces.application.FacesMessage;
-import javax.faces.component.UIViewRoot;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.faces.event.PhaseListener;
import javax.faces.lifecycle.Lifecycle;
import javax.faces.lifecycle.LifecycleFactory;
import java.io.UnsupportedEncodingException;
-import java.lang.annotation.Annotation;
import java.net.URLEncoder;
import java.util.HashSet;
import java.util.Iterator;
-import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.ResourceBundle;
@@ -217,166 +201,4 @@ public abstract class JsfUtils
return result;
}
-
- /**
- * Checks if the page-bean for the current view hosts {@link ConversationRequired} and the conversation has been
- * started or the current page is an allowed entry-point for the conversation. If a violation is detected,
- * the default-entry-point (specified by {@link ConversationRequired}) will be used as new view
- * which will be rendered.
- *
- * @param facesContext current faces-context
- */
- public static void ensureExistingConversation(FacesContext facesContext)
- {
- UIViewRoot uiViewRoot = facesContext.getViewRoot();
-
- if(uiViewRoot == null)
- {
- return;
- }
-
- String oldViewId = uiViewRoot.getViewId();
-
- if(oldViewId == null)
- {
- return;
- }
-
- ViewConfigDescriptor entry = ViewConfigCache.getViewConfigDescriptor(oldViewId);
-
- if(entry == null)
- {
- return;
- }
-
- BeanManager beanManager = BeanManagerProvider.getInstance().getBeanManager();
-
- ConversationConfig conversationConfig =
- CodiUtils.getContextualReferenceByClass(beanManager, ConversationConfig.class);
-
- if(!conversationConfig.isConversationRequiredEnabled())
- {
- return;
- }
-
- String newViewId = checkConversationRequired(beanManager, uiViewRoot, entry);
-
- if(newViewId != null && !oldViewId.equals(newViewId))
- {
- UIViewRoot newViewRoot = facesContext.getApplication().getViewHandler().createView(facesContext, newViewId);
-
- if(newViewRoot != null)
- {
- facesContext.setViewRoot(newViewRoot);
- }
- }
- }
-
- private static String checkConversationRequired(BeanManager beanManager,
- UIViewRoot uiViewRoot,
- ViewConfigDescriptor viewConfigDescriptor)
- {
- Class<? extends ViewConfig> currentView =
- ViewConfigCache.getViewConfigDescriptor(uiViewRoot.getViewId()).getViewConfig();
-
- if(currentView == null)
- {
- return null;
- }
-
- List<PageBeanDescriptor> pageBeanDescriptorList = viewConfigDescriptor.getPageBeanDescriptors();
- for(PageBeanDescriptor pageBeanDescriptor : pageBeanDescriptorList)
- {
- Class<?> pageBeanClass = pageBeanDescriptor.getBeanClass();
-
- ConversationRequired conversationRequired =
- resolveConversationRequiredAnnotation(viewConfigDescriptor, pageBeanDescriptorList, pageBeanClass);
-
- if(conversationRequired == null)
- {
- continue;
- }
-
- if(!isEntryPoint(currentView, conversationRequired.defaultEntryPoint(), conversationRequired.entryPoints()))
- {
- EditableWindowContext editableWindowContext =
- (EditableWindowContext)ConversationUtils.getWindowContextManager().getCurrentWindowContext();
-
- Set<? extends Bean> foundBeans =
- beanManager.getBeans(pageBeanDescriptor.getBeanClass(), new AnyLiteral());
-
- Bean<?> foundBean;
- Set<Bean<?>> beanSet;
- Class<?> conversationGroup;
- for(Bean<?> currentBean : foundBeans)
- {
- beanSet = new HashSet<Bean<?>>(1);
- beanSet.add(currentBean);
- foundBean = beanManager.resolve(beanSet);
-
- //only page-beans are supported -> we have to compare them by bean-name
- if(!pageBeanDescriptor.getBeanName().equals(foundBean.getName()))
- {
- continue;
- }
-
- if(ConversationRequired.class.equals(conversationRequired.conversationGroup()))
- {
- conversationGroup = ConversationUtils.getConversationGroup(foundBean);
- }
- else
- {
- conversationGroup = conversationRequired.conversationGroup();
- }
-
- if(!editableWindowContext.isConversationActive(conversationGroup,
- foundBean.getQualifiers().toArray(new Annotation[foundBean.getQualifiers().size()])))
- {
- return ViewConfigCache
- .getViewConfigDescriptor(conversationRequired.defaultEntryPoint()).getViewId();
- }
- }
- }
- }
- return null;
- }
-
- private static ConversationRequired resolveConversationRequiredAnnotation(ViewConfigDescriptor viewConfigDescriptor,
- List<PageBeanDescriptor> pageBeanDescriptorList, Class<?> pageBeanClass)
- {
- ConversationRequired conversationRequired = pageBeanClass.getAnnotation(ConversationRequired.class);
-
- //here we support just simple constellations
- //TODO handle unsupported constellations
- if(conversationRequired == null && pageBeanDescriptorList.size() == 1)
- {
- List<ConversationRequired> conversationRequiredMetaData =
- viewConfigDescriptor.getMetaData(ConversationRequired.class);
-
- if(conversationRequiredMetaData.size() == 1)
- {
- conversationRequired = conversationRequiredMetaData.iterator().next();
- }
- }
- return conversationRequired;
- }
-
- private static boolean isEntryPoint(Class<? extends ViewConfig> currentView,
- Class<? extends ViewConfig> defaultEntryPoint,
- Class<? extends ViewConfig>[] entryPoints)
- {
- if(currentView.equals(defaultEntryPoint))
- {
- return true;
- }
-
- for(Class<? extends ViewConfig> entryPoint : entryPoints)
- {
- if(currentView.equals(entryPoint))
- {
- return true;
- }
- }
- return false;
- }
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/phase/CodiLifecycleWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/phase/CodiLifecycleWrapper.java?rev=1089398&r1=1089397&r2=1089398&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/phase/CodiLifecycleWrapper.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/phase/CodiLifecycleWrapper.java Wed Apr 6 10:51:21 2011
@@ -24,8 +24,8 @@ import org.apache.myfaces.extensions.cdi
import org.apache.myfaces.extensions.cdi.jsf.impl.listener.startup.ApplicationStartupBroadcaster;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.WindowHandler;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.LifecycleAwareWindowHandler;
+import org.apache.myfaces.extensions.cdi.jsf.impl.util.ConversationRequiredUtils;
import org.apache.myfaces.extensions.cdi.jsf.impl.util.ConversationUtils;
-import org.apache.myfaces.extensions.cdi.jsf.impl.util.JsfUtils;
import javax.faces.context.FacesContext;
@@ -117,7 +117,7 @@ class CodiLifecycleWrapper extends Lifec
*/
public void render(FacesContext facesContext)
{
- JsfUtils.ensureExistingConversation(facesContext);
+ ConversationRequiredUtils.ensureExistingConversation(facesContext);
wrapped.render(facesContext);