Skip to content

Commit

Permalink
HV-1447 Be more consistent about the naming of validationContext
Browse files Browse the repository at this point in the history 
context is not clear enough as we also have the valueContext.
  • Loading branch information
@gsmet
gsmet committed Aug 3, 2017
1 parent aa03d82 commit 51ca465
Showing 1 changed file with 61 additions and 59 deletions.
120 changes: 61 additions & 59 deletions engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,22 +189,22 @@ public final <T> Set<ConstraintViolation<T>> validateProperty(T object, String p
sanityCheckPropertyPath( propertyName );
sanityCheckGroups( groups );

ValidationContext<T> context = getValidationContextBuilder().forValidateProperty( object );
ValidationContext<T> validationContext = getValidationContextBuilder().forValidateProperty( object );

if ( !context.getRootBeanMetaData().hasConstraints() ) {
if ( !validationContext.getRootBeanMetaData().hasConstraints() ) {
return Collections.emptySet();
}

PathImpl propertyPath = PathImpl.createPathFromString( propertyName );
ValueContext<?, Object> valueContext = getValueContextForPropertyValidation( context, propertyPath );
ValueContext<?, Object> valueContext = getValueContextForPropertyValidation( validationContext, propertyPath );

if ( valueContext.getCurrentBean() == null ) {
throw log.getUnableToReachPropertyToValidateException( context.getRootBean(), propertyPath );
throw log.getUnableToReachPropertyToValidateException( validationContext.getRootBean(), propertyPath );
}

ValidationOrder validationOrder = determineGroupValidationOrder( groups );

return validateInContext( context, valueContext, validationOrder );
return validateInContext( validationContext, valueContext, validationOrder );
}

@Override
Expand All @@ -213,16 +213,16 @@ public final <T> Set<ConstraintViolation<T>> validateValue(Class<T> beanType, St
sanityCheckPropertyPath( propertyName );
sanityCheckGroups( groups );

ValidationContext<T> context = getValidationContextBuilder().forValidateValue( beanType );
ValidationContext<T> validationContext = getValidationContextBuilder().forValidateValue( beanType );

if ( !context.getRootBeanMetaData().hasConstraints() ) {
if ( !validationContext.getRootBeanMetaData().hasConstraints() ) {
return Collections.emptySet();
}

ValidationOrder validationOrder = determineGroupValidationOrder( groups );

return validateValueInContext(
context,
validationContext,
value,
PathImpl.createPathFromString( propertyName ),
validationOrder
Expand Down Expand Up @@ -265,42 +265,42 @@ public <T> Set<ConstraintViolation<T>> validateReturnValue(T object, Method meth
private <T> Set<ConstraintViolation<T>> validateParameters(T object, Executable executable, Object[] parameterValues, Class<?>... groups) {
sanityCheckGroups( groups );

ValidationContext<T> context = getValidationContextBuilder().forValidateParameters(
ValidationContext<T> validationContext = getValidationContextBuilder().forValidateParameters(
parameterNameProvider,
object,
executable,
parameterValues
);

if ( !context.getRootBeanMetaData().hasConstraints() ) {
if ( !validationContext.getRootBeanMetaData().hasConstraints() ) {
return Collections.emptySet();
}

ValidationOrder validationOrder = determineGroupValidationOrder( groups );

validateParametersInContext( context, parameterValues, validationOrder );
validateParametersInContext( validationContext, parameterValues, validationOrder );

return context.getFailingConstraints();
return validationContext.getFailingConstraints();
}

private <T> Set<ConstraintViolation<T>> validateReturnValue(T object, Executable executable, Object returnValue, Class<?>... groups) {
sanityCheckGroups( groups );

ValidationContext<T> context = getValidationContextBuilder().forValidateReturnValue(
ValidationContext<T> validationContext = getValidationContextBuilder().forValidateReturnValue(
object,
executable,
returnValue
);

if ( !context.getRootBeanMetaData().hasConstraints() ) {
if ( !validationContext.getRootBeanMetaData().hasConstraints() ) {
return Collections.emptySet();
}

ValidationOrder validationOrder = determineGroupValidationOrder( groups );

validateReturnValueInContext( context, object, returnValue, validationOrder );
validateReturnValueInContext( validationContext, object, returnValue, validationOrder );

return context.getFailingConstraints();
return validationContext.getFailingConstraints();
}

@Override
Expand Down Expand Up @@ -366,15 +366,16 @@ private ValidationOrder determineGroupValidationOrder(Class<?>[] groups) {

/**
* Validates the given object using the available context information.
* @param context the global validation context
* @param validationContext the global validation context
* @param valueContext the current validation context
* @param validationOrder Contains the information which and in which order groups have to be executed
*
* @param <T> The root bean type
*
* @return Set of constraint violations or the empty set if there were no violations.
*/
private <T, U> Set<ConstraintViolation<T>> validateInContext(ValidationContext<T> context, ValueContext<U, Object> valueContext, ValidationOrder validationOrder) {
private <T, U> Set<ConstraintViolation<T>> validateInContext(ValidationContext<T> validationContext, ValueContext<U, Object> valueContext,
ValidationOrder validationOrder) {
if ( valueContext.getCurrentBean() == null ) {
return Collections.emptySet();
}
Expand All @@ -390,18 +391,18 @@ private <T, U> Set<ConstraintViolation<T>> validateInContext(ValidationContext<T
while ( groupIterator.hasNext() ) {
Group group = groupIterator.next();
valueContext.setCurrentGroup( group.getDefiningClass() );
validateConstraintsForCurrentGroup( context, valueContext );
if ( shouldFailFast( context ) ) {
return context.getFailingConstraints();
validateConstraintsForCurrentGroup( validationContext, valueContext );
if ( shouldFailFast( validationContext ) ) {
return validationContext.getFailingConstraints();
}
}
groupIterator = validationOrder.getGroupIterator();
while ( groupIterator.hasNext() ) {
Group group = groupIterator.next();
valueContext.setCurrentGroup( group.getDefiningClass() );
validateCascadedConstraints( context, valueContext );
if ( shouldFailFast( context ) ) {
return context.getFailingConstraints();
validateCascadedConstraints( validationContext, valueContext );
if ( shouldFailFast( validationContext ) ) {
return validationContext.getFailingConstraints();
}
}

Expand All @@ -410,27 +411,27 @@ private <T, U> Set<ConstraintViolation<T>> validateInContext(ValidationContext<T
while ( sequenceIterator.hasNext() ) {
Sequence sequence = sequenceIterator.next();
for ( GroupWithInheritance groupOfGroups : sequence ) {
int numberOfViolations = context.getFailingConstraints().size();
int numberOfViolations = validationContext.getFailingConstraints().size();

for ( Group group : groupOfGroups ) {
valueContext.setCurrentGroup( group.getDefiningClass() );

validateConstraintsForCurrentGroup( context, valueContext );
if ( shouldFailFast( context ) ) {
return context.getFailingConstraints();
validateConstraintsForCurrentGroup( validationContext, valueContext );
if ( shouldFailFast( validationContext ) ) {
return validationContext.getFailingConstraints();
}

validateCascadedConstraints( context, valueContext );
if ( shouldFailFast( context ) ) {
return context.getFailingConstraints();
validateCascadedConstraints( validationContext, valueContext );
if ( shouldFailFast( validationContext ) ) {
return validationContext.getFailingConstraints();
}
}
if ( context.getFailingConstraints().size() > numberOfViolations ) {
if ( validationContext.getFailingConstraints().size() > numberOfViolations ) {
break;
}
}
}
return context.getFailingConstraints();
return validationContext.getFailingConstraints();
}

private void validateConstraintsForCurrentGroup(ValidationContext<?> validationContext, ValueContext<?, Object> valueContext) {
Expand Down Expand Up @@ -779,8 +780,9 @@ private ValueContext<?, Object> buildNewLocalExecutionContext(ValueContext<?, ?>
return newValueContext;
}

private <T> Set<ConstraintViolation<T>> validateValueInContext(ValidationContext<T> context, Object value, PathImpl propertyPath, ValidationOrder validationOrder) {
ValueContext<?, Object> valueContext = getValueContextForValueValidation( context, propertyPath );
private <T> Set<ConstraintViolation<T>> validateValueInContext(ValidationContext<T> validationContext, Object value, PathImpl propertyPath,
ValidationOrder validationOrder) {
ValueContext<?, Object> valueContext = getValueContextForValueValidation( validationContext, propertyPath );
valueContext.setCurrentValidatedValue( value );

BeanMetaData<?> beanMetaData = valueContext.getCurrentBeanMetaData();
Expand All @@ -793,9 +795,9 @@ private <T> Set<ConstraintViolation<T>> validateValueInContext(ValidationContext
while ( groupIterator.hasNext() ) {
Group group = groupIterator.next();
valueContext.setCurrentGroup( group.getDefiningClass() );
validateConstraintsForCurrentGroup( context, valueContext );
if ( shouldFailFast( context ) ) {
return context.getFailingConstraints();
validateConstraintsForCurrentGroup( validationContext, valueContext );
if ( shouldFailFast( validationContext ) ) {
return validationContext.getFailingConstraints();
}
}

Expand All @@ -804,21 +806,21 @@ private <T> Set<ConstraintViolation<T>> validateValueInContext(ValidationContext
while ( sequenceIterator.hasNext() ) {
Sequence sequence = sequenceIterator.next();
for ( GroupWithInheritance groupOfGroups : sequence ) {
int numberOfConstraintViolationsBefore = context.getFailingConstraints().size();
int numberOfConstraintViolationsBefore = validationContext.getFailingConstraints().size();
for ( Group group : groupOfGroups ) {
valueContext.setCurrentGroup( group.getDefiningClass() );
validateConstraintsForCurrentGroup( context, valueContext );
if ( shouldFailFast( context ) ) {
return context.getFailingConstraints();
validateConstraintsForCurrentGroup( validationContext, valueContext );
if ( shouldFailFast( validationContext ) ) {
return validationContext.getFailingConstraints();
}
}
if ( context.getFailingConstraints().size() > numberOfConstraintViolationsBefore ) {
if ( validationContext.getFailingConstraints().size() > numberOfConstraintViolationsBefore ) {
break;
}
}
}

return context.getFailingConstraints();
return validationContext.getFailingConstraints();
}

private <T> void validateParametersInContext(ValidationContext<T> validationContext,
Expand Down Expand Up @@ -1018,10 +1020,10 @@ private <T> ValueContext<T, Object> getExecutableValueContext(T object, Executab
return valueContext;
}

private <V, T> void validateReturnValueInContext(ValidationContext<T> context, T bean, V value, ValidationOrder validationOrder) {
BeanMetaData<T> beanMetaData = context.getRootBeanMetaData();
private <V, T> void validateReturnValueInContext(ValidationContext<T> validationContext, T bean, V value, ValidationOrder validationOrder) {
BeanMetaData<T> beanMetaData = validationContext.getRootBeanMetaData();

Optional<ExecutableMetaData> executableMetaDataOptional = beanMetaData.getMetaDataFor( context.getExecutable() );
Optional<ExecutableMetaData> executableMetaDataOptional = beanMetaData.getMetaDataFor( validationContext.getExecutable() );

if ( !executableMetaDataOptional.isPresent() ) {
// the method is unconstrained
Expand All @@ -1038,8 +1040,8 @@ private <V, T> void validateReturnValueInContext(ValidationContext<T> context, T

// process first single groups
while ( groupIterator.hasNext() ) {
validateReturnValueForGroup( context, executableMetaData, bean, value, groupIterator.next() );
if ( shouldFailFast( context ) ) {
validateReturnValueForGroup( validationContext, executableMetaData, bean, value, groupIterator.next() );
if ( shouldFailFast( validationContext ) ) {
return;
}
}
Expand All @@ -1059,8 +1061,8 @@ private <V, T> void validateReturnValueInContext(ValidationContext<T> context, T
while ( groupIterator.hasNext() ) {
Group group = groupIterator.next();
cascadingValueContext.setCurrentGroup( group.getDefiningClass() );
validateCascadedConstraints( context, cascadingValueContext );
if ( shouldFailFast( context ) ) {
validateCascadedConstraints( validationContext, cascadingValueContext );
if ( shouldFailFast( validationContext ) ) {
return;
}
}
Expand All @@ -1071,24 +1073,24 @@ private <V, T> void validateReturnValueInContext(ValidationContext<T> context, T
while ( sequenceIterator.hasNext() ) {
Sequence sequence = sequenceIterator.next();
for ( GroupWithInheritance groupOfGroups : sequence ) {
int numberOfFailingConstraintsBeforeGroup = context.getFailingConstraints().size();
int numberOfFailingConstraintsBeforeGroup = validationContext.getFailingConstraints().size();
for ( Group group : groupOfGroups ) {
validateReturnValueForGroup( context, executableMetaData, bean, value, group );
if ( shouldFailFast( context ) ) {
validateReturnValueForGroup( validationContext, executableMetaData, bean, value, group );
if ( shouldFailFast( validationContext ) ) {
return;
}

if ( value != null ) {
cascadingValueContext.setCurrentGroup( group.getDefiningClass() );
validateCascadedConstraints( context, cascadingValueContext );
validateCascadedConstraints( validationContext, cascadingValueContext );

if ( shouldFailFast( context ) ) {
if ( shouldFailFast( validationContext ) ) {
return;
}
}
}

if ( context.getFailingConstraints().size() > numberOfFailingConstraintsBeforeGroup ) {
if ( validationContext.getFailingConstraints().size() > numberOfFailingConstraintsBeforeGroup ) {
break;
}
}
Expand Down Expand Up @@ -1385,8 +1387,8 @@ private boolean isReturnValueValidation(PathImpl path) {
return path.getLeafNode().getKind() == ElementKind.RETURN_VALUE;
}

private boolean shouldFailFast(ValidationContext<?> context) {
return context.isFailFastModeEnabled() && !context.getFailingConstraints().isEmpty();
private boolean shouldFailFast(ValidationContext<?> validationContext) {
return validationContext.isFailFastModeEnabled() && !validationContext.getFailingConstraints().isEmpty();
}

private PropertyMetaData getBeanPropertyMetaData(BeanMetaData<?> beanMetaData, Path.Node propertyNode ) {
Expand Down

0 comments on commit 51ca465

Please sign in to comment.