diff options
Diffstat (limited to 'src/main/java/org/pacien/lemonad/validation/Validator.java')
-rw-r--r-- | src/main/java/org/pacien/lemonad/validation/Validator.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/org/pacien/lemonad/validation/Validator.java b/src/main/java/org/pacien/lemonad/validation/Validator.java index a8a9e3f..e04cde8 100644 --- a/src/main/java/org/pacien/lemonad/validation/Validator.java +++ b/src/main/java/org/pacien/lemonad/validation/Validator.java | |||
@@ -28,8 +28,8 @@ import lombok.NonNull; | |||
28 | import lombok.val; | 28 | import lombok.val; |
29 | 29 | ||
30 | import static java.util.stream.Collectors.toUnmodifiableList; | 30 | import static java.util.stream.Collectors.toUnmodifiableList; |
31 | import static org.pacien.lemonad.validation.ValidationResult.invalid; | 31 | import static org.pacien.lemonad.validation.Validation.invalid; |
32 | import static org.pacien.lemonad.validation.ValidationResult.valid; | 32 | import static org.pacien.lemonad.validation.Validation.valid; |
33 | 33 | ||
34 | /** | 34 | /** |
35 | * A function which applies validation rules on a subject and reports possible errors. | 35 | * A function which applies validation rules on a subject and reports possible errors. |
@@ -43,7 +43,7 @@ import static org.pacien.lemonad.validation.ValidationResult.valid; | |||
43 | * @param subject the subject to validate, which can potentially be null. | 43 | * @param subject the subject to validate, which can potentially be null. |
44 | * @return the non-null result of the validation of the supplied subject. | 44 | * @return the non-null result of the validation of the supplied subject. |
45 | */ | 45 | */ |
46 | ValidationResult<S, E> validate(S subject); | 46 | Validation<S, E> validate(S subject); |
47 | 47 | ||
48 | /** | 48 | /** |
49 | * @param predicate the validation predicate testing the validity of a subject. | 49 | * @param predicate the validation predicate testing the validity of a subject. |
@@ -60,7 +60,7 @@ import static org.pacien.lemonad.validation.ValidationResult.valid; | |||
60 | */ | 60 | */ |
61 | @SafeVarargs static <S, E> Validator<S, E> validatingAll(@NonNull Validator<? super S, ? extends E>... validators) { | 61 | @SafeVarargs static <S, E> Validator<S, E> validatingAll(@NonNull Validator<? super S, ? extends E>... validators) { |
62 | val validatorList = Arrays.stream(validators).map(Objects::requireNonNull).collect(toUnmodifiableList()); | 62 | val validatorList = Arrays.stream(validators).map(Objects::requireNonNull).collect(toUnmodifiableList()); |
63 | return subject -> new ValidationResultContainer<>( | 63 | return subject -> new ValidationContainer<>( |
64 | subject, | 64 | subject, |
65 | validatorList.stream() | 65 | validatorList.stream() |
66 | .flatMap(validator -> validator.validate(subject).getErrors().stream()) | 66 | .flatMap(validator -> validator.validate(subject).getErrors().stream()) |
@@ -75,6 +75,6 @@ import static org.pacien.lemonad.validation.ValidationResult.valid; | |||
75 | static <S, F, E> Validator<S, E> validatingField(@NonNull Function<? super S, ? extends F> getter, | 75 | static <S, F, E> Validator<S, E> validatingField(@NonNull Function<? super S, ? extends F> getter, |
76 | @NonNull Validator<? super F, ? extends E> validator) { | 76 | @NonNull Validator<? super F, ? extends E> validator) { |
77 | //noinspection unchecked | 77 | //noinspection unchecked |
78 | return subject -> new ValidationResultContainer<>(subject, (List<E>) validator.validate(getter.apply(subject)).getErrors()); | 78 | return subject -> new ValidationContainer<>(subject, (List<E>) validator.validate(getter.apply(subject)).getErrors()); |
79 | } | 79 | } |
80 | } | 80 | } |