HV-1623 Reintroduce field and getter constraint locations

Author: marko-bekhta

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

@@ -23,6 +23,7 @@
 import org.hibernate.validator.internal.properties.Callable;
 import org.hibernate.validator.internal.properties.Property;
 import org.hibernate.validator.internal.properties.javabean.JavaBeanField;
+import org.hibernate.validator.internal.properties.javabean.JavaBeanGetter;
 import org.hibernate.validator.internal.util.annotation.AnnotationDescriptor;
 import org.hibernate.validator.internal.util.annotation.ConstraintAnnotationDescriptor;
 import org.hibernate.validator.internal.util.logging.Log;
@@ -59,7 +60,9 @@ static <A extends Annotation> ConfiguredConstraint<A> forType(ConstraintDef<?, A
 	static <A extends Annotation> ConfiguredConstraint<A> forProperty(ConstraintDef<?, A> constraint, Property property) {
 		return new ConfiguredConstraint<>(
 				constraint,
-				ConstraintLocation.forProperty( property ),
+				property instanceof JavaBeanField
+						? ConstraintLocation.forField( property.as( JavaBeanField.class ) )
+						: ConstraintLocation.forGetter( property.as( JavaBeanGetter.class ) ),
 				property instanceof JavaBeanField ? ElementType.FIELD : ElementType.METHOD
 		);
 	}

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

@@ -24,6 +24,7 @@
 import org.hibernate.validator.internal.properties.Callable;
 import org.hibernate.validator.internal.properties.Property;
 import org.hibernate.validator.internal.properties.javabean.JavaBeanField;
+import org.hibernate.validator.internal.properties.javabean.JavaBeanGetter;
 import org.hibernate.validator.internal.util.TypeResolutionHelper;
 
 /**
@@ -47,7 +48,9 @@ final class PropertyConstraintMappingContextImpl
 		super( typeContext.getConstraintMapping(), property.getType() );
 		this.typeContext = typeContext;
 		this.property = property;
-		this.location = ConstraintLocation.forProperty( property );
+		this.location = property instanceof JavaBeanField
+				? ConstraintLocation.forField( property.as( JavaBeanField.class ) )
+				: ConstraintLocation.forGetter( property.as( JavaBeanGetter.class ) );
 	}
 
 	@Override

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

@@ -31,7 +31,7 @@
 import org.hibernate.validator.internal.metadata.descriptor.PropertyDescriptorImpl;
 import org.hibernate.validator.internal.metadata.facets.Cascadable;
 import org.hibernate.validator.internal.metadata.location.ConstraintLocation;
-import org.hibernate.validator.internal.metadata.location.PropertyConstraintLocation;
+import org.hibernate.validator.internal.metadata.location.GetterPropertyConstraintLocation;
 import org.hibernate.validator.internal.metadata.location.TypeArgumentConstraintLocation;
 import org.hibernate.validator.internal.metadata.raw.ConstrainedElement;
 import org.hibernate.validator.internal.metadata.raw.ConstrainedElement.ConstrainedElementKind;
@@ -41,6 +41,7 @@
 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.JavaBeanGetter;
 import org.hibernate.validator.internal.util.CollectionHelper;
 import org.hibernate.validator.internal.util.TypeResolutionHelper;
 import org.hibernate.validator.internal.util.privilegedactions.GetDeclaredMethod;
@@ -243,7 +244,7 @@ protected Set<MetaConstraint<?>> adaptConstraints(ConstrainedElement constrained
 				return constraints;
 			}
 
-			ConstraintLocation getterConstraintLocation = ConstraintLocation.forProperty( ( (ConstrainedExecutable) constrainedElement ).getCallable().as( Property.class ) );
+			ConstraintLocation getterConstraintLocation = ConstraintLocation.forGetter( ( (ConstrainedExecutable) constrainedElement ).getCallable().as( JavaBeanGetter.class ) );
 
 			// convert return value locations into getter locations for usage within this meta-data
 			return constraints.stream()
@@ -257,7 +258,7 @@ private MetaConstraint<?> withGetterLocation(ConstraintLocation getterConstraint
 			// fast track if it's a regular constraint
 			if ( !(constraint.getLocation() instanceof TypeArgumentConstraintLocation) ) {
 				// Change the constraint location to a GetterConstraintLocation if it is not already one
-				if ( constraint.getLocation() instanceof PropertyConstraintLocation ) {
+				if ( constraint.getLocation() instanceof GetterPropertyConstraintLocation ) {
 					converted = constraint.getLocation();
 				}
 				else {
@@ -284,7 +285,7 @@ private MetaConstraint<?> withGetterLocation(ConstraintLocation getterConstraint
 				for ( ConstraintLocation location : locationStack ) {
 					if ( !(location instanceof TypeArgumentConstraintLocation) ) {
 						// Change the constraint location to a GetterConstraintLocation if it is not already one
-						if ( location instanceof PropertyConstraintLocation ) {
+						if ( location instanceof GetterPropertyConstraintLocation ) {
 							converted = location;
 						}
 						else {

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

@@ -12,7 +12,8 @@
 import org.hibernate.validator.internal.engine.path.PathImpl;
 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.JavaBeanField;
+import org.hibernate.validator.internal.properties.javabean.JavaBeanGetter;
 import org.hibernate.validator.internal.util.ExecutableParameterNameProvider;
 
 /**
@@ -38,8 +39,12 @@ static ConstraintLocation forClass(Class<?> declaringClass) {
 		return new BeanConstraintLocation( declaringClass );
 	}
 
-	static ConstraintLocation forProperty(Property property) {
-		return new PropertyConstraintLocation( property );
+	static ConstraintLocation forField(JavaBeanField field) {
+		return new FieldPropertyConstraintLocation( field );
+	}
+
+	static ConstraintLocation forGetter(JavaBeanGetter getter) {
+		return new GetterPropertyConstraintLocation( getter );
 	}
 
 	static ConstraintLocation forTypeArgument(ConstraintLocation delegate, TypeVariable<?> typeParameter, Type typeOfAnnotatedElement) {

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

@@ -0,0 +1,21 @@
+/*
+ * Hibernate Validator, declare and validate application constraints
+ *
+ * License: Apache License, Version 2.0
+ * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package org.hibernate.validator.internal.metadata.location;
+
+import org.hibernate.validator.internal.properties.javabean.JavaBeanField;
+
+/**
+ * Field property constraint location.
+ *
+ * @author Marko Bekhta
+ */
+public class FieldPropertyConstraintLocation extends PropertyConstraintLocation<JavaBeanField> {
+
+	FieldPropertyConstraintLocation(JavaBeanField javaBeanGetter) {
+		super( javaBeanGetter );
+	}
+}

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

@@ -0,0 +1,21 @@
+/*
+ * Hibernate Validator, declare and validate application constraints
+ *
+ * License: Apache License, Version 2.0
+ * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package org.hibernate.validator.internal.metadata.location;
+
+import org.hibernate.validator.internal.properties.javabean.JavaBeanGetter;
+
+/**
+ * Getter property constraint location.
+ *
+ * @author Marko Bekhta
+ */
+public class GetterPropertyConstraintLocation extends PropertyConstraintLocation<JavaBeanGetter> {
+
+	GetterPropertyConstraintLocation(JavaBeanGetter javaBeanGetter) {
+		super( javaBeanGetter );
+	}
+}

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

@@ -9,23 +9,22 @@
 import java.lang.reflect.Type;
 
 import org.hibernate.validator.internal.engine.path.PathImpl;
-import org.hibernate.validator.internal.properties.Constrainable;
 import org.hibernate.validator.internal.properties.Property;
 import org.hibernate.validator.internal.util.ExecutableParameterNameProvider;
 
 /**
- * Property constraint location.
+ * An abstract property constraint location.
  *
  * @author Marko Bekhta
  */
-public class PropertyConstraintLocation implements ConstraintLocation {
+public abstract class PropertyConstraintLocation<T extends Property> implements ConstraintLocation {
 
 	/**
 	 * The member the constraint was defined on.
 	 */
-	private final Property property;
+	private final T property;
 
-	PropertyConstraintLocation(Property property) {
+	PropertyConstraintLocation(T property) {
 		this.property = property;
 	}
 
@@ -35,7 +34,7 @@ public Class<?> getDeclaringClass() {
 	}
 
 	@Override
-	public Constrainable getConstrainable() {
+	public T getConstrainable() {
 		return property;
 	}
 
@@ -60,7 +59,7 @@ public Object getValue(Object parent) {
 
 	@Override
 	public String toString() {
-		return "PropertyConstraintLocation [property=" + property + "]";
+		return getClass().getSimpleName() + " [property=" + property + "]";
 	}
 
 	@Override
@@ -72,7 +71,7 @@ public boolean equals(Object o) {
 			return false;
 		}
 
-		PropertyConstraintLocation that = (PropertyConstraintLocation) o;
+		PropertyConstraintLocation<?> that = (PropertyConstraintLocation<?>) o;
 
 		if ( !property.equals( that.property ) ) {
 			return false;

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

@@ -218,46 +218,46 @@ private Set<ConstrainedElement> getFieldMetaData(Class<?> beanClass) {
 		Set<ConstrainedElement> propertyMetaData = newHashSet();
 
 		for ( Field field : run( GetDeclaredFields.action( beanClass ) ) ) {
-			Property property = new JavaBeanField( field );
+			JavaBeanField javaBeanField = new JavaBeanField( field );
 			// HV-172
 			if ( Modifier.isStatic( field.getModifiers() ) ||
-					annotationProcessingOptions.areMemberConstraintsIgnoredFor( property ) ||
+					annotationProcessingOptions.areMemberConstraintsIgnoredFor( javaBeanField ) ||
 					field.isSynthetic() ) {
 
 				continue;
 			}
 
-			propertyMetaData.add( findPropertyMetaData( field, property ) );
+			propertyMetaData.add( findPropertyMetaData( field, javaBeanField ) );
 		}
 		return propertyMetaData;
 	}
 
-	private ConstrainedField findPropertyMetaData(Field field, Property property) {
+	private ConstrainedField findPropertyMetaData(Field field, JavaBeanField javaBeanField) {
 		Set<MetaConstraint<?>> constraints = convertToMetaConstraints(
-				findConstraints( field, ElementType.FIELD, property ),
-				property
+				findConstraints( field, ElementType.FIELD, javaBeanField ),
+				javaBeanField
 		);
 
 		CascadingMetaDataBuilder cascadingMetaDataBuilder = findCascadingMetaData( field );
-		Set<MetaConstraint<?>> typeArgumentsConstraints = findTypeAnnotationConstraints( field, property );
+		Set<MetaConstraint<?>> typeArgumentsConstraints = findTypeAnnotationConstraints( field, javaBeanField );
 
 		return new ConstrainedField(
 				ConfigurationSource.ANNOTATION,
-				property,
+				javaBeanField,
 				constraints,
 				typeArgumentsConstraints,
 				cascadingMetaDataBuilder
 		);
 	}
 
-	private Set<MetaConstraint<?>> convertToMetaConstraints(List<ConstraintDescriptorImpl<?>> constraintDescriptors, Property property) {
+	private Set<MetaConstraint<?>> convertToMetaConstraints(List<ConstraintDescriptorImpl<?>> constraintDescriptors, JavaBeanField javaBeanField) {
 		if ( constraintDescriptors.isEmpty() ) {
 			return Collections.emptySet();
 		}
 
 		Set<MetaConstraint<?>> constraints = newHashSet();
 
-		ConstraintLocation location = ConstraintLocation.forProperty( property );
+		ConstraintLocation location = ConstraintLocation.forField( javaBeanField );
 
 		for ( ConstraintDescriptorImpl<?> constraintDescription : constraintDescriptors ) {
 			constraints.add( MetaConstraints.create( typeResolutionHelper, valueExtractorManager, constraintDescription, location ) );
@@ -843,7 +843,7 @@ private TypeArgumentFieldLocation(Field field) {
 
 		@Override
 		public ConstraintLocation toConstraintLocation() {
-			return ConstraintLocation.forProperty( new JavaBeanField( field ) );
+			return ConstraintLocation.forField( new JavaBeanField( field ) );
 		}
 	}
 

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

@@ -70,19 +70,19 @@ ConstrainedField build(Class<?> beanClass, List<String> alreadyProcessedFieldNam
 			alreadyProcessedFieldNames.add( mainAttributeValue );
 		}
 		Field field = findField( beanClass, mainAttributeValue );
-		JavaBeanField property = new JavaBeanField( field );
-		ConstraintLocation constraintLocation = ConstraintLocation.forProperty( property );
+		JavaBeanField javaBeanField = new JavaBeanField( field );
+		ConstraintLocation constraintLocation = ConstraintLocation.forField( javaBeanField );
 
 		Set<MetaConstraint<?>> metaConstraints = constraintTypeStaxBuilders.stream()
 				.map( builder -> builder.build( constraintLocation, java.lang.annotation.ElementType.FIELD, null ) )
 				.collect( Collectors.toSet() );
 
 		ContainerElementTypeConfiguration containerElementTypeConfiguration = getContainerElementTypeConfiguration(
-				property.getType(), constraintLocation );
+				javaBeanField.getType(), constraintLocation );
 
 		ConstrainedField constrainedField = new ConstrainedField(
 				ConfigurationSource.XML,
-				property,
+				javaBeanField,
 				metaConstraints,
 				containerElementTypeConfiguration.getMetaConstraints(),
 				getCascadingMetaData( containerElementTypeConfiguration.getTypeParametersCascadingMetaData(), ReflectionHelper.typeOf( field ) )
@@ -91,7 +91,7 @@ ConstrainedField build(Class<?> beanClass, List<String> alreadyProcessedFieldNam
 		// ignore annotations
 		if ( ignoreAnnotations.isPresent() ) {
 			annotationProcessingOptions.ignoreConstraintAnnotationsOnMember(
-					property,
+					javaBeanField,
 					ignoreAnnotations.get()
 			);
 		}

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

@@ -26,8 +26,6 @@
 import org.hibernate.validator.internal.metadata.raw.ConfigurationSource;
 import org.hibernate.validator.internal.metadata.raw.ConstrainedExecutable;
 import org.hibernate.validator.internal.metadata.raw.ConstrainedParameter;
-import org.hibernate.validator.internal.properties.Callable;
-import org.hibernate.validator.internal.properties.Property;
 import org.hibernate.validator.internal.properties.javabean.JavaBeanGetter;
 import org.hibernate.validator.internal.util.ReflectionHelper;
 import org.hibernate.validator.internal.util.TypeResolutionHelper;
@@ -74,8 +72,8 @@ ConstrainedExecutable build(Class<?> beanClass, List<String> alreadyProcessedGet
 			alreadyProcessedGetterNames.add( mainAttributeValue );
 		}
 		Method getter = findGetter( beanClass, mainAttributeValue );
-		Property property = new JavaBeanGetter( beanClass, getter );
-		ConstraintLocation constraintLocation = ConstraintLocation.forProperty( property );
+		JavaBeanGetter javaBeanGetter = new JavaBeanGetter( beanClass, getter );
+		ConstraintLocation constraintLocation = ConstraintLocation.forGetter( javaBeanGetter );
 
 		Set<MetaConstraint<?>> metaConstraints = constraintTypeStaxBuilders.stream()
 				.map( builder -> builder.build( constraintLocation, java.lang.annotation.ElementType.METHOD, null ) )
@@ -86,7 +84,7 @@ ConstrainedExecutable build(Class<?> beanClass, List<String> alreadyProcessedGet
 
 		ConstrainedExecutable constrainedGetter = new ConstrainedExecutable(
 				ConfigurationSource.XML,
-				property.as( Callable.class ),
+				javaBeanGetter,
 				Collections.<ConstrainedParameter>emptyList(),
 				Collections.<MetaConstraint<?>>emptySet(),
 				metaConstraints,
@@ -97,7 +95,7 @@ ConstrainedExecutable build(Class<?> beanClass, List<String> alreadyProcessedGet
 		// ignore annotations
 		if ( ignoreAnnotations.isPresent() ) {
 			annotationProcessingOptions.ignoreConstraintAnnotationsOnMember(
-					property,
+					javaBeanGetter,
 					ignoreAnnotations.get()
 			);
 		}