diff --git a/src/main/java/ai/diffy/compare/Difference.java b/src/main/java/ai/diffy/compare/Difference.java index 7c65c01..d2954e7 100644 --- a/src/main/java/ai/diffy/compare/Difference.java +++ b/src/main/java/ai/diffy/compare/Difference.java @@ -86,7 +86,7 @@ static Difference apply(Object leftRaw, Object rightRaw) { if (isPrimitive(l) && Objects.equals(l, r)) return new NoDifference<>(l); if (isPrimitive(l) && l.getClass() == r.getClass()) return new PrimitiveDifference<>(l, r); - if (l instanceof List ls && r instanceof List rs && ls.equals(rs)) return new NoDifference<>(ls); + if (l instanceof List ls && r instanceof List rs && ls.equals(rs)) return diffEqualSeq((List) ls, (List) rs); if (l instanceof List ls && r instanceof List rs) return diffSeq((List) ls, (List) rs); if (l instanceof Set ls && r instanceof Set rs) return diffSet((Set) ls, (Set) rs); if (l instanceof FieldMap lm && r instanceof FieldMap rm) return diffObjectMap(lm, rm); @@ -104,6 +104,19 @@ static TerminalDifference diffSet(Set left, Set right) { return new SetDifference<>(lnr, rnl); } + /** + * Equal lists have no difference. Lists of structured elements are still walked + * element by element so that field-level NoDifference metadata is retained. + */ + static Difference diffEqualSeq(List left, List right) { + if (left.stream().noneMatch(e -> e instanceof FieldMap)) return new NoDifference<>(left); + List diffs = new ArrayList<>(); + for (int i = 0; i < left.size(); i++) { + diffs.add(apply(left.get(i), right.get(i))); + } + return new IndexedDifference(diffs); + } + @SuppressWarnings("unchecked") static SeqDifference diffSeq(List left, List right) { List leftNotRight = new ArrayList<>(left); diff --git a/src/main/java/ai/diffy/lifter/FieldMap.java b/src/main/java/ai/diffy/lifter/FieldMap.java index 8f81f19..d920b48 100644 --- a/src/main/java/ai/diffy/lifter/FieldMap.java +++ b/src/main/java/ai/diffy/lifter/FieldMap.java @@ -1,6 +1,7 @@ package ai.diffy.lifter; import java.util.Map; +import java.util.Objects; import java.util.TreeMap; public class FieldMap { @@ -10,6 +11,17 @@ public FieldMap(Map value) { this.value = value; } + @Override + public boolean equals(Object o) { + if (this == o) return true; + return o instanceof FieldMap other && Objects.equals(value, other.value); + } + + @Override + public int hashCode() { + return Objects.hashCode(value); + } + @Override public String toString() { // Match Scala: toSeq.sortBy key then toString diff --git a/src/test/java/ai/diffy/compare/DifferenceTest.java b/src/test/java/ai/diffy/compare/DifferenceTest.java index 1e7e4b7..3b27093 100644 --- a/src/test/java/ai/diffy/compare/DifferenceTest.java +++ b/src/test/java/ai/diffy/compare/DifferenceTest.java @@ -60,6 +60,42 @@ void actualArrayDifferencesArePreserved(String left, String right, String field) assertTrue(differences.containsKey("value." + field), differences::toString); } + @Test + void reorderedObjectArraysAreOrderingDifferences() { + Map differences = + Difference.apply("[{\"a\":1},{\"a\":2}]", "[{\"a\":2},{\"a\":1}]").flattened(); + + assertTrue(differences.containsKey("value.OrderingDifference"), differences::toString); + assertFalse(differences.containsKey("value.a.PrimitiveDifference"), differences::toString); + } + + @Test + void reorderedNestedObjectArraysAreOrderingDifferences() { + String left = "{\"items\":[{\"id\":1,\"tags\":[\"x\"]},{\"id\":2,\"tags\":[]}]}"; + String right = "{\"items\":[{\"id\":2,\"tags\":[]},{\"id\":1,\"tags\":[\"x\"]}]}"; + Map differences = Difference.apply(left, right).flattened(); + + assertTrue(differences.containsKey("value.items.OrderingDifference"), differences::toString); + } + + @Test + void identicalObjectArraysRetainFieldLevelNoDifferences() { + String json = "{\"items\":[{\"id\":1,\"tags\":[]},{\"id\":2,\"tags\":[\"x\"]}]}"; + Map differences = Difference.apply(json, json).flattened(); + + assertInstanceOf(NoDifference.class, differences.get("value.items.id.NoDifference")); + assertInstanceOf(NoDifference.class, differences.get("value.items.tags.NoDifference")); + assertTrue(differences.values().stream().allMatch(difference -> difference instanceof NoDifference)); + } + + @Test + void changedObjectArraysStillReportFieldDifferences() { + Map differences = + Difference.apply("[{\"a\":1},{\"a\":2}]", "[{\"a\":1},{\"a\":3}]").flattened(); + + assertTrue(differences.containsKey("value.a.PrimitiveDifference"), differences::toString); + } + @Test public void payloadTest() throws IOException { FileSystemResource payload = new FileSystemResource("src/test/resources/payload.json"); diff --git a/src/test/java/ai/diffy/lifter/FieldMapTest.java b/src/test/java/ai/diffy/lifter/FieldMapTest.java new file mode 100644 index 0000000..82f85d0 --- /dev/null +++ b/src/test/java/ai/diffy/lifter/FieldMapTest.java @@ -0,0 +1,32 @@ +package ai.diffy.lifter; + +import org.junit.jupiter.api.Test; + +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; + +class FieldMapTest { + + @Test + void fieldMapsWithEqualValuesAreEqual() { + Map left = new LinkedHashMap<>(); + left.put("a", 1); + left.put("b", List.of("x")); + Map right = new LinkedHashMap<>(); + right.put("b", List.of("x")); + right.put("a", 1); + + assertEquals(new FieldMap(left), new FieldMap(right)); + assertEquals(new FieldMap(left).hashCode(), new FieldMap(right).hashCode()); + } + + @Test + void fieldMapsWithDifferentValuesAreNotEqual() { + assertNotEquals(new FieldMap(Map.of("a", 1)), new FieldMap(Map.of("a", 2))); + assertNotEquals(new FieldMap(Map.of("a", 1)), new FieldMap(Map.of("b", 1))); + } +}