HV-1831 Make path fully modifiable

make it more of a builder

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

Author: marko-bekhta

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

@@ -38,8 +38,8 @@
 import org.hibernate.validator.internal.engine.groups.Sequence;
 import org.hibernate.validator.internal.engine.groups.ValidationOrder;
 import org.hibernate.validator.internal.engine.groups.ValidationOrderGenerator;
+import org.hibernate.validator.internal.engine.path.ModifiableNode;
 import org.hibernate.validator.internal.engine.path.ModifiablePath;
-import org.hibernate.validator.internal.engine.path.NodeImpl;
 import org.hibernate.validator.internal.engine.resolver.TraversableResolvers;
 import org.hibernate.validator.internal.engine.validationcontext.BaseBeanValidationContext;
 import org.hibernate.validator.internal.engine.validationcontext.ExecutableValidationContext;
@@ -1195,7 +1195,7 @@ private <V> BeanValueContext<?, V> getValueContextForPropertyValidation(BaseBean
 
 		while ( propertyPathIter.hasNext() ) {
 			// cast is ok, since we are dealing with engine internal classes
-			NodeImpl propertyPathNode = (NodeImpl) propertyPathIter.next();
+			ModifiableNode propertyPathNode = (ModifiableNode) propertyPathIter.next();
 			propertyMetaData = getBeanPropertyMetaData( beanMetaData, propertyPathNode );
 
 			// if the property is not the leaf property, we set up the context for the next iteration
@@ -1214,7 +1214,7 @@ private <V> BeanValueContext<?, V> getValueContextForPropertyValidation(BaseBean
 				// if we are in the case of an iterable and we want to validate an element of this iterable, we have to get the
 				// element value
 				if ( propertyPathNode.isIterable() ) {
-					propertyPathNode = (NodeImpl) propertyPathIter.next();
+					propertyPathNode = (ModifiableNode) propertyPathIter.next();
 
 					if ( propertyPathNode.getIndex() != null ) {
 						value = ReflectionHelper.getIndexedValue( value, propertyPathNode.getIndex() );
@@ -1272,7 +1272,7 @@ private <V> BeanValueContext<?, V> getValueContextForValueValidation(Class<?> ro
 
 		while ( propertyPathIter.hasNext() ) {
 			// cast is ok, since we are dealing with engine internal classes
-			NodeImpl propertyPathNode = (NodeImpl) propertyPathIter.next();
+			ModifiableNode propertyPathNode = (ModifiableNode) propertyPathIter.next();
 			beanMetaData = beanMetaDataManager.getBeanMetaData( clazz );
 			propertyMetaData = getBeanPropertyMetaData( beanMetaData, propertyPathNode );
 
@@ -1281,7 +1281,7 @@ private <V> BeanValueContext<?, V> getValueContextForValueValidation(Class<?> ro
 				// if we are in the case of an iterable and we want to validate an element of this iterable, we have to get the
 				// type from the parameterized type
 				if ( propertyPathNode.isIterable() ) {
-					propertyPathNode = (NodeImpl) propertyPathIter.next();
+					propertyPathNode = (ModifiableNode) propertyPathIter.next();
 
 					clazz = ReflectionHelper.getClassFromType( ReflectionHelper.getCollectionElementType( propertyMetaData.getType() ) );
 					beanMetaData = beanMetaDataManager.getBeanMetaData( clazz );

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

@@ -276,6 +276,10 @@ private void dropLeafNodeIfRequired() {
 			if ( propertyPath.getLeafNode().getKind() == ElementKind.BEAN ) {
 				propertyPath = ModifiablePath.createCopyWithoutLeafNode( propertyPath );
 			}
+			else {
+				// if we haven't dropped the node, we should clean up "container-related" things:
+				propertyPath.getLeafNode().reset();
+			}
 		}
 	}
 

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

@@ -8,6 +8,8 @@
 
 import java.util.Map;
 
+import jakarta.validation.Path;
+
 import org.hibernate.validator.internal.engine.path.ModifiablePath;
 import org.hibernate.validator.internal.util.stereotypes.Immutable;
 import org.hibernate.validator.messageinterpolation.ExpressionLanguageFeatureLevel;
@@ -23,7 +25,7 @@ public class ConstraintViolationCreationContext {
 	private final String message;
 	private final ExpressionLanguageFeatureLevel expressionLanguageFeatureLevel;
 	private final boolean customViolation;
-	private final ModifiablePath propertyPath;
+	private final Path propertyPath;
 	@Immutable
 	private final Map<String, Object> messageParameters;
 	@Immutable
@@ -40,7 +42,8 @@ public ConstraintViolationCreationContext(String message,
 		this.message = message;
 		this.expressionLanguageFeatureLevel = expressionLanguageFeatureLevel;
 		this.customViolation = customViolation;
-		this.propertyPath = property;
+		// at this point we make a copy of the path to avoid side effects
+		this.propertyPath = property.materialize();
 		this.messageParameters = toImmutableMap( messageParameters );
 		this.expressionVariables = toImmutableMap( expressionVariables );
 		this.dynamicPayload = dynamicPayload;
@@ -58,7 +61,7 @@ public boolean isCustomViolation() {
 		return customViolation;
 	}
 
-	public final ModifiablePath getPath() {
+	public final Path getPath() {
 		return propertyPath;
 	}