Fixed equals methods and upgraded dependencies

Author: Bebendorf, Jan

pom.xml

@@ -44,12 +44,12 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.30</version>
+            <version>1.33</version>
         </dependency>
         <dependency>
             <groupId>org.mongodb</groupId>
             <artifactId>bson</artifactId>
-            <version>4.6.0</version>
+            <version>4.7.1</version>
             <optional>true</optional>
         </dependency>
     </dependencies>

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

@@ -346,23 +346,21 @@ public AbstractElement clone() {
     public boolean equals(Object obj, boolean strict) {
         if (obj == null)
             return false;
-        if (!(obj instanceof AbstractArray)) {
-            if (strict)
+        if (!(obj instanceof AbstractElement))
+            return false;
+        try {
+            AbstractArray arr = ((AbstractElement) obj).array(strict);
+            if (arr.size() != arr.size())
                 return false;
 
-            obj = AbstractElement.fromAbstractObject(obj).array();
-        }
-
-        AbstractArray arr = (AbstractArray) obj;
-        if (arr.size() != arr.size())
+            for (int i = 0; i < size(); i++) {
+                if (!(get(i).equals(arr.get(i), strict)))
+                    return false;
+            }
+            return true;
+        } catch (AbstractCoercingException ignored) {
             return false;
-
-        for (int i = 0; i < size(); i++) {
-            if (!(get(i).equals(arr.get(i), strict)))
-                return false;
         }
-
-        return true;
     }
 
     public boolean equals (Object obj) {

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

@@ -270,25 +270,22 @@ public AbstractElement clone() {
     public boolean equals(Object obj, boolean strict) {
         if (obj == null)
             return false;
-        if (!(obj instanceof AbstractObject)) {
-            if (strict)
-                return false;
-            
-            obj = AbstractElement.fromAbstractObject(obj).object();
-        }
-
-        AbstractObject object = (AbstractObject) obj;
-        if (size() != object.size())
+        if (!(obj instanceof AbstractElement))
             return false;
-
-        for (String key : keys()) {
-            if (!object.has(key))
-                return false;
-            if (!object.get(key).equals(get(key), strict))
+        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;
         }
-
-        return true;
     }
 
     public boolean equals (Object obj) {

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

@@ -178,21 +178,17 @@ public AbstractElement clone() {
     public boolean equals(Object obj, boolean strict) {
         if (obj == null)
             return false;
-        if (!(obj instanceof AbstractPrimitive)) {
-            if (strict)
-                return false;
-
-            obj = AbstractElement.fromAbstractObject(obj).primitive();
-        }
-
+        if (!(obj instanceof AbstractPrimitive))
+            return false;
         AbstractPrimitive primitive = (AbstractPrimitive) obj;
-        if (isBoolean() && primitive.isBoolean())
-            return bool(strict).equals(primitive.bool(strict));
-        if (isNumber() && primitive.isNumber())
-            return number(strict).equals(primitive.number(strict));
-        if (isString() && primitive.isString())
-            return string(strict).equals(primitive.string(strict));
-
+        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;
     }