HV-1589 Include the initialization context in all the caching mechanisms

Author: gsmet

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

@@ -34,9 +34,11 @@
 import org.hibernate.validator.HibernateValidatorContext;
 import org.hibernate.validator.HibernateValidatorFactory;
 import org.hibernate.validator.cfg.ConstraintMapping;
+import org.hibernate.validator.constraintvalidation.HibernateConstraintValidatorInitializationContext;
 import org.hibernate.validator.internal.cfg.context.DefaultConstraintMapping;
 import org.hibernate.validator.internal.engine.constraintdefinition.ConstraintDefinitionContribution;
 import org.hibernate.validator.internal.engine.constraintvalidation.ConstraintValidatorManager;
+import org.hibernate.validator.internal.engine.constraintvalidation.HibernateConstraintValidatorInitializationContextImpl;
 import org.hibernate.validator.internal.engine.groups.ValidationOrderGenerator;
 import org.hibernate.validator.internal.engine.scripting.DefaultScriptEvaluatorFactory;
 import org.hibernate.validator.internal.engine.valueextraction.ValueExtractorManager;
@@ -177,8 +179,6 @@ public ValidatorFactoryImpl(ConfigurationState configurationState) {
 						getAllowParallelMethodsDefineParameterConstraints( hibernateSpecificConfig, properties )
 				).build();
 
