Merge pull request #27 from JavaWebStack/dev

Release 1.0.5

Author: JanHolger

README.md

@@ -22,6 +22,6 @@ You can find the current docs on our [website](https://docs.javawebstack.org/fra
 <dependency>
     <groupId>org.javawebstack</groupId>
     <artifactId>abstract-data</artifactId>
-    <version>1.0.4</version>
+    <version>1.0.5</version>
 </dependency>
 ```

pom.xml

@@ -7,7 +7,7 @@
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
-        <buildVersion>1.0.4-SNAPSHOT</buildVersion>
+        <buildVersion>1.0.5-SNAPSHOT</buildVersion>
     </properties>
 
     <groupId>org.javawebstack</groupId>
@@ -44,14 +44,20 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.30</version>
+            <version>2.0</version>
         </dependency>
         <dependency>
             <groupId>org.mongodb</groupId>
             <artifactId>bson</artifactId>
-            <version>4.6.0</version>
+            <version>4.9.1</version>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.9.3</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/org/javawebstack/abstractdata/AbstractArray.java

@@ -343,4 +343,43 @@ public AbstractElement clone() {
         return new AbstractArrayCollector<>(e -> e);
     }
 
+    public boolean equals(Object obj, boolean strict) {
+        if (obj == null)
+            return false;
+        if (!(obj instanceof AbstractElement))
+            return false;
+        try {
+            AbstractArray arr = ((AbstractElement) obj).array(strict);
+            if (size() != arr.size())
+                return false;
+            if (size() == 0 || arr.size() == 0)
+                return false;
+
+            for (int i = 0; i < size(); i++) {
+                if (!(get(i).equals(arr.get(i), strict)))
+                    return false;
+            }
+            return true;
+        } catch (AbstractCoercingException ignored) {
+            return false;
+        }
+    }
+
+    public boolean equals (Object obj) {
+        return equals(obj, false);
+    }
+
+    public AbstractArray addAll(AbstractArray array) {
+        elements.addAll(array.elements);
+        return this;
+    }
+
+    public AbstractArray concat(AbstractArray... array) {
+        AbstractArray newArr = new AbstractArray();
+        newArr.addAll(this);
+        for (AbstractArray arr : array)
+            newArr.addAll(arr);
+
+        return newArr;
+    }
 }

src/main/java/org/javawebstack/abstractdata/AbstractElement.java

@@ -246,4 +246,5 @@ public boolean isPrimitive() {
         }
     }
 
+    boolean equals(Object obj, boolean strict);
 }

src/main/java/org/javawebstack/abstractdata/AbstractNull.java

@@ -55,4 +55,12 @@ public AbstractElement clone() {
     public Type getType() {
         return Type.NULL;
     }
+
+    public boolean equals(Object obj, boolean strict) {
+        return obj == null || obj instanceof AbstractNull;
+    }
+
+    public boolean equals (Object obj) {
+        return equals(obj, false);
+    }
 }

src/main/java/org/javawebstack/abstractdata/AbstractObject.java

@@ -267,4 +267,28 @@ public AbstractElement clone() {
         return new AbstractObjectCollector<>(keyFunction, valueFunction);
     }
 
+    public boolean equals(Object obj, boolean strict) {
+        if (obj == null)
+            return false;
+        if (!(obj instanceof AbstractElement))
+            return false;
+        try {
+            AbstractObject object = ((AbstractElement) obj).object(strict);
+            if (size() != object.size())
+                return false;
+            for (String key : keys()) {
+                if (!object.has(key))
+                    return false;
+                if (!object.get(key).equals(get(key), strict))
+                    return false;
+            }
+            return true;
+        } catch (AbstractCoercingException ignored) {
+            return false;
+        }
+    }
+
+    public boolean equals (Object obj) {
+        return equals(obj, false);
+    }
 }

src/main/java/org/javawebstack/abstractdata/AbstractPrimitive.java

@@ -175,4 +175,24 @@ public AbstractElement clone() {
         return from(value);
     }
 
+    public boolean equals(Object obj, boolean strict) {
+        if (obj == null)
+            return false;
+        if (!(obj instanceof AbstractPrimitive))
+            return false;
+        AbstractPrimitive primitive = (AbstractPrimitive) obj;
+        try {
+            if(isBoolean())
+                return bool() == primitive.bool(strict);
+            if(isNumber())
+                return number().equals(primitive.number(strict));
+            if(isString())
+                return string().equals(primitive.string(strict));
+        } catch (AbstractCoercingException ignored) {}
+        return false;
+    }
+
+    public boolean equals (Object obj) {
+        return equals(obj, false);
+    }
 }