diff --git a/engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java b/engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java index 52ace8bea0..50012dcb9b 100644 --- a/engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java +++ b/engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java @@ -189,22 +189,22 @@ public final Set> validateProperty(T object, String p sanityCheckPropertyPath( propertyName ); sanityCheckGroups( groups ); - ValidationContext context = getValidationContextBuilder().forValidateProperty( object ); + ValidationContext validationContext = getValidationContextBuilder().forValidateProperty( object ); - if ( !context.getRootBeanMetaData().hasConstraints() ) { + if ( !validationContext.getRootBeanMetaData().hasConstraints() ) { return Collections.emptySet(); } PathImpl propertyPath = PathImpl.createPathFromString( propertyName ); - ValueContext valueContext = getValueContextForPropertyValidation( context, propertyPath ); + ValueContext 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 @@ -213,16 +213,16 @@ public final Set> validateValue(Class beanType, St sanityCheckPropertyPath( propertyName ); sanityCheckGroups( groups ); - ValidationContext context = getValidationContextBuilder().forValidateValue( beanType ); + ValidationContext 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 @@ -265,42 +265,42 @@ public Set> validateReturnValue(T object, Method meth private Set> validateParameters(T object, Executable executable, Object[] parameterValues, Class... groups) { sanityCheckGroups( groups ); - ValidationContext context = getValidationContextBuilder().forValidateParameters( + ValidationContext 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 Set> validateReturnValue(T object, Executable executable, Object returnValue, Class... groups) { sanityCheckGroups( groups ); - ValidationContext context = getValidationContextBuilder().forValidateReturnValue( + ValidationContext 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 @@ -366,7 +366,7 @@ 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 * @@ -374,7 +374,8 @@ private ValidationOrder determineGroupValidationOrder(Class[] groups) { * * @return Set of constraint violations or the empty set if there were no violations. */ - private Set> validateInContext(ValidationContext context, ValueContext valueContext, ValidationOrder validationOrder) { + private Set> validateInContext(ValidationContext validationContext, ValueContext valueContext, + ValidationOrder validationOrder) { if ( valueContext.getCurrentBean() == null ) { return Collections.emptySet(); } @@ -390,18 +391,18 @@ private Set> validateInContext(ValidationContext Set> validateInContext(ValidationContext numberOfViolations ) { + if ( validationContext.getFailingConstraints().size() > numberOfViolations ) { break; } } } - return context.getFailingConstraints(); + return validationContext.getFailingConstraints(); } private void validateConstraintsForCurrentGroup(ValidationContext validationContext, ValueContext valueContext) { @@ -779,8 +780,9 @@ private ValueContext buildNewLocalExecutionContext(ValueContext return newValueContext; } - private Set> validateValueInContext(ValidationContext context, Object value, PathImpl propertyPath, ValidationOrder validationOrder) { - ValueContext valueContext = getValueContextForValueValidation( context, propertyPath ); + private Set> validateValueInContext(ValidationContext validationContext, Object value, PathImpl propertyPath, + ValidationOrder validationOrder) { + ValueContext valueContext = getValueContextForValueValidation( validationContext, propertyPath ); valueContext.setCurrentValidatedValue( value ); BeanMetaData beanMetaData = valueContext.getCurrentBeanMetaData(); @@ -793,9 +795,9 @@ private Set> 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(); } } @@ -804,21 +806,21 @@ private Set> 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 void validateParametersInContext(ValidationContext validationContext, @@ -1018,10 +1020,10 @@ private ValueContext getExecutableValueContext(T object, Executab return valueContext; } - private void validateReturnValueInContext(ValidationContext context, T bean, V value, ValidationOrder validationOrder) { - BeanMetaData beanMetaData = context.getRootBeanMetaData(); + private void validateReturnValueInContext(ValidationContext validationContext, T bean, V value, ValidationOrder validationOrder) { + BeanMetaData beanMetaData = validationContext.getRootBeanMetaData(); - Optional executableMetaDataOptional = beanMetaData.getMetaDataFor( context.getExecutable() ); + Optional executableMetaDataOptional = beanMetaData.getMetaDataFor( validationContext.getExecutable() ); if ( !executableMetaDataOptional.isPresent() ) { // the method is unconstrained @@ -1038,8 +1040,8 @@ private void validateReturnValueInContext(ValidationContext 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; } } @@ -1059,8 +1061,8 @@ private void validateReturnValueInContext(ValidationContext 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; } } @@ -1071,24 +1073,24 @@ private void validateReturnValueInContext(ValidationContext 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; } } @@ -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 ) {