HV-1623 Introduce getter as a constraint location kind

Author: marko-bekhta

engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/GetterCascadable.java

@@ -25,7 +25,7 @@ public class GetterCascadable extends PropertyCascadable {
 
 	@Override
 	public ConstraintLocationKind getConstraintLocationKind() {
-		return ConstraintLocationKind.METHOD;
+		return ConstraintLocationKind.GETTER;
 	}
 
 	public static class Builder extends PropertyCascadable.Builder {

engine/src/main/java/org/hibernate/validator/internal/metadata/descriptor/ConstraintDescriptorImpl.java

@@ -403,7 +403,7 @@ private ConstraintType determineConstraintType(Class<? extends Annotation> const
 			ConstraintType externalConstraintType) {
 		ConstraintTarget constraintTarget = validationAppliesTo;
 		ConstraintType constraintType = null;
-		boolean isExecutable = isExecutable( constraintLocationKind );
+		boolean isExecutable = constraintLocationKind.isExecutable();
 
 		//target explicitly set to RETURN_VALUE
 		if ( constraintTarget == ConstraintTarget.RETURN_VALUE ) {
@@ -530,10 +530,6 @@ private void validateComposingConstraintTypes() {
 		}
 	}
 
-	private boolean isExecutable(ConstraintLocationKind locationKind) {
-		return locationKind == ConstraintLocationKind.METHOD || locationKind == ConstraintLocationKind.CONSTRUCTOR;
-	}
-
 	@SuppressWarnings("unchecked")
 	private static Set<Class<? extends Payload>> buildPayloadSet(ConstraintAnnotationDescriptor<?> annotationDescriptor) {
 		Set<Class<? extends Payload>> payloadSet = newHashSet();

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

@@ -11,6 +11,7 @@
 import java.lang.reflect.TypeVariable;
 
 import org.hibernate.validator.internal.engine.path.PathImpl;
+import org.hibernate.validator.internal.metadata.raw.ConstrainedElement.ConstrainedElementKind;
 import org.hibernate.validator.internal.properties.Callable;
 import org.hibernate.validator.internal.properties.Constrainable;
 import org.hibernate.validator.internal.properties.javabean.JavaBeanField;
@@ -108,6 +109,7 @@ enum ConstraintLocationKind {
 		METHOD( ElementType.METHOD ),
 		PARAMETER( ElementType.PARAMETER ),
 		FIELD( ElementType.FIELD ),
+		GETTER( ElementType.METHOD ),
 		TYPE_USE( ElementType.TYPE_USE ),
 		;
 
@@ -120,5 +122,19 @@ enum ConstraintLocationKind {
 		public ElementType getElementType() {
 			return elementType;
 		}
+
+		public boolean isExecutable() {
+			return this == CONSTRUCTOR || isMethod();
+		}
+
+		public boolean isMethod() {
+			return this == METHOD || this == GETTER;
+		}
+
+		public static ConstraintLocationKind of(Callable callable) {
+			return callable.getConstrainedElementKind() == ConstrainedElementKind.CONSTRUCTOR
+					? ConstraintLocationKind.CONSTRUCTOR
+					: callable instanceof JavaBeanGetter ? ConstraintLocationKind.GETTER : ConstraintLocationKind.METHOD;
+		}
 	}
 }

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

@@ -9,7 +9,6 @@
 import java.lang.reflect.Type;
 
 import org.hibernate.validator.internal.engine.path.PathImpl;
-import org.hibernate.validator.internal.metadata.raw.ConstrainedElement.ConstrainedElementKind;
 import org.hibernate.validator.internal.properties.Callable;
 import org.hibernate.validator.internal.properties.Constrainable;
 import org.hibernate.validator.internal.util.ExecutableParameterNameProvider;
@@ -29,9 +28,7 @@ class CrossParameterConstraintLocation implements ConstraintLocation {
 
 	CrossParameterConstraintLocation(Callable callable) {
 		this.callable = callable;
-		this.kind = callable.getConstrainedElementKind() == ConstrainedElementKind.CONSTRUCTOR
-				? ConstraintLocationKind.CONSTRUCTOR
-				: ConstraintLocationKind.METHOD;
+		this.kind = ConstraintLocationKind.of( callable );
 	}
 
 	@Override

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

@@ -21,6 +21,6 @@ public class GetterPropertyConstraintLocation extends PropertyConstraintLocation
 
 	@Override
 	public ConstraintLocationKind getKind() {
-		return ConstraintLocationKind.METHOD;
+		return ConstraintLocationKind.GETTER;
 	}
 }

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

@@ -9,7 +9,6 @@
 import java.lang.reflect.Type;
 
 import org.hibernate.validator.internal.engine.path.PathImpl;
-import org.hibernate.validator.internal.metadata.raw.ConstrainedElement.ConstrainedElementKind;
 import org.hibernate.validator.internal.properties.Callable;
 import org.hibernate.validator.internal.properties.Constrainable;
 import org.hibernate.validator.internal.util.ExecutableParameterNameProvider;
@@ -33,9 +32,7 @@ public ParameterConstraintLocation(Callable callable, int index) {
 		this.callable = callable;
 		this.index = index;
 		this.typeForValidatorResolution = ReflectionHelper.boxedType( callable.getParameterGenericType( index ) );
-		this.kind = callable.getConstrainedElementKind() == ConstrainedElementKind.CONSTRUCTOR
-				? ConstraintLocationKind.CONSTRUCTOR
-				: ConstraintLocationKind.METHOD;
+		this.kind = ConstraintLocationKind.of( callable );
 	}
 
 	@Override

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

@@ -9,7 +9,6 @@
 import java.lang.reflect.Type;
 
 import org.hibernate.validator.internal.engine.path.PathImpl;
-import org.hibernate.validator.internal.metadata.raw.ConstrainedElement.ConstrainedElementKind;
 import org.hibernate.validator.internal.properties.Callable;
 import org.hibernate.validator.internal.properties.Constrainable;
 import org.hibernate.validator.internal.util.ExecutableParameterNameProvider;
@@ -30,9 +29,7 @@ class ReturnValueConstraintLocation implements ConstraintLocation {
 
 	ReturnValueConstraintLocation(Callable callable) {
 		this.callable = callable;
-		this.kind = callable.getConstrainedElementKind() == ConstrainedElementKind.CONSTRUCTOR
-				? ConstraintLocationKind.CONSTRUCTOR
-				: ConstraintLocationKind.METHOD;
+		this.kind = ConstraintLocationKind.of( callable );
 	}
 
 	@Override

engine/src/main/java/org/hibernate/validator/internal/metadata/provider/AnnotationMetaDataProvider.java

@@ -303,9 +303,7 @@ private ConstrainedExecutable findExecutableMetaData(Executable executable) {
 
 		Map<ConstraintType, List<ConstraintDescriptorImpl<?>>> executableConstraints = findConstraints(
 				javaBeanExecutable,
-				javaBeanExecutable.getConstrainedElementKind() == ConstrainedElement.ConstrainedElementKind.CONSTRUCTOR
-						? ConstraintLocationKind.CONSTRUCTOR
-						: ConstraintLocationKind.METHOD
+				ConstraintLocationKind.of( javaBeanExecutable )
 		).stream().collect( Collectors.groupingBy( ConstraintDescriptorImpl::getConstraintType ) );
 
 		Set<MetaConstraint<?>> crossParameterConstraints;

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

@@ -77,7 +77,7 @@ ConstrainedExecutable build(Class<?> beanClass, List<String> alreadyProcessedGet
 		ConstraintLocation constraintLocation = ConstraintLocation.forGetter( javaBeanGetter );
 
 		Set<MetaConstraint<?>> metaConstraints = constraintTypeStaxBuilders.stream()
-				.map( builder -> builder.build( constraintLocation, ConstraintLocationKind.METHOD, null ) )
+				.map( builder -> builder.build( constraintLocation, ConstraintLocationKind.GETTER, null ) )
 				.collect( Collectors.toSet() );
 
 		ContainerElementTypeConfiguration containerElementTypeConfiguration = getContainerElementTypeConfiguration(

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

@@ -89,7 +89,7 @@ Set<MetaConstraint<?>> build(Callable callable) {
 		ConstraintLocation constraintLocation = ConstraintLocation.forCrossParameter( callable );
 
 		Set<MetaConstraint<?>> crossParameterConstraints = constraintTypeStaxBuilders.stream()
-				.map( builder -> builder.build( constraintLocation, ConstraintLocationKind.METHOD, ConstraintType.CROSS_PARAMETER ) )
+				.map( builder -> builder.build( constraintLocation, ConstraintLocationKind.of( callable ), ConstraintType.CROSS_PARAMETER ) )
 				.collect( Collectors.toSet() );
 
 		// ignore annotations

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

@@ -20,7 +20,6 @@
 import org.hibernate.validator.internal.metadata.descriptor.ConstraintDescriptorImpl;
 import org.hibernate.validator.internal.metadata.location.ConstraintLocation;
 import org.hibernate.validator.internal.metadata.location.ConstraintLocation.ConstraintLocationKind;
-import org.hibernate.validator.internal.metadata.raw.ConstrainedElement.ConstrainedElementKind;
 import org.hibernate.validator.internal.properties.Callable;
 import org.hibernate.validator.internal.util.TypeResolutionHelper;
 import org.hibernate.validator.internal.xml.mapping.ContainerElementTypeConfigurationBuilder.ContainerElementTypeConfiguration;
@@ -57,7 +56,7 @@ CascadingMetaDataBuilder build(
 
 		ConstraintLocation constraintLocation = ConstraintLocation.forReturnValue( callable );
 		returnValueConstraints.addAll( constraintTypeStaxBuilders.stream()
-				.map( builder -> builder.build( constraintLocation, callable.getConstrainedElementKind() == ConstrainedElementKind.CONSTRUCTOR ? ConstraintLocationKind.CONSTRUCTOR : ConstraintLocationKind.METHOD, ConstraintDescriptorImpl.ConstraintType.GENERIC ) )
+				.map( builder -> builder.build( constraintLocation, ConstraintLocationKind.of( callable ), ConstraintDescriptorImpl.ConstraintType.GENERIC ) )
 				.collect( Collectors.toSet() ) );
 
 		ContainerElementTypeConfiguration containerElementTypeConfiguration = getContainerElementTypeConfiguration( callable.getType(), constraintLocation );

engine/src/test/java/org/hibernate/validator/testutils/ConstraintValidatorInitializationHelper.java

@@ -18,6 +18,7 @@
 import org.hibernate.validator.internal.engine.scripting.DefaultScriptEvaluatorFactory;
 import org.hibernate.validator.internal.metadata.core.ConstraintHelper;
 import org.hibernate.validator.internal.metadata.descriptor.ConstraintDescriptorImpl;
+import org.hibernate.validator.internal.metadata.location.ConstraintLocation.ConstraintLocationKind;
 import org.hibernate.validator.internal.util.annotation.ConstraintAnnotationDescriptor;
 import org.hibernate.validator.spi.scripting.ScriptEvaluator;
 import org.hibernate.validator.spi.scripting.ScriptEvaluatorFactory;
@@ -40,7 +41,7 @@ public static <T extends Annotation> ConstraintDescriptor<T> descriptorFrom(Cons
 				CONSTRAINT_HELPER,
 				null,
 				annotationDescriptor,
-				null
+				ConstraintLocationKind.GETTER
 		);
 	}