Merge pull request #12 from rwatler/refactored

Alternative fix to issue #11 using the refactored diff implementation.

Author: fge

src/main/java/com/github/fge/jsonpatch/diff/Diff.java

@@ -51,14 +51,12 @@ static Diff simpleDiff(final DiffOperation operation,
      * "Stateless" removal of a given node from an array given a base path (the
      * immediate parent of an array) and an array index; as the name suggests,
      * this factory method is called only when a node is removed from the tail
-     * of a target array; in other words, the source node has extra elements,
-     * and the only relevant information for generating the removal operation is
-     * the index in the source array.
+     * of a target array; in other words, the source node has extra elements.
      */
     static Diff tailArrayRemove(final JsonPointer basePath, final int index,
-        final JsonNode victim)
+        final int removeIndex, final JsonNode victim)
     {
-        return new Diff(DiffOperation.REMOVE, basePath, index, index,
+        return new Diff(DiffOperation.REMOVE, basePath, index, removeIndex,
             victim.deepCopy());
     }
 

src/main/java/com/github/fge/jsonpatch/diff/IndexedJsonArray.java

@@ -68,4 +68,9 @@ boolean isEmpty()
     {
         return index >= size;
     }
+
+    int size()
+    {
+        return size;
+    }
 }

src/main/java/com/github/fge/jsonpatch/diff/JsonDiff.java

@@ -397,7 +397,7 @@ private static void postLCS(final List<Diff> diffs, final JsonPointer path,
             target.shift();
         }
         addRemaining(diffs, path, target);
-        removeRemaining(diffs, path, source);
+        removeRemaining(diffs, path, source, target.size());
     }
 
     private static void addRemaining(final List<Diff> diffs,
@@ -415,16 +415,16 @@ private static void addRemaining(final List<Diff> diffs,
     }
 
     private static void removeRemaining(final List<Diff> diffs,
-        final JsonPointer path, final IndexedJsonArray array)
+        final JsonPointer path, final IndexedJsonArray array,
+        final int removeIndex)
     {
-        final int startingIndex = array.getIndex();
-
         Diff diff;
         JsonNode node;
 
         while (!array.isEmpty()) {
             node = array.getElement();
-            diff = Diff.tailArrayRemove(path, startingIndex, node);
+            diff = Diff.tailArrayRemove(path, array.getIndex(),
+                                        removeIndex, node);
             diffs.add(diff);
             array.shift();
         }