From 8e2ac13ad51b68faad23706c977d2fb53905f351 Mon Sep 17 00:00:00 2001
From: broccolai <me@broccol.ai>
Date: Mon, 28 Sep 2020 16:46:05 +0000
Subject: [PATCH] Allow mappers to throw RuntimeExceptions and make
 ArgumentPair/Turple extensible

---
 .../arguments/compound/ArgumentPair.java              |  2 +-
 .../arguments/compound/ArgumentTriplet.java           |  2 +-
 .../arguments/compound/CompoundArgument.java          | 11 +++++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentPair.java b/cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentPair.java
index 7d4e653d..05dccab8 100644
--- a/cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentPair.java
+++ b/cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentPair.java
@@ -41,7 +41,7 @@ import java.util.function.Function;
  * @param <V> Second argument type
  * @param <O> Output type
  */
-public final class ArgumentPair<C, U, V, O> extends CompoundArgument<Pair<U, V>, C, O> {
+public class ArgumentPair<C, U, V, O> extends CompoundArgument<Pair<U, V>, C, O> {
 
     /**
      * Create a new argument pair.
diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentTriplet.java b/cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentTriplet.java
index f634196f..9be2f6b8 100644
--- a/cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentTriplet.java
+++ b/cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentTriplet.java
@@ -42,7 +42,7 @@ import java.util.function.Function;
  * @param <W> Third argument type
  * @param <O> Output type
  */
-public final class ArgumentTriplet<C, U, V, W, O> extends CompoundArgument<Triplet<U, V, W>, C, O> {
+public class ArgumentTriplet<C, U, V, W, O> extends CompoundArgument<Triplet<U, V, W>, C, O> {
 
     /**
      * Create a new argument triplet.
diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/compound/CompoundArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/compound/CompoundArgument.java
index c736e95c..43020e55 100644
--- a/cloud-core/src/main/java/cloud/commandframework/arguments/compound/CompoundArgument.java
+++ b/cloud-core/src/main/java/cloud/commandframework/arguments/compound/CompoundArgument.java
@@ -128,8 +128,15 @@ public class CompoundArgument<T extends Tuple, C, O> extends CommandArgument<C,
                 /* Store the parsed value */
                 output[i] = result.getParsedValue().orElse(null);
             }
-            /* We now know that we have complete output, as none of the parsers returned a failure */
-            return ArgumentParseResult.success(this.mapper.apply(this.tupleFactory.apply(output)));
+            /*
+            * We now know that we have complete output, as none of the parsers returned a failure.
+            * Now check if the mapper threw any exceptions
+             */
+            try {
+                return ArgumentParseResult.success(this.mapper.apply(this.tupleFactory.apply(output)));
+            } catch (final Exception e) {
+                return ArgumentParseResult.failure(e);
+            }
         }
 
         @Nonnull