Added array rule and made date rule more configurable

Author: JanHolger

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

@@ -11,6 +11,7 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
+import java.sql.Date;
 import java.sql.Timestamp;
 import java.util.*;
 
@@ -22,12 +23,16 @@ public class Validator {
     static {
         registerRuleType("string", StringRule.class);
         registerRuleType("boolean", BooleanRule.class);
+        registerRuleType("bool", BooleanRule.class);
         registerRuleType("enum", EnumRule.class);
         registerRuleType("required", RequiredRule.class);
+        registerRuleType("req", RequiredRule.class);
         registerRuleType("ipv4", IPv4AddressRule.class);
         registerRuleType("ipv6", IPv6AddressRule.class);
+        registerRuleType("int", IntegerRule.class);
         registerRuleType("integer", IntegerRule.class);
-        registerRuleType("timestamp", TimestampRule.class);
+        registerRuleType("date", DateRule.class);
+        registerRuleType("array", ArrayRule.class);
     }
 
     public static void registerRuleType(String name, Class<? extends ValidationRule> type){
@@ -219,8 +224,12 @@ private static Map<String[], List<ValidationRule>> getClassRules(Class<?> type){
             return rules;
         if(type.equals(String.class))
             return rules;
-        if(type.equals(Timestamp.class) || type.equals(Date.class)){
-            rules.put(new String[0], Collections.singletonList(new TimestampRule()));
+        if(type.equals(Timestamp.class) || type.equals(java.util.Date.class)){
+            rules.put(new String[0], Collections.singletonList(new DateRule(new String[]{})));
+            return rules;
+        }
+        if(type.equals(Date.class)){
+            rules.put(new String[0], Collections.singletonList(new DateRule(new String[]{"date"})));
             return rules;
         }
         if(type.equals(Boolean.class)){

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

@@ -0,0 +1,39 @@
+package org.javawebstack.validator.rule;
+
+import org.javawebstack.graph.GraphElement;
+import org.javawebstack.validator.Validator;
+
+public class ArrayRule implements ValidationRule {
+
+    private final int min;
+    private final int max;
+
+    public ArrayRule(int min, int max){
+        this.min = min;
+        this.max = max;
+    }
+
+    public ArrayRule(String[] params){
+        int min = 0;
+        int max = Integer.MAX_VALUE;
+        if(params.length > 0)
+            min = Integer.parseInt(params[0]);
+        if(params.length > 1)
+            max = Integer.parseInt(params[1]);
+        this.min = min;
+        this.max = max;
+    }
+
+    public String validate(Validator validator, GraphElement value) {
+        if(value == null)
+            return null;
+        if(!value.isArray())
+            return "Not an array";
+        if(value.array().size() < min)
+            return String.format("Shorter than minimum array length (%d < %d)", value.array().size(), min);
+        if(value.array().size() > max)
+            return String.format("Longer than maximum array length (%d > %d)", value.array().size(), max);
+        return null;
+    }
+
+}

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

@@ -0,0 +1,35 @@
+package org.javawebstack.validator.rule;
+
+import org.javawebstack.graph.GraphElement;
+import org.javawebstack.graph.GraphMapper;
+import org.javawebstack.validator.Validator;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+
+public class DateRule implements ValidationRule {
+    private DateFormat dateFormat;
+
+    public DateRule(DateFormat dateFormat){
+        this.dateFormat = dateFormat;
+    }
+
+    public DateRule(String[] params){
+        switch (params.length > 0 ? params[0] : "datetime"){
+            case "date":
+                dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+                break;
+            case "time":
+                dateFormat = new SimpleDateFormat("HH:mm:ss");
+                break;
+            default:
+                dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                break;
+        }
+    }
+
+    public String validate(Validator validator, GraphElement value) {
+
+        return null;
+    }
+}

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

@@ -30,9 +30,9 @@ public String validate(Validator validator, GraphElement value) {
         if(!value.isPrimitive())
             return "Not a string value";
         if(value.toString().length() < min)
-            return String.format("Shorter than minimum length (%d < %d)", value.toString().length(), min);
+            return String.format("Shorter than minimum string length (%d < %d)", value.toString().length(), min);
         if(value.toString().length() > max)
-            return String.format("Longer than maximum length (%d > %d)", value.toString().length(), max);
+            return String.format("Longer than maximum string length (%d > %d)", value.toString().length(), max);
         return null;
     }
 }