Added ValidationError

Author: JanHolger

.github/workflows/maven-deploy.yml

@@ -1,5 +1,8 @@
 name: Maven Deploy
-on: [push]
+on:
+  push:
+    branches:
+      - master
 jobs:
   build:
     runs-on: ubuntu-latest

src/main/java/org/javawebstack/validator/ValidationError.java

@@ -0,0 +1,31 @@
+package org.javawebstack.validator;
+
+import org.javawebstack.validator.rule.ValidationRule;
+
+public class ValidationError {
+
+    private final ValidationRule rule;
+    private final String message;
+
+    public ValidationError(ValidationRule rule, String message) {
+        this.rule = rule;
+        this.message = message;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public ValidationRule getRule() {
+        return rule;
+    }
+
+    public Class<? extends ValidationRule> getRuleType() {
+        return rule.getClass();
+    }
+
+    public String toString() {
+        return message;
+    }
+
+}

src/main/java/org/javawebstack/validator/ValidationResult.java

@@ -7,9 +7,9 @@
 public class ValidationResult {
 
     private final ValidationContext context;
-    private final Map<String[], List<String>> errors;
+    private final Map<String[], List<ValidationError>> errors;
 
-    ValidationResult(ValidationContext context, Map<String[], List<String>> errors) {
+    ValidationResult(ValidationContext context, Map<String[], List<ValidationError>> errors) {
         this.context = context;
         this.errors = errors;
     }
@@ -18,12 +18,12 @@ public ValidationContext getContext() {
         return context;
     }
 
-    public Map<String[], List<String>> getErrors() {
+    public Map<String[], List<ValidationError>> getErrors() {
         return errors;
     }
 
-    public Map<String, List<String>> getErrorMap() {
-        Map<String, List<String>> errorMap = new HashMap<>();
+    public Map<String, List<ValidationError>> getErrorMap() {
+        Map<String, List<ValidationError>> errorMap = new HashMap<>();
         getErrors().forEach((k, v) -> errorMap.put(String.join(".", k), v));
         return errorMap;
     }

src/main/java/org/javawebstack/validator/Validator.java

@@ -152,23 +152,23 @@ public Validator rule(String key, ValidationRule... rules) {
 
     public ValidationResult validate(ValidationContext context, AbstractElement rootElement) {
         context.setValidator(this);
-        Map<String[], List<String>> errors = new HashMap<>();
+        Map<String[], List<ValidationError>> errors = new HashMap<>();
         for (String[] key : rules.keySet()) {
             errors.putAll(check(context, rules, new String[0], new String[0], key, rootElement));
         }
         return new ValidationResult(context, errors);
     }
 
-    private Map<String[], List<String>> check(ValidationContext context, Map<String[], ValidationConfig> rules, String[] keyPrefix, String[] resolvedKeyPrefix, String[] key, AbstractElement element) {
+    private Map<String[], List<ValidationError>> check(ValidationContext context, Map<String[], ValidationConfig> rules, String[] keyPrefix, String[] resolvedKeyPrefix, String[] key, AbstractElement element) {
         if (key.length == 0) {
-            Map<String[], List<String>> errors = new HashMap<>();
+            Map<String[], List<ValidationError>> errors = new HashMap<>();
             ValidationConfig config = getMapValue(rules, keyPrefix);
             for (ValidationRule rule : config.rules) {
                 String error = rule.validate(context, config.field, element);
                 if (error != null) {
                     if (!errors.containsKey(resolvedKeyPrefix))
                         errors.put(resolvedKeyPrefix, new ArrayList<>());
-                    errors.get(resolvedKeyPrefix).add(error);
+                    errors.get(resolvedKeyPrefix).add(new ValidationError(rule, error));
                 }
             }
             return errors;
@@ -181,7 +181,7 @@ private Map<String[], List<String>> check(ValidationContext context, Map<String[
         System.arraycopy(keyPrefix, 0, innerKeyPrefix, 0, keyPrefix.length);
         innerKeyPrefix[innerKeyPrefix.length - 1] = key[0];
         if (key[0].equals("*")) {
-            Map<String[], List<String>> errors = new HashMap<>();
+            Map<String[], List<ValidationError>> errors = new HashMap<>();
             if (element.isArray()) {
                 for (int i = 0; i < element.array().size(); i++) {
                     String[] innerResolvedKeyPrefix = new String[keyPrefix.length + 1];