Skip to content

Commit

Permalink
HV-1441 Some naming improvements to improve consistency
Browse files Browse the repository at this point in the history
  • Loading branch information
@gsmet
gsmet committed Aug 3, 2017
1 parent e0f480f commit 99551f9
Show file tree
Hide file tree
Showing 15 changed files with 44 additions and 42 deletions.
6 changes: 3 additions & 3 deletions engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java
View file
Expand Up @@ -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() );
Expand Down Expand Up @@ -619,7 +619,7 @@ private void validateCascadedAnnotatedObjectForCurrentGroup(Object value, Valida
private void validateCascadedContainerElementsForCurrentGroup(Object value, ValidationContext<?> validationContext, ValueContext<?, ?> valueContext,
List<ContainerCascadingMetaData> containerElementTypesCascadingMetaData) {
for ( ContainerCascadingMetaData cascadingMetaData : containerElementTypesCascadingMetaData ) {
if ( !cascadingMetaData.isMarkedForCascadingOnElementOrContainerElements() ) {
if ( !cascadingMetaData.isMarkedForCascadingOnAnnotatedObjectOrContainerElements() ) {
continue;
}

Expand Down Expand Up @@ -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<?, Object> cascadedTypeArgumentValueContext = buildNewLocalExecutionContext( valueContext, value );
if ( cascadingMetaData.getTypeParameter() != null ) {
cascadedValueContext.setTypeParameter( cascadingMetaData.getDeclaredContainerClass(), cascadingMetaData.getDeclaredTypeParameter() );
Expand Down
4 changes: 2 additions & 2 deletions ...java/org/hibernate/validator/internal/metadata/aggregated/AbstractConstraintMetaData.java
View file
Expand Up @@ -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 ) );
}

Expand Down Expand Up @@ -264,7 +264,7 @@ private void addCascadingMetaData(List<TypeVariable<?>> path, ContainerCascading
tree.cascading = nestedCascadingMetaData.isCascading();
tree.groupConversionDescriptors = nestedCascadingMetaData.getGroupConversionDescriptors();

if ( nestedCascadingMetaData.isMarkedForCascadingOnElementOrContainerElements() ) {
if ( nestedCascadingMetaData.isMarkedForCascadingOnAnnotatedObjectOrContainerElements() ) {
addCascadingMetaData( nestedPath, nestedCascadingMetaData );
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/org/hibernate/validator/internal/metadata/aggregated/CascadingMetaData.java
View file
Expand Up @@ -32,7 +32,7 @@ public interface CascadingMetaData {

boolean isCascading();

boolean isMarkedForCascadingOnElementOrContainerElements();
boolean isMarkedForCascadingOnAnnotatedObjectOrContainerElements();

Class<?> convertGroup(Class<?> originalGroup);

Expand Down
28 changes: 14 additions & 14 deletions ...n/java/org/hibernate/validator/internal/metadata/aggregated/CascadingMetaDataBuilder.java
View file
Expand Up @@ -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<TypeVariable<?>, CascadingMetaDataBuilder> containerElementTypesCascadingMetaData, Map<Class<?>, Class<?>> groupConversions) {
Expand All @@ -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() {
Expand Down Expand Up @@ -170,12 +170,12 @@ public Map<Class<?>, 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<TypeVariable<?>, CascadingMetaDataBuilder> getContainerElementTypesCascadingMetaData() {
Expand Down
10 changes: 5 additions & 5 deletions ...java/org/hibernate/validator/internal/metadata/aggregated/ContainerCascadingMetaData.java
View file
Expand Up @@ -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
Expand All @@ -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()
);
}

Expand All @@ -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();
Expand Down Expand Up @@ -159,8 +159,8 @@ public boolean isCascading() {
}

@Override
public boolean isMarkedForCascadingOnElementOrContainerElements() {
return markedForCascadingOnElementOrContainerElements;
public boolean isMarkedForCascadingOnAnnotatedObjectOrContainerElements() {
return markedForCascadingOnAnnotatedObjectOrContainerElements;
}

public List<ContainerCascadingMetaData> getContainerElementTypesCascadingMetaData() {
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/org/hibernate/validator/internal/metadata/aggregated/ExecutableMetaData.java
View file
Expand Up @@ -95,7 +95,7 @@ private ExecutableMetaData(
returnType,
returnValueConstraints,
returnValueContainerElementConstraints,
cascadingMetaData.isMarkedForCascadingOnElementOrContainerElements(),
cascadingMetaData.isMarkedForCascadingOnAnnotatedObjectOrContainerElements(),
isConstrained
);

Expand Down
2 changes: 1 addition & 1 deletion ...e/src/main/java/org/hibernate/validator/internal/metadata/aggregated/MetaDataBuilder.java
View file
Expand Up @@ -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();
}

/**
Expand Down
2 changes: 1 addition & 1 deletion ...a/org/hibernate/validator/internal/metadata/aggregated/NonContainerCascadingMetaData.java
View file
Expand Up @@ -76,7 +76,7 @@ public boolean isCascading() {
}

@Override
public boolean isMarkedForCascadingOnElementOrContainerElements() {
public boolean isMarkedForCascadingOnAnnotatedObjectOrContainerElements() {
return cascading;
}

Expand Down
4 changes: 2 additions & 2 deletions ...src/main/java/org/hibernate/validator/internal/metadata/aggregated/ParameterMetaData.java
View file
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions .../src/main/java/org/hibernate/validator/internal/metadata/aggregated/PropertyMetaData.java
View file
Expand Up @@ -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 );
Expand Down
4 changes: 2 additions & 2 deletions ...c/main/java/org/hibernate/validator/internal/metadata/aggregated/ReturnValueMetaData.java
View file
Expand Up @@ -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()
);


Expand Down
8 changes: 4 additions & 4 deletions ...ta/aggregated/rule/ParallelMethodsMustNotDefineGroupConversionForCascadedReturnValue.java
View file
Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions ...al/metadata/aggregated/rule/ReturnValueMayOnlyBeMarkedOnceAsCascadedPerHierarchyLine.java
View file
Expand Up @@ -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(),
Expand Down
3 changes: 2 additions & 1 deletion ...lidator/internal/metadata/aggregated/rule/VoidMethodsMustNotBeReturnValueConstrained.java
View file
Expand Up @@ -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() );
}
}
Expand Down
3 changes: 2 additions & 1 deletion ...c/main/java/org/hibernate/validator/internal/metadata/raw/AbstractConstrainedElement.java
View file
Expand Up @@ -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
Expand Down

0 comments on commit 99551f9

Please sign in to comment.