diff --git a/engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java b/engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java index 01effbead9..a9d97024f0 100644 --- a/engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java +++ b/engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java @@ -583,7 +583,7 @@ private void validateCascadedConstraints(ValidationContext validationContext, validateCascadedAnnotatedObjectForCurrentGroup( value, validationContext, valueContext, cascadingMetaData ); } - if ( cascadingMetaData.isContainer() && cascadingMetaData.isMarkedForCascadingOnElementOrContainerElements() ) { + if ( cascadingMetaData.isContainer() && cascadingMetaData.isMarkedForCascadingOnAnnotatedObjectOrContainerElements() ) { // validate cascading on the container elements validateCascadedContainerElementsForCurrentGroup( value, validationContext, valueContext, cascadingMetaData.as( ContainerCascadingMetaData.class ).getContainerElementTypesCascadingMetaData() ); @@ -619,7 +619,7 @@ private void validateCascadedAnnotatedObjectForCurrentGroup(Object value, Valida private void validateCascadedContainerElementsForCurrentGroup(Object value, ValidationContext validationContext, ValueContext valueContext, List containerElementTypesCascadingMetaData) { for ( ContainerCascadingMetaData cascadingMetaData : containerElementTypesCascadingMetaData ) { - if ( !cascadingMetaData.isMarkedForCascadingOnElementOrContainerElements() ) { + if ( !cascadingMetaData.isMarkedForCascadingOnAnnotatedObjectOrContainerElements() ) { continue; } @@ -701,7 +701,7 @@ private void doValidate(Object value, String nodeName) { } // Cascade validation to container elements if we are dealing with a container element - if ( cascadingMetaData.isMarkedForCascadingOnElementOrContainerElements() ) { + if ( cascadingMetaData.isMarkedForCascadingOnAnnotatedObjectOrContainerElements() ) { ValueContext cascadedTypeArgumentValueContext = buildNewLocalExecutionContext( valueContext, value ); if ( cascadingMetaData.getTypeParameter() != null ) { cascadedValueContext.setTypeParameter( cascadingMetaData.getDeclaredContainerClass(), cascadingMetaData.getDeclaredTypeParameter() ); diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/AbstractConstraintMetaData.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/AbstractConstraintMetaData.java index 2e78b6837c..d0760f45ea 100644 --- a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/AbstractConstraintMetaData.java +++ b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/AbstractConstraintMetaData.java @@ -229,7 +229,7 @@ private static ContainerElementMetaDataTree of(CascadingMetaData cascadingMetaDa containerElementMetaConstraintTree.addConstraint( constraintPath, constraint ); } - if ( cascadingMetaData != null && cascadingMetaData.isContainer() && cascadingMetaData.isMarkedForCascadingOnElementOrContainerElements() ) { + if ( cascadingMetaData != null && cascadingMetaData.isContainer() && cascadingMetaData.isMarkedForCascadingOnAnnotatedObjectOrContainerElements() ) { containerElementMetaConstraintTree.addCascadingMetaData( new ArrayList<>(), cascadingMetaData.as( ContainerCascadingMetaData.class ) ); } @@ -264,7 +264,7 @@ private void addCascadingMetaData(List> path, ContainerCascading tree.cascading = nestedCascadingMetaData.isCascading(); tree.groupConversionDescriptors = nestedCascadingMetaData.getGroupConversionDescriptors(); - if ( nestedCascadingMetaData.isMarkedForCascadingOnElementOrContainerElements() ) { + if ( nestedCascadingMetaData.isMarkedForCascadingOnAnnotatedObjectOrContainerElements() ) { addCascadingMetaData( nestedPath, nestedCascadingMetaData ); } } diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/CascadingMetaData.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/CascadingMetaData.java index 8234f85877..066ce15839 100644 --- a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/CascadingMetaData.java +++ b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/CascadingMetaData.java @@ -32,7 +32,7 @@ public interface CascadingMetaData { boolean isCascading(); - boolean isMarkedForCascadingOnElementOrContainerElements(); + boolean isMarkedForCascadingOnAnnotatedObjectOrContainerElements(); Class convertGroup(Class originalGroup); diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/CascadingMetaDataBuilder.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/CascadingMetaDataBuilder.java index f24cc45037..c814de1cb3 100644 --- a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/CascadingMetaDataBuilder.java +++ b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/CascadingMetaDataBuilder.java @@ -85,12 +85,12 @@ public class CascadingMetaDataBuilder { /** * Whether the constrained element is directly or indirectly (via type arguments) marked for cascaded validation. */ - private final boolean markedForCascadingOnElementOrContainerElements; + private final boolean markedForCascadingOnAnnotatedObjectOrContainerElements; /** * Whether the constrained element has directly or indirectly (via type arguments) group conversions defined. */ - private final boolean hasGroupConversionsOnElementOrContainerElements; + private final boolean hasGroupConversionsOnAnnotatedObjectOrContainerElements; public CascadingMetaDataBuilder(Type enclosingType, TypeVariable typeParameter, boolean cascading, Map, CascadingMetaDataBuilder> containerElementTypesCascadingMetaData, Map, Class> groupConversions) { @@ -110,16 +110,16 @@ private CascadingMetaDataBuilder(Type enclosingType, TypeVariable typeParamet this.groupConversions = CollectionHelper.toImmutableMap( groupConversions ); this.containerElementTypesCascadingMetaData = CollectionHelper.toImmutableMap( containerElementTypesCascadingMetaData ); - boolean tmpMarkedForCascadingOnElementOrContainerElements = cascading; - boolean tmpHasGroupConversionsOnElementOrContainerElements = !groupConversions.isEmpty(); + boolean tmpMarkedForCascadingOnAnnotatedObjectOrContainerElements = cascading; + boolean tmpHasGroupConversionsOnAnnotatedObjectOrContainerElements = !groupConversions.isEmpty(); for ( CascadingMetaDataBuilder nestedCascadingTypeParameter : containerElementTypesCascadingMetaData.values() ) { - tmpMarkedForCascadingOnElementOrContainerElements = tmpMarkedForCascadingOnElementOrContainerElements - || nestedCascadingTypeParameter.markedForCascadingOnElementOrContainerElements; - tmpHasGroupConversionsOnElementOrContainerElements = tmpHasGroupConversionsOnElementOrContainerElements - || nestedCascadingTypeParameter.hasGroupConversionsOnElementOrContainerElements; + tmpMarkedForCascadingOnAnnotatedObjectOrContainerElements = tmpMarkedForCascadingOnAnnotatedObjectOrContainerElements + || nestedCascadingTypeParameter.markedForCascadingOnAnnotatedObjectOrContainerElements; + tmpHasGroupConversionsOnAnnotatedObjectOrContainerElements = tmpHasGroupConversionsOnAnnotatedObjectOrContainerElements + || nestedCascadingTypeParameter.hasGroupConversionsOnAnnotatedObjectOrContainerElements; } - markedForCascadingOnElementOrContainerElements = tmpMarkedForCascadingOnElementOrContainerElements; - hasGroupConversionsOnElementOrContainerElements = tmpHasGroupConversionsOnElementOrContainerElements; + markedForCascadingOnAnnotatedObjectOrContainerElements = tmpMarkedForCascadingOnAnnotatedObjectOrContainerElements; + hasGroupConversionsOnAnnotatedObjectOrContainerElements = tmpHasGroupConversionsOnAnnotatedObjectOrContainerElements; } public static CascadingMetaDataBuilder nonCascading() { @@ -170,12 +170,12 @@ public Map, Class> getGroupConversions() { return groupConversions; } - public boolean isMarkedForCascadingOnElementOrContainerElements() { - return markedForCascadingOnElementOrContainerElements; + public boolean isMarkedForCascadingOnAnnotatedObjectOrContainerElements() { + return markedForCascadingOnAnnotatedObjectOrContainerElements; } - public boolean hasGroupConversionsOnElementOrContainerElements() { - return hasGroupConversionsOnElementOrContainerElements; + public boolean hasGroupConversionsOnAnnotatedObjectOrContainerElements() { + return hasGroupConversionsOnAnnotatedObjectOrContainerElements; } public Map, CascadingMetaDataBuilder> getContainerElementTypesCascadingMetaData() { diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/ContainerCascadingMetaData.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/ContainerCascadingMetaData.java index ae1cc8f84f..b5eeede7fa 100644 --- a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/ContainerCascadingMetaData.java +++ b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/ContainerCascadingMetaData.java @@ -75,7 +75,7 @@ public class ContainerCascadingMetaData implements CascadingMetaData { /** * Whether the constrained element is directly or indirectly (via type arguments) marked for cascaded validation. */ - private final boolean markedForCascadingOnElementOrContainerElements; + private final boolean markedForCascadingOnAnnotatedObjectOrContainerElements; /** * The set of value extractors which are type compliant and container element compliant with the element where @@ -101,7 +101,7 @@ private ContainerCascadingMetaData(ValueExtractorManager valueExtractorManager, .collect( Collectors.collectingAndThen( Collectors.toList(), CollectionHelper::toImmutableList ) ), cascadingMetaDataBuilder.isCascading(), GroupConversionHelper.of( cascadingMetaDataBuilder.getGroupConversions() ), - cascadingMetaDataBuilder.isMarkedForCascadingOnElementOrContainerElements() + cascadingMetaDataBuilder.isMarkedForCascadingOnAnnotatedObjectOrContainerElements() ); } @@ -115,7 +115,7 @@ private ContainerCascadingMetaData(ValueExtractorManager valueExtractorManager, this.containerElementTypesCascadingMetaData = containerElementTypesCascadingMetaData; this.cascading = cascading; this.groupConversionHelper = groupConversionHelper; - this.markedForCascadingOnElementOrContainerElements = markedForCascadingOnElementOrContainerElements; + this.markedForCascadingOnAnnotatedObjectOrContainerElements = markedForCascadingOnElementOrContainerElements; if ( TypeVariables.isAnnotatedObject( this.typeParameter ) || !markedForCascadingOnElementOrContainerElements ) { this.valueExtractorCandidates = Collections.emptySet(); @@ -159,8 +159,8 @@ public boolean isCascading() { } @Override - public boolean isMarkedForCascadingOnElementOrContainerElements() { - return markedForCascadingOnElementOrContainerElements; + public boolean isMarkedForCascadingOnAnnotatedObjectOrContainerElements() { + return markedForCascadingOnAnnotatedObjectOrContainerElements; } public List getContainerElementTypesCascadingMetaData() { diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/ExecutableMetaData.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/ExecutableMetaData.java index af5740b927..62bb4b272b 100644 --- a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/ExecutableMetaData.java +++ b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/ExecutableMetaData.java @@ -95,7 +95,7 @@ private ExecutableMetaData( returnType, returnValueConstraints, returnValueContainerElementConstraints, - cascadingMetaData.isMarkedForCascadingOnElementOrContainerElements(), + cascadingMetaData.isMarkedForCascadingOnAnnotatedObjectOrContainerElements(), isConstrained ); diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/MetaDataBuilder.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/MetaDataBuilder.java index cd286b0dcb..88ab3ee303 100644 --- a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/MetaDataBuilder.java +++ b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/MetaDataBuilder.java @@ -68,7 +68,7 @@ protected MetaDataBuilder(Class beanClass, ConstraintHelper constraintHelper, public void add(ConstrainedElement constrainedElement) { directConstraints.addAll( adaptConstraints( constrainedElement.getKind(), constrainedElement.getConstraints() ) ); containerElementsConstraints.addAll( adaptConstraints( constrainedElement.getKind(), constrainedElement.getTypeArgumentConstraints() ) ); - isCascading = isCascading || constrainedElement.getCascadingMetaDataBuilder().isMarkedForCascadingOnElementOrContainerElements(); + isCascading = isCascading || constrainedElement.getCascadingMetaDataBuilder().isMarkedForCascadingOnAnnotatedObjectOrContainerElements(); } /** diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/NonContainerCascadingMetaData.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/NonContainerCascadingMetaData.java index 8e36217de5..732392e926 100644 --- a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/NonContainerCascadingMetaData.java +++ b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/NonContainerCascadingMetaData.java @@ -76,7 +76,7 @@ public boolean isCascading() { } @Override - public boolean isMarkedForCascadingOnElementOrContainerElements() { + public boolean isMarkedForCascadingOnAnnotatedObjectOrContainerElements() { return cascading; } diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/ParameterMetaData.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/ParameterMetaData.java index 9cb799ea2b..d175c6e548 100644 --- a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/ParameterMetaData.java +++ b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/ParameterMetaData.java @@ -50,8 +50,8 @@ private ParameterMetaData(int index, type, constraints, containerElementsConstraints, - cascadingMetaData.isMarkedForCascadingOnElementOrContainerElements(), - !constraints.isEmpty() || !containerElementsConstraints.isEmpty() || cascadingMetaData.isMarkedForCascadingOnElementOrContainerElements() + cascadingMetaData.isMarkedForCascadingOnAnnotatedObjectOrContainerElements(), + !constraints.isEmpty() || !containerElementsConstraints.isEmpty() || cascadingMetaData.isMarkedForCascadingOnAnnotatedObjectOrContainerElements() ); this.index = index; diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/PropertyMetaData.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/PropertyMetaData.java index eca2075808..74eb12283f 100644 --- a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/PropertyMetaData.java +++ b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/PropertyMetaData.java @@ -202,8 +202,8 @@ public final void add(ConstrainedElement constrainedElement) { cascadingProperty = cascadingProperty || constrainedElement.getCascadingMetaDataBuilder().isCascading(); - if ( constrainedElement.getCascadingMetaDataBuilder().isMarkedForCascadingOnElementOrContainerElements() || - constrainedElement.getCascadingMetaDataBuilder().hasGroupConversionsOnElementOrContainerElements() ) { + if ( constrainedElement.getCascadingMetaDataBuilder().isMarkedForCascadingOnAnnotatedObjectOrContainerElements() || + constrainedElement.getCascadingMetaDataBuilder().hasGroupConversionsOnAnnotatedObjectOrContainerElements() ) { if ( constrainedElement.getKind() == ConstrainedElementKind.FIELD ) { Field field = ( (ConstrainedField) constrainedElement ).getField(); Cascadable.Builder builder = cascadableBuilders.get( field ); diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/ReturnValueMetaData.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/ReturnValueMetaData.java index 2543aa0ab0..10981ada7c 100644 --- a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/ReturnValueMetaData.java +++ b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/ReturnValueMetaData.java @@ -47,8 +47,8 @@ public ReturnValueMetaData(Type type, type, constraints, containerElementsConstraints, - cascadingMetaData.isMarkedForCascadingOnElementOrContainerElements(), - !constraints.isEmpty() || containerElementsConstraints.isEmpty() || cascadingMetaData.isMarkedForCascadingOnElementOrContainerElements() + cascadingMetaData.isMarkedForCascadingOnAnnotatedObjectOrContainerElements(), + !constraints.isEmpty() || containerElementsConstraints.isEmpty() || cascadingMetaData.isMarkedForCascadingOnAnnotatedObjectOrContainerElements() ); diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/rule/ParallelMethodsMustNotDefineGroupConversionForCascadedReturnValue.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/rule/ParallelMethodsMustNotDefineGroupConversionForCascadedReturnValue.java index 47e0a7937d..d58e5b32ba 100644 --- a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/rule/ParallelMethodsMustNotDefineGroupConversionForCascadedReturnValue.java +++ b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/rule/ParallelMethodsMustNotDefineGroupConversionForCascadedReturnValue.java @@ -18,10 +18,10 @@ public class ParallelMethodsMustNotDefineGroupConversionForCascadedReturnValue e @Override public void apply(ConstrainedExecutable method, ConstrainedExecutable otherMethod) { - boolean isCascaded = method.getCascadingMetaDataBuilder().isMarkedForCascadingOnElementOrContainerElements() || - otherMethod.getCascadingMetaDataBuilder().isMarkedForCascadingOnElementOrContainerElements(); - boolean hasGroupConversions = method.getCascadingMetaDataBuilder().hasGroupConversionsOnElementOrContainerElements() || - otherMethod.getCascadingMetaDataBuilder().hasGroupConversionsOnElementOrContainerElements(); + boolean isCascaded = method.getCascadingMetaDataBuilder().isMarkedForCascadingOnAnnotatedObjectOrContainerElements() || + otherMethod.getCascadingMetaDataBuilder().isMarkedForCascadingOnAnnotatedObjectOrContainerElements(); + boolean hasGroupConversions = method.getCascadingMetaDataBuilder().hasGroupConversionsOnAnnotatedObjectOrContainerElements() || + otherMethod.getCascadingMetaDataBuilder().hasGroupConversionsOnAnnotatedObjectOrContainerElements(); if ( isDefinedOnParallelType( method, otherMethod ) && isCascaded && hasGroupConversions ) { throw log.getMethodsFromParallelTypesMustNotDefineGroupConversionsForCascadedReturnValueException( diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/rule/ReturnValueMayOnlyBeMarkedOnceAsCascadedPerHierarchyLine.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/rule/ReturnValueMayOnlyBeMarkedOnceAsCascadedPerHierarchyLine.java index d46894a573..a30ce63153 100644 --- a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/rule/ReturnValueMayOnlyBeMarkedOnceAsCascadedPerHierarchyLine.java +++ b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/rule/ReturnValueMayOnlyBeMarkedOnceAsCascadedPerHierarchyLine.java @@ -18,8 +18,8 @@ public class ReturnValueMayOnlyBeMarkedOnceAsCascadedPerHierarchyLine extends Me @Override public void apply(ConstrainedExecutable method, ConstrainedExecutable otherMethod) { - if ( method.getCascadingMetaDataBuilder().isMarkedForCascadingOnElementOrContainerElements() && - otherMethod.getCascadingMetaDataBuilder().isMarkedForCascadingOnElementOrContainerElements() && + if ( method.getCascadingMetaDataBuilder().isMarkedForCascadingOnAnnotatedObjectOrContainerElements() && + otherMethod.getCascadingMetaDataBuilder().isMarkedForCascadingOnAnnotatedObjectOrContainerElements() && ( isDefinedOnSubType( method, otherMethod ) || isDefinedOnSubType( otherMethod, method ) ) ) { throw log.getMethodReturnValueMustNotBeMarkedMoreThanOnceForCascadedValidationException( method.getExecutable(), diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/rule/VoidMethodsMustNotBeReturnValueConstrained.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/rule/VoidMethodsMustNotBeReturnValueConstrained.java index c546d4b5e6..f6e1553da6 100644 --- a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/rule/VoidMethodsMustNotBeReturnValueConstrained.java +++ b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/rule/VoidMethodsMustNotBeReturnValueConstrained.java @@ -22,7 +22,8 @@ public class VoidMethodsMustNotBeReturnValueConstrained extends MethodConfigurat public void apply(ConstrainedExecutable executable, ConstrainedExecutable otherExecutable) { if ( ( executable.getExecutable() instanceof Method ) && ( (Method) executable.getExecutable() ).getReturnType() == void.class && - ( !executable.getConstraints().isEmpty() || executable.getCascadingMetaDataBuilder().isMarkedForCascadingOnElementOrContainerElements() ) ) { + ( !executable.getConstraints().isEmpty() + || executable.getCascadingMetaDataBuilder().isMarkedForCascadingOnAnnotatedObjectOrContainerElements() ) ) { throw log.getVoidMethodsMustNotBeConstrainedException( executable.getExecutable() ); } } diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/raw/AbstractConstrainedElement.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/raw/AbstractConstrainedElement.java index f434ecb225..abd925b004 100644 --- a/engine/src/main/java/org/hibernate/validator/internal/metadata/raw/AbstractConstrainedElement.java +++ b/engine/src/main/java/org/hibernate/validator/internal/metadata/raw/AbstractConstrainedElement.java @@ -69,7 +69,8 @@ public CascadingMetaDataBuilder getCascadingMetaDataBuilder() { @Override public boolean isConstrained() { - return cascadingMetaDataBuilder.isMarkedForCascadingOnElementOrContainerElements() || !constraints.isEmpty() || !typeArgumentConstraints.isEmpty(); + return cascadingMetaDataBuilder.isMarkedForCascadingOnAnnotatedObjectOrContainerElements() || !constraints.isEmpty() + || !typeArgumentConstraints.isEmpty(); } @Override