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()