HV-1623 Stop the propagation of JavaBeanField/Getter

We don't need the elements to be typed so let's be looser to open the
gate for JSON properties (which will probably simply be treated as
fields).

Author: gsmet

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

@@ -21,6 +21,7 @@
 import org.hibernate.validator.internal.metadata.location.ConstraintLocation;
 import org.hibernate.validator.internal.properties.Callable;
 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;
@@ -53,10 +54,14 @@ static <A extends Annotation> ConfiguredConstraint<A> forType(ConstraintDef<?, A
 		return new ConfiguredConstraint<>( constraint, ConstraintLocation.forClass( beanType ) );
 	}
 
-	static <A extends Annotation> ConfiguredConstraint<A> forFieldProperty(ConstraintDef<?, A> constraint, JavaBeanField javaBeanField) {
+	static <A extends Annotation> ConfiguredConstraint<A> forField(ConstraintDef<?, A> constraint, JavaBeanField javaBeanField) {
 		return new ConfiguredConstraint<>( constraint, ConstraintLocation.forField( javaBeanField ) );
 	}
 
+	static <A extends Annotation> ConfiguredConstraint<A> forGetter(ConstraintDef<?, A> constraint, JavaBeanGetter javaBeanGetter) {
+		return forExecutable( constraint, javaBeanGetter );
+	}
+
 	public static <A extends Annotation> ConfiguredConstraint<A> forParameter(ConstraintDef<?, A> constraint, Callable callable, int parameterIndex) {
 		return new ConfiguredConstraint<>( constraint, ConstraintLocation.forParameter( callable, parameterIndex ) );
 	}

engine/src/main/java/org/hibernate/validator/internal/cfg/context/FieldPropertyConstraintMappingContextImpl.java renamed to engine/src/main/java/org/hibernate/validator/internal/cfg/context/FieldConstraintMappingContextImpl.java

@@ -25,16 +25,16 @@
  *
  * @author Marko Bekhta
  */
-final class FieldPropertyConstraintMappingContextImpl extends PropertyConstraintMappingContextImpl<JavaBeanField> {
+final class FieldConstraintMappingContextImpl extends PropertyConstraintMappingContextImpl<JavaBeanField> {
 
-	FieldPropertyConstraintMappingContextImpl(TypeConstraintMappingContextImpl<?> typeContext, JavaBeanField javaBeanField) {
+	FieldConstraintMappingContextImpl(TypeConstraintMappingContextImpl<?> typeContext, JavaBeanField javaBeanField) {
 		super( typeContext, javaBeanField, ConstraintLocation.forField( javaBeanField ) );
 	}
 
 	@Override
 	public PropertyConstraintMappingContext constraint(ConstraintDef<?, ?> definition) {
 		super.addConstraint(
-				ConfiguredConstraint.forFieldProperty(
+				ConfiguredConstraint.forField(
 						definition, getProperty()
 				)
 		);

engine/src/main/java/org/hibernate/validator/internal/cfg/context/GetterPropertyConstraintMappingContextImpl.java renamed to engine/src/main/java/org/hibernate/validator/internal/cfg/context/GetterConstraintMappingContextImpl.java

@@ -24,16 +24,16 @@
  *
  * @author Marko Bekhta
  */
-final class GetterPropertyConstraintMappingContextImpl extends PropertyConstraintMappingContextImpl<JavaBeanGetter> {
+final class GetterConstraintMappingContextImpl extends PropertyConstraintMappingContextImpl<JavaBeanGetter> {
 
-	GetterPropertyConstraintMappingContextImpl(TypeConstraintMappingContextImpl<?> typeContext, JavaBeanGetter javaBeanGetter) {
+	GetterConstraintMappingContextImpl(TypeConstraintMappingContextImpl<?> typeContext, JavaBeanGetter javaBeanGetter) {
 		super( typeContext, javaBeanGetter, ConstraintLocation.forGetter( javaBeanGetter ) );
 	}
 
 	@Override
 	public PropertyConstraintMappingContext constraint(ConstraintDef<?, ?> definition) {
 		super.addConstraint(
-				ConfiguredConstraint.forExecutable(
+				ConfiguredConstraint.forGetter(
 						definition, getProperty()
 				)
 		);

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

@@ -146,7 +146,7 @@ public PropertyConstraintMappingContext field(String property) {
 			throw LOG.getPropertyHasAlreadyBeConfiguredViaProgrammaticApiException( beanClass, property );
 		}
 
-		PropertyConstraintMappingContextImpl context = new FieldPropertyConstraintMappingContextImpl( this, javaBeanField );
+		PropertyConstraintMappingContextImpl context = new FieldConstraintMappingContextImpl( this, javaBeanField );
 		configuredMembers.add( javaBeanField );
 		propertyContexts.add( context );
 		return context;
@@ -166,7 +166,7 @@ public PropertyConstraintMappingContext getter(String property) {
 			throw LOG.getPropertyHasAlreadyBeConfiguredViaProgrammaticApiException( beanClass, property );
 		}
 
-		PropertyConstraintMappingContextImpl context = new GetterPropertyConstraintMappingContextImpl( this, javaBeanGetter );
+		PropertyConstraintMappingContextImpl context = new GetterConstraintMappingContextImpl( this, javaBeanGetter );
 		configuredMembers.add( javaBeanGetter );
 		propertyContexts.add( context );
 		return context;

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

@@ -29,7 +29,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.GetterPropertyConstraintLocation;
+import org.hibernate.validator.internal.metadata.location.GetterConstraintLocation;
 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;
@@ -234,7 +234,8 @@ protected Set<MetaConstraint<?>> adaptConstraints(ConstrainedElement constrained
 				return constraints;
 			}
 
-			ConstraintLocation getterConstraintLocation = ConstraintLocation.forGetter( ( (ConstrainedExecutable) constrainedElement ).getCallable().as( JavaBeanGetter.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()
@@ -248,7 +249,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 GetterPropertyConstraintLocation ) {
+				if ( constraint.getLocation() instanceof GetterConstraintLocation ) {
 					converted = constraint.getLocation();
 				}
 				else {
@@ -275,7 +276,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 GetterPropertyConstraintLocation ) {
+						if ( location instanceof GetterConstraintLocation ) {
 							converted = location;
 						}
 						else {

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

@@ -43,11 +43,11 @@ static ConstraintLocation forClass(Class<?> declaringClass) {
 	}
 
 	static ConstraintLocation forField(JavaBeanField field) {
-		return new FieldPropertyConstraintLocation( field );
+		return new FieldConstraintLocation( field );
 	}
 
 	static ConstraintLocation forGetter(JavaBeanGetter getter) {
-		return new GetterPropertyConstraintLocation( getter );
+		return new GetterConstraintLocation( getter );
 	}
 
 	static ConstraintLocation forTypeArgument(ConstraintLocation delegate, TypeVariable<?> typeParameter, Type typeOfAnnotatedElement) {

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

@@ -6,17 +6,17 @@
  */
 package org.hibernate.validator.internal.metadata.location;
 
-import org.hibernate.validator.internal.properties.javabean.JavaBeanField;
+import org.hibernate.validator.internal.properties.Property;
 
 /**
  * Field property constraint location.
  *
  * @author Marko Bekhta
  */
-public class FieldPropertyConstraintLocation extends PropertyConstraintLocation<JavaBeanField> {
+public class FieldConstraintLocation extends PropertyConstraintLocation {
 
-	FieldPropertyConstraintLocation(JavaBeanField javaBeanGetter) {
-		super( javaBeanGetter );
+	FieldConstraintLocation(Property field) {
+		super( field );
 	}
 
 	@Override

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

@@ -6,17 +6,17 @@
  */
 package org.hibernate.validator.internal.metadata.location;
 
-import org.hibernate.validator.internal.properties.javabean.JavaBeanGetter;
+import org.hibernate.validator.internal.properties.Property;
 
 /**
  * Getter property constraint location.
  *
  * @author Marko Bekhta
  */
-public class GetterPropertyConstraintLocation extends PropertyConstraintLocation<JavaBeanGetter> {
+public class GetterConstraintLocation extends PropertyConstraintLocation {
 
-	GetterPropertyConstraintLocation(JavaBeanGetter javaBeanGetter) {
-		super( javaBeanGetter );
+	GetterConstraintLocation(Property getter) {
+		super( getter );
 	}
 
 	@Override

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

@@ -18,14 +18,14 @@
  * @author Marko Bekhta
  * @author Guillaume Smet
  */
-public abstract class PropertyConstraintLocation<T extends Property> implements ConstraintLocation {
+public abstract class PropertyConstraintLocation implements ConstraintLocation {
 
 	/**
 	 * The member the constraint was defined on.
 	 */
-	private final T property;
+	private final Property property;
 
-	PropertyConstraintLocation(T property) {
+	PropertyConstraintLocation(Property property) {
 		this.property = property;
 	}
 
@@ -35,7 +35,7 @@ public Class<?> getDeclaringClass() {
 	}
 
 	@Override
-	public T getConstrainable() {
+	public Property getConstrainable() {
 		return property;
 	}
 
@@ -72,7 +72,7 @@ public boolean equals(Object o) {
 			return false;
 		}
 
-		PropertyConstraintLocation<?> that = (PropertyConstraintLocation<?>) o;
+		PropertyConstraintLocation that = (PropertyConstraintLocation) o;
 
 		if ( !property.equals( that.property ) ) {
 			return false;