Switched from Graph to AbstractData

JanHolger · JanHolger · commit d3d72e353a3e · 2021-01-22T00:19:39.000+01:00
diff --git a/pom.xml b/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>
diff --git a/src/main/java/org/javawebstack/validator/Validator.java b/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]));
diff --git a/src/main/java/org/javawebstack/validator/rule/ArrayRule.java b/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())
diff --git a/src/main/java/org/javawebstack/validator/rule/BooleanRule.java b/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())
diff --git a/src/main/java/org/javawebstack/validator/rule/DateRule.java b/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;
     }
diff --git a/src/main/java/org/javawebstack/validator/rule/EnumRule.java b/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));
diff --git a/src/main/java/org/javawebstack/validator/rule/IPv4AddressRule.java b/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";
     }
 }
diff --git a/src/main/java/org/javawebstack/validator/rule/IPv6AddressRule.java b/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";
     }
 }
diff --git a/src/main/java/org/javawebstack/validator/rule/IntegerRule.java b/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;
diff --git a/src/main/java/org/javawebstack/validator/rule/RegexRule.java b/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";
diff --git a/src/main/java/org/javawebstack/validator/rule/RequiredRule.java b/src/main/java/org/javawebstack/validator/rule/RequiredRule.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 RequiredRule implements ValidationRule {
-    public String validate(Validator validator, GraphElement value) {
+    public String validate(Validator validator, AbstractElement value) {
         return value != null ? null : "Missing required field";
     }
 }
diff --git a/src/main/java/org/javawebstack/validator/rule/StringRule.java b/src/main/java/org/javawebstack/validator/rule/StringRule.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 StringRule implements ValidationRule {
@@ -24,7 +24,7 @@ public StringRule(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.isPrimitive())
diff --git a/src/main/java/org/javawebstack/validator/rule/UUIDRule.java b/src/main/java/org/javawebstack/validator/rule/UUIDRule.java
@@ -1,13 +1,13 @@
 package org.javawebstack.validator.rule;
 
-import org.javawebstack.graph.GraphElement;
+import org.javawebstack.abstractdata.AbstractElement;
 import org.javawebstack.validator.Validator;
 
 import java.util.UUID;
 
 public class UUIDRule implements ValidationRule {
 
-    public String validate(Validator validator, GraphElement value) {
+    public String validate(Validator validator, AbstractElement value) {
         if(!value.isString())
             return "Not a valid uuid value";
         try {
diff --git a/src/main/java/org/javawebstack/validator/rule/ValidationRule.java b/src/main/java/org/javawebstack/validator/rule/ValidationRule.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 interface ValidationRule {
 
-    String validate(Validator validator, GraphElement value);
+    String validate(Validator validator, AbstractElement value);
 
 }
diff --git a/src/test/java/test/org/javawebstack/validator/RequiredRuleTest.java b/src/test/java/test/org/javawebstack/validator/RequiredRuleTest.java
@@ -1,7 +1,7 @@
 package test.org.javawebstack.validator;
 
 import com.google.gson.annotations.Expose;
-import org.javawebstack.graph.GraphMapper;
+import org.javawebstack.abstractdata.AbstractMapper;
 import org.javawebstack.validator.Rule;
 import org.javawebstack.validator.Validator;
 import org.junit.jupiter.api.Test;
@@ -13,24 +13,24 @@ public class RequiredRuleTest {
     public void testSimpleRequiredRule(){
         Validator validator = Validator.getValidator(TestObject1.class);
         TestObject1 test = new TestObject1();
-        assertFalse(validator.validate(new GraphMapper().toGraph(test)).isValid());
+        assertFalse(validator.validate(new AbstractMapper().toAbstract(test)).isValid());
         test.name = "Test";
-        assertTrue(validator.validate(new GraphMapper().toGraph(test)).isValid());
+        assertTrue(validator.validate(new AbstractMapper().toAbstract(test)).isValid());
     }
 
     @Test
     public void testInnerRequiredRule(){
         Validator validator = Validator.getValidator(TestObject2.class);
         TestObject2 test = new TestObject2();
-        assertTrue(validator.validate(new GraphMapper().toGraph(test)).isValid());
+        assertTrue(validator.validate(new AbstractMapper().toAbstract(test)).isValid());
         test.inners = new TestObject2.Inner[0];
-        assertTrue(validator.validate(new GraphMapper().toGraph(test)).isValid());
+        assertTrue(validator.validate(new AbstractMapper().toAbstract(test)).isValid());
         test.inners = new TestObject2.Inner[]{
                 new TestObject2.Inner()
         };
-        assertFalse(validator.validate(new GraphMapper().toGraph(test)).isValid());
+        assertFalse(validator.validate(new AbstractMapper().toAbstract(test)).isValid());
         test.inners[0].name = "Test";
-        assertTrue(validator.validate(new GraphMapper().toGraph(test)).isValid());
+        assertTrue(validator.validate(new AbstractMapper().toAbstract(test)).isValid());
     }
 
     private static class TestObject1 {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package org.javawebstack.validator.rule;`
`2`	`2`
`3`		`-import org.javawebstack.graph.GraphElement;`
`4`		`-import org.javawebstack.graph.GraphMapper;`
	`3`	`+import org.javawebstack.abstractdata.AbstractElement;`
	`4`	`+import org.javawebstack.abstractdata.AbstractMapper;`
`5`	`5`	`import org.javawebstack.validator.Validator;`
`6`	`6`
`7`	`7`	`import java.text.DateFormat;`
`@@ -28,7 +28,7 @@ public DateRule(String[] params){`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
`31`		`- public String validate(Validator validator, GraphElement value) {`
	`31`	`+ public String validate(Validator validator, AbstractElement value) {`
`32`	`32`
`33`	`33`	`return null;`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package org.javawebstack.validator.rule;`
`2`	`2`
`3`		`-import org.javawebstack.graph.GraphElement;`
	`3`	`+import org.javawebstack.abstractdata.AbstractElement;`
`4`	`4`	`import org.javawebstack.validator.Validator;`
`5`	`5`
`6`	`6`	`public class IPv4AddressRule extends RegexRule {`
`@@ -9,7 +9,7 @@ public IPv4AddressRule() {`
`9`	`9`	`super("((([01][0-9]{0,2})\|(2[0-4][0-9])\|(25[0-5])))(\\.(?1)){3}");`
`10`	`10`	`}`
`11`	`11`
`12`		`- public String validate(Validator validator, GraphElement value) {`
	`12`	`+ public String validate(Validator validator, AbstractElement value) {`
`13`	`13`	`return super.validate(validator, value) == null ? null : "Not a valid IPv4 Address";`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,14 @@`
`1`	`1`	`package org.javawebstack.validator.rule;`
`2`	`2`
`3`		`-import org.javawebstack.graph.GraphElement;`
	`3`	`+import org.javawebstack.abstractdata.AbstractElement;`
`4`	`4`	`import org.javawebstack.validator.Validator;`
`5`	`5`
`6`	`6`	`public class IPv6AddressRule extends RegexRule {`
`7`	`7`	`public IPv6AddressRule() {`
`8`	`8`	`super("([0-9a-fA-F]{1,4})(:(?1)){7}");`
`9`	`9`	`}`
`10`	`10`
`11`		`- public String validate(Validator validator, GraphElement value) {`
	`11`	`+ public String validate(Validator validator, AbstractElement value) {`
`12`	`12`	`return super.validate(validator, value) == null ? null : "Not a valid IPv6 Address";`
`13`	`13`	`}`
`14`	`14`	`}`