Finally fixed the Validator issue and the step validation in the IntegerRule

Author: JanHolger

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

@@ -1,6 +1,5 @@
 package org.javawebstack.validator;
 
-import com.google.gson.FieldNamingPolicy;
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.annotations.SerializedName;
@@ -149,8 +148,6 @@ private Map<String[], List<String>> check(Map<String[], List<ValidationRule>> ru
             for(ValidationRule rule : getMapValue(rules, keyPrefix)){
                 String error = rule.validate(this, element);
                 if(error != null){
-                    //System.out.println(String.join(".", resolvedKeyPrefix));
-                    //System.out.println(rule.toString());
                     if(!errors.containsKey(resolvedKeyPrefix))
                         errors.put(resolvedKeyPrefix, new ArrayList<>());
                     errors.get(resolvedKeyPrefix).add(error);
@@ -204,11 +201,11 @@ private static boolean stringArrayEqual(String[] a, String[] b){
         if(a.length != b.length)
             return false;
         for(int i=0; i<a.length; i++){
-            if(a[0] == null && b[0] == null)
+            if(a[i] == null && b[i] == null)
                 continue;
-            if(a[0] == null || b[0] == null)
+            if(a[i] == null || b[i] == null)
                 return false;
-            if(!a[0].equals(b[0]))
+            if(!a[i].equals(b[i]))
                 return false;
         }
         return true;
@@ -223,6 +220,24 @@ private static <V> V getMapValue(Map<String[], V> map, String[] key){
         return null;
     }
 
+    private static <V> void putMapValue(Map<String[], Object> map, String[] key, Object value){
+        for(String[] k : map.keySet()){
+            if(stringArrayEqual(k, key)){
+                map.put(k, value);
+                return;
+            }
+        }
+        map.put(key, value);
+    }
+
+    private static <V> void addMapListEntryValue(Map map, String[] key, List values){
+        List<Object> list = (List<Object>) getMapValue(map, key);
+        if(list == null)
+            list = new ArrayList<>();
+        list.addAll(values);
+        putMapValue(map, key, list);
+    }
+
     private static String toSnakeCase(String source){
         StringBuilder sb = new StringBuilder();
         sb.append(Character.toLowerCase(source.charAt(0)));
@@ -280,7 +295,7 @@ private static Map<String[], List<ValidationRule>> getClassRules(Class<?> type){
                 String[] actualKey = new String[key.length+1];
                 actualKey[0] = "*";
                 System.arraycopy(key, 0, actualKey, 1, key.length);
-                rules.put(actualKey, validators);
+                addMapListEntryValue(rules, actualKey, validators);
             });
             return rules;
         }
@@ -290,7 +305,7 @@ private static Map<String[], List<ValidationRule>> getClassRules(Class<?> type){
                 String[] actualKey = new String[key.length+1];
                 actualKey[0] = name;
                 System.arraycopy(key, 0, actualKey, 1, key.length);
-                rules.put(actualKey, validators);
+                addMapListEntryValue(rules, actualKey, validators);
             });
             field.setAccessible(true);
             Rule[] ruleAnnotations = field.getDeclaredAnnotationsByType(Rule.class);
@@ -302,7 +317,7 @@ private static Map<String[], List<ValidationRule>> getClassRules(Class<?> type){
                         r.add(rule);
                 }
                 if(r.size() > 0)
-                    rules.put(new String[]{name}, r);
+                    addMapListEntryValue(rules, new String[]{name}, r);
             }
         }
         return rules;

src/main/java/org/javawebstack/validator/rule/IntegerRule.java

@@ -53,7 +53,7 @@ public String validate(Validator validator, GraphElement value) {
             return String.format("Smaller than the minimum value (%d < %d)", v, min);
         if(v > max)
             return String.format("Greater than the maximum value (%d > %d)", v, max);
-        if(step > 1 && v-min % step != 0)
+        if(step > 1 && (v-min) % step != 0)
             return String.format("Not in steps of %d", step);
         return null;
     }