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/12/22 15:32:59 UTC
svn commit: r1051918 - in /myfaces/extensions/cdi/trunk:
core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/
core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/
jee-modules/bv-module/impl/src/main/java/org/ap...
Author: gpetracek
Date: Wed Dec 22 14:32:59 2010
New Revision: 1051918
URL: http://svn.apache.org/viewvc?rev=1051918&view=rev
Log:
EXTCDI-95 cleanup
Modified:
myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/CodiCoreConfig.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/CodiUtils.java
myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/CdiAwareBeanValidationProducer.java
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/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/CodiCoreConfig.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/CodiCoreConfig.java?rev=1051918&r1=1051917&r2=1051918&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/CodiCoreConfig.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/CodiCoreConfig.java Wed Dec 22 14:32:59 2010
@@ -34,6 +34,6 @@ public class CodiCoreConfig extends Abst
public boolean isAdvancedQualifierRequiredForDependencyInjection()
{
- return false;
+ return true;
}
}
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/CodiUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/CodiUtils.java?rev=1051918&r1=1051917&r2=1051918&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/CodiUtils.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/CodiUtils.java Wed Dec 22 14:32:59 2010
@@ -229,11 +229,6 @@ public class CodiUtils
@SuppressWarnings({"unchecked"})
private static <T> T tryToInjectFields(T instance)
{
- if(instance == null)
- {
- return null;
- }
-
BeanManager beanManager = BeanManagerProvider.getInstance().getBeanManager();
T foundBean = (T)getOrCreateScopedInstanceOfBeanByClass(beanManager, instance.getClass(), true);
Modified: myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/CdiAwareBeanValidationProducer.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/CdiAwareBeanValidationProducer.java?rev=1051918&r1=1051917&r2=1051918&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/CdiAwareBeanValidationProducer.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/CdiAwareBeanValidationProducer.java Wed Dec 22 14:32:59 2010
@@ -19,7 +19,6 @@
package org.apache.myfaces.extensions.cdi.bv.impl;
import org.apache.myfaces.extensions.cdi.core.api.Advanced;
-import org.apache.myfaces.extensions.cdi.core.api.config.CodiCoreConfig;
import org.apache.myfaces.extensions.cdi.core.api.resolver.qualifier.BeanValidation;
import org.apache.myfaces.extensions.cdi.core.api.resolver.GenericResolver;
import static org.apache.myfaces.extensions.cdi.bv.api.BeanValidationModuleBeanNames.VALIDATOR_FACTORY;
@@ -46,8 +45,7 @@ public class CdiAwareBeanValidationProdu
@Advanced
@Named(VALIDATOR_FACTORY)
public ValidatorFactory createValidatorFactoryForDependencyInjectionAwareConstraintValidators(
- @BeanValidation GenericResolver<ValidatorFactory> validatorFactoryResolver,
- CodiCoreConfig codiCoreConfig)
+ @BeanValidation GenericResolver<ValidatorFactory> validatorFactoryResolver)
{
ValidatorFactory validatorFactory = validatorFactoryResolver.resolve();
if (validatorFactory == null)
@@ -55,39 +53,36 @@ public class CdiAwareBeanValidationProdu
validatorFactory = ValidatorFactoryStorage.getOrCreateValidatorFactory();
}
- return new CdiAwareValidatorFactory(validatorFactory, codiCoreConfig);
+ return new CdiAwareValidatorFactory(validatorFactory);
}
@Produces
@Dependent
@Advanced
public Validator createValidatorForDependencyInjectionAwareConstraintValidators(
- @BeanValidation GenericResolver<ValidatorFactory> validatorFactoryResolver,
- CodiCoreConfig codiCoreConfig)
+ @BeanValidation GenericResolver<ValidatorFactory> validatorFactoryResolver)
{
return createValidatorFactoryForDependencyInjectionAwareConstraintValidators(
- validatorFactoryResolver, codiCoreConfig).getValidator();
+ validatorFactoryResolver).getValidator();
}
@Produces
@Dependent
@Advanced
public ConstraintValidatorFactory createConstraintValidatorFactoryForDependencyInjectionAwareConstraintValidators(
- @BeanValidation GenericResolver<ValidatorFactory> validatorFactoryResolver,
- CodiCoreConfig codiCoreConfig)
+ @BeanValidation GenericResolver<ValidatorFactory> validatorFactoryResolver)
{
return createValidatorFactoryForDependencyInjectionAwareConstraintValidators(
- validatorFactoryResolver, codiCoreConfig).getConstraintValidatorFactory();
+ validatorFactoryResolver).getConstraintValidatorFactory();
}
@Produces
@Dependent
@Advanced
public MessageInterpolator createMessageInterpolator(
- @BeanValidation GenericResolver<ValidatorFactory> validatorFactoryResolver,
- CodiCoreConfig codiCoreConfig)
+ @BeanValidation GenericResolver<ValidatorFactory> validatorFactoryResolver)
{
return createValidatorFactoryForDependencyInjectionAwareConstraintValidators(
- validatorFactoryResolver, codiCoreConfig).getMessageInterpolator();
+ validatorFactoryResolver).getMessageInterpolator();
}
}
\ No newline at end of file
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=1051918&r1=1051917&r2=1051918&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 Wed Dec 22 14:32:59 2010
@@ -18,8 +18,6 @@
*/
package org.apache.myfaces.extensions.cdi.bv.impl;
-import org.apache.myfaces.extensions.cdi.core.api.config.CodiCoreConfig;
-
import static org.apache.myfaces.extensions.cdi.core.impl.util.CodiUtils.injectFields;
import javax.enterprise.inject.Typed;
@@ -39,13 +37,10 @@ public class CdiAwareValidatorFactory im
{
private ValidatorFactory wrappedValidatorFactory;
private boolean customContextUsed;
- private boolean advancedQualifierRequiredForDependencyInjection;
- protected CdiAwareValidatorFactory(ValidatorFactory wrappedValidatorFactory, CodiCoreConfig codiCoreConfig)
+ protected CdiAwareValidatorFactory(ValidatorFactory wrappedValidatorFactory)
{
this.wrappedValidatorFactory = wrappedValidatorFactory;
- this.advancedQualifierRequiredForDependencyInjection =
- codiCoreConfig.isAdvancedQualifierRequiredForDependencyInjection();
}
public Validator getValidator()
@@ -82,7 +77,7 @@ public class CdiAwareValidatorFactory im
{
T validator = wrappedValidatorFactory.getConstraintValidatorFactory().getInstance(targetClass);
- return injectFields(validator, advancedQualifierRequiredForDependencyInjection);
+ return injectFields(validator, false);
}
};
}