From 3f6d980c4c91c583f64dcdd4896b3eb19cb67b7e Mon Sep 17 00:00:00 2001
From: Sheldan <5037282+Sheldan@users.noreply.github.com>
Date: Thu, 14 May 2020 01:02:31 +0200
Subject: [PATCH] added template for command not found, when disabling a
 command in a group

---
 .../core/service/ChannelGroupServiceBean.java |  6 +++---
 .../command_not_found_exception_en_US.ftl     |  1 +
 .../command/exception/CommandException.java   |  9 ---------
 .../exception/CommandNotFoundException.java   | 20 +++++++++++++++++++
 ...command_not_found_exception_text_en_US.ftl |  1 +
 5 files changed, 25 insertions(+), 12 deletions(-)
 create mode 100644 abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/command_not_found_exception_en_US.ftl
 delete mode 100644 abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/exception/CommandException.java
 create mode 100644 abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/exception/CommandNotFoundException.java
 create mode 100644 abstracto-application/template-config/src/main/resources/templates/en_US/core/exception/command_not_found_exception_text_en_US.ftl

diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelGroupServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelGroupServiceBean.java
index 810f4cae4..4ae5e9dfa 100644
--- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelGroupServiceBean.java
+++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelGroupServiceBean.java
@@ -1,7 +1,7 @@
 package dev.sheldan.abstracto.core.service;
 
 import dev.sheldan.abstracto.core.command.exception.ChannelGroupNotFoundException;
-import dev.sheldan.abstracto.core.command.exception.CommandException;
+import dev.sheldan.abstracto.core.command.exception.CommandNotFoundException;
 import dev.sheldan.abstracto.core.command.models.database.ACommand;
 import dev.sheldan.abstracto.core.command.service.management.ChannelGroupCommandManagementService;
 import dev.sheldan.abstracto.core.command.service.management.CommandManagementService;
@@ -104,7 +104,7 @@ public class ChannelGroupServiceBean implements ChannelGroupService {
         }
         ACommand command = commandManagementService.findCommandByName(commandName);
         if(command == null) {
-            throw new CommandException(String.format(COMMAND_NOT_FOUND, commandName));
+            throw new CommandNotFoundException();
         }
         channelGroupCommandManagementService.setCommandInGroupTo(command, channelGroup, false);
     }
@@ -118,7 +118,7 @@ public class ChannelGroupServiceBean implements ChannelGroupService {
         }
         ACommand command = commandManagementService.findCommandByName(commandName);
         if(command == null) {
-            throw new CommandException(String.format(COMMAND_NOT_FOUND, commandName));
+            throw new CommandNotFoundException();
         }
         channelGroupCommandManagementService.setCommandInGroupTo(command, channelGroup, true);
     }
diff --git a/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/command_not_found_exception_en_US.ftl b/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/command_not_found_exception_en_US.ftl
new file mode 100644
index 000000000..60f95309d
--- /dev/null
+++ b/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/command_not_found_exception_en_US.ftl
@@ -0,0 +1 @@
+<#include "command_not_found_exception_text">
\ No newline at end of file
diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/exception/CommandException.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/exception/CommandException.java
deleted file mode 100644
index 117827ee3..000000000
--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/exception/CommandException.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package dev.sheldan.abstracto.core.command.exception;
-
-import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException;
-
-public class CommandException extends AbstractoRunTimeException {
-    public CommandException(String message) {
-        super(message);
-    }
-}
diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/exception/CommandNotFoundException.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/exception/CommandNotFoundException.java
new file mode 100644
index 000000000..ed732d30c
--- /dev/null
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/exception/CommandNotFoundException.java
@@ -0,0 +1,20 @@
+package dev.sheldan.abstracto.core.command.exception;
+
+import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException;
+import dev.sheldan.abstracto.templating.Templatable;
+
+public class CommandNotFoundException extends AbstractoRunTimeException implements Templatable {
+    public CommandNotFoundException() {
+        super("");
+    }
+
+    @Override
+    public String getTemplateName() {
+        return "command_not_found_exception_text";
+    }
+
+    @Override
+    public Object getTemplateModel() {
+        return new Object();
+    }
+}
diff --git a/abstracto-application/template-config/src/main/resources/templates/en_US/core/exception/command_not_found_exception_text_en_US.ftl b/abstracto-application/template-config/src/main/resources/templates/en_US/core/exception/command_not_found_exception_text_en_US.ftl
new file mode 100644
index 000000000..244065545
--- /dev/null
+++ b/abstracto-application/template-config/src/main/resources/templates/en_US/core/exception/command_not_found_exception_text_en_US.ftl
@@ -0,0 +1 @@
+Command not found.
\ No newline at end of file