[value-context-changes] Delegate retrieving bean metadata to CascadingMetaData

As in case of property holders we would need to produce metadata not based
on a class of a current object at runtime but based on a string representing
the constraint mapping, we need to delegate this to cascading metadata as
that's the place where this information will be stored.

Author: marko-bekhta

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

@@ -621,7 +621,7 @@ private void validateCascadedAnnotatedObjectForCurrentGroup(Object value, BaseBe
 		// already and need only to pass the current element
 		ValidationOrder validationOrder = validationOrderGenerator.getValidationOrder( currentGroup, currentGroup != originalGroup );
 
-		BeanValueContext<?, Object> cascadedValueContext = buildNewLocalExecutionContext( valueContext, value );
+		BeanValueContext<?, Object> cascadedValueContext = buildNewLocalExecutionContext( cascadingMetaData, valueContext, value );
 
 		validateInContext( validationContext, cascadedValueContext, validationOrder );
 	}
@@ -699,7 +699,7 @@ private void doValidate(Object value, String nodeName) {
 			// already and need only to pass the current element
 			ValidationOrder validationOrder = validationOrderGenerator.getValidationOrder( currentGroup, currentGroup != originalGroup );
 
-			BeanValueContext<?, Object> cascadedValueContext = buildNewLocalExecutionContext( valueContext, value );
+			BeanValueContext<?, Object> cascadedValueContext = buildNewLocalExecutionContext( cascadingMetaData, valueContext, value );
 
 			if ( cascadingMetaData.getDeclaredContainerClass() != null ) {
 				cascadedValueContext.setTypeParameter( cascadingMetaData.getDeclaredContainerClass(), cascadingMetaData.getDeclaredTypeParameterIndex() );
@@ -712,7 +712,7 @@ private void doValidate(Object value, String nodeName) {
 
 			// Cascade validation to container elements if we are dealing with a container element
 			if ( cascadingMetaData.hasContainerElementsMarkedForCascading() ) {
-				ValueContext<?, Object> cascadedTypeArgumentValueContext = buildNewLocalExecutionContext( valueContext, value );
+				ValueContext<?, Object> cascadedTypeArgumentValueContext = buildNewLocalExecutionContext( cascadingMetaData, valueContext, value );
 				if ( cascadingMetaData.getTypeParameter() != null ) {
 					cascadedValueContext.setTypeParameter( cascadingMetaData.getDeclaredContainerClass(), cascadingMetaData.getDeclaredTypeParameterIndex() );
 				}
@@ -761,14 +761,13 @@ private void validateCascadedContainerElementsInContext(Object value, BaseBeanVa
 		}
 	}
 
-	private BeanValueContext<?, Object> buildNewLocalExecutionContext(ValueContext<?, ?> valueContext, Object value) {
+	private BeanValueContext<?, Object> buildNewLocalExecutionContext(CascadingMetaData cascadingMetaData, ValueContext<?, ?> valueContext, Object value) {
 		BeanValueContext<?, Object> newValueContext;
 		Contracts.assertNotNull( value, "value cannot be null" );
-		BeanMetaData<?> beanMetaData = beanMetaDataManager.getBeanMetaData( value.getClass() );
 		newValueContext = ValueContexts.getLocalExecutionContextForBean(
 				validatorScopedContext.getParameterNameProvider(),
 				value,
-				beanMetaData,
+				cascadingMetaData.getBeanMetaDataForCascadable( beanMetaDataManager, value ),
 				valueContext.getPropertyPath()
 		);
 		newValueContext.setCurrentValidatedValue( value );

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

@@ -15,6 +15,7 @@
 import org.hibernate.validator.internal.engine.valueextraction.AnnotatedObject;
 import org.hibernate.validator.internal.engine.valueextraction.ArrayElement;
 import org.hibernate.validator.internal.engine.valueextraction.ValueExtractorManager;
+import org.hibernate.validator.internal.metadata.BeanMetaDataManager;
 
 /**
  * An aggregated view of the cascading validation metadata. Note that it also includes the cascading validation metadata
@@ -59,4 +60,8 @@ public interface CascadingMetaData {
 	 * time.
 	 */
 	CascadingMetaData addRuntimeContainerSupport(ValueExtractorManager valueExtractorManager, Class<?> valueClass);
+
+	default BeanMetaData<?> getBeanMetaDataForCascadable(BeanMetaDataManager beanMetaDataManager, Object value) {
+		return beanMetaDataManager.getBeanMetaData( value.getClass() );
+	}
 }