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 2009/11/06 15:57:22 UTC
svn commit: r833425 - in
/myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval:
BeanValidationInterceptor.java BeanValidationInterceptorInternals.java
Author: gpetracek
Date: Fri Nov 6 14:57:22 2009
New Revision: 833425
URL: http://svn.apache.org/viewvc?rev=833425&view=rev
Log:
minor changes
Modified:
myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptor.java
myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptorInternals.java
Modified: myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptor.java?rev=833425&r1=833424&r2=833425&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptor.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptor.java Fri Nov 6 14:57:22 2009
@@ -29,11 +29,14 @@
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.util.ExtValUtils;
+import org.apache.myfaces.extensions.validator.beanval.util.BeanValidationUtils;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.render.Renderer;
+import javax.validation.ConstraintViolation;
import java.io.IOException;
+import java.util.Set;
/**
* @author Gerhard Petracek
@@ -77,9 +80,7 @@
protected void processValidation(FacesContext facesContext, UIComponent uiComponent, Object convertedObject)
{
- MetaDataExtractor metaDataExtractor = bviUtils.getComponentMetaDataExtractor(uiComponent);
-
- PropertyInformation propertyInformation = metaDataExtractor.extract(facesContext, uiComponent);
+ PropertyInformation propertyInformation = getPropertyInformation(facesContext, uiComponent);
boolean validateProperty = hasBeanValidationConstraints(propertyInformation);
try
@@ -115,6 +116,13 @@
}
}
+ protected PropertyInformation getPropertyInformation(FacesContext facesContext, UIComponent uiComponent)
+ {
+ MetaDataExtractor metaDataExtractor = bviUtils.getComponentMetaDataExtractor(uiComponent);
+
+ return metaDataExtractor.extract(facesContext, uiComponent);
+ }
+
protected boolean hasBeanValidationConstraints(PropertyInformation propertyInformation)
{
return this.bviUtils.hasBeanValidationConstraints(propertyInformation);
@@ -126,7 +134,14 @@
PropertyInformation propertyInformation)
{
/*not used yet supportMultipleViolationsPerField()*/
- this.bviUtils.validate(facesContext, uiComponent, convertedObject, propertyInformation);
+ Set<ConstraintViolation> violations = this.bviUtils
+ .validate(facesContext, uiComponent, convertedObject, propertyInformation);
+
+ if(violations != null && !violations.isEmpty())
+ {
+ BeanValidationUtils
+ .processConstraintViolations(facesContext, uiComponent, convertedObject, violations, true);
+ }
}
/*
Modified: myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptorInternals.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptorInternals.java?rev=833425&r1=833424&r2=833425&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptorInternals.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptorInternals.java Fri Nov 6 14:57:22 2009
@@ -20,7 +20,6 @@
import org.apache.commons.logging.Log;
import org.apache.myfaces.extensions.validator.beanval.validation.strategy.BeanValidationVirtualValidationStrategy;
-import org.apache.myfaces.extensions.validator.beanval.util.BeanValidationUtils;
import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
import org.apache.myfaces.extensions.validator.core.metadata.extractor.MetaDataExtractor;
import org.apache.myfaces.extensions.validator.core.metadata.transformer.MetaDataTransformer;
@@ -189,7 +188,7 @@
}
@SuppressWarnings({"unchecked"})
- void validate(FacesContext facesContext,
+ Set<ConstraintViolation> validate(FacesContext facesContext,
UIComponent uiComponent,
Object convertedObject,
PropertyInformation propertyInformation)
@@ -201,20 +200,14 @@
if (groups == null)
{
- return;
+ return null;
}
- Set<ConstraintViolation> violations = ExtValBeanValidationContext.getCurrentInstance().getValidatorFactory()
+ return ExtValBeanValidationContext.getCurrentInstance().getValidatorFactory()
.usingContext()
.messageInterpolator(ExtValBeanValidationContext.getCurrentInstance().getMessageInterpolator())
.getValidator()
.validateValue(baseBeanClass, propertyName, convertedObject, groups);
-
- if(violations != null && !violations.isEmpty())
- {
- BeanValidationUtils
- .processConstraintViolations(facesContext, uiComponent, convertedObject, violations, true);
- }
}
private Class getBaseClassType(PropertyInformation propertyInformation)