HV-1352 Only accessing validated value after a value unwrapper has set (if present)

Author: marko-bekhta

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

@@ -6,11 +6,18 @@
  */
 package org.hibernate.validator.internal.engine.constraintvalidation;
 
+import static org.hibernate.validator.constraints.CompositionType.ALL_FALSE;
+import static org.hibernate.validator.constraints.CompositionType.AND;
+import static org.hibernate.validator.constraints.CompositionType.OR;
+import static org.hibernate.validator.internal.util.CollectionHelper.newArrayList;
+import static org.hibernate.validator.internal.util.CollectionHelper.newHashSet;
+
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
+
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintViolation;
 
@@ -23,12 +30,6 @@
 import org.hibernate.validator.internal.util.logging.LoggerFactory;
 import org.hibernate.validator.spi.valuehandling.ValidatedValueUnwrapper;
 
-import static org.hibernate.validator.constraints.CompositionType.ALL_FALSE;
-import static org.hibernate.validator.constraints.CompositionType.AND;
-import static org.hibernate.validator.constraints.CompositionType.OR;
-import static org.hibernate.validator.internal.util.CollectionHelper.newArrayList;
-import static org.hibernate.validator.internal.util.CollectionHelper.newHashSet;
-
 /**
  * Due to constraint composition a single constraint annotation can lead to a whole constraint tree being validated.
  * This class encapsulates such a tree.
@@ -104,6 +105,9 @@ private <T, V> void validateConstraints(ValidationContext<T> validationContext,
 		// After all children are validated the actual ConstraintValidator of the constraint itself is executed
 		if ( mainConstraintNeedsEvaluation( validationContext, constraintViolations ) ) {
 
+			// find the right constraint validator
+			ConstraintValidator<A, V> validator = getInitializedConstraintValidator( validationContext, valueContext );
+
 			if ( log.isTraceEnabled() ) {
 				log.tracef(
 						"Validating value %s against constraint defined by %s.",
@@ -112,9 +116,6 @@ private <T, V> void validateConstraints(ValidationContext<T> validationContext,
 				);
 			}
 
-			// find the right constraint validator
-			ConstraintValidator<A, V> validator = getInitializedConstraintValidator( validationContext, valueContext );
-
 			// create a constraint validator context
 			ConstraintValidatorContextImpl constraintValidatorContext = new ConstraintValidatorContextImpl(
 					validationContext.getParameterNames(),

engine/src/test/java/org/hibernate/validator/test/TraceLoggingTest.java

@@ -0,0 +1,63 @@
+/*
+ * 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;
+
+import static org.hibernate.validator.testutil.ConstraintViolationAssert.assertNumberOfViolations;
+import static org.hibernate.validator.testutils.ValidatorUtil.getValidator;
+
+import java.util.Optional;
+
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.testutil.TestForIssue;
+import org.hibernate.validator.valuehandling.UnwrapValidatedValue;
+
+import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ * @author Marko Bekhta
+ */
+public class TraceLoggingTest {
+
+	private Level currentLevel;
+
+	@BeforeMethod
+	public void setUp() throws Exception {
+		currentLevel = LogManager.getRootLogger().getLevel();
+		LogManager.getRootLogger().setLevel( Level.TRACE );
+	}
+
+	@Test
+	@TestForIssue(jiraKey = "HV-1352")
+	public void testLoggingIsNotFailing() {
+		assertNumberOfViolations( getValidator().validate( new Foo( Optional.of( 1 ), 1 ) ), 0 );
+	}
+
+	@AfterMethod
+	public void tearDown() throws Exception {
+		LogManager.getRootLogger().setLevel( currentLevel );
+	}
+
+	private static class Foo {
+
+		@NotNull
+		@UnwrapValidatedValue
+		private final Optional<Integer> optInt;
+		@NotNull
+		private final Integer integer;
+
+		public Foo(@NotNull Optional<Integer> optInt, @NotNull Integer integer) {
+			this.optInt = optInt;
+			this.integer = integer;
+		}
+	}
+
+}