1 files changed, 20 insertions, 0 deletions

diff --git a/src/main/java/org/pacien/lemonad/attempt/Attempt.java b/src/main/java/org/pacien/lemonad/attempt/Attempt.java
index dcbb2d3..d5d82ed 100644
--- a/src/main/java/org/pacien/lemonad/attempt/Attempt.java
+++ b/src/main/java/org/pacien/lemonad/attempt/Attempt.java
@@ -81,6 +81,16 @@ public interface Attempt<R, E> {
   }
 
   /**
+   * @param mapper       a function producing an {@link Attempt}, called with the current result if this {@link Attempt} is a success.
+   * @param errorAdapter a function adapting any intermediate error returned by the {@code mapper} function.
+   * @return this {@link Attempt} if it is a failure, or the produced one otherwise.
+   */
+  default <RR, IE> Attempt<RR, E> mapResult(@NonNull Function<? super R, ? extends Attempt<? extends RR, ? extends IE>> mapper,
+                                            @NonNull Function<? super IE, ? extends E> errorAdapter) {
+    return mapResult(result -> mapper.apply(result).mapError(error -> failure(errorAdapter.apply(error))));
+  }
+
+  /**
    * @param mapper a function producing an {@link Attempt}, called with the current error if this {@link Attempt} is a failure.
    * @return this {@link Attempt} if it is a success, or the alternative {@link Attempt} retrieved from the supplier otherwise.
    */
@@ -90,6 +100,16 @@ public interface Attempt<R, E> {
   }
 
   /**
+   * @param mapper        a function producing an {@link Attempt}, called with the current error if this {@link Attempt} is a failure.
+   * @param resultAdapter a function adapting any intermediate result returned by the {@code mapper} function.
+   * @return this {@link Attempt} if it is a success, or the alternative {@link Attempt} retrieved from the supplier otherwise.
+   */
+  default <IR, EE> Attempt<R, EE> mapError(@NonNull Function<? super E, ? extends Attempt<? extends IR, ? extends EE>> mapper,
+                                           @NonNull Function<? super IR, ? extends R> resultAdapter) {
+    return mapError(error -> mapper.apply(error).mapResult(result -> success(resultAdapter.apply(result))));
+  }
+
+  /**
    * @param resultMapper a function producing an {@link Attempt}, called with the current result if this {@link Attempt} is a success.
    * @param errorMapper  a function producing an {@link Attempt}, called with the current error if this {@link Attempt} is a failure.
    * @return the transformed {@link Attempt}.