HV-1481 Move the logic out of the flow of ValidatorImpl

Author: gsmet

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

@@ -54,7 +54,6 @@
 import org.hibernate.validator.internal.metadata.aggregated.CascadingMetaData;
 import org.hibernate.validator.internal.metadata.aggregated.ContainerCascadingMetaData;
 import org.hibernate.validator.internal.metadata.aggregated.ExecutableMetaData;
-import org.hibernate.validator.internal.metadata.aggregated.NonContainerCascadingMetaData;
 import org.hibernate.validator.internal.metadata.aggregated.ParameterMetaData;
 import org.hibernate.validator.internal.metadata.aggregated.PropertyMetaData;
 import org.hibernate.validator.internal.metadata.aggregated.ReturnValueMetaData;
@@ -581,28 +580,15 @@ private void validateCascadedConstraints(ValidationContext<?> validationContext,
 				CascadingMetaData cascadingMetaData = cascadable.getCascadingMetaData();
 
 				if ( value != null ) {
+					CascadingMetaData effectiveCascadingMetaData = cascadingMetaData.addRuntimeLegacyCollectionSupport( value.getClass() );
+
 					// validate cascading on the annotated object
-					if ( cascadingMetaData.isCascading() ) {
-						validateCascadedAnnotatedObjectForCurrentGroup( value, validationContext, valueContext, cascadingMetaData );
-
-						if ( !cascadingMetaData.isContainer() ) {
-							// We might be in the case where the legacy @Valid support for collections and arrays has been used on a type for which
-							// it cannot be detected at bootstrap time: thus we need to check with the runtime type.
-							// Note that if it has been detected at bootstrap time, the cascading metadata has been modified to include it
-							// and we are then in the container case.
-							NonContainerCascadingMetaData nonContainerCascadingMetaData = cascadingMetaData.as( NonContainerCascadingMetaData.class );
-							ContainerCascadingMetaData legacyContainerCascadingMetaData = nonContainerCascadingMetaData
-									.getLegacyContainerCascadingMetaData( value.getClass() );
-
-							if ( legacyContainerCascadingMetaData != null ) {
-								validateCascadedContainerElementsForCurrentGroup( value, validationContext, valueContext,
-										Collections.singletonList( legacyContainerCascadingMetaData ) );
-							}
-						}
+					if ( effectiveCascadingMetaData.isCascading() ) {
+						validateCascadedAnnotatedObjectForCurrentGroup( value, validationContext, valueContext, effectiveCascadingMetaData );
 					}
 
-					if ( cascadingMetaData.isContainer() ) {
-						ContainerCascadingMetaData containerCascadingMetaData = cascadingMetaData.as( ContainerCascadingMetaData.class );
+					if ( effectiveCascadingMetaData.isContainer() ) {
+						ContainerCascadingMetaData containerCascadingMetaData = effectiveCascadingMetaData.as( ContainerCascadingMetaData.class );
 
 						if ( containerCascadingMetaData.hasContainerElementsMarkedForCascading() ) {
 							// validate cascading on the container elements

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

@@ -41,4 +41,19 @@ public interface CascadingMetaData {
 	boolean isContainer();
 
 	<T extends CascadingMetaData> T as(Class<T> clazz);
+
+	/**
+	 * Add additional cascading metadata when:
+	 * <ul>
+	 * <li>the element is marked with {@code @Valid},</li>
+	 * <li>the runtime type of the element is collection based (e.g. collections, maps or arrays),</li>
+	 * <li>and the static type isn't collection based.</li>
+	 * </ul>
+	 * <p>
+	 * An example of this particular situation is: {@code @Valid private Object element = new ArrayList<String>()}.
+	 * <p>
+	 * Note that if the static type is collection based, the cascading information are directly included at bootstrap
+	 * time.
+	 */
+	CascadingMetaData addRuntimeLegacyCollectionSupport(Class<?> valueClass);
 }

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

@@ -131,6 +131,19 @@ private ContainerCascadingMetaData(ValueExtractorManager valueExtractorManager,
 		}
 	}
 
+	ContainerCascadingMetaData(Type enclosingType, List<ContainerCascadingMetaData> containerElementTypesCascadingMetaData,
+			GroupConversionHelper groupConversionHelper) {
+		this.enclosingType = enclosingType;
+		this.typeParameter = AnnotatedObject.INSTANCE;
+		this.declaredContainerClass = null;
+		this.declaredTypeParameter = null;
+		this.containerElementTypesCascadingMetaData = containerElementTypesCascadingMetaData;
+		this.cascading = true;
+		this.groupConversionHelper = groupConversionHelper;
+		this.hasContainerElementsMarkedForCascading = true;
+		this.valueExtractorCandidates = Collections.emptySet();
+	}
+
 	ContainerCascadingMetaData(Type enclosingType, TypeVariable<?> typeParameter, Class<?> declaredContainerClass, TypeVariable<?> declaredTypeParameter,
 			GroupConversionHelper groupConversionHelper, Set<ValueExtractorDescriptor> valueExtractorCandidates) {
 		this.enclosingType = enclosingType;
@@ -208,6 +221,11 @@ public <T extends CascadingMetaData> T as(Class<T> clazz) {
 		throw LOG.getUnableToCastException( this, clazz );
 	}
 
+	@Override
+	public CascadingMetaData addRuntimeLegacyCollectionSupport(Class<?> valueClass) {
+		return this;
+	}
+
 	@Override
 	public String toString() {
 		StringBuilder sb = new StringBuilder();

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

@@ -101,7 +101,21 @@ public boolean isContainer() {
 		return false;
 	}
 
-	public ContainerCascadingMetaData getLegacyContainerCascadingMetaData(Class<?> valueClass) {
+	@Override
+	public CascadingMetaData addRuntimeLegacyCollectionSupport(Class<?> valueClass) {
+		if ( !cascading ) {
+			return this;
+		}
+
+		ContainerCascadingMetaData legacyContainerElementCascadingMetaData = getLegacyContainerElementCascadingMetaData( valueClass );
+		if ( legacyContainerElementCascadingMetaData == null ) {
+			return this;
+		}
+
+		return new ContainerCascadingMetaData( valueClass, Collections.singletonList( legacyContainerElementCascadingMetaData ), groupConversionHelper );
+	}
+
+	private ContainerCascadingMetaData getLegacyContainerElementCascadingMetaData(Class<?> valueClass) {
 		if ( List.class.isAssignableFrom( valueClass ) ) {
 			return new ContainerCascadingMetaData( List.class, List.class.getTypeParameters()[0], List.class, List.class.getTypeParameters()[0],
 					groupConversionHelper, LegacyCollectionSupportValueExtractors.LIST );