Do exception handling self and in whenComplete for better semantics and correct logging category

Vampire · Vampire · commit 09af4353391c · 2019-10-05T05:12:54.000+02:00
diff --git a/src/main/java/net/kautler/command/api/CommandHandler.java b/src/main/java/net/kautler/command/api/CommandHandler.java
@@ -350,9 +350,10 @@ private boolean isCommandAllowed(M message, Command<? super M> command) {
      */
     protected void executeAsync(M message, Runnable commandExecutor) {
         runAsync(commandExecutor, getExecutorService())
-                .exceptionally(throwable -> {
-                    logger.error("Exception while executing command asynchronously", throwable);
-                    return null;
+                .whenComplete((result, throwable) -> {
+                    if (throwable != null) {
+                        logger.error("Exception while executing command asynchronously", throwable);
+                    }
                 });
     }
 
diff --git a/src/main/java/net/kautler/command/handler/CommandHandlerJavacord.java b/src/main/java/net/kautler/command/handler/CommandHandlerJavacord.java
@@ -27,7 +27,6 @@
 import org.javacord.api.DiscordApi;
 import org.javacord.api.entity.message.Message;
 import org.javacord.api.event.message.MessageCreateEvent;
-import org.javacord.api.util.logging.ExceptionLogger;
 
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.ApplicationScoped;
@@ -159,6 +158,10 @@ protected void fireCommandNotFoundEvent(Message message, String prefix, String u
     @Override
     protected void executeAsync(Message message, Runnable commandExecutor) {
         runAsync(commandExecutor, message.getApi().getThreadPool().getExecutorService())
-                .exceptionally(ExceptionLogger.get());
+                .whenComplete((result, throwable) -> {
+                    if (throwable != null) {
+                        logger.error("Exception while executing command asynchronously", throwable);
+                    }
+                });
     }
 }
