HV-1831 Move metaconstraint-per-bean tracking to value context

Signed-off-by: marko-bekhta <[email protected]>

Author: marko-bekhta

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

@@ -588,7 +588,7 @@ private boolean validateMetaConstraint(BaseBeanValidationContext<?> validationCo
 
 			success = metaConstraint.validateConstraint( validationContext, valueContext );
 
-			validationContext.markConstraintProcessed( valueContext.getCurrentBean(), valueContext.getPropertyPath(), metaConstraint );
+			validationContext.markConstraintProcessed( valueContext, metaConstraint );
 		}
 
 		// reset the value context to the state before this call
@@ -1313,8 +1313,7 @@ private boolean isValidationRequired(BaseBeanValidationContext<?> validationCont
 			return false;
 		}
 		if ( validationContext.hasMetaConstraintBeenProcessed(
-				valueContext.getCurrentBean(),
-				valueContext.getPropertyPath(),
+				valueContext,
 				metaConstraint
 		) ) {
 			return false;

engine/src/main/java/org/hibernate/validator/internal/engine/validationcontext/AbstractValidationContext.java

@@ -24,7 +24,6 @@
 import org.hibernate.validator.internal.engine.constraintvalidation.ConstraintValidatorManager;
 import org.hibernate.validator.internal.engine.constraintvalidation.ConstraintViolationCreationContext;
 import org.hibernate.validator.internal.engine.path.ModifiablePath;
-import org.hibernate.validator.internal.engine.path.NodeImpl;
 import org.hibernate.validator.internal.engine.valuecontext.ValueContext;
 import org.hibernate.validator.internal.metadata.aggregated.BeanMetaData;
 import org.hibernate.validator.internal.metadata.core.MetaConstraint;
@@ -96,12 +95,6 @@ abstract class AbstractValidationContext<T> implements BaseBeanValidationContext
 	 */
 	private final boolean processedBeanTrackingEnabled;
 
-	/**
-	 * The set of already processed meta constraints per bean - path ({@link BeanPathMetaConstraintProcessedUnit}).
-	 */
-	@Lazy
-	private Set<BeanPathMetaConstraintProcessedUnit> processedPathUnits;
-
 	/**
 	 * Contains all failing constraints so far.
 	 */
@@ -248,25 +241,25 @@ protected abstract ConstraintViolation<T> createConstraintViolation(
 			ConstraintViolationCreationContext constraintViolationCreationContext);
 
 	@Override
-	public boolean hasMetaConstraintBeenProcessed(Object bean, ModifiablePath path, MetaConstraint<?> metaConstraint) {
+	public boolean hasMetaConstraintBeenProcessed(ValueContext<?, ?> valueContext, MetaConstraint<?> metaConstraint) {
 		// this is only useful if the constraint is defined for more than 1 group as in the case it's only
 		// defined for one group, there is no chance it's going to be called twice.
 		if ( metaConstraint.isDefinedForOneGroupOnly() ) {
 			return false;
 		}
 
-		return getInitializedProcessedPathUnits().contains( new BeanPathMetaConstraintProcessedUnit( bean, path, metaConstraint ) );
+		return valueContext.hasMetaConstraintBeenProcessed( metaConstraint );
 	}
 
 	@Override
-	public void markConstraintProcessed(Object bean, ModifiablePath path, MetaConstraint<?> metaConstraint) {
+	public void markConstraintProcessed(ValueContext<?, ?> valueContext, MetaConstraint<?> metaConstraint) {
 		// this is only useful if the constraint is defined for more than 1 group as in the case it's only
 		// defined for one group, there is no chance it's going to be called twice.
 		if ( metaConstraint.isDefinedForOneGroupOnly() ) {
 			return;
 		}
 
-		getInitializedProcessedPathUnits().add( new BeanPathMetaConstraintProcessedUnit( bean, path, metaConstraint ) );
+		valueContext.markConstraintProcessed( metaConstraint );
 	}
 
 	@Override
@@ -318,69 +311,11 @@ private String interpolate(
 		}
 	}
 
-	private Set<BeanPathMetaConstraintProcessedUnit> getInitializedProcessedPathUnits() {
-		if ( processedPathUnits == null ) {
-			processedPathUnits = new HashSet<>();
-		}
-		return processedPathUnits;
-	}
-
 	private Set<ConstraintViolation<T>> getInitializedFailingConstraintViolations() {
 		if ( failingConstraintViolations == null ) {
 			failingConstraintViolations = new HashSet<>();
 		}
 		return failingConstraintViolations;
 	}
 
-	private static final class BeanPathMetaConstraintProcessedUnit {
-
-		// these fields are final but we don't mark them as final as an optimization
-		private Object bean;
-		private NodeImpl pathLeaf;
-		private MetaConstraint<?> metaConstraint;
-		private int hashCode;
-
-		BeanPathMetaConstraintProcessedUnit(Object bean, ModifiablePath path, MetaConstraint<?> metaConstraint) {
-			this.bean = bean;
-			this.pathLeaf = path.getLeafNode(); // because the leaf represent the entire path.
-			this.metaConstraint = metaConstraint;
-			this.hashCode = createHashCode();
-		}
-
-		@Override
-		public boolean equals(Object o) {
-			// null check intentionally left out
-			if ( this == o ) {
-				return true;
-			}
-
-			// No need to check if the class matches because of how this class is used in the set.
-			BeanPathMetaConstraintProcessedUnit that = (BeanPathMetaConstraintProcessedUnit) o;
-
-			if ( bean != that.bean ) { // instance equality
-				return false;
-			}
-			if ( metaConstraint != that.metaConstraint ) {
-				return false;
-			}
-			if ( !pathLeaf.equals( that.pathLeaf ) ) {
-				return false;
-			}
-
-			return true;
-		}
-
-		@Override
-		public int hashCode() {
-			return hashCode;
-		}
-
-		private int createHashCode() {
-			int result = System.identityHashCode( bean );
-			result = 31 * result + pathLeaf.hashCode();
-			result = 31 * result + System.identityHashCode( metaConstraint );
-			return result;
-		}
-	}
-
 }

engine/src/main/java/org/hibernate/validator/internal/engine/validationcontext/BaseBeanValidationContext.java

@@ -8,7 +8,6 @@
 import jakarta.validation.Validator;
 
 import org.hibernate.validator.internal.engine.ValidatorImpl;
-import org.hibernate.validator.internal.engine.path.ModifiablePath;
 import org.hibernate.validator.internal.engine.valuecontext.ValueContext;
 import org.hibernate.validator.internal.metadata.aggregated.BeanMetaData;
 import org.hibernate.validator.internal.metadata.core.MetaConstraint;
@@ -38,9 +37,9 @@ public interface BaseBeanValidationContext<T> extends ValidationContext<T> {
 
 	void markCurrentBeanAsProcessed(ValueContext<?, ?> valueContext);
 
-	boolean hasMetaConstraintBeenProcessed(Object bean, ModifiablePath path, MetaConstraint<?> metaConstraint);
+	boolean hasMetaConstraintBeenProcessed(ValueContext<?, ?> valueContext, MetaConstraint<?> metaConstraint);
 
-	void markConstraintProcessed(Object bean, ModifiablePath path, MetaConstraint<?> metaConstraint);
+	void markConstraintProcessed(ValueContext<?, ?> valueContext, MetaConstraint<?> metaConstraint);
 
 	/**
 	 * @return {@code true} if current validation context can and should process passed meta constraint. Is used in

engine/src/main/java/org/hibernate/validator/internal/engine/valuecontext/BeanValueContext.java

@@ -5,10 +5,13 @@
 package org.hibernate.validator.internal.engine.valuecontext;
 
 import java.util.HashSet;
+import java.util.IdentityHashMap;
+import java.util.Map;
 import java.util.Set;
 
 import org.hibernate.validator.internal.engine.path.ModifiablePath;
 import org.hibernate.validator.internal.metadata.aggregated.BeanMetaData;
+import org.hibernate.validator.internal.metadata.core.MetaConstraint;
 import org.hibernate.validator.internal.util.ExecutableParameterNameProvider;
 import org.hibernate.validator.internal.util.stereotypes.Lazy;
 
@@ -29,6 +32,12 @@ public final class BeanValueContext<T, V> extends ValueContext<T, V> {
 	@Lazy
 	private Set<Class<?>> alreadyProcessedGroups;
 
+	/**
+	 * To track when the constraint is in multiple groups, and it was already processed for some other group.
+	 */
+	@Lazy
+	private Map<MetaConstraint<?>, Boolean> alreadyProcessedMetaConstraints;
+
 	BeanValueContext(ValueContext<?, ?> parentContext, ExecutableParameterNameProvider parameterNameProvider, T currentBean, BeanMetaData<T> currentBeanMetaData, ModifiablePath propertyPath) {
 		super( parentContext, parameterNameProvider, currentBean, currentBeanMetaData, propertyPath );
 		this.currentBeanMetaData = currentBeanMetaData;
@@ -67,4 +76,17 @@ public void markCurrentGroupAsProcessed() {
 	protected boolean isProcessedForGroup(Class<?> group) {
 		return group == this.currentGroup || ( this.alreadyProcessedGroups != null && alreadyProcessedGroups.contains( group ) );
 	}
+
+	@Override
+	public void markConstraintProcessed(MetaConstraint<?> metaConstraint) {
+		if ( alreadyProcessedMetaConstraints == null ) {
+			alreadyProcessedMetaConstraints = new IdentityHashMap<>();
+		}
+		alreadyProcessedMetaConstraints.put( metaConstraint, Boolean.TRUE );
+	}
+
+	@Override
+	public boolean hasMetaConstraintBeenProcessed(MetaConstraint<?> metaConstraint) {
+		return alreadyProcessedMetaConstraints != null && alreadyProcessedMetaConstraints.containsKey( metaConstraint );
+	}
 }

engine/src/main/java/org/hibernate/validator/internal/engine/valuecontext/ExecutableValueContext.java

@@ -5,6 +5,7 @@
 package org.hibernate.validator.internal.engine.valuecontext;
 
 import org.hibernate.validator.internal.engine.path.ModifiablePath;
+import org.hibernate.validator.internal.metadata.core.MetaConstraint;
 import org.hibernate.validator.internal.metadata.facets.Validatable;
 import org.hibernate.validator.internal.util.ExecutableParameterNameProvider;
 
@@ -33,4 +34,14 @@ public void markCurrentGroupAsProcessed() {
 	protected boolean isProcessedForGroup(Class<?> group) {
 		return false;
 	}
+
+	@Override
+	public void markConstraintProcessed(MetaConstraint<?> metaConstraint) {
+		// do nothing as usual
+	}
+
+	@Override
+	public boolean hasMetaConstraintBeenProcessed(MetaConstraint<?> metaConstraint) {
+		return false;
+	}
 }

engine/src/main/java/org/hibernate/validator/internal/engine/valuecontext/ValueContext.java

@@ -10,6 +10,7 @@
 import org.hibernate.validator.internal.engine.path.ModifiablePath;
 import org.hibernate.validator.internal.engine.valueextraction.AnnotatedObject;
 import org.hibernate.validator.internal.engine.valueextraction.ArrayElement;
+import org.hibernate.validator.internal.metadata.core.MetaConstraint;
 import org.hibernate.validator.internal.metadata.facets.Cascadable;
 import org.hibernate.validator.internal.metadata.facets.Validatable;
 import org.hibernate.validator.internal.metadata.location.ConstraintLocation;
@@ -154,6 +155,10 @@ public final void setCurrentGroup(Class<?> currentGroup) {
 
 	protected abstract boolean isProcessedForGroup(Class<?> group);
 
+	public abstract void markConstraintProcessed(MetaConstraint<?> metaConstraint);
+
+	public abstract boolean hasMetaConstraintBeenProcessed(MetaConstraint<?> metaConstraint);
+
 	public final void setCurrentValidatedValue(V currentValue) {
 		propertyPath.setLeafNodeValueIfRequired( currentValue );
 		this.currentValue = currentValue;