HV-1587 Simplify how already validated bean tracking is disabled/enabled

Author: gsmet

engine/src/main/java/org/hibernate/validator/internal/engine/ValidationContext.java

@@ -41,6 +41,7 @@
 import org.hibernate.validator.internal.metadata.aggregated.BeanMetaData;
 import org.hibernate.validator.internal.metadata.aggregated.ExecutableMetaData;
 import org.hibernate.validator.internal.metadata.core.MetaConstraint;
+import org.hibernate.validator.internal.metadata.facets.Validatable;
 import org.hibernate.validator.internal.util.ExecutableParameterNameProvider;
 import org.hibernate.validator.internal.util.logging.Log;
 import org.hibernate.validator.internal.util.logging.LoggerFactory;
@@ -415,29 +416,35 @@ public String toString() {
 
 	private static boolean buildDisableAlreadyValidatedBeanTracking(ValidationOperation validationOperation, BeanMetaData<?> rootBeanMetaData,
 			Optional<ExecutableMetaData> executableMetaData) {
+		Validatable validatable;
 		switch ( validationOperation ) {
 			case BEAN_VALIDATION:
 			case PROPERTY_VALIDATION:
 			case VALUE_VALIDATION:
 				// note that in the case of property and value validation, we are considering the root bean, whereas we
 				// could consider the bean of the property or the value. We don't really have the info here though so it
 				// will do for now.
-				return !rootBeanMetaData.hasCascadingProperties();
+				validatable = rootBeanMetaData;
+				break;
 			case PARAMETER_VALIDATION:
 				if ( !executableMetaData.isPresent() ) {
 					// the method is unconstrained so there's no need to worry about the tracking
 					return false;
 				}
-				return !executableMetaData.get().hasCascadingParameters();
+				validatable = executableMetaData.get().getValidatableParametersMetaData();
+				break;
 			case RETURN_VALUE_VALIDATION:
 				if ( !executableMetaData.isPresent() ) {
 					// the method is unconstrained so there's no need to worry about the tracking
 					return false;
 				}
-				return !executableMetaData.get().getReturnValueMetaData().isCascading();
+				validatable = executableMetaData.get().getReturnValueMetaData();
+				break;
 			default:
 				return false;
 		}
+
+		return !validatable.hasCascadables();
 	}
 
 	private String interpolate(String messageTemplate,

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

@@ -113,9 +113,4 @@ public interface BeanMetaData<T> extends Validatable {
 	 *         element itself and goes up the hierarchy chain. Interfaces are not included.
 	 */
 	List<Class<? super T>> getClassHierarchy();
-
-	/**
-	 * @return {@code true} if there is at least one cascading property in the bean metadata, {@code false} otherwise.
-	 */
-	boolean hasCascadingProperties();
 }

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

@@ -134,11 +134,6 @@ public final class BeanMetaDataImpl<T> implements BeanMetaData<T> {
 	@Immutable
 	private final Set<Cascadable> cascadedProperties;
 
-	/**
-	 * Indicates if the bean has at least one cascading property.
-	 */
-	private final boolean hasCascadingProperties;
-
 	/**
 	 * The bean descriptor for this bean.
 	 */
@@ -221,7 +216,6 @@ public BeanMetaDataImpl(Class<T> beanClass,
 
 		this.hasConstraints = hasConstraints;
 		this.cascadedProperties = CollectionHelper.toImmutableSet( cascadedProperties );
-		this.hasCascadingProperties = cascadedProperties.size() > 0;
 		this.allMetaConstraints = CollectionHelper.toImmutableSet( allMetaConstraints );
 
 		this.classHierarchyWithoutInterfaces = CollectionHelper.toImmutableList( ClassHierarchyHelper.getHierarchy(
@@ -292,8 +286,8 @@ public Set<Cascadable> getCascadables() {
 	}
 
 	@Override
-	public boolean hasCascadingProperties() {
-		return hasCascadingProperties;
+	public boolean hasCascadables() {
+		return !cascadedProperties.isEmpty();
 	}
 
 	@Override

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

@@ -60,10 +60,15 @@
 public class ExecutableMetaData extends AbstractConstraintMetaData {
 
 	private final Class<?>[] parameterTypes;
+
 	@Immutable
 	private final List<ParameterMetaData> parameterMetaDataList;
+
+	private final ValidatableParametersMetaData validatableParametersMetaData;
+
 	@Immutable
 	private final Set<MetaConstraint<?>> crossParameterConstraints;
+
 	private final boolean isGetter;
 
 	/**
@@ -76,8 +81,6 @@ public class ExecutableMetaData extends AbstractConstraintMetaData {
 	private final ReturnValueMetaData returnValueMetaData;
 	private final ElementKind kind;
 
-	private final boolean hasCascadingParameters;
-
 	private ExecutableMetaData(
 			String name,
 			Type returnType,
@@ -102,6 +105,7 @@ private ExecutableMetaData(
 
 		this.parameterTypes = parameterTypes;
 		this.parameterMetaDataList = CollectionHelper.toImmutableList( parameterMetaDataList );
+		this.validatableParametersMetaData = new ValidatableParametersMetaData( parameterMetaDataList );
 		this.crossParameterConstraints = CollectionHelper.toImmutableSet( crossParameterConstraints );
 		this.signatures = signatures;
 		this.returnValueMetaData = new ReturnValueMetaData(
@@ -112,8 +116,6 @@ private ExecutableMetaData(
 		);
 		this.isGetter = isGetter;
 		this.kind = kind;
-
-		this.hasCascadingParameters = buildHasCascadingParameters( parameterMetaDataList );
 	}
 
 	/**
@@ -156,7 +158,7 @@ public Set<MetaConstraint<?>> getCrossParameterConstraints() {
 	}
 
 	public ValidatableParametersMetaData getValidatableParametersMetaData() {
-		return new ValidatableParametersMetaData( parameterMetaDataList );
+		return validatableParametersMetaData;
 	}
 
 	public ReturnValueMetaData getReturnValueMetaData() {
@@ -244,19 +246,6 @@ public boolean equals(Object obj) {
 		return true;
 	}
 
-	public boolean hasCascadingParameters() {
-		return hasCascadingParameters;
-	}
-
-	private boolean buildHasCascadingParameters(List<ParameterMetaData> parameterMetaDataList) {
-		for ( ParameterMetaData parameterMetaData : parameterMetaDataList ) {
-			if ( parameterMetaData.isCascading() ) {
-				return true;
-			}
-		}
-		return false;
-	}
-
 	/**
 	 * Creates new {@link ExecutableMetaData} instances.
 	 *

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

@@ -61,6 +61,11 @@ public Iterable<Cascadable> getCascadables() {
 		return cascadables;
 	}
 
+	@Override
+	public boolean hasCascadables() {
+		return !cascadables.isEmpty();
+	}
+
 	@Override
 	public ElementType getElementType() {
 		return ElementType.METHOD;

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

@@ -24,8 +24,9 @@ public class ValidatableParametersMetaData implements Validatable {
 
 	@Immutable
 	private final List<ParameterMetaData> parameterMetaData;
+
 	@Immutable
-	private final Iterable<Cascadable> cascadables;
+	private final List<Cascadable> cascadables;
 
 	public ValidatableParametersMetaData(List<ParameterMetaData> parameterMetaData) {
 		this.parameterMetaData = CollectionHelper.toImmutableList( parameterMetaData );
@@ -39,4 +40,8 @@ public Iterable<Cascadable> getCascadables() {
 		return cascadables;
 	}
 
+	@Override
+	public boolean hasCascadables() {
+		return !cascadables.isEmpty();
+	}
 }

engine/src/main/java/org/hibernate/validator/internal/metadata/facets/Validatable.java

@@ -23,4 +23,8 @@ public interface Validatable {
 	 */
 	Iterable<Cascadable> getCascadables();
 
+	/**
+	 * Returns {@code true} if this validatable has at least one cascadable element, {@code false} otherwise.
+	 */
+	boolean hasCascadables();
 }