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/04/09 20:15:52 UTC
svn commit: r763761 - in
/myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval:
./ annotation/group/ interceptor/
Author: gpetracek
Date: Thu Apr 9 18:15:52 2009
New Revision: 763761
URL: http://svn.apache.org/viewvc?rev=763761&view=rev
Log:
cleanup and possibility to deactivate bv if there is no @BeanValidation
Removed:
myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/interceptor/
Modified:
myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptor.java
myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/ExtValBeanValidationContext.java
myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/annotation/group/BeanValidation.java
Modified: myfaces/extensions/validator/branches/beanval_integration/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/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptor.java?rev=763761&r1=763760&r2=763761&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptor.java (original)
+++ myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptor.java Thu Apr 9 18:15:52 2009
@@ -32,7 +32,6 @@
import org.apache.myfaces.extensions.validator.core.metadata.transformer.MetaDataTransformer;
import org.apache.myfaces.extensions.validator.core.interceptor.AbstractRendererInterceptor;
import org.apache.myfaces.extensions.validator.util.ExtValUtils;
-import org.apache.myfaces.extensions.validator.beanval.interceptor.PropertyValidationInterceptor;
import org.apache.myfaces.extensions.validator.beanval.property.BeanValidationPropertyInformationKeys;
import org.apache.myfaces.extensions.validator.beanval.annotation.group.BeanValidation;
import org.apache.myfaces.extensions.validator.beanval.annotation.group.None;
@@ -231,61 +230,49 @@
PropertyInformationKeys.PROPERTY_DETAILS, PropertyDetails.class)).getProperty();
ExtValBeanValidationContext beanValidationContext = ExtValBeanValidationContext.getCurrentInstance();
- for (PropertyValidationInterceptor interceptor : beanValidationContext.getPropertyValidationInterceptors())
+
+ Class[] groups = beanValidationContext.getGroups(
+ facesContext.getViewRoot().getViewId(), uiComponent.getClientId(facesContext));
+
+ if(groups == null)
{
- interceptor.beforeValidation(uiComponent, propertyInformation, convertedObject);
+ return;
}
Set<ConstraintViolation> violations = this.validationFactory.usingContext()
.messageInterpolator(ExtValBeanValidationContext.getCurrentInstance().getMessageInterpolator())
.getValidator()
- .validateValue(
- baseBeanClass,
- propertyName,
- convertedObject,
- beanValidationContext.getGroups(
- facesContext.getViewRoot().getViewId(),
- uiComponent.getClientId(facesContext)));
+ .validateValue(baseBeanClass, propertyName, convertedObject, groups);
- try
+ if (violations != null && violations.size() > 0)
{
- if (violations != null && violations.size() > 0)
- {
- ConstraintViolation violation = (ConstraintViolation) violations.toArray()[0];
+ ConstraintViolation violation = (ConstraintViolation) violations.toArray()[0];
- String violationMessage = violation.getMessage();
+ String violationMessage = violation.getMessage();
- String labeledMessage = "{0}: " + violationMessage;
- ValidatorException validatorException = new ValidatorException(
- new FacesMessage(FacesMessage.SEVERITY_ERROR, labeledMessage, labeledMessage));
+ String labeledMessage = "{0}: " + violationMessage;
+ ValidatorException validatorException = new ValidatorException(
+ new FacesMessage(FacesMessage.SEVERITY_ERROR, labeledMessage, labeledMessage));
- ExtValUtils.executeAfterThrowingInterceptors(
- uiComponent,
- null,
- convertedObject,
- validatorException,
- null);
+ ExtValUtils.executeAfterThrowingInterceptors(
+ uiComponent,
+ null,
+ convertedObject,
+ validatorException,
+ null);
- propertyInformation.setInformation(
- BeanValidationPropertyInformationKeys.CONSTRAINT_VIOLATIONS, violations);
+ propertyInformation.setInformation(
+ BeanValidationPropertyInformationKeys.CONSTRAINT_VIOLATIONS, violations);
- if (labeledMessage.equals(validatorException.getFacesMessage().getSummary()) ||
- labeledMessage.equals(validatorException.getFacesMessage().getDetail()))
- {
- throw new ValidatorException(
- new FacesMessage(FacesMessage.SEVERITY_ERROR, violationMessage, violationMessage));
- }
- else
- {
- throw validatorException;
- }
+ if (labeledMessage.equals(validatorException.getFacesMessage().getSummary()) ||
+ labeledMessage.equals(validatorException.getFacesMessage().getDetail()))
+ {
+ throw new ValidatorException(
+ new FacesMessage(FacesMessage.SEVERITY_ERROR, violationMessage, violationMessage));
}
- }
- finally
- {
- for (PropertyValidationInterceptor interceptor : beanValidationContext.getPropertyValidationInterceptors())
+ else
{
- interceptor.afterValidation(uiComponent, propertyInformation, convertedObject);
+ throw validatorException;
}
}
Modified: myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/ExtValBeanValidationContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/ExtValBeanValidationContext.java?rev=763761&r1=763760&r2=763761&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/ExtValBeanValidationContext.java (original)
+++ myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/ExtValBeanValidationContext.java Thu Apr 9 18:15:52 2009
@@ -18,7 +18,6 @@
*/
package org.apache.myfaces.extensions.validator.beanval;
-import org.apache.myfaces.extensions.validator.beanval.interceptor.PropertyValidationInterceptor;
import org.apache.myfaces.extensions.validator.beanval.validation.message.interpolator.DefaultMessageInterpolator;
import org.apache.myfaces.extensions.validator.beanval.validation.message.interpolator.ExtValMessageInterpolatorAdapter;
import org.apache.myfaces.extensions.validator.internal.ToDo;
@@ -57,11 +56,6 @@
@ToDo(value = Priority.HIGH, description = "refactor to a pluggable GroupStorage")
private Map<String, List<Class>> restrictedGroups = new HashMap<String, List<Class>>();
- @ToDo(value = Priority.HIGH,
- description = "idea: use it for impl. group support in a more extensible way - target: move it to the core")
- private List<PropertyValidationInterceptor> propertyValidationInterceptors
- = new ArrayList<PropertyValidationInterceptor>();
-
private ExtValBeanValidationContext()
{
}
@@ -176,9 +170,10 @@
{
return new Class[] {Default.class};
}
- return new Class[0];
+ return null;
}
+ //add found groups
String key = getGroupKey(viewId, null);
List<Class> resultListForPage = buildResultFor(key, this.addedGroups);
@@ -258,21 +253,6 @@
this.addedGroups.remove(getGroupKey(viewId, componentId));
}
- @ToDo(Priority.HIGH)
- public void registerPropertyValidationInterceptor(PropertyValidationInterceptor propertyValidationInterceptor)
- {
- }
-
- @ToDo(Priority.HIGH)
- public void denyPropertyValidationInterceptor(Class<? extends PropertyValidationInterceptor> groupInterceptorClass)
- {
- }
-
- public List<PropertyValidationInterceptor> getPropertyValidationInterceptors()
- {
- return this.propertyValidationInterceptors;
- }
-
public MessageInterpolator getMessageInterpolator()
{
if(messageResolver != null)
Modified: myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/annotation/group/BeanValidation.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/annotation/group/BeanValidation.java?rev=763761&r1=763760&r2=763761&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/annotation/group/BeanValidation.java (original)
+++ myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/annotation/group/BeanValidation.java Thu Apr 9 18:15:52 2009
@@ -51,5 +51,4 @@
{
BeanValidation[] value();
}
-
}
\ No newline at end of file