Explore FreeForm validation v2 #989
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| /* | ||
| * Hibernate Validator, declare and validate application constraints | ||
| * | ||
| * License: Apache License, Version 2.0 | ||
| * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>. | ||
| */ | ||
| package org.hibernate.validator.internal.metadata.aggregated.cascading; | ||
|
|
||
| import java.lang.reflect.Type; | ||
| import java.lang.reflect.TypeVariable; | ||
| import java.util.List; | ||
| import java.util.Set; | ||
|
|
||
| import org.hibernate.validator.internal.engine.valueextraction.ValueExtractorDescriptor; | ||
| import org.hibernate.validator.internal.engine.valueextraction.ValueExtractorManager; | ||
| import org.hibernate.validator.internal.metadata.aggregated.BeanMetaData; | ||
| import org.hibernate.validator.internal.metadata.aggregated.CascadingMetaDataBuilder; | ||
| import org.hibernate.validator.internal.metadata.manager.ConstraintMetaDataManager; | ||
| import org.hibernate.validator.internal.util.Contracts; | ||
| import org.hibernate.validator.internal.util.StringHelper; | ||
|
|
||
| /** | ||
| * Extended view of container cascading metadta for property holders that in addition stores mapping name. | ||
|
|
||
| * | ||
| * @author Marko Bekhta | ||
| */ | ||
| public class ContainerPropertyHolderCascadingMetaData extends ContainerCascadingMetaData { | ||
|
|
||
| /** | ||
| * Name of the constraint mappings to be applied. | ||
| */ | ||
| private final String mapping; | ||
|
|
||
|
|
||
| public static ContainerPropertyHolderCascadingMetaData of(ValueExtractorManager valueExtractorManager, CascadingMetaDataBuilder cascadingMetaDataBuilder, | ||
| Object context) { | ||
| Contracts.assertNotEmpty( cascadingMetaDataBuilder.getMappingName(), "Property holder mapping cannot be an empty string." ); | ||
|
|
||
| return new ContainerPropertyHolderCascadingMetaData( valueExtractorManager, cascadingMetaDataBuilder ); | ||
| } | ||
|
|
||
| private ContainerPropertyHolderCascadingMetaData(ValueExtractorManager valueExtractorManager, CascadingMetaDataBuilder cascadingMetaDataBuilder) { | ||
| super( valueExtractorManager, cascadingMetaDataBuilder ); | ||
| this.mapping = cascadingMetaDataBuilder.getMappingName(); | ||
| } | ||
|
|
||
| ContainerPropertyHolderCascadingMetaData(String mapping, Type enclosingType, List<ContainerPropertyHolderCascadingMetaData> containerElementTypesCascadingMetaData, | ||
| GroupConversionHelper groupConversionHelper, Set<ValueExtractorDescriptor> valueExtractorCandidates) { | ||
| super( enclosingType, containerElementTypesCascadingMetaData, groupConversionHelper, valueExtractorCandidates ); | ||
| this.mapping = mapping; | ||
| } | ||
|
|
||
| ContainerPropertyHolderCascadingMetaData(String mapping, Type enclosingType, TypeVariable<?> typeParameter, Class<?> declaredContainerClass, TypeVariable<?> declaredTypeParameter, | ||
| GroupConversionHelper groupConversionHelper) { | ||
| super( enclosingType, typeParameter, declaredContainerClass, declaredTypeParameter, groupConversionHelper ); | ||
| this.mapping = mapping; | ||
| } | ||
|
|
||
| @Override | ||
| public BeanMetaData<?> getBeanMetaDataForCascadable(ConstraintMetaDataManager constraintMetaDataManager, Object value) { | ||
| return constraintMetaDataManager.getPropertyHolderBeanMetaData( value.getClass(), mapping ); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| StringBuilder sb = new StringBuilder(); | ||
| sb.append( getClass().getSimpleName() ); | ||
| sb.append( " [" ); | ||
| sb.append( "mapping=" ).append( mapping ).append( ", " ); | ||
| sb.append( "enclosingType=" ).append( StringHelper.toShortString( getEnclosingType() ) ).append( ", " ); | ||
| sb.append( "typeParameter=" ).append( getTypeParameter() ).append( ", " ); | ||
| sb.append( "cascading=" ).append( isCascading() ).append( ", " ); | ||
| sb.append( "containerElementTypesCascadingMetaData=" ).append( getContainerElementTypesCascadingMetaData() ); | ||
| sb.append( "]" ); | ||
| return sb.toString(); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| /* | ||
| * Hibernate Validator, declare and validate application constraints | ||
| * | ||
| * License: Apache License, Version 2.0 | ||
| * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>. | ||
| */ | ||
| package org.hibernate.validator.internal.metadata.aggregated.cascading; | ||
|
|
||
| import org.hibernate.validator.internal.metadata.aggregated.BeanMetaData; | ||
| import org.hibernate.validator.internal.metadata.aggregated.CascadingMetaDataBuilder; | ||
| import org.hibernate.validator.internal.metadata.manager.ConstraintMetaDataManager; | ||
| import org.hibernate.validator.internal.util.Contracts; | ||
|
|
||
| /** | ||
| * Extended view of non container cascading metadta for property holders that in addition stores mapping name. | ||
| * | ||
| * @author Marko Bekhta | ||
| */ | ||
| public class NonContainerPropertyHolderCascadingMetaData extends NonContainerCascadingMetaData { | ||
|
|
||
| /** | ||
| * Name of the constraint mappings to be applied. | ||
| */ | ||
| private final String mapping; | ||
|
|
||
| public static NonContainerPropertyHolderCascadingMetaData of(CascadingMetaDataBuilder cascadingMetaDataBuilder, Object context) { | ||
| Contracts.assertTrue( cascadingMetaDataBuilder.isCascading(), "Property holder cascading metadata should always be cascading." ); | ||
| Contracts.assertNotEmpty( cascadingMetaDataBuilder.getMappingName(), "Property holder mapping cannot be an empty string." ); | ||
|
|
||
| return new NonContainerPropertyHolderCascadingMetaData( cascadingMetaDataBuilder ); | ||
| } | ||
|
|
||
| private NonContainerPropertyHolderCascadingMetaData(CascadingMetaDataBuilder cascadingMetaDataBuilder) { | ||
| super( cascadingMetaDataBuilder ); | ||
| this.mapping = cascadingMetaDataBuilder.getMappingName(); | ||
| } | ||
|
|
||
| @Override | ||
| public BeanMetaData<?> getBeanMetaDataForCascadable(ConstraintMetaDataManager constraintMetaDataManager, Object value) { | ||
| return constraintMetaDataManager.getPropertyHolderBeanMetaData( value.getClass(), mapping ); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| StringBuilder sb = new StringBuilder(); | ||
| sb.append( getClass().getSimpleName() ); | ||
| sb.append( " [" ); | ||
| sb.append( "mapping=" ).append( mapping ).append( ", " ); | ||
| sb.append( "cascading=" ).append( isCascading() ).append( ", " ); | ||
| sb.append( "]" ); | ||
| return sb.toString(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For now property holders and regular beans are using the same cascading metadata builder. When I've tried to break it into smaller reusable pieces, I've broke it so badly 😄 that I decided to revert the changes for now and just use the same builder. But this still is needed to be done.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, let's try to have a todo list somewhere so that we don't forget about it.