sort out package names a bit, add validation of decorators

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@3433 1c488680-804c-0410-94cd-c6b725194a0e
weld · Aug 11, 2009 · 458fa1a · 458fa1a
1 parent 794a0fd
commit 458fa1a
Showing 1 changed file with 25 additions and 8 deletions.
diff --git a/impl/src/main/java/org/jboss/webbeans/Validator.java b/impl/src/main/java/org/jboss/webbeans/Validator.java
@@ -91,7 +91,7 @@ private void validateBean(Bean<?> bean, BeanManagerImpl beanManager)
     * @param beanManager the current manager
     * @param specializedBeans the existing specialized beans
     */
-   private void validateRIBean(RIBean<?> bean, BeanManagerImpl beanManager, List<RIBean<?>> specializedBeans)
+   private void validateRIBean(RIBean<?> bean, BeanManagerImpl beanManager, Collection<RIBean<?>> specializedBeans)
    {
       validateBean(bean, beanManager);
       if (!(bean instanceof NewSimpleBean<?>) && !(bean instanceof NewEnterpriseBean<?>))
@@ -116,12 +116,16 @@ private void validateRIBean(RIBean<?> bean, BeanManagerImpl beanManager, List<RI
                   {
                      throw new UnserializableDependencyException("The bean " + bean + " declares a passivating scope but has non-serializable decorator: " + decorator);
                   }
+                  for (InjectionPoint ij : decorator.getInjectionPoints())
+                  {
+                     Bean<?> resolvedBean = beanManager.resolve(beanManager.getInjectableBeans(ij));
+                     validateInjectionPointPassivationCapable(ij, resolvedBean, beanManager);
+                  }
                }
             }
 
          }
       }
-
    }
 
    /**
@@ -183,6 +187,14 @@ public void validateInjectionPoint(InjectionPoint ij, BeanManagerImpl beanManage
          throw new NullableDependencyException("The injection point " + ij + " has nullable dependencies");
       }
       if (Beans.isPassivatingScope(ij.getBean(), beanManager) && (!ij.isTransient()) && !Beans.isPassivationCapableBean(resolvedBean))
+      {
+         validateInjectionPointPassivationCapable(ij, resolvedBean, beanManager);
+      }
+   }
+
+   public void validateInjectionPointPassivationCapable(InjectionPoint ij, Bean<?> resolvedBean, BeanManagerImpl beanManager)
+   {
+      if (!ij.isTransient() && !Beans.isPassivationCapableBean(resolvedBean))
       {
          if (resolvedBean.getScopeType().equals(Dependent.class) && resolvedBean instanceof AbstractProducerBean<?,?>)
          {
@@ -194,8 +206,17 @@ public void validateInjectionPoint(InjectionPoint ij, BeanManagerImpl beanManage
 
    public void validateDeployment(BeanManagerImpl manager, BeanDeployerEnvironment environment)
    {
-      List<RIBean<?>> specializedBeans = new ArrayList<RIBean<?>>();
-      for (Bean<?> bean : manager.getBeans())
+      validateBeans(manager.getDecorators(), new ArrayList<RIBean<?>>(), manager);
+      validateBeans(manager.getBeans(), new ArrayList<RIBean<?>>(), manager);
+      validateEnabledDecoratorClasses(manager);
+      validateEnabledPolicies(manager);
+      validateDisposalMethods(environment);
+      validateBeanNames(manager);
+   }
+
+   public void validateBeans(Collection<? extends Bean<?>> beans, Collection<RIBean<?>> specializedBeans, BeanManagerImpl manager)
+   {
+      for (Bean<?> bean : beans)
       {
          if (bean instanceof RIBean<?>)
          {
@@ -206,10 +227,6 @@ public void validateDeployment(BeanManagerImpl manager, BeanDeployerEnvironment
             validateBean(bean, manager);
          }
       }
-      validateEnabledDecoratorClasses(manager);
-      validateEnabledPolicies(manager);
-      validateDisposalMethods(environment);
-      validateBeanNames(manager);
    }
 
    public void validateBeanNames(BeanManagerImpl beanManager)