From 8c33de9898071324b0e0463fa87bd025407ee945 Mon Sep 17 00:00:00 2001 From: John DeRegnaucourt Date: Sat, 30 Mar 2024 15:38:10 -0400 Subject: [PATCH] Updated "everything" test to use ZonedDateTime's parser instead of Instant's parser because of JDK 1.8 --- changelog.md | 2 ++ pom.xml | 2 +- .../com/cedarsoftware/util/TestGraphComparator.java | 12 ++++-------- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/changelog.md b/changelog.md index 5d4ccbb8..76b33e15 100644 --- a/changelog.md +++ b/changelog.md @@ -1,4 +1,6 @@ ### Revision History +* 2.4.8-SNAPSHOT + * Using json-io 4.14.2 for cloning object in "test" scope, eliminates cycle depedencies * 2.4.7 * All 687 conversions supported are now 100% cross-product tested. Converter test suite is complete. * 2.4.6 diff --git a/pom.xml b/pom.xml index 1bf278bb..42188033 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ 5.10.2 5.10.2 3.25.3 - 4.19.11 + 4.14.2 4.11.0 1.21.1 diff --git a/src/test/java/com/cedarsoftware/util/TestGraphComparator.java b/src/test/java/com/cedarsoftware/util/TestGraphComparator.java index 2d9a16c1..ea8ac33d 100644 --- a/src/test/java/com/cedarsoftware/util/TestGraphComparator.java +++ b/src/test/java/com/cedarsoftware/util/TestGraphComparator.java @@ -17,11 +17,8 @@ import java.util.TreeMap; import java.util.TreeSet; -import com.cedarsoftware.io.JsonIo; -import com.cedarsoftware.io.ReadOptions; -import com.cedarsoftware.io.ReadOptionsBuilder; -import com.cedarsoftware.io.WriteOptions; -import com.cedarsoftware.io.WriteOptionsBuilder; +import com.cedarsoftware.util.io.JsonReader; +import com.cedarsoftware.util.io.JsonWriter; import org.junit.jupiter.api.Test; import static com.cedarsoftware.util.GraphComparator.Delta.Command.ARRAY_RESIZE; @@ -2176,9 +2173,8 @@ private Dude getDude(String name, int age) private Object clone(Object source) { - WriteOptions writeOptions = new WriteOptionsBuilder().showTypeInfoAlways().build(); - ReadOptions readOptions = new ReadOptionsBuilder().build(); - return JsonIo.deepCopy(source, readOptions, writeOptions); + String json = JsonWriter.objectToJson(source); + return JsonReader.jsonToJava(json); } private GraphComparator.ID getIdFetcher()