HV-1471 Properly reset the context after constraint validation

The path was properly reset but the value was not. I introduced a plain
object to manage the state so that it's properly reset everywhere.

Author: gsmet

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

@@ -534,7 +534,7 @@ private void validateMetaConstraints(ValidationContext<?> validationContext, Val
 	}
 
 	private boolean validateMetaConstraint(ValidationContext<?> validationContext, ValueContext<?, Object> valueContext, Object parent, MetaConstraint<?> metaConstraint) {
-		PathImpl currentPath = valueContext.getPropertyPath();
+		ValueContext.ValueState<Object> originalValueState = valueContext.getCurrentValueState();
 		valueContext.appendNode( metaConstraint.getLocation() );
 		boolean success = true;
 
@@ -554,8 +554,8 @@ private boolean validateMetaConstraint(ValidationContext<?> validationContext, V
 			validationContext.markConstraintProcessed( valueContext.getCurrentBean(), valueContext.getPropertyPath(), metaConstraint );
 		}
 
-		// reset the path to the state before this call
-		valueContext.setPropertyPath( currentPath );
+		// reset the value context to the state before this call
+		valueContext.resetValueState( originalValueState );
 
 		return success;
 	}
@@ -569,7 +569,7 @@ private boolean validateMetaConstraint(ValidationContext<?> validationContext, V
 	 */
 	private void validateCascadedConstraints(ValidationContext<?> validationContext, ValueContext<?, Object> valueContext) {
 		Validatable validatable = valueContext.getCurrentValidatable();
-		PathImpl originalPath = valueContext.getPropertyPath();
+		ValueContext.ValueState<Object> originalValueState = valueContext.getCurrentValueState();
 
 		for ( Cascadable cascadable : validatable.getCascadables() ) {
 			valueContext.appendNode( cascadable );
@@ -597,8 +597,8 @@ private void validateCascadedConstraints(ValidationContext<?> validationContext,
 				}
 			}
 
-			// reset the path
-			valueContext.setPropertyPath( originalPath );
+			// reset the value context
+			valueContext.resetValueState( originalValueState );
 		}
 	}
 

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

@@ -137,10 +137,6 @@ public final Object getCurrentValidatedValue() {
 		return currentValue;
 	}
 
-	public final void setPropertyPath(PathImpl propertyPath) {
-		this.propertyPath = propertyPath;
-	}
-
 	public final void appendNode(Cascadable node) {
 		PathImpl newPath = PathImpl.createCopy( propertyPath );
 		node.appendTo( newPath );
@@ -212,6 +208,15 @@ public final void setElementType(ElementType elementType) {
 		this.elementType = elementType;
 	}
 
+	public final ValueState<V> getCurrentValueState() {
+		return new ValueState<V>( propertyPath, currentValue );
+	}
+
+	public final void resetValueState(ValueState<V> valueState) {
+		this.propertyPath = valueState.propertyPath;
+		this.currentValue = valueState.currentValue;
+	}
+
 	@Override
 	public String toString() {
 		final StringBuilder sb = new StringBuilder();
@@ -230,4 +235,16 @@ public Object getValue(Object parent, ConstraintLocation location) {
 		// TODO: For BVAL-214 we'd get the value from a map or another alternative structure instead
 		return location.getValue( parent );
 	}
+
+	public static class ValueState<V> {
+
+		private final PathImpl propertyPath;
+
+		private final V currentValue;
+
+		private ValueState(PathImpl propertyPath, V currentValue) {
+			this.propertyPath = propertyPath;
+			this.currentValue = currentValue;
+		}
+	}
 }

engine/src/main/java/org/hibernate/validator/internal/metadata/core/MetaConstraint.java

@@ -19,7 +19,6 @@
 import org.hibernate.validator.internal.engine.ValidationContext;
 import org.hibernate.validator.internal.engine.ValueContext;
 import org.hibernate.validator.internal.engine.constraintvalidation.ConstraintTree;
-import org.hibernate.validator.internal.engine.path.PathImpl;
 import org.hibernate.validator.internal.engine.valueextraction.ValueExtractorDescriptor;
 import org.hibernate.validator.internal.engine.valueextraction.ValueExtractorHelper;
 import org.hibernate.validator.internal.metadata.descriptor.ConstraintDescriptorImpl;
@@ -208,7 +207,7 @@ public void keyedValue(String nodeName, Object key, Object value) {
 		}
 
 		private void doValidate(Object value, String nodeName) {
-			PathImpl before = valueContext.getPropertyPath();
+			ValueContext.ValueState<Object> originalValueState = valueContext.getCurrentValueState();
 
 			Class<?> containerClass = currentValueExtractionPathNode.getContainerClass();
 			if ( containerClass != null ) {
@@ -235,8 +234,8 @@ private void doValidate(Object value, String nodeName) {
 				success &= doValidateConstraint( validationContext, valueContext );
 			}
 
-			// reset the path to the state before this call
-			valueContext.setPropertyPath( before );
+			// reset the value context to the state before this call
+			valueContext.resetValueState( originalValueState );
 		}
 
 		public boolean isSuccess() {

engine/src/test/java/org/hibernate/validator/test/internal/engine/valueextraction/UnwrapValidatedValueTest.java

@@ -25,6 +25,7 @@
 import org.hibernate.validator.cfg.ConstraintMapping;
 import org.hibernate.validator.cfg.defs.MaxDef;
 import org.hibernate.validator.test.internal.engine.valueextraction.model.Account;
+import org.hibernate.validator.test.internal.engine.valueextraction.model.Company;
 import org.hibernate.validator.test.internal.engine.valueextraction.model.Customer;
 import org.hibernate.validator.test.internal.engine.valueextraction.model.Order;
 import org.hibernate.validator.test.internal.engine.valueextraction.model.OrderLine;
@@ -35,7 +36,6 @@
 import org.hibernate.validator.testutil.TestForIssue;
 import org.hibernate.validator.testutils.CandidateForTck;
 import org.hibernate.validator.testutils.ValidatorUtil;
-
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
@@ -139,6 +139,19 @@ public void shouldUnwrapPropertyValuesDuringValueValidation() {
 		);
 	}
 
+	@Test
+	@TestForIssue(jiraKey = "HV-1471")
+	public void shouldUnwrapPropertyValuesDuringValueValidationAndProperlyResetContextAfterConstraintValidation() {
+		Set<ConstraintViolation<Company>> violations = validator.validateValue(
+				Company.class,
+				"name",
+				new StringProperty( "Acm" )
+		);
+		assertThat( violations ).containsOnlyViolations(
+				violationOf( Size.class )
+		);
+	}
+
 	@Test(expectedExceptions = ConstraintDeclarationException.class, expectedExceptionsMessageRegExp = "HV000198.*")
 	public void shouldRaiseExceptionIfNoMatchingUnwrapperIsFound() {
 		validator.validate( new Order() );

engine/src/test/java/org/hibernate/validator/test/internal/engine/valueextraction/model/Company.java

@@ -0,0 +1,20 @@
+/*
+ * Hibernate Validator, declare and validate application constraints
+ *
+ * License: Apache License, Version 2.0
+ * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package org.hibernate.validator.test.internal.engine.valueextraction.model;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+/**
+ * @author Guillaume Smet
+ */
+public class Company {
+
+	@NotNull
+	@Size(min = 4)
+	private Property<String> name = new Property<String>( "Acm" );
+}