fixup! HV-1363 Build abstraction over reflection in ConstraintLocation and related code

Author: gsmet

engine/src/main/java/org/hibernate/validator/internal/cfg/context/ExecutableConstraintMappingContextImpl.java

@@ -130,7 +130,7 @@ private List<ConstrainedParameter> getParameters(ConstraintHelper constraintHelp
 						new ConstrainedParameter(
 								ConfigurationSource.API,
 								callable,
-								callable.typeOfParameter( i ),
+								callable.getTypeOfParameter( i ),
 								i
 						)
 				);

engine/src/main/java/org/hibernate/validator/internal/cfg/context/ParameterConstraintMappingContextImpl.java

@@ -121,7 +121,7 @@ public ContainerElementConstraintMappingContext containerElementType(int index,
 
 	public ConstrainedParameter build(ConstraintHelper constraintHelper, TypeResolutionHelper typeResolutionHelper,
 			ValueExtractorManager valueExtractorManager) {
-		Type parameterType = executableContext.getCallable().typeOfParameter( parameterIndex );
+		Type parameterType = executableContext.getCallable().getTypeOfParameter( parameterIndex );
 
 		return new ConstrainedParameter(
 				ConfigurationSource.API,

engine/src/main/java/org/hibernate/validator/internal/cfg/context/TypeConstraintMappingContextImpl.java

@@ -255,13 +255,13 @@ protected ConstraintType getConstraintType() {
 	}
 
 	/**
-	 * Returns the member with the given name and type.
+	 * Returns the property with the given name and type.
 	 *
-	 * @param clazz The class from which to retrieve the member. Cannot be {@code null}.
+	 * @param clazz The class from which to retrieve the property. Cannot be {@code null}.
 	 * @param property The property name without "is", "get" or "has". Cannot be {@code null} or empty.
 	 * @param elementType The element type. Either {@code ElementType.FIELD} or {@code ElementType METHOD}.
 	 *
-	 * @return the member which matching the name and type or {@code null} if no such member exists.
+	 * @return the property which matches the name and type or {@code null} if no such property exists.
 	 */
 	private Property getProperty(Class<?> clazz, String property, ElementType elementType) {
 		Contracts.assertNotNull( clazz, MESSAGES.classCannotBeNull() );

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

@@ -39,7 +39,6 @@ public class ConstraintViolationImpl<T> implements HibernateConstraintViolation<
 	private final Map<String, Object> messageParameters;
 	private final Map<String, Object> expressionVariables;
 	private final Class<T> rootBeanClass;
-	private final ElementType elementType;
 	private final Object[] executableParameters;
 	private final Object executableReturnValue;
 	private final Object dynamicPayload;
@@ -161,7 +160,6 @@ private ConstraintViolationImpl(String messageTemplate,
 		this.leafBeanInstance = leafBeanInstance;
 		this.constraintDescriptor = constraintDescriptor;
 		this.rootBeanClass = rootBeanClass;
-		this.elementType = elementType;
 		this.executableParameters = executableParameters;
 		this.executableReturnValue = executableReturnValue;
 		this.dynamicPayload = dynamicPayload;
@@ -296,10 +294,6 @@ public boolean equals(Object o) {
 		if ( constraintDescriptor != null ? !constraintDescriptor.equals( that.constraintDescriptor ) : that.constraintDescriptor != null ) {
 			return false;
 		}
-		if ( elementType != null ? !elementType.equals( that.elementType ) : that.elementType != null ) {
-			return false;
-		}
-
 		return true;
 	}
 
@@ -331,7 +325,6 @@ private int createHashCode() {
 		result = 31 * result + System.identityHashCode( value );
 		result = 31 * result + ( constraintDescriptor != null ? constraintDescriptor.hashCode() : 0 );
 		result = 31 * result + ( messageTemplate != null ? messageTemplate.hashCode() : 0 );
-		result = 31 * result + ( elementType != null ? elementType.hashCode() : 0 );
 		return result;
 	}
 }

engine/src/main/java/org/hibernate/validator/internal/metadata/location/ParameterConstraintLocation.java

@@ -29,7 +29,7 @@ public class ParameterConstraintLocation implements ConstraintLocation {
 	public ParameterConstraintLocation(Callable executable, int index) {
 		this.executable = executable;
 		this.index = index;
-		this.typeForValidatorResolution = ReflectionHelper.boxedType( executable.typeOfParameter( index ) );
+		this.typeForValidatorResolution = ReflectionHelper.boxedType( executable.getTypeOfParameter( index ) );
 	}
 
 	@Override

engine/src/main/java/org/hibernate/validator/internal/metadata/location/ReturnValueConstraintLocation.java

@@ -24,8 +24,8 @@ class ReturnValueConstraintLocation implements ConstraintLocation {
 
 	private final Callable callable;
 
-	ReturnValueConstraintLocation(Callable executable) {
-		this.callable = executable;
+	ReturnValueConstraintLocation(Callable callable) {
+		this.callable = callable;
 	}
 
 	@Override

engine/src/main/java/org/hibernate/validator/internal/metadata/raw/ConstrainedProperty.java

@@ -13,7 +13,7 @@
 import org.hibernate.validator.internal.properties.Property;
 
 /**
- * Represents a property of a Java type (either field or getter) and all its associated meta-data relevant
+ * Represents a property of a Java type (either field or getter) and all its associated metadata relevant
  * in the context of bean validation, for instance its constraints.
  *
  * @author Marko Bekhta

engine/src/main/java/org/hibernate/validator/internal/properties/Callable.java

@@ -32,7 +32,7 @@ public interface Callable extends Constrainable {
 
 	String getSignature();
 
-	Type typeOfParameter(int parameterIndex);
+	Type getTypeOfParameter(int parameterIndex);
 
 	boolean overrides(ExecutableHelper executableHelper, Callable superTypeMethod);
 

engine/src/main/java/org/hibernate/validator/internal/properties/Constrainable.java

@@ -21,6 +21,7 @@ public interface Constrainable {
 
 	Type getType();
 
+	@SuppressWarnings("unchecked")
 	default <T> T as(Class<T> clazz) {
 		return ( (T) this );
 	}

engine/src/main/java/org/hibernate/validator/internal/properties/javabean/JavaBeanExecutable.java

@@ -110,7 +110,7 @@ public String getSignature() {
 	}
 
 	@Override
-	public Type typeOfParameter(int parameterIndex) {
+	public Type getTypeOfParameter(int parameterIndex) {
 		Type[] genericParameterTypes = executable.getGenericParameterTypes();
 
 		// getGenericParameterTypes() doesn't return synthetic parameters; in this case fall back to getParameterTypes()

engine/src/main/java/org/hibernate/validator/internal/properties/javabean/JavaBeanGetter.java

@@ -23,7 +23,7 @@
  */
 public class JavaBeanGetter extends JavaBeanExecutable implements Property {
 
-	private static final Class[] PARAMETER_TYPES = new Class[0];
+	private static final Class<?>[] PARAMETER_TYPES = new Class[0];
 
 	private final String name;
 

engine/src/main/java/org/hibernate/validator/internal/util/ReflectionHelper.java

@@ -24,7 +24,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.hibernate.validator.internal.properties.Callable;
 import org.hibernate.validator.internal.util.logging.Log;
 import org.hibernate.validator.internal.util.logging.LoggerFactory;
 

engine/src/main/java/org/hibernate/validator/internal/xml/mapping/ConstrainedParameterStaxBuilder.java

@@ -7,7 +7,6 @@
 package org.hibernate.validator.internal.xml.mapping;
 
 import java.lang.invoke.MethodHandles;
-import java.lang.reflect.Executable;
 import java.lang.reflect.Type;
 import java.util.Optional;
 import java.util.Set;
@@ -24,7 +23,6 @@
 import org.hibernate.validator.internal.metadata.raw.ConfigurationSource;
 import org.hibernate.validator.internal.metadata.raw.ConstrainedParameter;
 import org.hibernate.validator.internal.properties.Callable;
-import org.hibernate.validator.internal.util.ReflectionHelper;
 import org.hibernate.validator.internal.util.TypeResolutionHelper;
 import org.hibernate.validator.internal.util.logging.Log;
 import org.hibernate.validator.internal.util.logging.LoggerFactory;
@@ -72,7 +70,7 @@ public Class<?> getParameterType(Class<?> beanClass) {
 	ConstrainedParameter build(Callable callable, int index) {
 
 		ConstraintLocation constraintLocation = ConstraintLocation.forParameter( callable, index );
-		Type type = callable.typeOfParameter( index );
+		Type type = callable.getTypeOfParameter( index );
 
 		Set<MetaConstraint<?>> metaConstraints = constraintTypeStaxBuilders.stream()
 				.map( builder -> builder.build( constraintLocation, java.lang.annotation.ElementType.PARAMETER, null ) )

engine/src/test/java/org/hibernate/validator/test/internal/engine/failfast/FailFastTest.java

@@ -162,8 +162,9 @@ public void testFailFastMethodValidationSetOnValidatorFactory() {
 			fail();
 		}
 		catch (ConstraintViolationException e) {
-			assertThat( e.getConstraintViolations() ).containsOnlyViolations(
-					violationOf( NotBlank.class )
+			assertThat( e.getConstraintViolations() ).containsOneOfViolations(
+					violationOf( NotBlank.class ),
+					violationOf( Min.class )
 			);
 		}
 	}
@@ -212,8 +213,9 @@ public void testFailFastMethodValidationSetWithProperty() {
 			fail();
 		}
 		catch (ConstraintViolationException e) {
-			assertThat( e.getConstraintViolations() ).containsOnlyViolations(
-					violationOf( NotBlank.class )
+			assertThat( e.getConstraintViolations() ).containsOneOfViolations(
+					violationOf( NotBlank.class ),
+					violationOf( Min.class )
 			);
 		}
 	}

test-utils/src/main/java/org/hibernate/validator/testutil/ConstraintViolationAssert.java

@@ -262,6 +262,21 @@ public ConstraintViolationSetAssert describedAs(String description, Object... ar
 		public void containsOnlyViolations(ViolationExpectation... expectedViolations) {
 			isNotNull();
 
+			List<ViolationExpectation> actualViolations = getActualViolationExpectations( expectedViolations );
+
+			Assertions.assertThat( actualViolations ).containsExactlyInAnyOrder( expectedViolations );
+		}
+
+		public void containsOneOfViolations(ViolationExpectation... expectedViolations) {
+			isNotNull();
+
+			List<ViolationExpectation> actualViolations = getActualViolationExpectations( expectedViolations );
+
+			Assertions.assertThat( actualViolations ).hasSize( 1 );
+			Assertions.assertThat( expectedViolations ).contains( actualViolations.get( 0 ) );
+		}
+
+		private List<ViolationExpectation> getActualViolationExpectations(ViolationExpectation[] expectedViolations) {
 			List<ViolationExpectation> actualViolations = new ArrayList<>();
 
 			ViolationExpectationPropertiesToTest referencePropertiesToTest;
@@ -282,7 +297,7 @@ public void containsOnlyViolations(ViolationExpectation... expectedViolations) {
 				actualViolations.add( new ViolationExpectation( violation, referencePropertiesToTest ) );
 			}
 
-			Assertions.assertThat( actualViolations ).containsExactlyInAnyOrder( expectedViolations );
+			return actualViolations;
 		}
 
 		public void containsOnlyPaths(PathExpectation... paths) {