HV-1526 Move creation of ConstraintValidatorContextImpl into ValidationContext

- As we want to encapsulate the ValidationContext specifics and for example
not expose the getParameterNames() method, ConstraintValidatorContextImpl can
be created inside the context and returned from it.
- This also allows to remove unnecessarily exposed getters of clock provider
and constraint validator payload

Author: marko-bekhta

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

@@ -32,13 +32,15 @@
 
 import org.hibernate.validator.constraintvalidation.HibernateConstraintValidatorInitializationContext;
 import org.hibernate.validator.internal.engine.ValidatorFactoryImpl.ValidatorFactoryScopedContext;
+import org.hibernate.validator.internal.engine.constraintvalidation.ConstraintValidatorContextImpl;
 import org.hibernate.validator.internal.engine.constraintvalidation.ConstraintValidatorManager;
 import org.hibernate.validator.internal.engine.constraintvalidation.ConstraintViolationCreationContext;
 import org.hibernate.validator.internal.engine.path.PathImpl;
 import org.hibernate.validator.internal.metadata.BeanMetaDataManager;
 import org.hibernate.validator.internal.metadata.aggregated.BeanMetaData;
 import org.hibernate.validator.internal.metadata.aggregated.ExecutableMetaData;
 import org.hibernate.validator.internal.metadata.core.MetaConstraint;
+import org.hibernate.validator.internal.metadata.descriptor.ConstraintDescriptorImpl;
 import org.hibernate.validator.internal.metadata.facets.Validatable;
 import org.hibernate.validator.internal.util.ExecutableParameterNameProvider;
 import org.hibernate.validator.internal.util.logging.Log;
@@ -258,14 +260,6 @@ public List<String> getParameterNames() {
 		return validatorScopedContext.getParameterNameProvider().getParameterNames( executable );
 	}
 
-	public ClockProvider getClockProvider() {
-		return validatorScopedContext.getClockProvider();
-	}
-
-	public Object getConstraintValidatorPayload() {
-		return validatorScopedContext.getConstraintValidatorPayload();
-	}
-
 	public HibernateConstraintValidatorInitializationContext getConstraintValidatorInitializationContext() {
 		return constraintValidatorInitializationContext;
 	}
@@ -402,6 +396,16 @@ public void setValidatedProperty(String validatedProperty) {
 		this.validatedProperty = validatedProperty;
 	}
 
+	public ConstraintValidatorContextImpl createConstraintValidatorContextFor(ConstraintDescriptorImpl<?> constraintDescriptor, PathImpl path) {
+		return new ConstraintValidatorContextImpl(
+				getParameterNames(),
+				validatorScopedContext.getClockProvider(),
+				path,
+				constraintDescriptor,
+				validatorScopedContext.getConstraintValidatorPayload()
+		);
+	}
+
 	@Override
 	public String toString() {
 		final StringBuilder sb = new StringBuilder();

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

@@ -88,12 +88,8 @@ protected <T> void validateConstraints(ValidationContext<T> validationContext,
 			ConstraintValidator<B, ?> validator = getInitializedConstraintValidator( validationContext, valueContext );
 
 			// create a constraint validator context
-			ConstraintValidatorContextImpl constraintValidatorContext = new ConstraintValidatorContextImpl(
-					validationContext.getParameterNames(),
-					validationContext.getClockProvider(),
-					valueContext.getPropertyPath(),
-					descriptor,
-					validationContext.getConstraintValidatorPayload()
+			ConstraintValidatorContextImpl constraintValidatorContext = validationContext.createConstraintValidatorContextFor(
+					descriptor, valueContext.getPropertyPath()
 			);
 
 			// validate
@@ -170,13 +166,11 @@ private <T> void prepareFinalConstraintViolations(ValidationContext<T> validatio
 			// If not we create a violation
 			// using the error message in the annotation declaration at top level.
 			if ( !localConstraintValidatorContext.isPresent() ) {
-				violatedConstraintValidatorContexts.add( new ConstraintValidatorContextImpl(
-						validationContext.getParameterNames(),
-						validationContext.getClockProvider(),
-						valueContext.getPropertyPath(),
-						descriptor,
-						validationContext.getConstraintValidatorPayload()
-				) );
+				violatedConstraintValidatorContexts.add(
+						validationContext.createConstraintValidatorContextFor(
+								descriptor, valueContext.getPropertyPath()
+						)
+				);
 			}
 		}
 

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

@@ -54,12 +54,8 @@ protected <T> void validateConstraints(ValidationContext<T> validationContext,
 		ConstraintValidator<B, ?> validator = getInitializedConstraintValidator( validationContext, valueContext );
 
 		// create a constraint validator context
-		ConstraintValidatorContextImpl constraintValidatorContext = new ConstraintValidatorContextImpl(
-				validationContext.getParameterNames(),
-				validationContext.getClockProvider(),
-				valueContext.getPropertyPath(),
-				descriptor,
-				validationContext.getConstraintValidatorPayload()
+		ConstraintValidatorContextImpl constraintValidatorContext = validationContext.createConstraintValidatorContextFor(
+				descriptor, valueContext.getPropertyPath()
 		);
 
 		// validate