Generalize CommandExecutionHandler to both simplify and allow more control

Author: TBlueF

README.md

@@ -7,8 +7,8 @@ repositories {
 }
 
 dependencies {
-    implementation("de.bluecolored:bluecommands-core:1.1.4")
-    implementation("de.bluecolored:bluecommands-brigadier:1.1.4") // Optional
+    implementation("de.bluecolored:bluecommands-core:1.2.0")
+    implementation("de.bluecolored:bluecommands-brigadier:1.2.0") // Optional
 }
 ```
 

bluecommands-brigadier/src/main/java/de/bluecolored/bluecommands/brigadier/CommandCommand.java

@@ -50,23 +50,8 @@ public CommandCommand(Command<C,T> command, CommandExecutionHandler<C,T> executi
     public int run(CommandContext<D> context) throws CommandSyntaxException {
         InputReader inputReader = new InputReader(context.getInput());
         inputReader.setPosition(context.getRange().getStart());
-
         ParseResult<C, T> result = command.parse(contextConverter.apply(context.getSource()), inputReader);
-        if (result.getMatches().isEmpty())
-            return executionHandler.handleParseFailure(result);
-
-        ParseMatch<C, T> executable = result.getMatches().stream()
-                .max(Comparator.comparing(ParseMatch::getPriority))
-                .orElseThrow(IllegalStateException::new);
-
-        T executionResult;
-        try {
-            executionResult = executable.execute();
-        } catch (Exception exception) {
-            return executionHandler.handleExecutionException(executable.getContext(), exception);
-        }
-
-        return executionHandler.handleExecution(executable.getContext(), executionResult);
+        return executionHandler.handle(result);
     }
 
 }

bluecommands-brigadier/src/main/java/de/bluecolored/bluecommands/brigadier/CommandExecutionHandler.java

@@ -30,10 +30,6 @@
 
 public interface CommandExecutionHandler<C, T> {
 
-    int handleParseFailure(ParseResult<C, T> parseResult) throws CommandSyntaxException;
-
-    int handleExecution(C context, @Nullable T result) throws CommandSyntaxException;
-
-    int handleExecutionException(C context, Throwable throwable) throws CommandSyntaxException;
+    int handle(ParseResult<C, T> parseResult) throws CommandSyntaxException;
 
 }

bluecommands-brigadier/src/main/java/de/bluecolored/bluecommands/brigadier/DefaultExecutionHandler.java

@@ -27,13 +27,32 @@
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
 import de.bluecolored.bluecommands.ParseFailure;
+import de.bluecolored.bluecommands.ParseMatch;
 import de.bluecolored.bluecommands.ParseResult;
 
 import java.util.Comparator;
 
 public class DefaultExecutionHandler<C, T> implements CommandExecutionHandler<C, T> {
 
     @Override
+    public int handle(ParseResult<C, T> parseResult) throws CommandSyntaxException {
+        if (parseResult.getMatches().isEmpty())
+            return handleParseFailure(parseResult);
+
+        ParseMatch<C, T> executable = parseResult.getMatches().stream()
+                .max(Comparator.comparing(ParseMatch::getPriority))
+                .orElseThrow(IllegalStateException::new);
+
+        T executionResult;
+        try {
+            executionResult = executable.execute();
+        } catch (Exception exception) {
+            return handleExecutionException(executable.getContext(), exception);
+        }
+
+        return handleExecution(executable.getContext(), executionResult);
+    }
+
     public int handleParseFailure(ParseResult<C, T> result) throws CommandSyntaxException {
         ParseFailure<C, ?> failure = result.getFailures().stream()
                 .max(Comparator.comparing(ParseFailure::getPosition))
@@ -46,15 +65,13 @@ public int handleParseFailure(ParseResult<C, T> result) throws CommandSyntaxExce
         );
     }
 
-    @Override
     public int handleExecution(C context, T result) {
         if (result instanceof Number)
             return ((Number) result).intValue();
 
         return 1;
     }
 
-    @Override
     public int handleExecutionException(C context, Throwable throwable) {
         throw new RuntimeException(throwable);
     }