HV-1831 New zero cost approach to processed bean tracking strategy

I removed it from the traditional VF for now as I would like us to focus
on the case where it is useful first.

We will reintroduce it later once we have validated the approach where
it is the most useful.

I'm a bit unclear right now if we should use the same contract for
traditional and predefined scope VF as we are dealing with different
things and they won't be evaluated at the same moment.

I'm thinking that maybe this needs to be a different contract.

Author: gsmet

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

@@ -226,7 +226,6 @@ public PredefinedScopeValidatorFactoryImpl(ConfigurationState configurationState
 				determineConstraintValidatorPayload( hibernateSpecificConfig ),
 				determineConstraintExpressionLanguageFeatureLevel( hibernateSpecificConfig, properties ),
 				determineCustomViolationExpressionLanguageFeatureLevel( hibernateSpecificConfig, properties ),
-				beanMetaDataManager.getProcessedBeansTrackingStrategy(),
 				constraintValidatorInitializationContext );
 
 		if ( LOG.isDebugEnabled() ) {
@@ -296,6 +295,10 @@ public boolean isTraversableResolverResultCacheEnabled() {
 		return validatorFactoryScopedContext.isTraversableResolverResultCacheEnabled();
 	}
 
+	public PredefinedScopeBeanMetaDataManager getBeanMetaDataManager() {
+		return beanMetaDataManager;
+	}
+
 	@Override
 	public <T> T unwrap(Class<T> type) {
 		// allow unwrapping into public super types

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

@@ -10,9 +10,9 @@
 import static org.hibernate.validator.internal.engine.ValidatorFactoryConfigurationHelper.determineAllowOverridingMethodAlterParameterConstraint;
 import static org.hibernate.validator.internal.engine.ValidatorFactoryConfigurationHelper.determineAllowParallelMethodsDefineParameterConstraints;
 import static org.hibernate.validator.internal.engine.ValidatorFactoryConfigurationHelper.determineBeanMetaDataClassNormalizer;
+import static org.hibernate.validator.internal.engine.ValidatorFactoryConfigurationHelper.determineConstraintExpressionLanguageFeatureLevel;
 import static org.hibernate.validator.internal.engine.ValidatorFactoryConfigurationHelper.determineConstraintMappings;
 import static org.hibernate.validator.internal.engine.ValidatorFactoryConfigurationHelper.determineConstraintValidatorPayload;
-import static org.hibernate.validator.internal.engine.ValidatorFactoryConfigurationHelper.determineConstraintExpressionLanguageFeatureLevel;
 import static org.hibernate.validator.internal.engine.ValidatorFactoryConfigurationHelper.determineCustomViolationExpressionLanguageFeatureLevel;
 import static org.hibernate.validator.internal.engine.ValidatorFactoryConfigurationHelper.determineExternalClassLoader;
 import static org.hibernate.validator.internal.engine.ValidatorFactoryConfigurationHelper.determineFailFast;
@@ -49,7 +49,6 @@
 import org.hibernate.validator.internal.engine.constraintvalidation.ConstraintValidatorManager;
 import org.hibernate.validator.internal.engine.constraintvalidation.ConstraintValidatorManagerImpl;
 import org.hibernate.validator.internal.engine.groups.ValidationOrderGenerator;
-import org.hibernate.validator.internal.engine.tracking.HasCascadablesProcessedBeansTrackingStrategy;
 import org.hibernate.validator.internal.engine.valueextraction.ValueExtractorManager;
 import org.hibernate.validator.internal.metadata.BeanMetaDataManager;
 import org.hibernate.validator.internal.metadata.BeanMetaDataManagerImpl;
@@ -166,9 +165,6 @@ public ValidatorFactoryImpl(ConfigurationState configurationState) {
 				determineConstraintValidatorPayload( hibernateSpecificConfig ),
 				determineConstraintExpressionLanguageFeatureLevel( hibernateSpecificConfig, properties ),
 				determineCustomViolationExpressionLanguageFeatureLevel( hibernateSpecificConfig, properties ),
-				( hibernateSpecificConfig != null && hibernateSpecificConfig.getProcessedBeansTrackingStrategy() != null )
-						? hibernateSpecificConfig.getProcessedBeansTrackingStrategy()
-						: new HasCascadablesProcessedBeansTrackingStrategy(),
 				determineShowValidatedValuesInTraceLogs( hibernateSpecificConfig, properties ) );
 
 		ConstraintValidatorManager constraintValidatorManager = new ConstraintValidatorManagerImpl(

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

@@ -15,7 +15,6 @@
 
 import org.hibernate.validator.constraintvalidation.HibernateConstraintValidatorInitializationContext;
 import org.hibernate.validator.internal.engine.constraintvalidation.HibernateConstraintValidatorInitializationContextImpl;
-import org.hibernate.validator.internal.engine.tracking.ProcessedBeansTrackingStrategy;
 import org.hibernate.validator.internal.util.Contracts;
 import org.hibernate.validator.internal.util.ExecutableParameterNameProvider;
 import org.hibernate.validator.messageinterpolation.ExpressionLanguageFeatureLevel;
@@ -79,11 +78,6 @@ public class ValidatorFactoryScopedContext {
 	 */
 	private final ExpressionLanguageFeatureLevel customViolationExpressionLanguageFeatureLevel;
 
-	/**
-	 * Strategy used to enable or not processed beans tracking.
-	 */
-	private final ProcessedBeansTrackingStrategy processedBeansTrackingStrategy;
-
 	/**
 	 * The constraint validator initialization context.
 	 */
@@ -105,11 +99,10 @@ public class ValidatorFactoryScopedContext {
 			Object constraintValidatorPayload,
 			ExpressionLanguageFeatureLevel constraintExpressionLanguageFeatureLevel,
 			ExpressionLanguageFeatureLevel customViolationExpressionLanguageFeatureLevel,
-			ProcessedBeansTrackingStrategy processedBeansTrackingStrategy,
 			boolean showValidatedValuesInTraceLogs) {
 		this( messageInterpolator, traversableResolver, parameterNameProvider, clockProvider, temporalValidationTolerance, scriptEvaluatorFactory, failFast,
 				traversableResolverResultCacheEnabled, showValidatedValuesInTraceLogs, constraintValidatorPayload, constraintExpressionLanguageFeatureLevel,
-				customViolationExpressionLanguageFeatureLevel, processedBeansTrackingStrategy,
+				customViolationExpressionLanguageFeatureLevel,
 				new HibernateConstraintValidatorInitializationContextImpl( scriptEvaluatorFactory, clockProvider,
 						temporalValidationTolerance ) );
 	}
@@ -125,7 +118,6 @@ public class ValidatorFactoryScopedContext {
 			boolean showValidatedValuesInTraceLogs, Object constraintValidatorPayload,
 			ExpressionLanguageFeatureLevel constraintExpressionLanguageFeatureLevel,
 			ExpressionLanguageFeatureLevel customViolationExpressionLanguageFeatureLevel,
-			ProcessedBeansTrackingStrategy processedBeanTrackingStrategy,
 			HibernateConstraintValidatorInitializationContextImpl constraintValidatorInitializationContext) {
 		this.messageInterpolator = messageInterpolator;
 		this.traversableResolver = traversableResolver;
@@ -139,7 +131,6 @@ public class ValidatorFactoryScopedContext {
 		this.constraintExpressionLanguageFeatureLevel = constraintExpressionLanguageFeatureLevel;
 		this.customViolationExpressionLanguageFeatureLevel = customViolationExpressionLanguageFeatureLevel;
 		this.showValidatedValuesInTraceLogs = showValidatedValuesInTraceLogs;
-		this.processedBeansTrackingStrategy = processedBeanTrackingStrategy;
 		this.constraintValidatorInitializationContext = constraintValidatorInitializationContext;
 	}
 
@@ -195,10 +186,6 @@ public boolean isShowValidatedValuesInTraceLogs() {
 		return showValidatedValuesInTraceLogs;
 	}
 
-	public ProcessedBeansTrackingStrategy getProcessedBeansTrackingStrategy() {
-		return processedBeansTrackingStrategy;
-	}
-
 	static class Builder {
 		private final ValidatorFactoryScopedContext defaultContext;
 
@@ -213,8 +200,6 @@ static class Builder {
 		private Object constraintValidatorPayload;
 		private ExpressionLanguageFeatureLevel constraintExpressionLanguageFeatureLevel;
 		private ExpressionLanguageFeatureLevel customViolationExpressionLanguageFeatureLevel;
-		private ProcessedBeansTrackingStrategy processedBeansTrackingStrategy;
-
 		private boolean showValidatedValuesInTraceLogs;
 		private HibernateConstraintValidatorInitializationContextImpl constraintValidatorInitializationContext;
 
@@ -234,7 +219,6 @@ static class Builder {
 			this.constraintExpressionLanguageFeatureLevel = defaultContext.constraintExpressionLanguageFeatureLevel;
 			this.customViolationExpressionLanguageFeatureLevel = defaultContext.customViolationExpressionLanguageFeatureLevel;
 			this.showValidatedValuesInTraceLogs = defaultContext.showValidatedValuesInTraceLogs;
-			this.processedBeansTrackingStrategy = defaultContext.processedBeansTrackingStrategy;
 			this.constraintValidatorInitializationContext = defaultContext.constraintValidatorInitializationContext;
 		}
 
@@ -327,12 +311,6 @@ public ValidatorFactoryScopedContext.Builder setShowValidatedValuesInTraceLogs(
 			return this;
 		}
 
-		public ValidatorFactoryScopedContext.Builder setProcessedBeansTrackingStrategy(
-				ProcessedBeansTrackingStrategy processedBeansTrackingStrategy) {
-			this.processedBeansTrackingStrategy = processedBeansTrackingStrategy;
-			return this;
-		}
-
 		public ValidatorFactoryScopedContext build() {
 			return new ValidatorFactoryScopedContext(
 					messageInterpolator,
@@ -346,7 +324,6 @@ public ValidatorFactoryScopedContext build() {
 					showValidatedValuesInTraceLogs, constraintValidatorPayload,
 					constraintExpressionLanguageFeatureLevel,
 					customViolationExpressionLanguageFeatureLevel,
-					processedBeansTrackingStrategy,
 					HibernateConstraintValidatorInitializationContextImpl.of(
 							constraintValidatorInitializationContext,
 							scriptEvaluatorFactory,

engine/src/main/java/org/hibernate/validator/internal/engine/tracking/HasCascadablesProcessedBeansTrackingStrategy.java

@@ -6,7 +6,6 @@
  */
 package org.hibernate.validator.internal.engine.tracking;
 
-import java.lang.reflect.Executable;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.Collections;
@@ -15,22 +14,22 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.hibernate.validator.internal.metadata.PredefinedScopeBeanMetaDataManager;
 import org.hibernate.validator.internal.metadata.aggregated.BeanMetaData;
 import org.hibernate.validator.internal.metadata.aggregated.CascadingMetaData;
 import org.hibernate.validator.internal.metadata.aggregated.ContainerCascadingMetaData;
 import org.hibernate.validator.internal.metadata.facets.Cascadable;
+import org.hibernate.validator.internal.properties.Signature;
 import org.hibernate.validator.internal.util.CollectionHelper;
 
 public class PredefinedScopeProcessedBeansTrackingStrategy implements ProcessedBeansTrackingStrategy {
 
 	private final Map<Class<?>, Boolean> trackingEnabledForBeans;
 
-	private final Map<Executable, Boolean> trackingEnabledForReturnValues;
+	private final Map<Signature, Boolean> trackingEnabledForReturnValues;
 
-	private final Map<Executable, Boolean> trackingEnabledForParameters;
+	private final Map<Signature, Boolean> trackingEnabledForParameters;
 
-	public PredefinedScopeProcessedBeansTrackingStrategy(PredefinedScopeBeanMetaDataManager beanMetaDataManager) {
+	public PredefinedScopeProcessedBeansTrackingStrategy(Map<Class<?>, BeanMetaData<?>> rawBeanMetaDataMap) {
 		// TODO: build the maps from the information inside the beanMetaDataManager
 		// There is a good chance we will need a structure with the whole hierarchy of constraint classes.
 		// That's something we could add to PredefinedScopeBeanMetaDataManager, as we are already doing similar things
@@ -39,24 +38,24 @@ public PredefinedScopeProcessedBeansTrackingStrategy(PredefinedScopeBeanMetaData
 		// PredefinedScopeBeanMetaDataManager.
 
 		this.trackingEnabledForBeans = CollectionHelper.toImmutableMap(
-				new TrackingEnabledStrategyBuilder( beanMetaDataManager ).build()
+				new TrackingEnabledStrategyBuilder( rawBeanMetaDataMap ).build()
 		);
 		this.trackingEnabledForReturnValues = CollectionHelper.toImmutableMap( new HashMap<>() );
 		this.trackingEnabledForParameters = CollectionHelper.toImmutableMap( new HashMap<>() );
 	}
 
 	private static class TrackingEnabledStrategyBuilder {
-		private final PredefinedScopeBeanMetaDataManager beanMetaDataManager;
+		private final Map<Class<?>, BeanMetaData<?>> rawBeanMetaDataMap;
 		private final Map<Class<?>, Boolean> classToBeanTrackingEnabled;
 
-		TrackingEnabledStrategyBuilder(PredefinedScopeBeanMetaDataManager beanMetaDataManager) {
-			this.beanMetaDataManager = beanMetaDataManager;
-			this.classToBeanTrackingEnabled = new HashMap<>( beanMetaDataManager.getBeanMetaData().size() );
+		TrackingEnabledStrategyBuilder(Map<Class<?>, BeanMetaData<?>> rawBeanMetaDataMap) {
+			this.rawBeanMetaDataMap = rawBeanMetaDataMap;
+			this.classToBeanTrackingEnabled = CollectionHelper.newHashMap( rawBeanMetaDataMap.size() );
 		}
 
 		public Map<Class<?>, Boolean> build() {
 			final Set<Class<?>> beanClassesInPath = new HashSet<>();
-			for ( BeanMetaData<?> beanMetadata : beanMetaDataManager.getBeanMetaData() ) {
+			for ( BeanMetaData<?> beanMetadata : rawBeanMetaDataMap.values() ) {
 				determineTrackingRequired( beanMetadata.getBeanClass(), beanClassesInPath );
 				if ( !beanClassesInPath.isEmpty() ) {
 					throw new IllegalStateException( "beanClassesInPath not empty" );
@@ -160,38 +159,38 @@ private boolean determineTrackingRequired(Class<?> beanClass, Set<Class<?>> bean
 
 		// TODO: is there a more concise way to do this?
 		private <T> Set<Class<?>> getDirectCascadedBeanClasses(Class<T> beanClass ) {
-			final BeanMetaData<T> beanMetaData = beanMetaDataManager.getBeanMetaData( beanClass );
-			if ( beanMetaData.hasCascadables() ) {
-				final Set<Class<?>> directCascadedBeanClasses = new HashSet<>();
-				for ( Cascadable cascadable : beanMetaData.getCascadables() ) {
-					final CascadingMetaData cascadingMetaData = cascadable.getCascadingMetaData();
-					if ( cascadingMetaData.isContainer() ) {
-						final ContainerCascadingMetaData containerCascadingMetaData = (ContainerCascadingMetaData) cascadingMetaData;
-						if ( containerCascadingMetaData.getEnclosingType() instanceof ParameterizedType ) {
-							ParameterizedType parameterizedType = (ParameterizedType) containerCascadingMetaData.getEnclosingType();
-							for ( Type typeArgument :  parameterizedType.getActualTypeArguments() ) {
-								if ( typeArgument instanceof Class ) {
-									directCascadedBeanClasses.add( (Class<?>) typeArgument );
-								}
-								else {
-									throw new UnsupportedOperationException( "Only ParameterizedType values of type Class are supported" );
-								}
+			final BeanMetaData<?> beanMetaData = rawBeanMetaDataMap.get( beanClass );
+
+			if ( beanMetaData == null || !beanMetaData.hasCascadables() ) {
+				return Collections.emptySet();
+			}
+
+			final Set<Class<?>> directCascadedBeanClasses = new HashSet<>();
+			for ( Cascadable cascadable : beanMetaData.getCascadables() ) {
+				final CascadingMetaData cascadingMetaData = cascadable.getCascadingMetaData();
+				if ( cascadingMetaData.isContainer() ) {
+					final ContainerCascadingMetaData containerCascadingMetaData = (ContainerCascadingMetaData) cascadingMetaData;
+					if ( containerCascadingMetaData.getEnclosingType() instanceof ParameterizedType ) {
+						ParameterizedType parameterizedType = (ParameterizedType) containerCascadingMetaData.getEnclosingType();
+						for ( Type typeArgument :  parameterizedType.getActualTypeArguments() ) {
+							if ( typeArgument instanceof Class ) {
+								directCascadedBeanClasses.add( (Class<?>) typeArgument );
+							}
+							else {
+								throw new UnsupportedOperationException( "Only ParameterizedType values of type Class are supported" );
 							}
-						}
-						else {
-							throw new UnsupportedOperationException( "Non-parameterized containers are not supported yet." );
 						}
 					}
 					else {
-						// TODO: For now, assume non-container Cascadables are always beans. Truee???
-						directCascadedBeanClasses.add( (Class<?>) cascadable.getCascadableType() );
+						throw new UnsupportedOperationException( "Non-parameterized containers are not supported yet." );
 					}
 				}
-				return directCascadedBeanClasses;
-			}
-			else {
-				return Collections.emptySet();
+				else {
+					// TODO: For now, assume non-container Cascadables are always beans. Truee???
+					directCascadedBeanClasses.add( (Class<?>) cascadable.getCascadableType() );
+				}
 			}
+			return directCascadedBeanClasses;
 		}
 
 		private boolean register(Class<?> beanClass, boolean isBeanTrackingEnabled) {
@@ -212,21 +211,21 @@ public boolean isEnabledForBean(Class<?> rootBeanClass, boolean hasCascadables)
 	}
 
 	@Override
-	public boolean isEnabledForReturnValue(Executable executable, boolean hasCascadables) {
+	public boolean isEnabledForReturnValue(Signature signature, boolean hasCascadables) {
 		if ( !hasCascadables ) {
 			return false;
 		}
 
-		return trackingEnabledForReturnValues.getOrDefault( executable, true );
+		return trackingEnabledForReturnValues.getOrDefault( signature, true );
 	}
 
 	@Override
-	public boolean isEnabledForParameters(Executable executable, boolean hasCascadables) {
+	public boolean isEnabledForParameters(Signature signature, boolean hasCascadables) {
 		if ( !hasCascadables ) {
 			return false;
 		}
 
-		return trackingEnabledForParameters.getOrDefault( executable, true );
+		return trackingEnabledForParameters.getOrDefault( signature, true );
 	}
 
 	@Override

engine/src/main/java/org/hibernate/validator/internal/engine/tracking/PredefinedScopeProcessedBeansTrackingStrategy.java

@@ -6,15 +6,15 @@
  */
 package org.hibernate.validator.internal.engine.tracking;
 
-import java.lang.reflect.Executable;
+import org.hibernate.validator.internal.properties.Signature;
 
 public interface ProcessedBeansTrackingStrategy {
 
 	boolean isEnabledForBean(Class<?> beanClass, boolean hasCascadables);
 
-	boolean isEnabledForReturnValue(Executable executable, boolean hasCascadables);
+	boolean isEnabledForReturnValue(Signature signature, boolean hasCascadables);
 
-	boolean isEnabledForParameters(Executable executable, boolean hasCascadables);
+	boolean isEnabledForParameters(Signature signature, boolean hasCascadables);
 
 	void clear();
 }

engine/src/main/java/org/hibernate/validator/internal/engine/tracking/ProcessedBeansTrackingStrategy.java

@@ -37,7 +37,7 @@ class BeanValidationContext<T> extends AbstractValidationContext<T> {
 			BeanMetaData<T> rootBeanMetaData
 	) {
 		super( constraintValidatorManager, constraintValidatorFactory, validatorScopedContext, traversableResolver, constraintValidatorInitializationContext,
-				rootBean, rootBeanClass, rootBeanMetaData, rootBeanMetaData.isTrackingRequired()
+				rootBean, rootBeanClass, rootBeanMetaData, rootBeanMetaData.isTrackingEnabled()
 		);
 	}