HV-1623 Make the fields/getters accessible lazily

Author: gsmet

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

@@ -14,6 +14,7 @@
 import org.hibernate.validator.internal.properties.Field;
 import org.hibernate.validator.internal.properties.Getter;
 import org.hibernate.validator.internal.properties.Property;
+import org.hibernate.validator.internal.properties.PropertyAccessor;
 
 /**
  * A {@link Cascadable} backed by a property of a Java bean.
@@ -24,11 +25,13 @@
 public abstract class AbstractPropertyCascadable<T extends Property> implements Cascadable {
 
 	private final T property;
+	private final PropertyAccessor propertyAccessor;
 	private final Type cascadableType;
 	private final CascadingMetaData cascadingMetaData;
 
 	AbstractPropertyCascadable(T property, CascadingMetaData cascadingMetaData) {
 		this.property = property;
+		this.propertyAccessor = property.createAccessor();
 		this.cascadableType = property.getType();
 		this.cascadingMetaData = cascadingMetaData;
 	}
@@ -40,7 +43,7 @@ public Type getCascadableType() {
 
 	@Override
 	public Object getValue(Object parent) {
-		return property.getValueFrom( parent );
+		return propertyAccessor.getValueFrom( parent );
 	}
 
 	@Override

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

@@ -10,6 +10,7 @@
 
 import org.hibernate.validator.internal.engine.path.PathImpl;
 import org.hibernate.validator.internal.properties.Property;
+import org.hibernate.validator.internal.properties.PropertyAccessor;
 import org.hibernate.validator.internal.util.ExecutableParameterNameProvider;
 
 /**
@@ -25,8 +26,11 @@ public abstract class AbstractPropertyConstraintLocation<T extends Property> imp
 	 */
 	private final T property;
 
+	private final PropertyAccessor propertyAccessor;
+
 	AbstractPropertyConstraintLocation(T property) {
 		this.property = property;
+		this.propertyAccessor = property.createAccessor();
 	}
 
 	@Override
@@ -55,7 +59,7 @@ public void appendTo(ExecutableParameterNameProvider parameterNameProvider, Path
 
 	@Override
 	public Object getValue(Object parent) {
-		return property.getValueFrom( parent );
+		return propertyAccessor.getValueFrom( parent );
 	}
 
 	@Override

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

@@ -11,7 +11,7 @@
  */
 public interface Property extends Constrainable {
 
-	Object getValueFrom(Object bean);
-
 	String getPropertyName();
+
+	PropertyAccessor createAccessor();
 }

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

@@ -0,0 +1,15 @@
+/*
+ * 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.properties;
+
+/**
+ * @author Guillaume Smet
+ */
+public interface PropertyAccessor {
+
+	Object getValueFrom(Object bean);
+}

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

@@ -15,6 +15,7 @@
 import java.security.PrivilegedAction;
 
 import org.hibernate.validator.HibernateValidatorPermission;
+import org.hibernate.validator.internal.properties.PropertyAccessor;
 import org.hibernate.validator.internal.util.ReflectionHelper;
 import org.hibernate.validator.internal.util.privilegedactions.GetDeclaredField;
 
@@ -29,7 +30,7 @@ public class JavaBeanField implements org.hibernate.validator.internal.propertie
 	private final Type type;
 
 	public JavaBeanField(Field field) {
-		this.field = getAccessible( field );
+		this.field = field;
 		this.name = field.getName();
 		this.type = ReflectionHelper.typeOf( field );
 		this.typeForValidatorResolution = ReflectionHelper.boxedType( this.type );
@@ -55,11 +56,6 @@ public Type getTypeForValidatorResolution() {
 		return typeForValidatorResolution;
 	}
 
-	@Override
-	public Object getValueFrom(Object bean) {
-		return ReflectionHelper.getValue( field, bean );
-	}
-
 	@Override
 	public String getPropertyName() {
 		return getName();
@@ -90,6 +86,11 @@ public TypeVariable<?>[] getTypeParameters() {
 		return field.getType().getTypeParameters();
 	}
 
+	@Override
+	public PropertyAccessor createAccessor() {
+		return new FieldAccessor( field );
+	}
+
 	@Override
 	public boolean equals(Object o) {
 		if ( this == o ) {
@@ -127,6 +128,20 @@ public String toString() {
 		return getName();
 	}
 
+	private static class FieldAccessor implements PropertyAccessor {
+
+		private Field accessibleField;
+
+		private FieldAccessor(Field field) {
+			this.accessibleField = getAccessible( field );
+		}
+
+		@Override
+		public Object getValueFrom(Object bean) {
+			return ReflectionHelper.getValue( accessibleField, bean );
+		}
+	}
+
 	/**
 	 * Returns an accessible copy of the given member.
 	 */

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

@@ -13,6 +13,7 @@
 import org.hibernate.validator.HibernateValidatorPermission;
 import org.hibernate.validator.internal.metadata.raw.ConstrainedElement.ConstrainedElementKind;
 import org.hibernate.validator.internal.properties.Getter;
+import org.hibernate.validator.internal.properties.PropertyAccessor;
 import org.hibernate.validator.internal.util.ExecutableParameterNameProvider;
 import org.hibernate.validator.internal.util.ReflectionHelper;
 import org.hibernate.validator.internal.util.privilegedactions.GetDeclaredMethod;
@@ -33,22 +34,17 @@ public class JavaBeanGetter extends JavaBeanMethod implements Getter {
 	private final Class<?> declaringClass;
 
 	public JavaBeanGetter(Method method) {
-		super( getAccessible( method ) );
+		super( method );
 		this.name = ReflectionHelper.getPropertyName( method );
 		this.declaringClass = method.getDeclaringClass();
 	}
 
 	public JavaBeanGetter(Class<?> declaringClass, Method method) {
-		super( getAccessible( method ) );
+		super( method );
 		this.name = ReflectionHelper.getPropertyName( method );
 		this.declaringClass = declaringClass;
 	}
 
-	@Override
-	public Object getValueFrom(Object bean) {
-		return ReflectionHelper.getValue( executable, bean );
-	}
-
 	@Override
 	public String getPropertyName() {
 		return name;
@@ -81,6 +77,11 @@ public ConstrainedElementKind getConstrainedElementKind() {
 		return ConstrainedElementKind.GETTER;
 	}
 
+	@Override
+	public PropertyAccessor createAccessor() {
+		return new GetterAccessor( executable );
+	}
+
 	@Override
 	public boolean equals(Object o) {
 		if ( this == o ) {
@@ -105,6 +106,20 @@ public int hashCode() {
 		return result;
 	}
 
+	private static class GetterAccessor implements PropertyAccessor {
+
+		private Method accessibleGetter;
+
+		private GetterAccessor(Method getter) {
+			this.accessibleGetter = getAccessible( getter );
+		}
+
+		@Override
+		public Object getValueFrom(Object bean) {
+			return ReflectionHelper.getValue( accessibleGetter, bean );
+		}
+	}
+
 	/**
 	 * Returns an accessible copy of the given method.
 	 */