-		this.constraintValidatorManager = new ConstraintValidatorManager( configurationState.getConstraintValidatorFactory() );
-
 		this.validatorFactoryScopedContext = new ValidatorFactoryScopedContext(
 				configurationState.getMessageInterpolator(),
 				configurationState.getTraversableResolver(),
@@ -191,6 +191,11 @@ public ValidatorFactoryImpl(ConfigurationState configurationState) {
 				getConstraintValidatorPayload( hibernateSpecificConfig )
 		);
 
+		this.constraintValidatorManager = new ConstraintValidatorManager(
+				configurationState.getConstraintValidatorFactory(),
+				this.validatorFactoryScopedContext.getConstraintValidatorInitializationContext()
+		);
+
 		this.validationOrderGenerator = new ValidationOrderGenerator();
 
 		if ( LOG.isDebugEnabled() ) {
@@ -702,8 +707,16 @@ static class ValidatorFactoryScopedContext {
 		 */
 		private final boolean traversableResolverResultCacheEnabled;
 
+		/**
+		 * The constraint validator payload.
+		 */
 		private final Object constraintValidatorPayload;
 
+		/**
+		 * The constraint validator initialization context.
+		 */
+		private final HibernateConstraintValidatorInitializationContextImpl constraintValidatorInitializationContext;
+
 		private ValidatorFactoryScopedContext(MessageInterpolator messageInterpolator,
 				TraversableResolver traversableResolver,
 				ExecutableParameterNameProvider parameterNameProvider,
@@ -713,6 +726,22 @@ private ValidatorFactoryScopedContext(MessageInterpolator messageInterpolator,
 				boolean failFast,
 				boolean traversableResolverResultCacheEnabled,
 				Object constraintValidatorPayload) {
+			this( messageInterpolator, traversableResolver, parameterNameProvider, clockProvider, temporalValidationTolerance, scriptEvaluatorFactory, failFast,
+					traversableResolverResultCacheEnabled, constraintValidatorPayload,
+					new HibernateConstraintValidatorInitializationContextImpl( scriptEvaluatorFactory, clockProvider,
+							temporalValidationTolerance, constraintValidatorPayload ) );
+		}
+
+		private ValidatorFactoryScopedContext(MessageInterpolator messageInterpolator,
+				TraversableResolver traversableResolver,
+				ExecutableParameterNameProvider parameterNameProvider,
+				ClockProvider clockProvider,
+				Duration temporalValidationTolerance,
+				ScriptEvaluatorFactory scriptEvaluatorFactory,
+				boolean failFast,
+				boolean traversableResolverResultCacheEnabled,
+				Object constraintValidatorPayload,
+				HibernateConstraintValidatorInitializationContextImpl constraintValidatorInitializationContext) {
 			this.messageInterpolator = messageInterpolator;
 			this.traversableResolver = traversableResolver;
 			this.parameterNameProvider = parameterNameProvider;
@@ -722,6 +751,7 @@ private ValidatorFactoryScopedContext(MessageInterpolator messageInterpolator,
 			this.failFast = failFast;
 			this.traversableResolverResultCacheEnabled = traversableResolverResultCacheEnabled;
 			this.constraintValidatorPayload = constraintValidatorPayload;
+			this.constraintValidatorInitializationContext = constraintValidatorInitializationContext;
 		}
 
 		public MessageInterpolator getMessageInterpolator() {
@@ -760,6 +790,10 @@ public Object getConstraintValidatorPayload() {
 			return this.constraintValidatorPayload;
 		}
 
+		public HibernateConstraintValidatorInitializationContext getConstraintValidatorInitializationContext() {
+			return this.constraintValidatorInitializationContext;
+		}
+
 		static class Builder {
 			private final ValidatorFactoryScopedContext defaultContext;
 
@@ -772,6 +806,7 @@ static class Builder {
 			private boolean failFast;
 			private boolean traversableResolverResultCacheEnabled;
 			private Object constraintValidatorPayload;
+			private HibernateConstraintValidatorInitializationContextImpl constraintValidatorInitializationContext;
 
 			Builder(ValidatorFactoryScopedContext defaultContext) {
 				Contracts.assertNotNull( defaultContext, "Default context cannot be null." );
@@ -786,6 +821,7 @@ static class Builder {
 				this.failFast = defaultContext.failFast;
 				this.traversableResolverResultCacheEnabled = defaultContext.traversableResolverResultCacheEnabled;
 				this.constraintValidatorPayload = defaultContext.constraintValidatorPayload;
+				this.constraintValidatorInitializationContext = defaultContext.constraintValidatorInitializationContext;
 			}
 
 			public Builder setMessageInterpolator(MessageInterpolator messageInterpolator) {
@@ -874,7 +910,14 @@ public ValidatorFactoryScopedContext build() {
 						scriptEvaluatorFactory,
 						failFast,
 						traversableResolverResultCacheEnabled,
-						constraintValidatorPayload
+						constraintValidatorPayload,
+						HibernateConstraintValidatorInitializationContextImpl.of(
+								constraintValidatorInitializationContext,
+								scriptEvaluatorFactory,
+								clockProvider,
+								temporalValidationTolerance,
+								constraintValidatorPayload
+						)
 				);
 			}
 		}

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

@@ -40,7 +40,6 @@
 import org.hibernate.validator.internal.engine.ValidationContext.ValidatorScopedContext;
 import org.hibernate.validator.internal.engine.ValidatorFactoryImpl.ValidatorFactoryScopedContext;
 import org.hibernate.validator.internal.engine.constraintvalidation.ConstraintValidatorManager;
-import org.hibernate.validator.internal.engine.constraintvalidation.HibernateConstraintValidatorInitializationContextImpl;
 import org.hibernate.validator.internal.engine.groups.Group;
 import org.hibernate.validator.internal.engine.groups.GroupWithInheritance;
 import org.hibernate.validator.internal.engine.groups.Sequence;
@@ -145,9 +144,7 @@ public ValidatorImpl(ConstraintValidatorFactory constraintValidatorFactory,
 		this.validationOrderGenerator = validationOrderGenerator;
 		this.validatorScopedContext = new ValidatorScopedContext( validatorFactoryScopedContext );
 		this.traversableResolver = validatorFactoryScopedContext.getTraversableResolver();
-		this.constraintValidatorInitializationContext = new HibernateConstraintValidatorInitializationContextImpl(
-				validatorScopedContext.getScriptEvaluatorFactory(), validatorScopedContext.getClockProvider(),
-				validatorScopedContext.getTemporalValidationTolerance(), validatorScopedContext.getConstraintValidatorPayload() );
+		this.constraintValidatorInitializationContext = validatorFactoryScopedContext.getConstraintValidatorInitializationContext();
 	}
 
 	@Override

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

@@ -20,7 +20,6 @@
 import javax.validation.ConstraintViolation;
 import javax.validation.ValidationException;
 
-import org.hibernate.validator.constraintvalidation.HibernateConstraintValidator;
 import org.hibernate.validator.internal.engine.ValidationContext;
 import org.hibernate.validator.internal.engine.ValueContext;
 import org.hibernate.validator.internal.metadata.descriptor.ConstraintDescriptorImpl;
@@ -53,7 +52,7 @@ public abstract class ConstraintTree<A extends Annotation> {
 	 * Either the initialized constraint validator for the default constraint validator factory or
 	 * {@link ConstraintValidatorManager#DUMMY_CONSTRAINT_VALIDATOR}.
 	 */
-	private volatile ConstraintValidator<A, ?> constraintValidatorForDefaultConstraintValidatorFactory;
+	private volatile ConstraintValidator<A, ?> constraintValidatorForDefaultConstraintValidatorFactoryAndInitializationContext;
 
 	protected ConstraintTree(ConstraintDescriptorImpl<A> descriptor, Type validatedValueType) {
 		this.descriptor = descriptor;
@@ -113,21 +112,18 @@ private ValidationException getExceptionForNullValidator(Type validatedValueType
 	protected final <T> ConstraintValidator<A, ?> getInitializedConstraintValidator(ValidationContext<T> validationContext, ValueContext<?, ?> valueContext) {
 		ConstraintValidator<A, ?> validator;
 
-		if ( validationContext.getConstraintValidatorFactory() == validationContext.getConstraintValidatorManager().getDefaultConstraintValidatorFactory() ) {
-			validator = constraintValidatorForDefaultConstraintValidatorFactory;
+		if ( validationContext.getConstraintValidatorFactory() == validationContext.getConstraintValidatorManager().getDefaultConstraintValidatorFactory()
+				&& validationContext.getConstraintValidatorInitializationContext() == validationContext.getConstraintValidatorManager()
+						.getDefaultConstraintValidatorInitializationContext() ) {
+			validator = constraintValidatorForDefaultConstraintValidatorFactoryAndInitializationContext;
 
 			if ( validator == null ) {
 				synchronized ( this ) {
-					validator = constraintValidatorForDefaultConstraintValidatorFactory;
+					validator = constraintValidatorForDefaultConstraintValidatorFactoryAndInitializationContext;
 					if ( validator == null ) {
 						validator = getInitializedConstraintValidator( validationContext );
 
-						// HibernateConstraintValidator instances should not be cached within this constraint tree instance, only ConstraintValidatorManager
-						// should handle their caching. That's because the HibernateConstraintValidatorInitializationContext influences their caching behaviour.
-						// (HibernateConstraintValidatorInitializationContext could have changed during a ValidatorFactory lifetime - via usingContext())
-						if ( !( validator instanceof HibernateConstraintValidator ) ) {
-							constraintValidatorForDefaultConstraintValidatorFactory = validator;
-						}
+						constraintValidatorForDefaultConstraintValidatorFactoryAndInitializationContext = validator;
 					}
 				}
 			}