Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Explore FreeForm validation v2 #989

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open

Explore FreeForm validation v2 #989

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f61a93d
[property-holder-preparation] Remove impossible case from ValidatorIm…
marko-bekhta Jun 29, 2018
80a4bb8
[property-holder-preparation] Delegate retrieving bean metadata to Ca…
marko-bekhta Jun 29, 2018
9418a35
[property-holder] Introduce property holder property and property holder
marko-bekhta Jul 8, 2018
415abf7
[property-holder-preparation] Move metadata manager to its own package
marko-bekhta Jul 9, 2018
4a523a8
[property-holder-preparation] Extract bean metadata provider code to its
marko-bekhta Jul 9, 2018
37d4545
[property-holder-preparation] Extract BeanMetaDataBuilder to upper level
marko-bekhta Jul 12, 2018
00a7af7
[property-holder-preparation] Make ConstraintMetaDataManager return m…
marko-bekhta Jul 12, 2018
f75e407
[property-holder] Create implementations of cascading metadata for pr…
marko-bekhta Jul 15, 2018
ac7835f
[property-holder] Make property holder configuration use location bui…
marko-bekhta Jul 18, 2018
92b0696
[property-holder] Introduce dummy metadata provider for property holders
marko-bekhta Jul 19, 2018
4e021be
[property-holder] Introduce method for validating property holders an…
marko-bekhta Jul 19, 2018
9f1b1da
[property-holder] Rework how constraints are validated for default group
marko-bekhta Jul 22, 2018
1807098
[property-holder] Rewrite how cascading constraints are created
marko-bekhta Jul 22, 2018
8076e67
[property-holder] start working on programmatic definition
marko-bekhta Aug 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 12 additions & 21 deletions engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ private void validateCascadedAnnotatedObjectForCurrentGroup(Object value, BaseBe
// already and need only to pass the current element
ValidationOrder validationOrder = validationOrderGenerator.getValidationOrder( currentGroup, currentGroup != originalGroup );

ValueContext<?, Object> cascadedValueContext = buildNewLocalExecutionContext( valueContext, value );
ValueContext<?, Object> cascadedValueContext = buildNewLocalExecutionContext( cascadingMetaData, valueContext, value );

validateInContext( validationContext, cascadedValueContext, validationOrder );
}
Expand Down Expand Up @@ -675,7 +675,7 @@ private void doValidate(Object value, String nodeName) {
// already and need only to pass the current element
ValidationOrder validationOrder = validationOrderGenerator.getValidationOrder( currentGroup, currentGroup != originalGroup );

ValueContext<?, Object> cascadedValueContext = buildNewLocalExecutionContext( valueContext, value );
ValueContext<?, Object> cascadedValueContext = buildNewLocalExecutionContext( cascadingMetaData, valueContext, value );

if ( cascadingMetaData.getDeclaredContainerClass() != null ) {
cascadedValueContext.setTypeParameter( cascadingMetaData.getDeclaredContainerClass(), cascadingMetaData.getDeclaredTypeParameterIndex() );
Expand All @@ -688,7 +688,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() );
}
Expand Down Expand Up @@ -737,25 +737,16 @@ private void validateCascadedContainerElementsInContext(Object value, BaseBeanVa
}
}

private ValueContext<?, Object> buildNewLocalExecutionContext(ValueContext<?, ?> valueContext, Object value) {
private ValueContext<?, Object> buildNewLocalExecutionContext(CascadingMetaData cascadingMetaData, ValueContext<?, ?> valueContext, Object value) {
ValueContext<?, Object> newValueContext;
if ( value != null ) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

based on the usage of this method null values could not be passed in here, as they go through a different logical branch. Reducing the number of different variations of ValueContext creations helps to fit in the property holders in the future.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, I merged this one.

newValueContext = ValueContext.getLocalExecutionContext(
validatorScopedContext.getParameterNameProvider(),
value,
beanMetaDataManager.getBeanMetaData( value.getClass() ),
valueContext.getPropertyPath()
);
newValueContext.setCurrentValidatedValue( value );
}
else {
newValueContext = ValueContext.getLocalExecutionContext(
validatorScopedContext.getParameterNameProvider(),
valueContext.getCurrentBeanType(),
valueContext.getCurrentBeanMetaData(),
valueContext.getPropertyPath()
);
}
Contracts.assertNotNull( value, "value cannot be null" );
newValueContext = ValueContext.getLocalExecutionContext(
validatorScopedContext.getParameterNameProvider(),
value,
cascadingMetaData.getBeanMetaDataForCascadable( beanMetaDataManager, value ),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you expect to have the metadata for the free form case in the beanMetaDataManager?

If not, I suspect we should push the beanMetaDataManager to the constructor (and we would have 2 implementations of CascadingMetaData in the end).

Not sure what you had in mind for that?

valueContext.getPropertyPath()
);
newValueContext.setCurrentValidatedValue( value );

return newValueContext;
}
Expand Down
5 changes: 5 additions & 0 deletions ...src/main/java/org/hibernate/validator/internal/metadata/aggregated/CascadingMetaData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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() );
}
}