Explore FreeForm validation v2 #989
+4,389
−688
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /* | ||
| * 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.core; | ||
|
|
||
| import java.lang.annotation.Annotation; | ||
|
|
||
| import org.hibernate.validator.internal.engine.valueextraction.ValueExtractorManager; | ||
| import org.hibernate.validator.internal.metadata.descriptor.ConstraintDescriptorImpl; | ||
| import org.hibernate.validator.internal.metadata.location.ConstraintLocation; | ||
| import org.hibernate.validator.internal.properties.Constrainable; | ||
| import org.hibernate.validator.internal.util.TypeResolutionHelper; | ||
|
|
||
| /** | ||
| * @author Marko Bekhta | ||
| */ | ||
| public class MetaConstraintBuilder<A extends Annotation> { | ||
|
|
||
| private final ConstraintDescriptorImpl<A> constraintDescriptor; | ||
| private final ConstraintLocation.Builder locationBuilder; | ||
|
|
||
| public MetaConstraintBuilder(ConstraintDescriptorImpl<A> constraintDescriptor, ConstraintLocation.Builder locationBuilder) { | ||
| this.constraintDescriptor = constraintDescriptor; | ||
| this.locationBuilder = locationBuilder; | ||
| } | ||
|
|
||
| public MetaConstraint<A> build(TypeResolutionHelper typeResolutionHelper, ValueExtractorManager valueExtractorManager, Constrainable constrainable) { | ||
| return MetaConstraints.create( typeResolutionHelper, valueExtractorManager, constraintDescriptor, locationBuilder.build( constrainable ) ); | ||
| } | ||
| } | ||
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,25 @@ | ||
| /* | ||
| * 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.location; | ||
|
|
||
| import org.hibernate.validator.internal.metadata.location.ConstraintLocation.Builder; | ||
| import org.hibernate.validator.internal.properties.Constrainable; | ||
| import org.hibernate.validator.internal.properties.Field; | ||
| import org.hibernate.validator.internal.util.Contracts; | ||
|
|
||
| /** | ||
| * @author Marko Bekhta | ||
| */ | ||
| public class PropertyHolderPropertyConstraintLocationBuilder implements Builder { | ||
|
|
||
| @Override | ||
| public ConstraintLocation build(Constrainable constrainable) { | ||
| Contracts.assertTrue( constrainable instanceof Field, "Only Field instances are accepted." ); | ||
|
|
||
| return ConstraintLocation.forField( constrainable.as( Field.class ) ); | ||
| } | ||
| } |
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,119 @@ | ||
| /* | ||
| * 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.raw.propertyholder; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.Iterator; | ||
| import java.util.Set; | ||
|
|
||
| import org.hibernate.validator.internal.metadata.aggregated.CascadingMetaDataBuilder; | ||
| import org.hibernate.validator.internal.metadata.core.MetaConstraint; | ||
| import org.hibernate.validator.internal.metadata.raw.ConfigurationSource; | ||
| import org.hibernate.validator.internal.metadata.raw.ConstrainedElement; | ||
| import org.hibernate.validator.internal.util.CollectionHelper; | ||
| import org.hibernate.validator.internal.util.stereotypes.Immutable; | ||
|
|
||
| /** | ||
| * Base implementation of with functionality common to all {@link ConstrainedElement} implementations. | ||
|
There was a problem hiding this comment. There's at least a word missing here. |
||
| * | ||
| * @author Gunnar Morling | ||
| * @author Hardy Ferentschik | ||
| * @author Marko Bekhta | ||
| */ | ||
| public abstract class ConstrainedPropertyHolderElement implements ConstrainedElement { | ||
|
There was a problem hiding this comment. I don't see anything specific to property holders here. Is this expected? |
||
| private final ConstrainedElementKind kind; | ||
| protected final ConfigurationSource source; | ||
| @Immutable | ||
| protected final Set<MetaConstraint<?>> constraints; | ||
| protected final CascadingMetaDataBuilder cascadingMetaDataBuilder; | ||
| @Immutable | ||
| protected final Set<MetaConstraint<?>> typeArgumentConstraints; | ||
|
There was a problem hiding this comment. Let's separate them with a new line, it will be more readable. |
||
|
|
||
| public ConstrainedPropertyHolderElement(ConfigurationSource source, | ||
| ConstrainedElementKind kind, | ||
| Set<MetaConstraint<?>> constraints, | ||
| Set<MetaConstraint<?>> typeArgumentConstraints, | ||
| CascadingMetaDataBuilder cascadingMetaDataBuilder) { | ||
|
There was a problem hiding this comment. Let's not propagate this way of indenting arguments, it's not very readable. |
||
| this.kind = kind; | ||
| this.source = source; | ||
| this.constraints = constraints != null ? CollectionHelper.toImmutableSet( constraints ) : Collections.<MetaConstraint<?>>emptySet(); | ||
| this.typeArgumentConstraints = typeArgumentConstraints != null ? CollectionHelper.toImmutableSet( typeArgumentConstraints ) : Collections.<MetaConstraint<?>>emptySet(); | ||
| this.cascadingMetaDataBuilder = cascadingMetaDataBuilder; | ||
| } | ||
|
|
||
| @Override | ||
| public ConstrainedElementKind getKind() { | ||
| return kind; | ||
| } | ||
|
|
||
| @Override | ||
| public Iterator<MetaConstraint<?>> iterator() { | ||
| return constraints.iterator(); | ||
| } | ||
|
|
||
| @Override | ||
| public Set<MetaConstraint<?>> getConstraints() { | ||
| return constraints; | ||
| } | ||
|
|
||
| @Override | ||
| public Set<MetaConstraint<?>> getTypeArgumentConstraints() { | ||
| return typeArgumentConstraints; | ||
| } | ||
|
|
||
| @Override | ||
| public CascadingMetaDataBuilder getCascadingMetaDataBuilder() { | ||
| return cascadingMetaDataBuilder; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isConstrained() { | ||
| return cascadingMetaDataBuilder.isMarkedForCascadingOnAnnotatedObjectOrContainerElements() | ||
| || cascadingMetaDataBuilder.hasGroupConversionsOnAnnotatedObjectOrContainerElements() | ||
| || !constraints.isEmpty() | ||
| || !typeArgumentConstraints.isEmpty(); | ||
| } | ||
|
|
||
| @Override | ||
| public ConfigurationSource getSource() { | ||
| return source; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "AbstractConstrainedElement [kind=" + kind + ", source=" | ||
|
|
||
| + source + ", constraints=" | ||
| + constraints + ", cascadingMetaDataBuilder=" | ||
| + cascadingMetaDataBuilder + "]"; | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| final int prime = 31; | ||
| int result = 1; | ||
| result = prime * result + ( ( source == null ) ? 0 : source.hashCode() ); | ||
| return result; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object obj) { | ||
| if ( this == obj ) { | ||
| return true; | ||
| } | ||
| if ( obj == null ) { | ||
| return false; | ||
| } | ||
| if ( getClass() != obj.getClass() ) { | ||
| return false; | ||
| } | ||
| ConstrainedPropertyHolderElement other = (ConstrainedPropertyHolderElement) obj; | ||
| if ( source != other.source ) { | ||
| return false; | ||
| } | ||
| return true; | ||
| } | ||
| } | ||
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.
The part about location builder in this commit can be ignored. It will be removed in later commits. And I think about removing this builder as well. I think that storing the ConstraintDefs will be enough and this logic will be moved elsewhere.