Async: Use except() rather than thenCatch().

Casterlabs · Dec 23, 2023 · de9da54 · de9da54
1 parent 228adc6
commit de9da54
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/async/src/main/java/co/casterlabs/commons/async/promise/Promise.java b/async/src/main/java/co/casterlabs/commons/async/promise/Promise.java
@@ -274,7 +274,7 @@ public Promise<Void> then(@NonNull PromiseConsumer<T> handler) {
     }
 
     /* ---------------- */
-    /* .thenCatch() chaining */
+    /* .except() chaining */
     /* ---------------- */
 
     /**
@@ -289,7 +289,7 @@ public Promise<Void> then(@NonNull PromiseConsumer<T> handler) {
      *           be of type R or T. You will have to check yourself and cast it to
      *           the appropriate type.
      */
-    public <R> Promise<?> thenCatch(@NonNull PromiseFunction<Throwable, R> handler) {
+    public <R> Promise<?> except(@NonNull PromiseFunction<Throwable, R> handler) {
         PromiseResolver<Object> subpromiseResolver = withResolvers();
         this.chainTo((result) -> {
             try {
@@ -318,8 +318,8 @@ public <R> Promise<?> thenCatch(@NonNull PromiseFunction<Throwable, R> handler)
      *           be of type Void or T. You will have to check yourself and cast it
      *           to the appropriate type.
      */
-    public Promise<?> thenCatch(@NonNull PromiseConsumer<Throwable> handler) {
-        return this.thenCatch((throwable) -> {
+    public Promise<?> except(@NonNull PromiseConsumer<Throwable> handler) {
+        return this.except((throwable) -> {
             handler.accept(throwable);
             return null;
         });
@@ -465,7 +465,7 @@ public static Promise<?> race(@NonNull Promise<?>... promises) {
                             resolver.resolve(v);
                         } catch (IllegalStateException ignored) {} // Already settled.
                     })
-                    .thenCatch((t) -> {
+                    .except((t) -> {
                         try {
                             resolver.reject(t);
                         } catch (IllegalStateException ignored) {} // Already settled.
@@ -510,7 +510,7 @@ public static Promise<?> any(@NonNull Promise<?>... promises) {
                             resolver.resolve(v);
                         } catch (IllegalStateException ignored) {} // Already settled.
                     })
-                    .thenCatch((t) -> {
+                    .except((t) -> {
                         if (rejectedCountDown.decrementAndGet() == 0) {
                             resolver.reject(new Exception("All Promises have rejected."));
                         }