Switched from Graph to AbstractData

Author: JanHolger

pom.xml

@@ -23,7 +23,7 @@
         </dependency>
         <dependency>
             <groupId>org.javawebstack</groupId>
-            <artifactId>Graph</artifactId>
+            <artifactId>AbstractData</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>

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

@@ -3,10 +3,10 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.annotations.SerializedName;
-import org.javawebstack.graph.GraphArray;
-import org.javawebstack.graph.GraphElement;
-import org.javawebstack.graph.GraphMapper;
-import org.javawebstack.graph.GraphNull;
+import org.javawebstack.abstractdata.AbstractArray;
+import org.javawebstack.abstractdata.AbstractElement;
+import org.javawebstack.abstractdata.AbstractMapper;
+import org.javawebstack.abstractdata.AbstractNull;
 import org.javawebstack.validator.rule.*;
 
 import java.lang.reflect.Constructor;
@@ -74,7 +74,7 @@ public static ValidationRule makeRule(String source){
             source = spl[0];
             String s = spl[1];
             s = s.substring(0, s.length()-1);
-            GraphArray array = GraphArray.fromJson(new Gson().fromJson("["+s+"]", JsonArray.class));
+            AbstractArray array = AbstractArray.fromJson(new Gson().fromJson("["+s+"]", JsonArray.class));
             if(array.stream().filter(e -> e.isPrimitive()).count() == array.size()){
                 params = new String[array.size()];
                 for(int i=0; i<params.length; i++)
@@ -103,16 +103,16 @@ public static Validator getValidator(Class<?> type){
         return validator;
     }
 
-    public static <T> T map(Class<T> type, GraphElement element, GraphMapper mapper){
+    public static <T> T map(Class<T> type, AbstractElement element, AbstractMapper mapper){
         Validator validator = getValidator(type);
         ValidationResult result = validator.validate(element);
         if(!result.isValid())
             throw new ValidationException(result);
-        return mapper.fromGraph(element, type);
+        return mapper.fromAbstract(element, type);
     }
 
-    public static <T> T map(Class<T> type, GraphElement element){
-        return map(type, element, new GraphMapper());
+    public static <T> T map(Class<T> type, AbstractElement element){
+        return map(type, element, new AbstractMapper());
     }
 
     private final Map<String[], List<ValidationRule>> rules = new HashMap<>();
@@ -134,15 +134,15 @@ public Validator rule(String key, ValidationRule... rules){
         return rule(key, Arrays.asList(rules));
     }
 
-    public ValidationResult validate(GraphElement rootElement){
+    public ValidationResult validate(AbstractElement rootElement){
         Map<String[], List<String>> errors = new HashMap<>();
         for(String[] key : rules.keySet()){
             errors.putAll(check(rules, new String[0], new String[0], key, rootElement));
         }
         return new ValidationResult(errors);
     }
 
-    private Map<String[], List<String>> check(Map<String[], List<ValidationRule>> rules, String[] keyPrefix, String[] resolvedKeyPrefix, String[] key, GraphElement element){
+    private Map<String[], List<String>> check(Map<String[], List<ValidationRule>> rules, String[] keyPrefix, String[] resolvedKeyPrefix, String[] key, AbstractElement element){
         if(key.length == 0){
             Map<String[], List<String>> errors = new HashMap<>();
             for(ValidationRule rule : getMapValue(rules, keyPrefix)){
@@ -156,7 +156,7 @@ private Map<String[], List<String>> check(Map<String[], List<ValidationRule>> ru
             return errors;
         }
         if(element == null)
-            element = GraphNull.INSTANCE;
+            element = AbstractNull.INSTANCE;
         String[] innerKey = new String[key.length-1];
         System.arraycopy(key, 1, innerKey, 0, innerKey.length);
         String[] innerKeyPrefix = new String[keyPrefix.length+1];
@@ -182,7 +182,7 @@ private Map<String[], List<String>> check(Map<String[], List<ValidationRule>> ru
             }
             return errors;
         }
-        GraphElement value = GraphNull.INSTANCE;
+        AbstractElement value = AbstractNull.INSTANCE;
         if(element.isArray()){
             try {
                 value = element.array().get(Integer.parseInt(key[0]));

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

@@ -1,6 +1,6 @@
 package org.javawebstack.validator.rule;
 
-import org.javawebstack.graph.GraphElement;
+import org.javawebstack.abstractdata.AbstractElement;
 import org.javawebstack.validator.Validator;
 
 public class ArrayRule implements ValidationRule {
@@ -24,7 +24,7 @@ public ArrayRule(String[] params){
         this.max = max;
     }
 
-    public String validate(Validator validator, GraphElement value) {
+    public String validate(Validator validator, AbstractElement value) {
         if(value == null)
             return null;
         if(!value.isArray())

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

@@ -1,10 +1,10 @@
 package org.javawebstack.validator.rule;
 
-import org.javawebstack.graph.GraphElement;
+import org.javawebstack.abstractdata.AbstractElement;
 import org.javawebstack.validator.Validator;
 
 public class BooleanRule implements ValidationRule {
-    public String validate(Validator validator, GraphElement value) {
+    public String validate(Validator validator, AbstractElement value) {
         if(value == null)
             return null;
         if(value.isBoolean())

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

@@ -1,7 +1,7 @@
 package org.javawebstack.validator.rule;
 
-import org.javawebstack.graph.GraphElement;
-import org.javawebstack.graph.GraphMapper;
+import org.javawebstack.abstractdata.AbstractElement;
+import org.javawebstack.abstractdata.AbstractMapper;
 import org.javawebstack.validator.Validator;
 
 import java.text.DateFormat;
@@ -28,7 +28,7 @@ public DateRule(String[] params){
         }
     }
 
-    public String validate(Validator validator, GraphElement value) {
+    public String validate(Validator validator, AbstractElement value) {
 
         return null;
     }

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

@@ -1,6 +1,6 @@
 package org.javawebstack.validator.rule;
 
-import org.javawebstack.graph.GraphElement;
+import org.javawebstack.abstractdata.AbstractElement;
 import org.javawebstack.validator.Validator;
 
 import java.util.Arrays;
@@ -18,7 +18,7 @@ public EnumRule(String... values){
     public EnumRule(Class<? extends Enum<?>> enumType){
         this(Arrays.stream(enumType.getEnumConstants()).map(Enum::name).collect(Collectors.toList()));
     }
-    public String validate(Validator validator, GraphElement value) {
+    public String validate(Validator validator, AbstractElement value) {
         if(value == null)
             return null;
         return value.isString() && values.contains(value.string()) ? null : String.format("Not an element of [%s]", String.join(",", values));

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

@@ -1,6 +1,6 @@
 package org.javawebstack.validator.rule;
 
-import org.javawebstack.graph.GraphElement;
+import org.javawebstack.abstractdata.AbstractElement;
 import org.javawebstack.validator.Validator;
 
 public class IPv4AddressRule extends RegexRule {
@@ -9,7 +9,7 @@ public IPv4AddressRule() {
         super("((([01][0-9]{0,2})|(2[0-4][0-9])|(25[0-5])))(\\.(?1)){3}");
     }
 
-    public String validate(Validator validator, GraphElement value) {
+    public String validate(Validator validator, AbstractElement value) {
         return super.validate(validator, value) == null ? null : "Not a valid IPv4 Address";
     }
 }

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

@@ -1,14 +1,14 @@
 package org.javawebstack.validator.rule;
 
-import org.javawebstack.graph.GraphElement;
+import org.javawebstack.abstractdata.AbstractElement;
 import org.javawebstack.validator.Validator;
 
 public class IPv6AddressRule extends RegexRule {
     public IPv6AddressRule() {
         super("([0-9a-fA-F]{1,4})(:(?1)){7}");
     }
 
-    public String validate(Validator validator, GraphElement value) {
+    public String validate(Validator validator, AbstractElement value) {
         return super.validate(validator, value) == null ? null : "Not a valid IPv6 Address";
     }
 }

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

@@ -1,6 +1,6 @@
 package org.javawebstack.validator.rule;
 
-import org.javawebstack.graph.GraphElement;
+import org.javawebstack.abstractdata.AbstractElement;
 import org.javawebstack.validator.Validator;
 
 public class IntegerRule implements ValidationRule {
@@ -34,7 +34,7 @@ public IntegerRule(String[] params){
         this.step = step;
     }
 
-    public String validate(Validator validator, GraphElement value) {
+    public String validate(Validator validator, AbstractElement value) {
         if(value == null)
             return null;
         int v;

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

@@ -1,6 +1,6 @@
 package org.javawebstack.validator.rule;
 
-import org.javawebstack.graph.GraphElement;
+import org.javawebstack.abstractdata.AbstractElement;
 import org.javawebstack.validator.Validator;
 
 import java.util.regex.Pattern;
@@ -12,7 +12,7 @@ public RegexRule(String regex){
         this.regex = regex;
         this.pattern = Pattern.compile(regex);
     }
-    public String validate(Validator validator, GraphElement value) {
+    public String validate(Validator validator, AbstractElement value) {
         if(value == null)
             return null;
         return value.isString() && pattern.matcher(value.string()).matches() ? null : "Doesn't match the expected pattern";