[value-context-changes] Return metadata hierarchy instead of a class one

Author: marko-bekhta

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

@@ -456,8 +456,7 @@ private <U> void validateConstraintsForDefaultGroup(BaseBeanValidationContext<?>
 		final Map<Class<?>, Class<?>> validatedInterfaces = new HashMap<>();
 
 		// evaluating the constraints of a bean per class in hierarchy, this is necessary to detect potential default group re-definitions
-		for ( Class<? super U> clazz : beanMetaData.getClassHierarchy() ) {
-			BeanMetaData<? super U> hostingBeanMetaData = beanMetaDataManager.getBeanMetaData( clazz );
+		for ( BeanMetaData<? super U> hostingBeanMetaData : beanMetaData.getBeanMetadataHierarchy() ) {
 			boolean defaultGroupSequenceIsRedefined = hostingBeanMetaData.isDefaultGroupSequenceRedefined();
 
 			// if the current class redefined the default group sequence, this sequence has to be applied to all the class hierarchy.
@@ -470,7 +469,7 @@ private <U> void validateConstraintsForDefaultGroup(BaseBeanValidationContext<?>
 						boolean validationSuccessful = true;
 
 						for ( Group defaultSequenceMember : groupOfGroups ) {
-							validationSuccessful = validateConstraintsForSingleDefaultGroupElement( validationContext, valueContext, validatedInterfaces, clazz,
+							validationSuccessful = validateConstraintsForSingleDefaultGroupElement( validationContext, valueContext, validatedInterfaces, hostingBeanMetaData.getBeanClass(),
 									metaConstraints, defaultSequenceMember );
 						}
 
@@ -485,7 +484,7 @@ private <U> void validateConstraintsForDefaultGroup(BaseBeanValidationContext<?>
 			// fast path in case the default group sequence hasn't been redefined
 			else {
 				Set<MetaConstraint<?>> metaConstraints = hostingBeanMetaData.getDirectMetaConstraints();
-				validateConstraintsForSingleDefaultGroupElement( validationContext, valueContext, validatedInterfaces, clazz, metaConstraints,
+				validateConstraintsForSingleDefaultGroupElement( validationContext, valueContext, validatedInterfaces, hostingBeanMetaData.getBeanClass(), metaConstraints,
 						Group.DEFAULT_GROUP );
 				validationContext.markCurrentBeanAsProcessed( valueContext );
 			}

engine/src/main/java/org/hibernate/validator/internal/metadata/BeanMetaDataManagerImpl.java

@@ -193,7 +193,7 @@ private <T> BeanMetaDataImpl<T> createBeanMetaData(Class<T> clazz) {
 			}
 		}
 
-		return builder.build();
+		return builder.build( this );
 	}
 
 	/**

engine/src/main/java/org/hibernate/validator/internal/metadata/PredefinedScopeBeanMetaDataManager.java

@@ -74,15 +74,13 @@ public PredefinedScopeBeanMetaDataManager(ConstraintCreationContext constraintCr
 		Map<Class<?>, BeanMetaData<?>> tmpBeanMetadataMap = new HashMap<>();
 
 		for ( Class<?> validatedClass : beanClassesToInitialize ) {
-			@SuppressWarnings("unchecked")
-			List<Class<?>> classHierarchy = (List<Class<?>>) (Object) ClassHierarchyHelper.getHierarchy( validatedClass, Filters.excludeInterfaces() );
-
-			// note that the hierarchy also contains the initial class
-			for ( Class<?> hierarchyElement : classHierarchy ) {
-				tmpBeanMetadataMap.put( beanMetaDataClassNormalizer.normalize( hierarchyElement ),
-						createBeanMetaData( constraintCreationContext, executableHelper, parameterNameProvider,
-								javaBeanHelper, validationOrderGenerator, optionalMetaDataProviders, methodValidationConfiguration,
-								metaDataProviders, hierarchyElement ) );
+			BeanMetaData<?> beanMetaData = createBeanMetaData( this, constraintCreationContext, executableHelper, parameterNameProvider,
+					javaBeanHelper, validationOrderGenerator, optionalMetaDataProviders, methodValidationConfiguration,
+					metaDataProviders, validatedClass );
+
+			tmpBeanMetadataMap.put( validatedClass, beanMetaData );
+			for ( BeanMetaData<?> metaData : beanMetaData.getBeanMetadataHierarchy() ) {
+				tmpBeanMetadataMap.put( metaData.getBeanClass(), metaData );
 			}
 		}
 
@@ -115,7 +113,8 @@ public void clear() {
 	 *
 	 * @return A bean meta data object for the given type.
 	 */
-	private static <T> BeanMetaDataImpl<T> createBeanMetaData(ConstraintCreationContext constraintCreationContext,
+	private static <T> BeanMetaDataImpl<T> createBeanMetaData(BeanMetaDataManager beanMetaDataManager,
+			ConstraintCreationContext constraintCreationContext,
 			ExecutableHelper executableHelper,
 			ExecutableParameterNameProvider parameterNameProvider,
 			JavaBeanHelper javaBeanHelper,
@@ -134,7 +133,7 @@ private static <T> BeanMetaDataImpl<T> createBeanMetaData(ConstraintCreationCont
 			}
 		}
 
-		return builder.build();
+		return builder.build( beanMetaDataManager );
 	}
 
 	/**

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

@@ -112,5 +112,5 @@ public interface BeanMetaData<T> extends Validatable {
 	 * @return Returns a list of classes representing the class hierarchy for the entity. The list start with the
 	 *         element itself and goes up the hierarchy chain. Interfaces are not included.
 	 */
-	List<Class<? super T>> getClassHierarchy();
+	List<BeanMetaData<? super T>> getBeanMetadataHierarchy();
 }

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

@@ -14,6 +14,7 @@
 import org.hibernate.validator.internal.engine.ConstraintCreationContext;
 import org.hibernate.validator.internal.engine.MethodValidationConfiguration;
 import org.hibernate.validator.internal.engine.groups.ValidationOrderGenerator;
+import org.hibernate.validator.internal.metadata.BeanMetaDataManager;
 import org.hibernate.validator.internal.metadata.raw.BeanConfiguration;
 import org.hibernate.validator.internal.metadata.raw.ConfigurationSource;
 import org.hibernate.validator.internal.metadata.raw.ConstrainedElement;
@@ -126,14 +127,15 @@ private void addMetaDataToBuilder(ConstrainedElement constrainableElement, Set<B
 		);
 	}
 
-	public BeanMetaDataImpl<T> build() {
+	public BeanMetaDataImpl<T> build(BeanMetaDataManager beanMetaDataManager) {
 		Set<ConstraintMetaData> aggregatedElements = newHashSet();
 
 		for ( BuilderDelegate builder : builders ) {
 			aggregatedElements.addAll( builder.build() );
 		}
 
 		return new BeanMetaDataImpl<>(
+				beanMetaDataManager,
 				beanClass,
 				defaultGroupSequence,
 				defaultGroupSequenceProvider,

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

@@ -30,6 +30,7 @@
 import org.hibernate.validator.internal.engine.groups.Sequence;
 import org.hibernate.validator.internal.engine.groups.ValidationOrder;
 import org.hibernate.validator.internal.engine.groups.ValidationOrderGenerator;
+import org.hibernate.validator.internal.metadata.BeanMetaDataManager;
 import org.hibernate.validator.internal.metadata.core.MetaConstraint;
 import org.hibernate.validator.internal.metadata.descriptor.BeanDescriptorImpl;
 import org.hibernate.validator.internal.metadata.descriptor.ConstraintDescriptorImpl;
@@ -138,11 +139,11 @@ public final class BeanMetaDataImpl<T> implements BeanMetaData<T> {
 	private final ValidationOrder validationOrder;
 
 	/**
-	 * The class hierarchy for this class starting with the class itself going up the inheritance chain. Interfaces
+	 * The bean metadata hierarchy for this class starting with the class itself going up the inheritance chain. Interfaces
 	 * are not included.
 	 */
 	@Immutable
-	private final List<Class<? super T>> classHierarchyWithoutInterfaces;
+	private final List<BeanMetaData<? super T>> beanMetadataHierarchyWithoutInterfaces;
 
 	/**
 	 * {code true} if the default group sequence is redefined, either via a group sequence redefinition or a group
@@ -168,12 +169,11 @@ public final class BeanMetaDataImpl<T> implements BeanMetaData<T> {
 	 * @param defaultGroupSequenceProvider The default group sequence provider if set.
 	 * @param constraintMetaDataSet All constraint meta data relating to the represented type.
 	 */
-	public BeanMetaDataImpl(Class<T> beanClass,
+	public BeanMetaDataImpl(BeanMetaDataManager beanMetaDataManager, Class<T> beanClass,
 							List<Class<?>> defaultGroupSequence,
 							DefaultGroupSequenceProvider<? super T> defaultGroupSequenceProvider,
 							Set<ConstraintMetaData> constraintMetaDataSet,
 							ValidationOrderGenerator validationOrderGenerator) {
-
 		this.validationOrderGenerator = validationOrderGenerator;
 		this.beanClass = beanClass;
 		this.propertyMetaDataMap = newHashMap();
@@ -219,10 +219,20 @@ else if ( constraintMetaData.getKind() == ElementKind.BEAN ) {
 		this.cascadedProperties = CollectionHelper.toImmutableSet( cascadedProperties );
 		this.allMetaConstraints = CollectionHelper.toImmutableSet( allMetaConstraints );
 
-		this.classHierarchyWithoutInterfaces = CollectionHelper.toImmutableList( ClassHierarchyHelper.getHierarchy(
+		// get the metadata for all other classes in hierarchy:
+		List<Class<? super T>> hierarchy = ClassHierarchyHelper.getHierarchy(
 				beanClass,
 				Filters.excludeInterfaces()
-		) );
+		);
+		List<BeanMetaData<? super T>> beanMetadataHierarchy = new ArrayList<>( hierarchy.size() );
+		// metadata for a class `beanClass` should go as a first element in the list
+		beanMetadataHierarchy.add( this );
+		for ( int index = 1; index < hierarchy.size(); index++ ) {
+			beanMetadataHierarchy.add( beanMetaDataManager.getBeanMetaData( hierarchy.get( index ) ) );
+		}
+
+		this.beanMetadataHierarchyWithoutInterfaces = CollectionHelper.toImmutableList( beanMetadataHierarchy );
+
 
 		DefaultGroupSequenceContext<? super T> defaultGroupContext = getDefaultGroupSequenceData( beanClass, defaultGroupSequence, defaultGroupSequenceProvider, validationOrderGenerator );
 		this.defaultGroupSequenceProvider = defaultGroupContext.defaultGroupSequenceProvider;
@@ -352,8 +362,8 @@ public boolean isDefaultGroupSequenceRedefined() {
 	}
 
 	@Override
-	public List<Class<? super T>> getClassHierarchy() {
-		return classHierarchyWithoutInterfaces;
+	public List<BeanMetaData<? super T>> getBeanMetadataHierarchy() {
+		return beanMetadataHierarchyWithoutInterfaces;
 	}
 
 	private static BeanDescriptor createBeanDescriptor(Class<?> beanClass, Set<MetaConstraint<?>> allMetaConstraints,