DiffProcessor: factorize additions into copies where possible

fge · fge · commit 799c5955403d · 2014-11-18T08:26:03.000+01:00
If an element is added which already exists in the source and is unchanged in
the target, make the addition a copy instead.
diff --git a/src/main/java/com/github/fge/jsonpatch/diff2/DiffProcessor.java b/src/main/java/com/github/fge/jsonpatch/diff2/DiffProcessor.java
@@ -20,18 +20,25 @@
 package com.github.fge.jsonpatch.diff2;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.github.fge.jackson.JsonNumEquals;
 import com.github.fge.jackson.jsonpointer.JsonPointer;
 import com.github.fge.jsonpatch.JsonPatch;
 import com.github.fge.jsonpatch.JsonPatchOperation;
+import com.google.common.base.Equivalence;
+import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 
+import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
 
 // Non final because we want to be able to Mockito.spy() on it
 class DiffProcessor
 {
+    private static final Equivalence<JsonNode> EQUIVALENCE
+        = JsonNumEquals.getInstance();
+
     private final Map<JsonPointer, JsonNode> unchanged;
 
     private final List<DiffOperation> diffs = Lists.newArrayList();
@@ -54,7 +61,12 @@ void valueRemoved(final JsonPointer pointer, final JsonNode value)
 
     void valueAdded(final JsonPointer pointer, final JsonNode value)
     {
-        diffs.add(DiffOperation.add(pointer, value));
+        final JsonPointer ptr = findUnchangedValue(value);
+        final DiffOperation op = ptr != null
+            ? DiffOperation.copy(ptr, pointer, value)
+            : DiffOperation.add(pointer, value);
+
+        diffs.add(op);
     }
 
     JsonPatch getPatch()
@@ -66,4 +78,14 @@ JsonPatch getPatch()
 
         return new JsonPatch(list);
     }
+
+    @Nullable
+    private JsonPointer findUnchangedValue(final JsonNode value)
+    {
+        final Predicate<JsonNode> predicate = EQUIVALENCE.equivalentTo(value);
+        for (final Map.Entry<JsonPointer, JsonNode> entry: unchanged.entrySet())
+            if (predicate.apply(entry.getValue()))
+                return entry.getKey();
+        return null;
+    }
 }
diff --git a/src/test/resources/jsonpatch/diff2/diff.json b/src/test/resources/jsonpatch/diff2/diff.json
@@ -113,5 +113,18 @@
             { "op": "replace", "path": "/0", "value": "x" },
             { "op": "add", "path": "/1/-", "value": "y" }
         ]
+    },
+    {
+        "message": "similar element is copied instead of added",
+        "first": {
+            "a": "c"
+        },
+        "second": {
+            "a": "c",
+            "d": "c"
+        },
+        "patch": [
+            { "op": "copy", "path": "/d", "from": "/a" }
+        ]
     }
 ]

Original file line number	Diff line number	Diff line change
`@@ -113,5 +113,18 @@`
`113`	`113`	`{ "op": "replace", "path": "/0", "value": "x" },`
`114`	`114`	`{ "op": "add", "path": "/1/-", "value": "y" }`
`115`	`115`	`]`
	`116`	`+ },`
	`117`	`+ {`
	`118`	`+ "message": "similar element is copied instead of added",`
	`119`	`+ "first": {`
	`120`	`+ "a": "c"`
	`121`	`+ },`
	`122`	`+ "second": {`
	`123`	`+ "a": "c",`
	`124`	`+ "d": "c"`
	`125`	`+ },`
	`126`	`+ "patch": [`
	`127`	`+ { "op": "copy", "path": "/d", "from": "/a" }`
	`128`	`+ ]`
`116`	`129`	`}`
`117`	`130`	`]`