From 2e9e4e2e49645207f11da6332e687165a98b7c7a Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Sun, 18 Dec 2022 21:36:46 +0100
Subject: [PATCH] Fix ErrorMessage annotation and ClassValidator never being
 present on Parameter

---
 src/de/steamwar/command/SWCommandUtils.java | 11 +++--------
 src/de/steamwar/command/SubCommand.java     |  1 +
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/de/steamwar/command/SWCommandUtils.java b/src/de/steamwar/command/SWCommandUtils.java
index 203bdd8..2f16d7a 100644
--- a/src/de/steamwar/command/SWCommandUtils.java
+++ b/src/de/steamwar/command/SWCommandUtils.java
@@ -135,14 +135,6 @@ public class SWCommandUtils {
     public static <T> AbstractValidator<T, ?> getValidator(Parameter parameter, Map<String, AbstractValidator<T, ?>> localValidator) {
         Class<?> clazz = parameter.getType();
 
-        AbstractSWCommand.ClassValidator classValidator = parameter.getAnnotation(AbstractSWCommand.ClassValidator.class);
-        if (classValidator != null) {
-            if (classValidator.value() != null) {
-                return getValidator(classValidator.value().getTypeName(), localValidator);
-            }
-            return getValidator(clazz.getTypeName(), localValidator);
-        }
-
         AbstractSWCommand.Validator validator = parameter.getAnnotation(AbstractSWCommand.Validator.class);
         if (validator != null) {
             if (validator.value() != null && !validator.value().isEmpty()) {
@@ -150,7 +142,10 @@ public class SWCommandUtils {
             }
             return getValidator(clazz.getTypeName(), localValidator);
         }
+        return null;
+    }
 
+    public static <T> AbstractValidator<T, ?> getErrorMessage(Parameter parameter) {
         AbstractSWCommand.ErrorMessage errorMessage = parameter.getAnnotation(AbstractSWCommand.ErrorMessage.class);
         if (errorMessage != null) {
             return (AbstractValidator<T, Object>) (sender, value, messageSender) -> {
diff --git a/src/de/steamwar/command/SubCommand.java b/src/de/steamwar/command/SubCommand.java
index bf11674..0e75d7b 100644
--- a/src/de/steamwar/command/SubCommand.java
+++ b/src/de/steamwar/command/SubCommand.java
@@ -155,6 +155,7 @@ public class SubCommand<T> {
                 commandPart.addValidator((AbstractValidator<T, Object>) STRING_SPACE_FILTER);
             }
             commandPart.addValidator(validator);
+            commandPart.addValidator((AbstractValidator<T, Object>) SWCommandUtils.getErrorMessage(parameter));
             if (min != null) {
                 commandPart.addValidator((AbstractValidator<T, Object>) createMinValidator(varArgType != null ? varArgType : parameter.getType(), min));
             }