HV-1623 Introduce ConstrainedElementKind.GETTER

gsmet · gsmet · commit e5b7c8d5a788 · 2018-06-11T10:03:21.000+02:00
diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/BeanMetaDataImpl.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/BeanMetaDataImpl.java
@@ -15,6 +15,7 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
@@ -42,10 +43,10 @@
 import org.hibernate.validator.internal.metadata.raw.BeanConfiguration;
 import org.hibernate.validator.internal.metadata.raw.ConfigurationSource;
 import org.hibernate.validator.internal.metadata.raw.ConstrainedElement;
-import org.hibernate.validator.internal.metadata.raw.ConstrainedElement.ConstrainedElementKind;
 import org.hibernate.validator.internal.metadata.raw.ConstrainedExecutable;
 import org.hibernate.validator.internal.metadata.raw.ConstrainedField;
 import org.hibernate.validator.internal.metadata.raw.ConstrainedType;
+import org.hibernate.validator.internal.metadata.raw.ConstrainedElement.ConstrainedElementKind;
 import org.hibernate.validator.internal.properties.Callable;
 import org.hibernate.validator.internal.util.CollectionHelper;
 import org.hibernate.validator.internal.util.ExecutableHelper;
@@ -736,6 +737,7 @@ public BuilderDelegate(
 					break;
 				case CONSTRUCTOR:
 				case METHOD:
+				case GETTER:
 					ConstrainedExecutable constrainedExecutable = (ConstrainedExecutable) constrainedElement;
 					Callable member = constrainedExecutable.getCallable();
 
@@ -754,7 +756,7 @@ public BuilderDelegate(
 						);
 					}
 
