Skip to content

Implemented equals methods and concat on AbstractArray #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JanHolger merged 7 commits into from
Nov 25, 2022
Merged

Implemented equals methods and concat on AbstractArray #19

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
26e02a6
Implemented equals methods
x7airworker Sep 5, 2022
26ae7df
Added concat method
x7airworker Sep 5, 2022
31f590c
Changed concat implementation
x7airworker Sep 5, 2022
f124d1d
Renamed old concat to addAll and implemented new concat method
x7airworker Sep 5, 2022
50f13de
Added option to use strict mode
x7airworker Sep 5, 2022
9b6bb4c
Added code to respect strict setting
x7airworker Nov 25, 2022
57ac5b9
Fixed equals methods and upgraded dependencies
JanHolger Nov 25, 2022
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
34 changes: 34 additions & 0 deletions src/main/java/org/javawebstack/abstractdata/AbstractArray.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,4 +343,38 @@ public AbstractElement clone() {
return new AbstractArrayCollector<>(e -> e);
}

public boolean equals(Object obj, boolean strict) {
if (obj == null)
return false;
if (!(obj instanceof AbstractArray))
Comment thread
x7airworker marked this conversation as resolved.
Resolved
return false;
AbstractArray arr = (AbstractArray) obj;
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;
}

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.add(arr);
Comment thread
x7airworker marked this conversation as resolved.
Resolved

return newArr;
}
}
1 change: 1 addition & 0 deletions src/main/java/org/javawebstack/abstractdata/AbstractElement.java
View file
Open in desktop
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
View file
Open in desktop
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);
}
}
22 changes: 22 additions & 0 deletions src/main/java/org/javawebstack/abstractdata/AbstractObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,4 +267,26 @@ public AbstractElement clone() {
return new AbstractObjectCollector<>(keyFunction, valueFunction);
}

public boolean equals(Object obj, boolean strict) {
if (obj == null)
return false;
if (!(obj instanceof AbstractObject))
Comment thread
x7airworker marked this conversation as resolved.
Resolved
return false;
AbstractObject object = (AbstractObject) obj;
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;
}

public boolean equals (Object obj) {
return equals(obj, false);
}
}
20 changes: 20 additions & 0 deletions src/main/java/org/javawebstack/abstractdata/AbstractPrimitive.java
View file
Open in desktop
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;
if (isBoolean() && primitive.isBoolean())
Comment thread
x7airworker marked this conversation as resolved.
Resolved
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));

return false;
}

public boolean equals (Object obj) {
return equals(obj, false);
}
}