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/09/19 02:42:09 UTC

svn commit: r998574 - /myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/CdiAwareValidatorFactory.java

Author: gpetracek
Date: Sun Sep 19 00:42:09 2010
New Revision: 998574

URL: http://svn.apache.org/viewvc?rev=998574&view=rev
Log:
EXTCDI-20 refactored to the new utils

Modified:
    myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/CdiAwareValidatorFactory.java

Modified: myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/CdiAwareValidatorFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/CdiAwareValidatorFactory.java?rev=998574&r1=998573&r2=998574&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/CdiAwareValidatorFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/CdiAwareValidatorFactory.java Sun Sep 19 00:42:09 2010
@@ -18,12 +18,9 @@
  */
 package org.apache.myfaces.extensions.cdi.bv.impl;
 
-import org.apache.myfaces.extensions.cdi.core.api.provider.BeanManagerProvider;
+import static org.apache.myfaces.extensions.cdi.core.impl.utils.CodiUtils.injectFields;
 
-import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.Typed;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
 import javax.validation.ValidatorFactory;
 import javax.validation.Validator;
 import javax.validation.ValidatorContext;
@@ -31,7 +28,6 @@ import javax.validation.MessageInterpola
 import javax.validation.TraversableResolver;
 import javax.validation.ConstraintValidatorFactory;
 import javax.validation.ConstraintValidator;
-import java.util.Set;
 
 /**
  * @author Gerhard Petracek
@@ -79,25 +75,9 @@ public class CdiAwareValidatorFactory im
             @SuppressWarnings({"unchecked"})
             public <T extends ConstraintValidator<?, ?>> T getInstance(Class<T> targetClass)
             {
-                BeanManager beanManager = BeanManagerProvider.getInstance().getBeanManager();
+                T validator = wrappedValidatorFactory.getConstraintValidatorFactory().getInstance(targetClass);
 
-                Set<? extends Bean> foundBeans = beanManager.getBeans(targetClass);
-
-                if (foundBeans.isEmpty())
-                {
-                    return wrappedValidatorFactory.getConstraintValidatorFactory().getInstance(targetClass);
-                }
-                else if (foundBeans.size() > 1)
-                {
-                    throw new IllegalStateException(
-                            foundBeans.size() + " beans are available for the class: " + targetClass);
-                }
-
-                Bean<ConstraintValidator> constraintValidatorBean = foundBeans.iterator().next();
-                CreationalContext<ConstraintValidator> creationalContext =
-                        beanManager.createCreationalContext(constraintValidatorBean);
-
-                return (T) constraintValidatorBean.create(creationalContext);
+                return injectFields(validator);
             }
         };
     }