4 files changed, 44 insertions, 44 deletions

diff --git a/src/main/java/org/pacien/lemonad/validation/ValidationResult.java b/src/main/java/org/pacien/lemonad/validation/Validation.java
index 65bb389..04c1ed0 100644
--- a/src/main/java/org/pacien/lemonad/validation/ValidationResult.java
+++ b/src/main/java/org/pacien/lemonad/validation/Validation.java
@@ -41,7 +41,7 @@ import static org.pacien.lemonad.attempt.Attempt.success;
  * @param <E> the error type.
  * @author pacien
  */
-public interface ValidationResult<S, E> {
+public interface Validation<S, E> {
   /**
    * @return whether no error have been reported during the validation.
    */
@@ -66,7 +66,7 @@ public interface ValidationResult<S, E> {
    * @param consumer a subject consumer called if the validation is successful.
    * @return the current object.
    */
-  default ValidationResult<S, E> ifValid(@NonNull Consumer<? super S> consumer) {
+  default Validation<S, E> ifValid(@NonNull Consumer<? super S> consumer) {
     if (isValid()) consumer.accept(getSubject());
     return this;
   }
@@ -75,7 +75,7 @@ public interface ValidationResult<S, E> {
    * @param consumer the consumer called with the validation subject and reported errors if the validation is failed.
    * @return the current object.
    */
-  default ValidationResult<S, E> ifInvalid(@NonNull BiConsumer<? super S, ? super List<? super E>> consumer) {
+  default Validation<S, E> ifInvalid(@NonNull BiConsumer<? super S, ? super List<? super E>> consumer) {
     if (!isValid()) consumer.accept(getSubject(), getErrors());
     return this;
   }
@@ -88,41 +88,41 @@ public interface ValidationResult<S, E> {
   }
 
   /**
-   * @param mapper a function transforming a {@link ValidationResult}.
-   * @return the transformed {@link ValidationResult}.
+   * @param mapper a function transforming a {@link Validation}.
+   * @return the transformed {@link Validation}.
    */
-  default <SS, EE> ValidationResult<SS, EE> flatMap(@NonNull Function<? super ValidationResult<? super S, ? super E>, ? extends ValidationResult<? extends SS, ? extends EE>> mapper) {
+  default <SS, EE> Validation<SS, EE> flatMap(@NonNull Function<? super Validation<? super S, ? super E>, ? extends Validation<? extends SS, ? extends EE>> mapper) {
     //noinspection unchecked
-    return (ValidationResult<SS, EE>) mapper.apply(this);
+    return (Validation<SS, EE>) mapper.apply(this);
   }
 
   /**
    * @param subject           an overriding subject.
-   * @param validationResults a {@link Stream} of {@link ValidationResult}s to merge.
-   * @return the merged {@link ValidationResult} containing all errors from the supplied ones.
+   * @param validationResults a {@link Stream} of {@link Validation}s to merge.
+   * @return the merged {@link Validation} containing all errors from the supplied ones.
    */
-  static <S, E> ValidationResult<S, E> merge(S subject, @NonNull Stream<? extends ValidationResult<?, ? extends E>> validationResults) {
-    return new ValidationResultContainer<>(
+  static <S, E> Validation<S, E> merge(S subject, @NonNull Stream<? extends Validation<?, ? extends E>> validationResults) {
+    return new ValidationContainer<>(
       subject,
       validationResults.flatMap(res -> res.getErrors().stream()).collect(toUnmodifiableList()));
   }
 
   /**
    * @param subject the suject of the validation.
-   * @return a successful {@link ValidationResult}.
+   * @return a successful {@link Validation}.
    */
-  static <S, E> ValidationResult<S, E> valid(S subject) {
-    return new ValidationResultContainer<>(subject, List.of());
+  static <S, E> Validation<S, E> valid(S subject) {
+    return new ValidationContainer<>(subject, List.of());
   }
 
   /**
    * @param subject the suject of the validation.
    * @param error   a validation error.
    * @param errors  additional validation errors.
-   * @return a failed {@link ValidationResult} for the supplied subject.
+   * @return a failed {@link Validation} for the supplied subject.
    */
-  @SafeVarargs static <S, E> ValidationResult<S, E> invalid(S subject, E error, E... errors) {
-    return new ValidationResultContainer<>(
+  @SafeVarargs static <S, E> Validation<S, E> invalid(S subject, E error, E... errors) {
+    return new ValidationContainer<>(
       subject,
       Stream.concat(Stream.of(error), Arrays.stream(errors)).map(Objects::requireNonNull).collect(toUnmodifiableList()));
   }
diff --git a/src/main/java/org/pacien/lemonad/validation/ValidationResultContainer.java b/src/main/java/org/pacien/lemonad/validation/ValidationContainer.java
index 2c752f6..03f77be 100644
--- a/src/main/java/org/pacien/lemonad/validation/ValidationResultContainer.java
+++ b/src/main/java/org/pacien/lemonad/validation/ValidationContainer.java
@@ -26,7 +26,7 @@ import lombok.Value;
 /**
  * @author pacien
  */
-@Value class ValidationResultContainer<S, E> implements ValidationResult<S, E> {
+@Value class ValidationContainer<S, E> implements Validation<S, E> {
   S subject;
   @NonNull List<E> errors;
 
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;
 import lombok.val;
 
 import static java.util.stream.Collectors.toUnmodifiableList;
-import static org.pacien.lemonad.validation.ValidationResult.invalid;
-import static org.pacien.lemonad.validation.ValidationResult.valid;
+import static org.pacien.lemonad.validation.Validation.invalid;
+import static org.pacien.lemonad.validation.Validation.valid;
 
 /**
  * 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;
    * @param subject the subject to validate, which can potentially be null.
    * @return the non-null result of the validation of the supplied subject.
    */
-  ValidationResult<S, E> validate(S subject);
+  Validation<S, E> validate(S subject);
 
   /**
    * @param predicate     the validation predicate testing the validity of a subject.
@@ -60,7 +60,7 @@ import static org.pacien.lemonad.validation.ValidationResult.valid;
    */
   @SafeVarargs static <S, E> Validator<S, E> validatingAll(@NonNull Validator<? super S, ? extends E>... validators) {
     val validatorList = Arrays.stream(validators).map(Objects::requireNonNull).collect(toUnmodifiableList());
-    return subject -> new ValidationResultContainer<>(
+    return subject -> new ValidationContainer<>(
       subject,
       validatorList.stream()
                    .flatMap(validator -> validator.validate(subject).getErrors().stream())
@@ -75,6 +75,6 @@ import static org.pacien.lemonad.validation.ValidationResult.valid;
   static <S, F, E> Validator<S, E> validatingField(@NonNull Function<? super S, ? extends F> getter,
                                                    @NonNull Validator<? super F, ? extends E> validator) {
     //noinspection unchecked
-    return subject -> new ValidationResultContainer<>(subject, (List<E>) validator.validate(getter.apply(subject)).getErrors());
+    return subject -> new ValidationContainer<>(subject, (List<E>) validator.validate(getter.apply(subject)).getErrors());
   }
 }
diff --git a/src/test/java/org/pacien/lemonad/validation/ValidationResultTest.java b/src/test/java/org/pacien/lemonad/validation/ValidationTest.java
index 65b2cb3..665f501 100644
--- a/src/test/java/org/pacien/lemonad/validation/ValidationResultTest.java
+++ b/src/test/java/org/pacien/lemonad/validation/ValidationTest.java
@@ -32,44 +32,44 @@ import static org.junit.jupiter.api.Assertions.fail;
 /**
  * @author pacien
  */
-class ValidationResultTest {
+class ValidationTest {
   @Test void testValidResult() {
     var subject = "subject";
-    var validationResult = ValidationResult.valid(subject);
-    assertTrue(validationResult.getErrors().isEmpty());
-    assertTrue(validationResult.isValid());
-    assertFalse(validationResult.isInvalid());
-    validationResult.ifValid(innerSubject -> assertEquals(subject, innerSubject));
-    validationResult.ifInvalid((__, ___) -> fail());
+    var validation = Validation.valid(subject);
+    assertTrue(validation.getErrors().isEmpty());
+    assertTrue(validation.isValid());
+    assertFalse(validation.isInvalid());
+    validation.ifValid(innerSubject -> assertEquals(subject, innerSubject));
+    validation.ifInvalid((__, ___) -> fail());
   }
 
   @Test void testInvalidResult() {
     var subject = "subject";