HV-1623 Encapsulate ConstraintLocationKind inside ConstraintLocation

Author: gsmet

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

@@ -19,8 +19,6 @@
 import org.hibernate.validator.cfg.AnnotationDef;
 import org.hibernate.validator.cfg.ConstraintDef;
 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.properties.javabean.JavaBeanField;
 import org.hibernate.validator.internal.util.annotation.AnnotationDescriptor;
@@ -34,6 +32,7 @@
  * related to its location (bean type etc.).
  *
  * @author Gunnar Morling
+ * @author Guillaume Smet
  */
 class ConfiguredConstraint<A extends Annotation> {
 
@@ -44,49 +43,36 @@ class ConfiguredConstraint<A extends Annotation> {
 
 	private final ConstraintDef<?, A> constraint;
 	private final ConstraintLocation location;
-	private final ConstraintLocationKind kind;
 
-	private ConfiguredConstraint(ConstraintDef<?, A> constraint, ConstraintLocation location, ConstraintLocationKind kind) {
+	private ConfiguredConstraint(ConstraintDef<?, A> constraint, ConstraintLocation location) {
 		this.constraint = constraint;
 		this.location = location;
-		this.kind = kind;
 	}
 
 	static <A extends Annotation> ConfiguredConstraint<A> forType(ConstraintDef<?, A> constraint, Class<?> beanType) {
-		return new ConfiguredConstraint<>( constraint, ConstraintLocation.forClass( beanType ), ConstraintLocationKind.TYPE );
+		return new ConfiguredConstraint<>( constraint, ConstraintLocation.forClass( beanType ) );
 	}
 
 	static <A extends Annotation> ConfiguredConstraint<A> forFieldProperty(ConstraintDef<?, A> constraint, JavaBeanField javaBeanField) {
-		return new ConfiguredConstraint<>(
-				constraint,
-				ConstraintLocation.forField( javaBeanField ),
-				ConstraintLocationKind.FIELD
-		);
+		return new ConfiguredConstraint<>( constraint, ConstraintLocation.forField( javaBeanField ) );
 	}
 
 	public static <A extends Annotation> ConfiguredConstraint<A> forParameter(ConstraintDef<?, A> constraint, Callable callable, int parameterIndex) {
-		return new ConfiguredConstraint<>(
-				constraint, ConstraintLocation.forParameter( callable, parameterIndex ), getConstraintLocationKindFromCallable( callable )
-		);
+		return new ConfiguredConstraint<>( constraint, ConstraintLocation.forParameter( callable, parameterIndex ) );
 	}
 
 	public static <A extends Annotation> ConfiguredConstraint<A> forExecutable(ConstraintDef<?, A> constraint, Callable callable) {
-		return new ConfiguredConstraint<>(
-				constraint, ConstraintLocation.forReturnValue( callable ), getConstraintLocationKindFromCallable( callable )
-		);
+		return new ConfiguredConstraint<>( constraint, ConstraintLocation.forReturnValue( callable ) );
 	}
 
 	public static <A extends Annotation> ConfiguredConstraint<A> forCrossParameter(ConstraintDef<?, A> constraint, Callable callable) {
-		return new ConfiguredConstraint<>(
-				constraint, ConstraintLocation.forCrossParameter( callable ), getConstraintLocationKindFromCallable( callable )
-		);
+		return new ConfiguredConstraint<>( constraint, ConstraintLocation.forCrossParameter( callable ) );
 	}
 
 	public static <A extends Annotation> ConfiguredConstraint<A> forTypeArgument(ConstraintDef<?, A> constraint, ConstraintLocation delegate, TypeVariable<?> typeArgument, Type typeOfAnnotatedElement) {
 		return new ConfiguredConstraint<>(
 				constraint,
-				ConstraintLocation.forTypeArgument( delegate, typeArgument, typeOfAnnotatedElement ),
-				ConstraintLocationKind.TYPE_USE
+				ConstraintLocation.forTypeArgument( delegate, typeArgument, typeOfAnnotatedElement )
 		);
 	}
 
@@ -116,16 +102,6 @@ public String toString() {
 		return constraint.toString();
 	}
 
-	public ConstraintLocationKind getConstraintLocationKind() {
-		return kind;
-	}
-
-	private static ConstraintLocationKind getConstraintLocationKindFromCallable(Callable callable) {
-		return callable.getConstrainedElementKind() == ConstrainedElementKind.CONSTRUCTOR
-				? ConstraintLocationKind.CONSTRUCTOR
-				: ConstraintLocationKind.METHOD;
-	}
-
 	/**
 	 * Runs the given privileged action, using a privileged block if required.
 	 * <b>NOTE:</b> This must never be changed into a publicly available method to avoid execution of arbitrary

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

@@ -75,7 +75,7 @@ private <A extends Annotation> MetaConstraint<A> asMetaConstraint(ConfiguredCons
 				constraintHelper,
 				config.getLocation().getConstrainable(),
 				config.createAnnotationDescriptor(),
-				config.getConstraintLocationKind(),
+				config.getLocation().getKind(),
 				getConstraintType()
 		);
 

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

@@ -239,7 +239,7 @@ private <A extends Annotation> MetaConstraint<A> asMetaConstraint(ConfiguredCons
 				constraintHelper,
 				config.getLocation().getConstrainable(),
 				config.createAnnotationDescriptor(),
-				config.getConstraintLocationKind(),
+				config.getLocation().getKind(),
 				getConstraintType()
 		);
 

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

@@ -18,6 +18,7 @@
  *
  * @author Hardy Ferentschik
  * @author Gunnar Morling
+ * @author Guillaume Smet
  */
 class BeanConstraintLocation implements ConstraintLocation {
 
@@ -66,6 +67,11 @@ public Object getValue(Object parent) {
 		return parent;
 	}
 
+	@Override
+	public ConstraintLocationKind getKind() {
+		return ConstraintLocationKind.TYPE;
+	}
+
 	@Override
 	public String toString() {
 		return "BeanConstraintLocation [declaringClass=" + declaringClass + ", typeForValidatorResolution=" + typeForValidatorResolution + "]";

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

@@ -97,6 +97,11 @@ static ConstraintLocation forParameter(Callable callable, int index) {
 	 */
 	Object getValue(Object parent);
 
+	/**
+	 * Returns the nature of the constraint location.
+	 */
+	ConstraintLocationKind getKind();
+
 	enum ConstraintLocationKind {
 		TYPE( ElementType.TYPE ),
 		CONSTRUCTOR( ElementType.CONSTRUCTOR ),

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

@@ -9,6 +9,7 @@
 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;
@@ -18,13 +19,19 @@
  *
  * @author Hardy Ferentschik
  * @author Gunnar Morling
+ * @author Guillaume Smet
  */
 class CrossParameterConstraintLocation implements ConstraintLocation {
 
 	private final Callable callable;
 
-	CrossParameterConstraintLocation(Callable executable) {
-		this.callable = executable;
+	private final ConstraintLocationKind kind;
+
+	CrossParameterConstraintLocation(Callable callable) {
+		this.callable = callable;
+		this.kind = callable.getConstrainedElementKind() == ConstrainedElementKind.CONSTRUCTOR
+				? ConstraintLocationKind.CONSTRUCTOR
+				: ConstraintLocationKind.METHOD;
 	}
 
 	@Override
@@ -52,6 +59,11 @@ public Object getValue(Object parent) {
 		return parent;
 	}
 
+	@Override
+	public ConstraintLocationKind getKind() {
+		return kind;
+	}
+
 	@Override
 	public String toString() {
 		return "CrossParameterConstraintLocation [callable=" + callable + "]";

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

@@ -18,4 +18,9 @@ public class FieldPropertyConstraintLocation extends PropertyConstraintLocation<
 	FieldPropertyConstraintLocation(JavaBeanField javaBeanGetter) {
 		super( javaBeanGetter );
 	}
+
+	@Override
+	public ConstraintLocationKind getKind() {
+		return ConstraintLocationKind.FIELD;
+	}
 }

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

@@ -18,4 +18,9 @@ public class GetterPropertyConstraintLocation extends PropertyConstraintLocation
 	GetterPropertyConstraintLocation(JavaBeanGetter javaBeanGetter) {
 		super( javaBeanGetter );
 	}
+
+	@Override
+	public ConstraintLocationKind getKind() {
+		return ConstraintLocationKind.METHOD;
+	}
 }

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

@@ -9,6 +9,7 @@
 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;
@@ -19,17 +20,22 @@
  *
  * @author Hardy Ferentschik
  * @author Gunnar Morling
+ * @author Guillaume Smet
  */
 public class ParameterConstraintLocation implements ConstraintLocation {
 
 	private final Callable callable;
 	private final int index;
 	private final Type typeForValidatorResolution;
+	private final ConstraintLocationKind kind;
 
 	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;
 	}
 
 	@Override
@@ -61,9 +67,14 @@ public Object getValue(Object parent) {
 		return ( (Object[]) parent )[index];
 	}
 
+	@Override
+	public ConstraintLocationKind getKind() {
+		return kind;
+	}
+
 	@Override
 	public String toString() {
-		return "ParameterConstraintLocation [executable=" + callable + ", index=" + index + "]";
+		return "ParameterConstraintLocation [callable=" + callable + ", index=" + index + "]";
 	}
 
 	@Override

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

@@ -16,6 +16,7 @@
  * An abstract property constraint location.
  *
  * @author Marko Bekhta
+ * @author Guillaume Smet
  */
 public abstract class PropertyConstraintLocation<T extends Property> implements ConstraintLocation {