HV-1623 Make parameters more specific in programmatic API executable mapping contexts

Author: marko-bekhta

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

@@ -7,7 +7,7 @@
 package org.hibernate.validator.internal.cfg.context;
 
 import org.hibernate.validator.cfg.context.ConstructorConstraintMappingContext;
-import org.hibernate.validator.internal.properties.Callable;
+import org.hibernate.validator.internal.properties.javabean.JavaBeanConstructor;
 
 /**
  * Constraint mapping creational context representing a constructor.
@@ -16,7 +16,7 @@
  */
 class ConstructorConstraintMappingContextImpl extends ExecutableConstraintMappingContextImpl implements ConstructorConstraintMappingContext {
 
-	<T> ConstructorConstraintMappingContextImpl(TypeConstraintMappingContextImpl<T> typeContext, Callable constructor) {
+	<T> ConstructorConstraintMappingContextImpl(TypeConstraintMappingContextImpl<T> typeContext, JavaBeanConstructor constructor) {
 		super( typeContext, constructor );
 	}
 

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

@@ -7,7 +7,7 @@
 package org.hibernate.validator.internal.cfg.context;
 
 import org.hibernate.validator.cfg.context.MethodConstraintMappingContext;
-import org.hibernate.validator.internal.properties.Callable;
+import org.hibernate.validator.internal.properties.javabean.JavaBeanMethod;
 
 /**
  * Constraint mapping creational context representing a method.
@@ -16,7 +16,7 @@
  */
 class MethodConstraintMappingContextImpl extends ExecutableConstraintMappingContextImpl implements MethodConstraintMappingContext {
 
-	MethodConstraintMappingContextImpl(TypeConstraintMappingContextImpl<?> typeContext, Callable callable) {
+	MethodConstraintMappingContextImpl(TypeConstraintMappingContextImpl<?> typeContext, JavaBeanMethod callable) {
 		super( typeContext, callable );
 	}
 

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

@@ -39,6 +39,7 @@
 import org.hibernate.validator.internal.properties.javabean.JavaBeanExecutable;
 import org.hibernate.validator.internal.properties.javabean.JavaBeanField;
 import org.hibernate.validator.internal.properties.javabean.JavaBeanGetter;
+import org.hibernate.validator.internal.properties.javabean.JavaBeanMethod;
 import org.hibernate.validator.internal.util.Contracts;
 import org.hibernate.validator.internal.util.ExecutableHelper;
 import org.hibernate.validator.internal.util.ReflectionHelper;
@@ -150,17 +151,17 @@ public MethodConstraintMappingContext method(String name, Class<?>... parameterT
 			throw LOG.getBeanDoesNotContainMethodException( beanClass, name, parameterTypes );
 		}
 
-		JavaBeanExecutable<?> javaBeanExecutable = JavaBeanExecutable.of( method );
+		JavaBeanMethod javaBeanMethod = JavaBeanExecutable.of( method );
 
-		if ( configuredMembers.contains( javaBeanExecutable ) ) {
+		if ( configuredMembers.contains( javaBeanMethod ) ) {
 			throw LOG.getMethodHasAlreadyBeenConfiguredViaProgrammaticApiException(
 					beanClass,
 					ExecutableHelper.getExecutableAsString( name, parameterTypes )
 			);
 		}
 
-		MethodConstraintMappingContextImpl context = new MethodConstraintMappingContextImpl( this, javaBeanExecutable );
-		configuredMembers.add( javaBeanExecutable );
+		MethodConstraintMappingContextImpl context = new MethodConstraintMappingContextImpl( this, javaBeanMethod );
+		configuredMembers.add( javaBeanMethod );
 		executableContexts.add( context );
 
 		return context;

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

@@ -69,11 +69,15 @@ public static JavaBeanExecutable<?> of(Executable executable) {
 			return new JavaBeanConstructor( (Constructor<?>) executable );
 		}
 
-		if ( ReflectionHelper.isGetterMethod( executable ) ) {
-			return new JavaBeanGetter( (Method) executable );
+		return of( ( (Method) executable ) );
+	}
+
+	public static JavaBeanMethod of(Method method) {
+		if ( ReflectionHelper.isGetterMethod( method ) ) {
+			return new JavaBeanGetter( method );
 		}
 
-		return new JavaBeanMethod( (Method) executable );
+		return new JavaBeanMethod( method );
 	}
 
 	@Override