From cd6c3251da13ae4eecc2caf552b7b73857d4bb13 Mon Sep 17 00:00:00 2001 From: John DeRegnaucourt Date: Sun, 7 Apr 2024 14:44:24 -0400 Subject: [PATCH] 2.5.0-SNAPSHOT ready --- changelog.md | 2 ++ pom.xml | 4 ++-- .../java/com/cedarsoftware/util/TestGraphComparator.java | 7 ++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/changelog.md b/changelog.md index ccfbe5d5..97509c14 100644 --- a/changelog.md +++ b/changelog.md @@ -1,4 +1,6 @@ ### Revision History +* 2.5.0-SNAPSHOT + * Wanted: DateTimeFormatter added as a supported conversion (to/from String, to/from Map) * 2.4.9 * Updated to allow the project to be compiled by versions of JDK > 1.8 yet still generate class file format 52 .class files so that they can be executed on JDK 1.8+ and up. * Incorporated @AxataDarji GraphComparator changes that reduce cyclomatic code complexity (refactored to smaller methods) diff --git a/pom.xml b/pom.xml index 65108e23..ce5d0d42 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.cedarsoftware java-util jar - 2.4.9 + 2.5.0-SNAPSHOT Java Utilities https://github.com/jdereg/java-util @@ -33,7 +33,7 @@ 5.10.2 5.10.2 3.25.3 - 4.14.1 + 4.19.13 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 ea8ac33d..92214c33 100644 --- a/src/test/java/com/cedarsoftware/util/TestGraphComparator.java +++ b/src/test/java/com/cedarsoftware/util/TestGraphComparator.java @@ -17,8 +17,7 @@ import java.util.TreeMap; import java.util.TreeSet; -import com.cedarsoftware.util.io.JsonReader; -import com.cedarsoftware.util.io.JsonWriter; +import com.cedarsoftware.io.JsonIo; import org.junit.jupiter.api.Test; import static com.cedarsoftware.util.GraphComparator.Delta.Command.ARRAY_RESIZE; @@ -2172,9 +2171,7 @@ private Dude getDude(String name, int age) } private Object clone(Object source) { - - String json = JsonWriter.objectToJson(source); - return JsonReader.jsonToJava(json); + return JsonIo.deepCopy(source, null, null); } private GraphComparator.ID getIdFetcher()