HV-1589 Take initializationContext into account when caching constraint validators

Author: mkurz

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

@@ -110,7 +110,7 @@ public ConstraintValidatorManager(ConstraintValidatorFactory constraintValidator
 		Contracts.assertNotNull( constraintValidatorFactory );
 		Contracts.assertNotNull( initializationContext );
 
-		CacheKey key = new CacheKey( descriptor.getAnnotationDescriptor(), validatedValueType, constraintValidatorFactory );
+		CacheKey key = new CacheKey( descriptor.getAnnotationDescriptor(), validatedValueType, constraintValidatorFactory, initializationContext );
 
 		@SuppressWarnings("unchecked")
 		ConstraintValidator<A, ?> constraintValidator = (ConstraintValidator<A, ?>) constraintValidatorCache.get( key );
@@ -281,12 +281,14 @@ private static final class CacheKey {
 		private final ConstraintAnnotationDescriptor<?> annotationDescriptor;
 		private final Type validatedType;
 		private final ConstraintValidatorFactory constraintValidatorFactory;
+		private final HibernateConstraintValidatorInitializationContext initializationContext;
 		private final int hashCode;
 
-		private CacheKey(ConstraintAnnotationDescriptor<?> annotationDescriptor, Type validatorType, ConstraintValidatorFactory constraintValidatorFactory) {
+		private CacheKey(ConstraintAnnotationDescriptor<?> annotationDescriptor, Type validatorType, ConstraintValidatorFactory constraintValidatorFactory, HibernateConstraintValidatorInitializationContext initializationContext) {
 			this.annotationDescriptor = annotationDescriptor;
 			this.validatedType = validatorType;
 			this.constraintValidatorFactory = constraintValidatorFactory;
+			this.initializationContext = initializationContext;
 			this.hashCode = createHashCode();
 		}
 
@@ -314,6 +316,9 @@ public boolean equals(Object o) {
 			if ( !constraintValidatorFactory.equals( cacheKey.constraintValidatorFactory ) ) {
 				return false;
 			}
+			if ( !initializationContext.equals( cacheKey.initializationContext ) ) {
+				return false;
+			}
 
 			return true;
 		}
@@ -327,6 +332,7 @@ private int createHashCode() {
 			int result = annotationDescriptor.hashCode();
 			result = 31 * result + validatedType.hashCode();
 			result = 31 * result + constraintValidatorFactory.hashCode();
+			result = 31 * result + initializationContext.hashCode();
 			return result;
 		}
 	}

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

@@ -27,12 +27,15 @@ public class HibernateConstraintValidatorInitializationContextImpl implements Hi
 
 	private final Object constraintValidatorPayload;
 
+	private final int hashCode;
+
 	public HibernateConstraintValidatorInitializationContextImpl(ScriptEvaluatorFactory scriptEvaluatorFactory, ClockProvider clockProvider,
 			Duration temporalValidationTolerance, Object constraintValidatorPayload) {
 		this.scriptEvaluatorFactory = scriptEvaluatorFactory;
 		this.clockProvider = clockProvider;
 		this.temporalValidationTolerance = temporalValidationTolerance;
 		this.constraintValidatorPayload = constraintValidatorPayload;
+		this.hashCode = createHashCode();
 	}
 
 	@Override
@@ -59,4 +62,43 @@ public <C> C getConstraintValidatorPayload(Class<C> type) {
 			return null;
 		}
 	}
+
+	@Override
+	public boolean equals(Object o) {
+		if ( this == o ) {
+			return true;
+		}
+		if ( o == null || getClass() != o.getClass() ) {
+			return false;
+		}
+
+		HibernateConstraintValidatorInitializationContextImpl hibernateConstraintValidatorInitializationContextImpl = (HibernateConstraintValidatorInitializationContextImpl) o;
+
+		if ( scriptEvaluatorFactory != hibernateConstraintValidatorInitializationContextImpl.scriptEvaluatorFactory ) {
+			return false;
+		}
+		if ( clockProvider != hibernateConstraintValidatorInitializationContextImpl.clockProvider ) {
+			return false;
+		}
+		if ( !temporalValidationTolerance.equals( hibernateConstraintValidatorInitializationContextImpl.temporalValidationTolerance ) ) {
+			return false;
+		}
+		if ( constraintValidatorPayload != hibernateConstraintValidatorInitializationContextImpl.constraintValidatorPayload ) {
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public int hashCode() {
+		return hashCode;
+	}
+
+	private int createHashCode() {
+		int result = System.identityHashCode( scriptEvaluatorFactory );
+		result = 31 * result + System.identityHashCode( clockProvider );
+		result = 31 * result + temporalValidationTolerance.hashCode();
+		result = 31 * result + System.identityHashCode( constraintValidatorPayload );
+		return result;
+	}
 }