Oct 26, 2020 · Oct 23, 2020
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java
 */
 package com.github.difflib.patch;

 import java.io.Serializable;
 import java.util.List;
 import java.util.Objects;

 /**
 * Abstract delta between a source and a target.
 * @author Tobias Warneke (t.warneke@gmx.net)
 */
 public abstract class AbstractDelta<T> {
 public abstract class AbstractDelta<T>implements Serializable{
    private final Chunk<T> source;
    private final Chunk<T> target;
    private final DeltaType type;
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java b/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
 */
 package com.github.difflib.patch;

 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 * @author <a href="dm.naumenko@gmail.com>Dmitry Naumenko</a>
 * @param <T> The type of the compared elements in the 'lines'.
 */
 public final class Chunk<T> {
 public final class Chunk<T>implements Serializable{

    private final int position;
    private List<T> lines;
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java b/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java

 import static java.util.Comparator.comparing;
 import com.github.difflib.algorithm.Change;

 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 * @author <a href="dm.naumenko@gmail.com">Dmitry Naumenko</a>
 * @param <T> The type of the compared elements in the 'lines'.
 */
 public final class Patch<T> {
 public final class Patch<T>implements Serializable{

    private final List<AbstractDelta<T>> deltas;

diff --git a/java-diff-utils/src/test/java/com/github/difflib/patch/PatchTest.java b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchTest.java
 package com.github.difflib.patch;

 import com.github.difflib.DiffUtils;
 import java.util.Arrays;
 import java.util.List;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;

 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.Arrays;
 import java.util.List;

 import org.junit.jupiter.api.Test;

 import com.github.difflib.DiffUtils;

 public class PatchTest {

    @Test
            fail(e.getMessage());
        }
    }

    @Test
    public void testPatch_Serializable() throws IOException, ClassNotFoundException {
        final List<String> changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
        final List<String> changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");

        final Patch<String> patch = DiffUtils.diff(changeTest_from, changeTest_to);
        ByteArrayOutputStream baos = new ByteArrayOutputStream();
        ObjectOutputStream out = new ObjectOutputStream(baos);
        out.writeObject(patch);
        out.close();
        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
        ObjectInputStream in = new ObjectInputStream(bais);
        Patch<String> result = (Patch<String>) in.readObject();
        in.close();

        try {
            assertEquals(changeTest_to, DiffUtils.patch(changeTest_from, result));
        } catch (PatchFailedException e) {
            fail(e.getMessage());
        }

    }
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,14 +15,15 @@
		*/
		package com.github.difflib.patch;

		import java.io.Serializable;
		import java.util.List;
		import java.util.Objects;

		/**
		* Abstract delta between a source and a target.
		* @author Tobias Warneke (t.warneke@gmx.net)
		*/
		public abstract class AbstractDelta<T> {
		public abstract class AbstractDelta<T>implements Serializable{
		private final Chunk<T> source;
		private final Chunk<T> target;
		private final DeltaType type;
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,6 +15,7 @@
		*/
		package com.github.difflib.patch;

		import java.io.Serializable;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.List;
Expand All		@@ -33,7 +34,7 @@
		* @author <a href="dm.naumenko@gmail.com>Dmitry Naumenko</a>
		* @param <T> The type of the compared elements in the 'lines'.
		*/
		public final class Chunk<T> {
		public final class Chunk<T>implements Serializable{

		private final int position;
		private List<T> lines;
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,6 +21,8 @@

		import static java.util.Comparator.comparing;
		import com.github.difflib.algorithm.Change;

		import java.io.Serializable;
		import java.util.ArrayList;
		import java.util.Collections;
		import java.util.List;
Expand All		@@ -32,7 +34,7 @@
		* @author <a href="dm.naumenko@gmail.com">Dmitry Naumenko</a>
		* @param <T> The type of the compared elements in the 'lines'.
		*/
		public final class Patch<T> {
		public final class Patch<T>implements Serializable{

		private final List<AbstractDelta<T>> deltas;

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,12 +1,20 @@
		package com.github.difflib.patch;

		import com.github.difflib.DiffUtils;
		import java.util.Arrays;
		import java.util.List;
		import static org.junit.jupiter.api.Assertions.assertEquals;
		import static org.junit.jupiter.api.Assertions.fail;

		import java.io.ByteArrayInputStream;
		import java.io.ByteArrayOutputStream;
		import java.io.IOException;
		import java.io.ObjectInputStream;
		import java.io.ObjectOutputStream;
		import java.util.Arrays;
		import java.util.List;

		import org.junit.jupiter.api.Test;

		import com.github.difflib.DiffUtils;

		public class PatchTest {

		@Test
Expand DownExpand Up		@@ -47,4 +55,27 @@ public void testPatch_Change() {
		fail(e.getMessage());
		}
		}

		@Test
		public void testPatch_Serializable() throws IOException, ClassNotFoundException {
		final List<String> changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
		final List<String> changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");

		final Patch<String> patch = DiffUtils.diff(changeTest_from, changeTest_to);
		ByteArrayOutputStream baos = new ByteArrayOutputStream();
		ObjectOutputStream out = new ObjectOutputStream(baos);
		out.writeObject(patch);
		out.close();
		ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
		ObjectInputStream in = new ObjectInputStream(bais);
		Patch<String> result = (Patch<String>) in.readObject();
		in.close();

		try {
		assertEquals(changeTest_to, DiffUtils.patch(changeTest_from, result));
		} catch (PatchFailedException e) {
		fail(e.getMessage());
		}

		}
		}