Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
37 changes: 37 additions & 0 deletions src/main/java/org/javawebstack/abstractdata/AbstractArray.java
Original file line number Diff line number Diff line change
Expand Up @@ -343,4 +343,41 @@ 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 (arr.size() != arr.size())
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;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -246,4 +246,5 @@ public boolean isPrimitive() {
}
}

boolean equals(Object obj, boolean strict);
}
8 changes: 8 additions & 0 deletions src/main/java/org/javawebstack/abstractdata/AbstractNull.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
24 changes: 24 additions & 0 deletions src/main/java/org/javawebstack/abstractdata/AbstractObject.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
20 changes: 20 additions & 0 deletions src/main/java/org/javawebstack/abstractdata/AbstractPrimitive.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}