HV-1363 More abstraction work around executables

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.getTypeOfParameter( i ),
+								callable.getParameterGenericType( i ),
 								i
 						)
 				);

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

@@ -40,7 +40,7 @@ final class ParameterConstraintMappingContextImpl
 	ParameterConstraintMappingContextImpl(ExecutableConstraintMappingContextImpl executableContext, int parameterIndex) {
 		super(
 			executableContext.getTypeContext().getConstraintMapping(),
-			executableContext.callable.getGenericParameterTypes()[parameterIndex]
+			executableContext.callable.getParameterGenericType( parameterIndex )
 		);
 
 		this.executableContext = executableContext;
@@ -121,7 +121,7 @@ public ContainerElementConstraintMappingContext containerElementType(int index,
 
 	public ConstrainedParameter build(ConstraintHelper constraintHelper, TypeResolutionHelper typeResolutionHelper,
 			ValueExtractorManager valueExtractorManager) {
-		Type parameterType = executableContext.getCallable().getTypeOfParameter( parameterIndex );
+		Type parameterType = executableContext.getCallable().getParameterGenericType( parameterIndex );
 
 		return new ConstrainedParameter(
 				ConfigurationSource.API,

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

@@ -32,9 +32,9 @@
 import org.hibernate.validator.internal.metadata.raw.ConfigurationSource;
 import org.hibernate.validator.internal.metadata.raw.ConstrainedElement;
 import org.hibernate.validator.internal.metadata.raw.ConstrainedType;
-import org.hibernate.validator.internal.properties.Callable;
 import org.hibernate.validator.internal.properties.Constrainable;
 import org.hibernate.validator.internal.properties.Property;
+import org.hibernate.validator.internal.properties.javabean.JavaBeanConstructor;
 import org.hibernate.validator.internal.properties.javabean.JavaBeanExecutable;
 import org.hibernate.validator.internal.properties.javabean.JavaBeanField;
 import org.hibernate.validator.internal.properties.javabean.JavaBeanGetter;
@@ -153,17 +153,17 @@ public MethodConstraintMappingContext method(String name, Class<?>... parameterT
 			throw LOG.getBeanDoesNotContainMethodException( beanClass, name, parameterTypes );
 		}
 
-		Callable callable = JavaBeanExecutable.of( method );
+		JavaBeanExecutable<?> javaBeanExecutable = JavaBeanExecutable.of( method );
 
-		if ( configuredMembers.contains( callable ) ) {
+		if ( configuredMembers.contains( javaBeanExecutable ) ) {
 			throw LOG.getMethodHasAlreadyBeenConfiguredViaProgrammaticApiException(
 					beanClass,
 					ExecutableHelper.getExecutableAsString( name, parameterTypes )
 			);
 		}
 
-		MethodConstraintMappingContextImpl context = new MethodConstraintMappingContextImpl( this, callable );
-		configuredMembers.add( callable );
+		MethodConstraintMappingContextImpl context = new MethodConstraintMappingContextImpl( this, javaBeanExecutable );
+		configuredMembers.add( javaBeanExecutable );
 		executableContexts.add( context );
 
 		return context;
@@ -180,9 +180,9 @@ public ConstructorConstraintMappingContext constructor(Class<?>... parameterType
 			);
 		}
 
-		Callable callable = JavaBeanExecutable.of( constructor );
+		JavaBeanConstructor javaBeanConstructor = new JavaBeanConstructor( constructor );
 
-		if ( configuredMembers.contains( callable ) ) {
+		if ( configuredMembers.contains( javaBeanConstructor ) ) {
 			throw LOG.getConstructorHasAlreadyBeConfiguredViaProgrammaticApiException(
 					beanClass,
 					ExecutableHelper.getExecutableAsString( beanClass.getSimpleName(), parameterTypes )
@@ -191,9 +191,9 @@ public ConstructorConstraintMappingContext constructor(Class<?>... parameterType
 
 		ConstructorConstraintMappingContextImpl context = new ConstructorConstraintMappingContextImpl(
 				this,
-				callable
+				javaBeanConstructor
 		);
-		configuredMembers.add( callable );
+		configuredMembers.add( javaBeanConstructor );
 		executableContexts.add( context );
 
 		return context;

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.getTypeOfParameter( index ) );
+		this.typeForValidatorResolution = ReflectionHelper.boxedType( executable.getParameterGenericType( index ) );
 	}
 
 	@Override