HV-1393 Removed Property Kind enum

Author: marko-bekhta

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

@@ -23,6 +23,7 @@
 import org.hibernate.validator.internal.metadata.raw.ConstrainedProperty;
 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.util.TypeResolutionHelper;
 
 /**
@@ -56,7 +57,7 @@ protected PropertyConstraintMappingContextImpl getThis() {
 
 	@Override
 	public PropertyConstraintMappingContext constraint(ConstraintDef<?, ?> definition) {
-		if ( property.getKind() == Property.Kind.FIELD ) {
+		if ( property instanceof JavaBeanField ) {
 			super.addConstraint(
 					ConfiguredConstraint.forProperty(
 							definition, property
@@ -110,7 +111,7 @@ public ContainerElementConstraintMappingContext containerElementType(int index,
 	}
 
 	ConstrainedElement build(ConstraintHelper constraintHelper, TypeResolutionHelper typeResolutionHelper, ValueExtractorManager valueExtractorManager) {
-		if ( property.getKind() == Property.Kind.FIELD ) {
+		if ( property instanceof JavaBeanField ) {
 			return ConstrainedProperty.forField(
 					ConfigurationSource.API,
 					property,

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

@@ -13,6 +13,7 @@
 import org.hibernate.validator.internal.engine.valueextraction.ValueExtractorManager;
 import org.hibernate.validator.internal.metadata.facets.Cascadable;
 import org.hibernate.validator.internal.properties.Property;
+import org.hibernate.validator.internal.properties.javabean.JavaBeanField;
 
 /**
  * A {@link Cascadable} backed by a field of a Java bean.
@@ -31,7 +32,7 @@ public class PropertyCascadable implements Cascadable {
 		this.property = property;
 		this.cascadableType = property.getType();
 		this.cascadingMetaData = cascadingMetaData;
-		this.elementType = property.getKind() == Property.Kind.FIELD ? ElementType.FIELD : ElementType.METHOD;
+		this.elementType = property instanceof JavaBeanField ? ElementType.FIELD : ElementType.METHOD;
 	}
 
 	@Override

engine/src/main/java/org/hibernate/validator/internal/metadata/raw/ConstrainedElement.java

@@ -50,10 +50,6 @@ enum ConstrainedElementKind {
 		TYPE, CONSTRUCTOR, METHOD, PARAMETER, PROPERTY
 	}
 
-	enum ConstrainedPropertyKind {
-		FIELD, GETTER
-	}
-
 	/**
 	 * Returns the kind of this constrained element.
 	 *

engine/src/main/java/org/hibernate/validator/internal/metadata/raw/ConstrainedProperty.java

@@ -22,8 +22,6 @@ public class ConstrainedProperty extends AbstractConstrainedElement {
 
 	private final Property property;
 
-	private final ConstrainedPropertyKind constrainedPropertyKind;
-
 	/**
 	 * Creates a new field meta data object.
 	 *
@@ -37,39 +35,25 @@ private ConstrainedProperty(ConfigurationSource source,
 			Property property,
 			Set<MetaConstraint<?>> constraints,
 			Set<MetaConstraint<?>> typeArgumentConstraints,
-			CascadingMetaDataBuilder cascadingMetaDataBuilder,
-			ConstrainedPropertyKind constrainedPropertyKind) {
+			CascadingMetaDataBuilder cascadingMetaDataBuilder) {
 
 		super( source, ConstrainedElementKind.PROPERTY, constraints, typeArgumentConstraints, cascadingMetaDataBuilder );
 
 		this.property = property;
-		this.constrainedPropertyKind = constrainedPropertyKind;
 	}
 
 	public static ConstrainedProperty forField(ConfigurationSource source,
 			Property property,
 			Set<MetaConstraint<?>> constraints,
 			Set<MetaConstraint<?>> typeArgumentConstraints,
 			CascadingMetaDataBuilder cascadingMetaDataBuilder) {
-		return new ConstrainedProperty( source, property, constraints, typeArgumentConstraints, cascadingMetaDataBuilder, ConstrainedPropertyKind.FIELD );
-	}
-
-	public static ConstrainedProperty forGetter(ConfigurationSource source,
-			Property property,
-			Set<MetaConstraint<?>> constraints,
-			Set<MetaConstraint<?>> typeArgumentConstraints,
-			CascadingMetaDataBuilder cascadingMetaDataBuilder) {
-		return new ConstrainedProperty( source, property, constraints, typeArgumentConstraints, cascadingMetaDataBuilder, ConstrainedPropertyKind.GETTER );
+		return new ConstrainedProperty( source, property, constraints, typeArgumentConstraints, cascadingMetaDataBuilder );
 	}
 
 	public Property getProperty() {
 		return property;
 	}
 
-	public ConstrainedPropertyKind getConstrainedPropertyKind() {
-		return constrainedPropertyKind;
-	}
-
 	@Override
 	public String toString() {
 		return "ConstrainedProperty [property=" + property.getName() + "]";
@@ -78,7 +62,6 @@ public String toString() {
 	@Override public int hashCode() {
 		int result = super.hashCode();
 		result = 31 * result + this.property.hashCode();
-		result = 31 * result + this.constrainedPropertyKind.hashCode();
 		return result;
 	}
 
@@ -96,9 +79,6 @@ public boolean equals(Object o) {
 
 		ConstrainedProperty that = (ConstrainedProperty) o;
 
-		if ( this.constrainedPropertyKind != that.constrainedPropertyKind ) {
-			return false;
-		}
 		return this.property.equals( that.property );
 	}
 }

engine/src/main/java/org/hibernate/validator/internal/properties/Property.java

@@ -11,14 +11,7 @@
  */
 public interface Property extends Constrainable {
 
-	enum Kind {
-		FIELD,
-		GETTER,
-	}
-
 	Object getValueFrom(Object bean);
 
-	Kind getKind();
-
 	String getPropertyName();
 }

engine/src/main/java/org/hibernate/validator/internal/properties/javabean/JavaBeanField.java

@@ -58,11 +58,6 @@ public Object getValueFrom(Object bean) {
 		return ReflectionHelper.getValue( field, bean );
 	}
 
-	@Override
-	public Kind getKind() {
-		return Kind.FIELD;
-	}
-
 	@Override
 	public String getPropertyName() {
 		return getName();
@@ -121,7 +116,7 @@ private static Field getAccessible(Field original) {
 
 	/**
 	 * Runs the given privileged action, using a privileged block if required.
-	 * <p>
+	 *
 	 * <b>NOTE:</b> This must never be changed into a publicly available method to avoid execution of arbitrary
 	 * privileged actions within HV's protection domain.
 	 */

engine/src/main/java/org/hibernate/validator/internal/properties/javabean/JavaBeanGetter.java

@@ -37,11 +37,6 @@ public Object getValueFrom(Object bean) {
 		return ReflectionHelper.getValue( (Method) executable, bean );
 	}
 
-	@Override
-	public Kind getKind() {
-		return Kind.GETTER;
-	}
-
 	@Override
 	public String getPropertyName() {
 		return name;
@@ -120,7 +115,7 @@ private static Method getAccessible(Method original) {
 
 	/**
 	 * Runs the given privileged action, using a privileged block if required.
-	 * <p>
+	 *
 	 * <b>NOTE:</b> This must never be changed into a publicly available method to avoid execution of arbitrary
 	 * privileged actions within HV's protection domain.
 	 */