HV-1526 Combine creation and addition of constraint violations in ValidationContext

As now we don't create violations unless we need them, these operations can
be combined. Another benefit is that ValidationContext exposes less public methods.

Author: marko-bekhta

engine/src/main/java/org/hibernate/validator/internal/engine/ValidationContext.java

@@ -294,15 +294,11 @@ public void markCurrentBeanAsProcessed(ValueContext<?, ?> valueContext) {
 		markCurrentBeanAsProcessedForCurrentPath( valueContext.getCurrentBean(), valueContext.getPropertyPath() );
 	}
 
-	public void addConstraintFailure(ConstraintViolation<T> failingConstraintViolation) {
-		this.failingConstraintViolations.add( failingConstraintViolation );
-	}
-
 	public Set<ConstraintViolation<T>> getFailingConstraints() {
 		return failingConstraintViolations;
 	}
 
-	public ConstraintViolation<T> createConstraintViolation(
+	public void addConstraintFailure(
 			ValueContext<?, ?> localContext,
 			ConstraintViolationCreationContext constraintViolationCreationContext,
 			ConstraintDescriptor<?> descriptor
@@ -318,10 +314,10 @@ public ConstraintViolation<T> createConstraintViolation(
 		// at this point we make a copy of the path to avoid side effects
 		Path path = PathImpl.createCopy( constraintViolationCreationContext.getPath() );
 		Object dynamicPayload = constraintViolationCreationContext.getDynamicPayload();
-
+		ConstraintViolation<T> violation;
 		switch ( validationOperation ) {
 			case PARAMETER_VALIDATION:
-				return ConstraintViolationImpl.forParameterValidation(
+				violation = ConstraintViolationImpl.forParameterValidation(
 						messageTemplate,
 						constraintViolationCreationContext.getMessageParameters(),
 						constraintViolationCreationContext.getExpressionVariables(),
@@ -336,8 +332,9 @@ public ConstraintViolation<T> createConstraintViolation(
 						executableParameters,
 						dynamicPayload
 				);
+				break;
 			case RETURN_VALUE_VALIDATION:
-				return ConstraintViolationImpl.forReturnValueValidation(
+				violation = ConstraintViolationImpl.forReturnValueValidation(
 						messageTemplate,
 						constraintViolationCreationContext.getMessageParameters(),
 						constraintViolationCreationContext.getExpressionVariables(),
@@ -352,8 +349,9 @@ public ConstraintViolation<T> createConstraintViolation(
 						executableReturnValue,
 						dynamicPayload
 				);
+				break;
 			default:
-				return ConstraintViolationImpl.forBeanValidation(
+				violation = ConstraintViolationImpl.forBeanValidation(
 						messageTemplate,
 						constraintViolationCreationContext.getMessageParameters(),
 						constraintViolationCreationContext.getExpressionVariables(),
@@ -368,6 +366,8 @@ public ConstraintViolation<T> createConstraintViolation(
 						dynamicPayload
 				);
 		}
+
+		this.failingConstraintViolations.add( violation );
 	}
 
 	public boolean hasMetaConstraintBeenProcessed(Object bean, Path path, MetaConstraint<?> metaConstraint) {

engine/src/main/java/org/hibernate/validator/internal/engine/constraintvalidation/ConstraintTree.java

@@ -75,7 +75,7 @@ public final <T> boolean validateConstraints(ValidationContext<T> validationCont
 			for ( ConstraintValidatorContextImpl constraintValidatorContext : violatedConstraintValidatorContexts ) {
 				for ( ConstraintViolationCreationContext constraintViolationCreationContext : constraintValidatorContext.getConstraintViolationCreationContexts() ) {
 					validationContext.addConstraintFailure(
-							validationContext.createConstraintViolation( valueContext, constraintViolationCreationContext, constraintValidatorContext.getConstraintDescriptor() )
+							valueContext, constraintViolationCreationContext, constraintValidatorContext.getConstraintDescriptor()
 					);
 				}
 			}