Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 14 additions & 1 deletion src/main/java/ai/diffy/compare/Difference.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<Object>) ls, (List<Object>) rs);
if (l instanceof List<?> ls && r instanceof List<?> rs) return diffSeq((List<Object>) ls, (List<Object>) rs);
if (l instanceof Set<?> ls && r instanceof Set<?> rs) return diffSet((Set<Object>) ls, (Set<Object>) rs);
if (l instanceof FieldMap lm && r instanceof FieldMap rm) return diffObjectMap(lm, rm);
Expand All @@ -104,6 +104,19 @@ static <A> TerminalDifference diffSet(Set<A> left, Set<A> 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<Object> left, List<Object> right) {
if (left.stream().noneMatch(e -> e instanceof FieldMap)) return new NoDifference<>(left);
List<Difference> 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 <A> SeqDifference diffSeq(List<A> left, List<A> right) {
List<A> leftNotRight = new ArrayList<>(left);
Expand Down
12 changes: 12 additions & 0 deletions src/main/java/ai/diffy/lifter/FieldMap.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package ai.diffy.lifter;

import java.util.Map;
import java.util.Objects;
import java.util.TreeMap;

public class FieldMap {
Expand All @@ -10,6 +11,17 @@ public FieldMap(Map<String, Object> 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
Expand Down
36 changes: 36 additions & 0 deletions src/test/java/ai/diffy/compare/DifferenceTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,42 @@ void actualArrayDifferencesArePreserved(String left, String right, String field)
assertTrue(differences.containsKey("value." + field), differences::toString);
}

@Test
void reorderedObjectArraysAreOrderingDifferences() {
Map<String, Difference> 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<String, Difference> 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<String, Difference> 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<String, Difference> 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");
Expand Down
32 changes: 32 additions & 0 deletions src/test/java/ai/diffy/lifter/FieldMapTest.java
Original file line number Diff line number Diff line change
@@ -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<String, Object> left = new LinkedHashMap<>();
left.put("a", 1);
left.put("b", List.of("x"));
Map<String, Object> 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)));
}
}
Loading