svn commit: r1533632 - in /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi: dependent/DependentBeanExtension.java dependent/RequestDependentBeanStorage.java dependent/ViewDependentBeanStorage.java util/ExternalArtifactResolver.java

[gp...@apache.org]

Author: gpetracek
Date: Fri Oct 18 21:07:18 2013
New Revision: 1533632

URL: http://svn.apache.org/r1533632
Log:
MYFACES-3797 removed serializable check (see MYFACES-3805)

Removed:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/dependent/ViewDependentBeanStorage.java
Modified:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/dependent/DependentBeanExtension.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/dependent/RequestDependentBeanStorage.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/util/ExternalArtifactResolver.java

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/dependent/DependentBeanExtension.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/dependent/DependentBeanExtension.java?rev=1533632&r1=1533631&r2=1533632&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/dependent/DependentBeanExtension.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/dependent/DependentBeanExtension.java Fri Oct 18 21:07:18 2013
@@ -29,6 +29,5 @@ public class DependentBeanExtension impl
     public void registerAnnotatedTypes(@Observes BeforeBeanDiscovery beforeBeanDiscovery, BeanManager beanManager)
     {
         beforeBeanDiscovery.addAnnotatedType(beanManager.createAnnotatedType(RequestDependentBeanStorage.class));
-        beforeBeanDiscovery.addAnnotatedType(beanManager.createAnnotatedType(ViewDependentBeanStorage.class));
     }
 }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/dependent/RequestDependentBeanStorage.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/dependent/RequestDependentBeanStorage.java?rev=1533632&r1=1533631&r2=1533632&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/dependent/RequestDependentBeanStorage.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/dependent/RequestDependentBeanStorage.java Fri Oct 18 21:07:18 2013
@@ -20,6 +20,7 @@ package org.apache.myfaces.cdi.dependent
 
 import javax.enterprise.context.RequestScoped;
 
+//TODO merge with AbstractBeanStorage if ViewDependentBeanStorage isn't needed (see MYFACES-3805)
 @RequestScoped
 public class RequestDependentBeanStorage extends AbstractBeanStorage
 {

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/util/ExternalArtifactResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/util/ExternalArtifactResolver.java?rev=1533632&r1=1533631&r2=1533632&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/util/ExternalArtifactResolver.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/util/ExternalArtifactResolver.java Fri Oct 18 21:07:18 2013
@@ -21,7 +21,6 @@ package org.apache.myfaces.cdi.util;
 import org.apache.myfaces.cdi.dependent.AbstractBeanStorage;
 import org.apache.myfaces.cdi.dependent.DependentBeanEntry;
 import org.apache.myfaces.cdi.dependent.RequestDependentBeanStorage;
-import org.apache.myfaces.cdi.dependent.ViewDependentBeanStorage;
 import org.apache.myfaces.shared.config.MyfacesConfig;
 import org.apache.myfaces.util.ExternalSpecifications;
 
@@ -33,7 +32,6 @@ import javax.faces.context.ExternalConte
 import javax.faces.context.FacesContext;
 import javax.faces.convert.Converter;
 import javax.faces.validator.Validator;
-import java.io.Serializable;
 import java.util.Set;
 
 public class ExternalArtifactResolver
@@ -144,16 +142,8 @@ public class ExternalArtifactResolver
 
         if (bean.getScope().equals(Dependent.class))
         {
-            AbstractBeanStorage beanStorage;
-
-            if (Serializable.class.isAssignableFrom(bean.getBeanClass()))
-            {
-                beanStorage = getContextualReference(beanManager, ViewDependentBeanStorage.class);
-            }
-            else
-            {
-                beanStorage = getContextualReference(beanManager, RequestDependentBeanStorage.class);
-            }
+            //TODO add serializable check again or remove this TODO once MYFACES-3805 is clarified
+            AbstractBeanStorage beanStorage = getContextualReference(beanManager, RequestDependentBeanStorage.class);
 
             //noinspection unchecked
             beanStorage.add(new DependentBeanEntry(result, bean, creationalContext));