Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 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
2258955
Updated snakeyaml
JanHolger Oct 7, 2022
7c15a41
Incremented version
JanHolger Oct 7, 2022
9b6bb4c
Added code to respect strict setting
x7airworker Nov 25, 2022
57ac5b9
Fixed equals methods and upgraded dependencies
JanHolger Nov 25, 2022
cd2c52e
Merge pull request #19 from JavaWebStack/qol
JanHolger Nov 25, 2022
a51060e
Improved exception message for missing enum constants
x7airworker Mar 21, 2023
a60ae1b
Merge pull request #20 from JavaWebStack/feature/better_errors
JanHolger Mar 23, 2023
e3cd218
Implemented basic Timezone support in serializing and deserializing
x7airworker Mar 29, 2023
c42c60d
Merge pull request #22 from JavaWebStack/feature/timezones
JanHolger Mar 31, 2023
939e39c
Cleaned up try-catches in DefaultMappers
x7airworker Apr 1, 2023
a3a6f1d
Merge remote-tracking branch 'origin/dev' into dev
x7airworker Apr 1, 2023
89d9ed0
Added tests for equals of AbstractArray and AbstractObject
x7airworker Apr 18, 2023
70b5b02
Merge pull request #24 from JavaWebStack/tests
JanHolger Apr 18, 2023
f8e9f69
Fxied out of bounds error
x7airworker Apr 19, 2023
13d42da
Merge pull request #25 from JavaWebStack/fix-outofbounds
x7airworker Apr 19, 2023
c4e3934
Updated dependencies
JanHolger May 26, 2023
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>
```
12 changes: 9 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
39 changes: 39 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,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;
}
}
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);
}
}
Loading