Added support for inheritance hierarchies validation #369
There are no files selected for viewing
This file contains hidden or 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 hidden or 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,50 @@ | ||
| /* | ||
| * Copyright (C) 2018-2023 Toshiaki Maki <makingx@gmail.com> | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package am.ik.yavi.core; | ||
|
|
||
| import java.util.Locale; | ||
|
|
||
| /** | ||
| * @since 0.14.0 | ||
| */ | ||
| public class InheritanceValidator<T, N extends T> implements Validatable<T> { | ||
| private final Class<N> nClass; | ||
| private final Validatable<N> validator; | ||
|
|
||
| public InheritanceValidator(Class<N> nClass, Validatable<N> validator) { | ||
| this.nClass = nClass; | ||
| this.validator = validator; | ||
| } | ||
|
|
||
| @Override | ||
| public ConstraintViolations validate(T target, Locale locale, | ||
| ConstraintContext constraintContext) { | ||
| final N n = nClass.cast(target); | ||
|
|
||
| return this.validator.validate(n, locale, constraintContext); | ||
| } | ||
|
|
||
| @Override | ||
| public Validatable<T> failFast(boolean failFast) { | ||
| final Validatable<N> validatable = this.validator.failFast(failFast); | ||
| return new InheritanceValidator<>(nClass, validatable); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isFailFast() { | ||
| return this.validator.isFailFast(); | ||
| } | ||
| } |
This file contains hidden or 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,83 @@ | ||
| package am.ik.yavi.core; | ||
|
|
||
| import am.ik.yavi.User; | ||
| import am.ik.yavi.builder.ValidatorBuilder; | ||
| import am.ik.yavi.constraint.CharSequenceConstraint; | ||
| import org.junit.jupiter.api.TestInstance; | ||
| import org.junit.jupiter.params.ParameterizedTest; | ||
| import org.junit.jupiter.params.provider.Arguments; | ||
| import org.junit.jupiter.params.provider.MethodSource; | ||
|
|
||
| import java.util.function.Function; | ||
| import java.util.stream.Stream; | ||
|
|
||
| import static com.google.common.truth.Truth.assertThat; | ||
|
|
||
| public class ConstraintOnClassTest { | ||
|
|
||
| @ParameterizedTest | ||
| @MethodSource("provideValidators") | ||
| void testConstraintOnConditionClass(Validator<Parent> validator) { | ||
| Parent validChild = new Child(23, "drawing"); | ||
| Parent invalidChild = new Child(6, "drawing"); | ||
|
|
||
| assertThat(validator.validate(validChild).isValid()).isTrue(); | ||
| assertThat(validator.validate(invalidChild).isValid()).isFalse(); | ||
| } | ||
|
|
||
| @ParameterizedTest | ||
| @MethodSource("provideValidators") | ||
| void testConstraintOnNonConditionClass(Validator<Parent> validator) { | ||
| Parent validParent = new Parent(35); | ||
| Parent invalidParent = new Parent(19); | ||
|
|
||
| assertThat(validator.validate(validParent).isValid()).isTrue(); | ||
| assertThat(validator.validate(invalidParent).isValid()).isFalse(); | ||
| } | ||
|
|
||
| static Stream<Arguments> provideValidators() { | ||
| ValidatorBuilder<Parent> userValidatorBuilder = ValidatorBuilder.of(Parent.class) | ||
| .constraint(Parent::getAge, "age", c -> c.greaterThan(20)); | ||
| Function<CharSequenceConstraint<Child, String>, CharSequenceConstraint<Child, String>> equalsToDrawing = ( | ||
| CharSequenceConstraint<Child, String> c) -> c.equalTo("drawing"); | ||
|
|
||
| return Stream | ||
|
There was a problem hiding this comment. The test case is difficult to understand. Please add the simple example in the pull request to the test case. There was a problem hiding this comment. sure, no problem. |
||
| .of(Arguments.of(new ValidatorBuilder<>(userValidatorBuilder) | ||
| .constraintOnClass(Child.class, | ||
| ValidatorBuilder.of(Child.class) | ||
| .constraint(Child::getHobby, "hobby", | ||
| equalsToDrawing) | ||
| .build()) | ||
| .build()), Arguments | ||
| .of(new ValidatorBuilder<>(userValidatorBuilder) | ||
| .constraintOnClass(Child.class, | ||
| b -> b.constraint(Child::getHobby, | ||
| "hobby", equalsToDrawing)) | ||
| .build())); | ||
| } | ||
|
|
||
| private static class Child extends Parent { | ||
| private String hobby; | ||
|
|
||
| public Child(int age, String hobby) { | ||
| super(age); | ||
| this.hobby = hobby; | ||
| } | ||
|
|
||
| public String getHobby() { | ||
| return hobby; | ||
| } | ||
| } | ||
|
|
||
| private static class Parent { | ||
| private final int age; | ||
|
|
||
| public Parent(int age) { | ||
| this.age = age; | ||
| } | ||
|
|
||
| public int getAge() { | ||
| return age; | ||
| } | ||
| } | ||
| } | ||
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.
These methods are quite advanced. Can you please add to the JavaDoc what use cases it is useful for and some sample code?
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.
absolutely