-					if ( constrainedExecutable.isGetterMethod() ) {
+					if ( constrainedElement.getKind() == ConstrainedElementKind.GETTER ) {
 						metaDataBuilder = new PropertyMetaData.Builder(
 								beanClass,
 								constrainedExecutable,
@@ -774,6 +776,9 @@ public BuilderDelegate(
 							valueExtractorManager
 					);
 					break;
+				default:
+					throw new IllegalStateException(
+							String.format( Locale.ROOT, "Constrained element kind '%1$s' not supported here.", constrainedElement.getKind() ) );
 			}
 
 			this.hashCode = buildHashCode();
@@ -790,7 +795,7 @@ public boolean add(ConstrainedElement constrainedElement) {
 			if ( metaDataBuilder != null && metaDataBuilder.accepts( constrainedElement ) ) {
 				metaDataBuilder.add( constrainedElement );
 
-				if ( !added && constrainedElement.getKind() == ConstrainedElementKind.METHOD && methodBuilder == null ) {
+				if ( !added && constrainedElement.getKind().isMethod() && methodBuilder == null ) {
 					ConstrainedExecutable constrainedMethod = (ConstrainedExecutable) constrainedElement;
 					methodBuilder = new ExecutableMetaData.Builder(
 							beanClass,
diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/ExecutableMetaData.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/ExecutableMetaData.java
@@ -254,12 +254,11 @@ public static class Builder extends MetaDataBuilder {
 		private final Set<String> signatures = newHashSet();
 
 		/**
-		 * Either CONSTRUCTOR or METHOD.
+		 * Either CONSTRUCTOR, METHOD or GETTER.
 		 */
 		private final ConstrainedElementKind kind;
 		private final Set<ConstrainedExecutable> constrainedExecutables = newHashSet();
 		private Callable callable;
-		private final boolean isGetterMethod;
 		private final Set<MetaConstraint<?>> crossParameterConstraints = newHashSet();
 		private final Set<MethodConfigurationRule> rules;
 		private boolean isConstrained = false;
@@ -293,7 +292,6 @@ public Builder(
 			this.kind = constrainedExecutable.getKind();
 			this.callable = constrainedExecutable.getCallable();
 			this.rules = methodValidationConfiguration.getConfiguredRuleSet();
-			this.isGetterMethod = constrainedExecutable.isGetterMethod();
 
 			add( constrainedExecutable );
 		}
@@ -397,7 +395,7 @@ public ExecutableMetaData build() {
 					adaptOriginsAndImplicitGroups( crossParameterConstraints ),
 					cascadingMetaDataBuilder.build( valueExtractorManager, callable ),
 					isConstrained,
-					isGetterMethod
+					kind == ConstrainedElementKind.GETTER
 			);
 		}
 
diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/PropertyCascadable.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/PropertyCascadable.java
@@ -80,10 +80,10 @@ public static Cascadable.Builder builder(ConstrainedElementKind constrainedEleme
 			if ( ConstrainedElementKind.FIELD == constrainedElementKind ) {
 				return new FieldCascadable.Builder( valueExtractorManager, property, cascadingMetaDataBuilder );
 			}
-			else if ( ConstrainedElementKind.METHOD == constrainedElementKind ) {
+			else if ( ConstrainedElementKind.GETTER == constrainedElementKind ) {
 				return new GetterCascadable.Builder( valueExtractorManager, property, cascadingMetaDataBuilder );
 			}
-			throw new IllegalStateException( "It should either be field or method." );
+			throw new IllegalStateException( "It should be either a field or a getter." );
 		}
 	}
 }
diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/PropertyMetaData.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/PropertyMetaData.java
@@ -151,7 +151,7 @@ public static class Builder extends MetaDataBuilder {
 
 		private static final EnumSet<ConstrainedElementKind> SUPPORTED_ELEMENT_KINDS = EnumSet.of(
 				ConstrainedElementKind.FIELD,
-				ConstrainedElementKind.METHOD
+				ConstrainedElementKind.GETTER
 		);
 
 		private final String propertyName;
@@ -182,11 +182,6 @@ public boolean accepts(ConstrainedElement constrainedElement) {
 				return false;
 			}
 
-			if ( constrainedElement.getKind() == ConstrainedElementKind.METHOD &&
-					!( (ConstrainedExecutable) constrainedElement ).isGetterMethod() ) {
-				return false;
-			}
-
 			return Objects.equals( getPropertyName( constrainedElement ), propertyName );
 		}
 
@@ -222,7 +217,7 @@ private Optional<Constrainable> getConstrainableFromConstrainedElement(Constrain
 					LOG.getUnexpectedConstraintElementType( ConstrainedField.class, constrainedElement.getClass() );
 				}
 			}
-			else if ( constrainedElement.getKind() == ConstrainedElementKind.METHOD ) {
+			else if ( constrainedElement.getKind() == ConstrainedElementKind.GETTER ) {
 				if ( constrainedElement instanceof ConstrainedExecutable ) {
 					return Optional.of( ( (ConstrainedExecutable) constrainedElement ).getCallable() );
 				}
@@ -235,7 +230,7 @@ else if ( constrainedElement.getKind() == ConstrainedElementKind.METHOD ) {
 
 		@Override
 		protected Set<MetaConstraint<?>> adaptConstraints(ConstrainedElement constrainedElement, Set<MetaConstraint<?>> constraints) {
-			if ( constraints.isEmpty() || constrainedElement.getKind() != ConstrainedElementKind.METHOD ) {
+			if ( constraints.isEmpty() || constrainedElement.getKind() != ConstrainedElementKind.GETTER ) {
 				return constraints;
 			}
 
@@ -304,7 +299,7 @@ private String getPropertyName(ConstrainedElement constrainedElement) {
 			if ( constrainedElement.getKind() == ConstrainedElementKind.FIELD ) {
 				return ( (ConstrainedField) constrainedElement ).getProperty().getPropertyName();
 			}
-			else if ( constrainedElement.getKind() == ConstrainedElementKind.METHOD ) {
+			else if ( constrainedElement.getKind() == ConstrainedElementKind.GETTER ) {
 				return ( (ConstrainedExecutable) constrainedElement ).getCallable().as( Property.class ).getPropertyName();
 			}
 
diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/location/ConstraintLocation.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/location/ConstraintLocation.java
@@ -9,6 +9,7 @@
 import java.lang.annotation.ElementType;
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
+import java.util.Locale;
 
 import org.hibernate.validator.internal.engine.path.PathImpl;
 import org.hibernate.validator.internal.metadata.raw.ConstrainedElement.ConstrainedElementKind;
@@ -110,8 +111,7 @@ enum ConstraintLocationKind {
 		PARAMETER( ElementType.PARAMETER ),
 		FIELD( ElementType.FIELD ),
 		GETTER( ElementType.METHOD ),
-		TYPE_USE( ElementType.TYPE_USE ),
-		;
+		TYPE_USE( ElementType.TYPE_USE );
 
 		private final ElementType elementType;
 
@@ -131,10 +131,24 @@ 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;
+		public static ConstraintLocationKind of(ConstrainedElementKind constrainedElementKind) {
+			switch ( constrainedElementKind ) {
+				case CONSTRUCTOR:
+					return ConstraintLocationKind.CONSTRUCTOR;
+				case FIELD:
+					return ConstraintLocationKind.FIELD;
+				case METHOD:
+					return ConstraintLocationKind.METHOD;
+				case PARAMETER:
+					return ConstraintLocationKind.PARAMETER;
+				case TYPE:
+					return ConstraintLocationKind.TYPE;
+				case GETTER:
+					return ConstraintLocationKind.GETTER;
+				default:
+					throw new IllegalArgumentException(
+							String.format( Locale.ROOT, "Constrained element kind '%1$s' not supported.", constrainedElementKind ) );
+			}
 		}
 	}
 }
diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/location/CrossParameterConstraintLocation.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/location/CrossParameterConstraintLocation.java
@@ -28,7 +28,7 @@ class CrossParameterConstraintLocation implements ConstraintLocation {
 
 	CrossParameterConstraintLocation(Callable callable) {
 		this.callable = callable;
-		this.kind = ConstraintLocationKind.of( callable );
+		this.kind = ConstraintLocationKind.of( callable.getConstrainedElementKind() );
 	}
 
 	@Override
diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/location/ParameterConstraintLocation.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/location/ParameterConstraintLocation.java
@@ -32,7 +32,7 @@ public ParameterConstraintLocation(Callable callable, int index) {
 		this.callable = callable;
 		this.index = index;
 		this.typeForValidatorResolution = ReflectionHelper.boxedType( callable.getParameterGenericType( index ) );
-		this.kind = ConstraintLocationKind.of( callable );
+		this.kind = ConstraintLocationKind.of( callable.getConstrainedElementKind() );
 	}
 
 	@Override
diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/location/ReturnValueConstraintLocation.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/location/ReturnValueConstraintLocation.java
@@ -29,7 +29,7 @@ class ReturnValueConstraintLocation implements ConstraintLocation {
 
 	ReturnValueConstraintLocation(Callable callable) {
 		this.callable = callable;
-		this.kind = ConstraintLocationKind.of( callable );
+		this.kind = ConstraintLocationKind.of( callable.getConstrainedElementKind() );
 	}
 
 	@Override
diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/provider/AnnotationMetaDataProvider.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/provider/AnnotationMetaDataProvider.java
@@ -303,7 +303,7 @@ private ConstrainedExecutable findExecutableMetaData(Executable executable) {
 
 		Map<ConstraintType, List<ConstraintDescriptorImpl<?>>> executableConstraints = findConstraints(
 				javaBeanExecutable,
-				ConstraintLocationKind.of( javaBeanExecutable )
+				ConstraintLocationKind.of( javaBeanExecutable.getConstrainedElementKind() )
 		).stream().collect( Collectors.groupingBy( ConstraintDescriptorImpl::getConstraintType ) );
 
 		Set<MetaConstraint<?>> crossParameterConstraints;
diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/raw/ConstrainedElement.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/raw/ConstrainedElement.java
@@ -40,16 +40,6 @@
  */
 public interface ConstrainedElement extends Iterable<MetaConstraint<?>> {
 
-	/**
-	 * The kind of a {@link ConstrainedElement}. Can be used to determine an
-	 * element's type when traversing over a collection of constrained elements.
-	 *
-	 * @author Gunnar Morling
-	 */
-	enum ConstrainedElementKind {
-		TYPE, FIELD, CONSTRUCTOR, METHOD, PARAMETER
-	}
-
 	/**
 	 * Returns the kind of this constrained element.
 	 *
@@ -91,4 +81,28 @@ enum ConstrainedElementKind {
 	 * Returns the configuration source contributing this constrained element.
 	 */
 	ConfigurationSource getSource();
+
+	/**
+	 * The kind of a {@link ConstrainedElement}. Can be used to determine an
+	 * element's type when traversing over a collection of constrained elements.
+	 *
+	 * @author Gunnar Morling
+	 */
+	enum ConstrainedElementKind {
+
+		TYPE,
+		FIELD,
+		CONSTRUCTOR,
+		METHOD,
+		PARAMETER,
+		GETTER;
+
+		public boolean isExecutable() {
+			return this == CONSTRUCTOR || isMethod();
+		}
+
+		public boolean isMethod() {
+			return this == METHOD || this == GETTER;
+		}
+	}
 }
diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/raw/ConstrainedExecutable.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/raw/ConstrainedExecutable.java
@@ -20,7 +20,6 @@
 import org.hibernate.validator.internal.metadata.aggregated.CascadingMetaDataBuilder;
 import org.hibernate.validator.internal.metadata.core.MetaConstraint;
 import org.hibernate.validator.internal.properties.Callable;
-import org.hibernate.validator.internal.properties.Property;
 import org.hibernate.validator.internal.util.CollectionHelper;
 import org.hibernate.validator.internal.util.logging.Log;
 import org.hibernate.validator.internal.util.logging.LoggerFactory;
@@ -51,8 +50,6 @@ public class ConstrainedExecutable extends AbstractConstrainedElement {
 	@Immutable
 	private final Set<MetaConstraint<?>> crossParameterConstraints;
 
-	private final boolean isGetterMethod;
-
 	/**
 	 * Creates a new executable meta data object for a parameter-less executable.
 	 *
@@ -123,7 +120,6 @@ public ConstrainedExecutable(
 		this.crossParameterConstraints = CollectionHelper.toImmutableSet( crossParameterConstraints );
 		this.parameterMetaData = CollectionHelper.toImmutableList( parameterMetaData );
 		this.hasParameterConstraints = hasParameterConstraints( parameterMetaData ) || !crossParameterConstraints.isEmpty();
-		this.isGetterMethod =  callable instanceof Property;
 	}
 
 	/**
@@ -190,16 +186,6 @@ public boolean hasParameterConstraints() {
 		return hasParameterConstraints;
 	}
 
-	/**
-	 * Whether the represented executable is a JavaBeans getter executable or not.
-	 *
-	 * @return {@code True}, if this executable is a getter method, {@code false}
-	 *         otherwise.
-	 */
-	public boolean isGetterMethod() {
-		return isGetterMethod;
-	}
-
 	public Callable getCallable() {
 		return callable;
 	}
diff --git a/engine/src/main/java/org/hibernate/validator/internal/properties/javabean/JavaBeanGetter.java b/engine/src/main/java/org/hibernate/validator/internal/properties/javabean/JavaBeanGetter.java
@@ -11,6 +11,7 @@
 import java.security.PrivilegedAction;
 
 import org.hibernate.validator.HibernateValidatorPermission;
+import org.hibernate.validator.internal.metadata.raw.ConstrainedElement.ConstrainedElementKind;
 import org.hibernate.validator.internal.properties.Property;
 import org.hibernate.validator.internal.util.ExecutableParameterNameProvider;
 import org.hibernate.validator.internal.util.ReflectionHelper;
@@ -67,14 +68,19 @@ public boolean hasParameters() {
 
 	@Override
 	public String getParameterName(ExecutableParameterNameProvider parameterNameProvider, int parameterIndex) {
-		throw new IllegalStateException( "Getters cannot have parameters" );
+		throw new IllegalStateException( "Getters may not have parameters" );
 	}
 
 	@Override
 	public Class<?> getDeclaringClass() {
 		return declaringClass;
 	}
 
+	@Override
+	public ConstrainedElementKind getConstrainedElementKind() {
+		return ConstrainedElementKind.GETTER;
+	}
+
 	@Override
 	public boolean equals(Object o) {
 		if ( this == o ) {
diff --git a/engine/src/main/java/org/hibernate/validator/internal/xml/mapping/CrossParameterStaxBuilder.java b/engine/src/main/java/org/hibernate/validator/internal/xml/mapping/CrossParameterStaxBuilder.java
@@ -89,7 +89,8 @@ Set<MetaConstraint<?>> build(Callable callable) {
 		ConstraintLocation constraintLocation = ConstraintLocation.forCrossParameter( callable );
 
 		Set<MetaConstraint<?>> crossParameterConstraints = constraintTypeStaxBuilders.stream()
-				.map( builder -> builder.build( constraintLocation, ConstraintLocationKind.of( callable ), ConstraintType.CROSS_PARAMETER ) )
+				.map( builder -> builder.build( constraintLocation, ConstraintLocationKind.of( callable.getConstrainedElementKind() ),
+						ConstraintType.CROSS_PARAMETER ) )
 				.collect( Collectors.toSet() );
 
 		// ignore annotations
diff --git a/engine/src/main/java/org/hibernate/validator/internal/xml/mapping/ReturnValueStaxBuilder.java b/engine/src/main/java/org/hibernate/validator/internal/xml/mapping/ReturnValueStaxBuilder.java
@@ -56,7 +56,8 @@ CascadingMetaDataBuilder build(
 
 		ConstraintLocation constraintLocation = ConstraintLocation.forReturnValue( callable );
 		returnValueConstraints.addAll( constraintTypeStaxBuilders.stream()
-				.map( builder -> builder.build( constraintLocation, ConstraintLocationKind.of( callable ), ConstraintDescriptorImpl.ConstraintType.GENERIC ) )
+				.map( builder -> builder.build( constraintLocation, ConstraintLocationKind.of( callable.getConstrainedElementKind() ),
+						ConstraintDescriptorImpl.ConstraintType.GENERIC ) )
 				.collect( Collectors.toSet() ) );
 
 		ContainerElementTypeConfiguration containerElementTypeConfiguration = getContainerElementTypeConfiguration( callable.getType(), constraintLocation );
diff --git a/engine/src/test/java/org/hibernate/validator/test/cfg/ConstraintMappingTest.java b/engine/src/test/java/org/hibernate/validator/test/cfg/ConstraintMappingTest.java
@@ -589,7 +589,7 @@ private ConstrainedField getConstrainedField(BeanConfiguration<?> beanConfigurat
 
 	private ConstrainedExecutable getConstrainedExecutable(BeanConfiguration<?> beanConfiguration, String executableName) {
 		for ( ConstrainedElement constrainedElement : beanConfiguration.getConstrainedElements() ) {
-			if ( constrainedElement.getKind() == ConstrainedElementKind.METHOD &&
+			if ( constrainedElement.getKind().isMethod() &&
 					( (ConstrainedExecutable) constrainedElement ).getCallable().getName().equals( executableName ) ) {
 				return (ConstrainedExecutable) constrainedElement;
 			}

Original file line number	Diff line number	Diff line change
`@@ -80,10 +80,10 @@ public static Cascadable.Builder builder(ConstrainedElementKind constrainedEleme`
`80`	`80`	`if ( ConstrainedElementKind.FIELD == constrainedElementKind ) {`
`81`	`81`	`return new FieldCascadable.Builder( valueExtractorManager, property, cascadingMetaDataBuilder );`
`82`	`82`	`}`
`83`		`- else if ( ConstrainedElementKind.METHOD == constrainedElementKind ) {`
	`83`	`+ else if ( ConstrainedElementKind.GETTER == constrainedElementKind ) {`
`84`	`84`	`return new GetterCascadable.Builder( valueExtractorManager, property, cascadingMetaDataBuilder );`
`85`	`85`	`}`
`86`		`- throw new IllegalStateException( "It should either be field or method." );`
	`86`	`+ throw new IllegalStateException( "It should be either a field or a getter." );`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ public static class Builder extends MetaDataBuilder {`
`151`	`151`
`152`	`152`	`private static final EnumSet<ConstrainedElementKind> SUPPORTED_ELEMENT_KINDS = EnumSet.of(`
`153`	`153`	`ConstrainedElementKind.FIELD,`
`154`		`- ConstrainedElementKind.METHOD`
	`154`	`+ ConstrainedElementKind.GETTER`
`155`	`155`	`);`
`156`	`156`
`157`	`157`	`private final String propertyName;`
`@@ -182,11 +182,6 @@ public boolean accepts(ConstrainedElement constrainedElement) {`
`182`	`182`	`return false;`
`183`	`183`	`}`
`184`	`184`
`185`		`- if ( constrainedElement.getKind() == ConstrainedElementKind.METHOD &&`
`186`		`- !( (ConstrainedExecutable) constrainedElement ).isGetterMethod() ) {`
`187`		`- return false;`
`188`		`- }`
`189`		`-`
`190`	`185`	`return Objects.equals( getPropertyName( constrainedElement ), propertyName );`
`191`	`186`	`}`
`192`	`187`
`@@ -222,7 +217,7 @@ private Optional<Constrainable> getConstrainableFromConstrainedElement(Constrain`
`222`	`217`	`LOG.getUnexpectedConstraintElementType( ConstrainedField.class, constrainedElement.getClass() );`
`223`	`218`	`}`
`224`	`219`	`}`
`225`		`- else if ( constrainedElement.getKind() == ConstrainedElementKind.METHOD ) {`
	`220`	`+ else if ( constrainedElement.getKind() == ConstrainedElementKind.GETTER ) {`
`226`	`221`	`if ( constrainedElement instanceof ConstrainedExecutable ) {`
`227`	`222`	`return Optional.of( ( (ConstrainedExecutable) constrainedElement ).getCallable() );`
`228`	`223`	`}`
`@@ -235,7 +230,7 @@ else if ( constrainedElement.getKind() == ConstrainedElementKind.METHOD ) {`
`235`	`230`
`236`	`231`	`@Override`
`237`	`232`	`protected Set<MetaConstraint<?>> adaptConstraints(ConstrainedElement constrainedElement, Set<MetaConstraint<?>> constraints) {`
`238`		`- if ( constraints.isEmpty() \|\| constrainedElement.getKind() != ConstrainedElementKind.METHOD ) {`
	`233`	`+ if ( constraints.isEmpty() \|\| constrainedElement.getKind() != ConstrainedElementKind.GETTER ) {`
`239`	`234`	`return constraints;`
`240`	`235`	`}`
`241`	`236`
`@@ -304,7 +299,7 @@ private String getPropertyName(ConstrainedElement constrainedElement) {`
`304`	`299`	`if ( constrainedElement.getKind() == ConstrainedElementKind.FIELD ) {`
`305`	`300`	`return ( (ConstrainedField) constrainedElement ).getProperty().getPropertyName();`
`306`	`301`	`}`
`307`		`- else if ( constrainedElement.getKind() == ConstrainedElementKind.METHOD ) {`
	`302`	`+ else if ( constrainedElement.getKind() == ConstrainedElementKind.GETTER ) {`
`308`	`303`	`return ( (ConstrainedExecutable) constrainedElement ).getCallable().as( Property.class ).getPropertyName();`
`309`	`304`	`}`
`310`	`305`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class CrossParameterConstraintLocation implements ConstraintLocation {`
`28`	`28`
`29`	`29`	`CrossParameterConstraintLocation(Callable callable) {`
`30`	`30`	`this.callable = callable;`
`31`		`- this.kind = ConstraintLocationKind.of( callable );`
	`31`	`+ this.kind = ConstraintLocationKind.of( callable.getConstrainedElementKind() );`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public ParameterConstraintLocation(Callable callable, int index) {`
`32`	`32`	`this.callable = callable;`
`33`	`33`	`this.index = index;`
`34`	`34`	`this.typeForValidatorResolution = ReflectionHelper.boxedType( callable.getParameterGenericType( index ) );`
`35`		`- this.kind = ConstraintLocationKind.of( callable );`
	`35`	`+ this.kind = ConstraintLocationKind.of( callable.getConstrainedElementKind() );`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class ReturnValueConstraintLocation implements ConstraintLocation {`
`29`	`29`
`30`	`30`	`ReturnValueConstraintLocation(Callable callable) {`
`31`	`31`	`this.callable = callable;`
`32`		`- this.kind = ConstraintLocationKind.of( callable );`
	`32`	`+ this.kind = ConstraintLocationKind.of( callable.getConstrainedElementKind() );`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`@Override`