introduced conflict processing

wumpz · wumpz · commit 8880ec545b61 · 2021-02-21T23:04:17.000+01:00
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/ConflictOutput.java b/java-diff-utils/src/main/java/com/github/difflib/patch/ConflictOutput.java
@@ -19,14 +19,15 @@
  */
 package com.github.difflib.patch;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
  *
  * @author tw
  */
 @FunctionalInterface
-public interface ConflictOutput<T> {
+public interface ConflictOutput<T> extends Serializable {
 
     public void processConflict(VerifyChunk verifyChunk, AbstractDelta<T> delta, List<T> result) throws PatchFailedException;
 }
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
@@ -60,18 +60,24 @@ public List<T> applyTo(List<T> target) throws PatchFailedException {
             AbstractDelta<T> delta = it.previous();
             VerifyChunk valid = delta.verifyAntApplyTo(result);
             if (valid != VerifyChunk.OK) {
-                
+                conflictOutput.processConflict(valid, delta, result);
             }
         }
         return result;
     }
-    
-    private ConflictOutput<T> conflictOutput = (VerifyChunk verifyChunk, AbstractDelta<T> delta, List<T> result) -> {
+
+    /**
+     * Standard Patch behaviour to throw an exception for pathching conflicts.
+     */
+    public final ConflictOutput<T> CONFLICT_PRODUCES_EXCEPTION = (VerifyChunk verifyChunk, AbstractDelta<T> delta, List<T> result) -> {
         throw new PatchFailedException("could not apply patch due to " + verifyChunk.toString());
     };
-    
+
+    private ConflictOutput<T> conflictOutput = CONFLICT_PRODUCES_EXCEPTION;
+
     /**
-     * Alter normal conflict output behaviour to e.g. inclide some conflict statements in the result, like git does it.
+     * Alter normal conflict output behaviour to e.g. inclide some conflict
+     * statements in the result, like git does it.
      */
     public Patch withConflictOutput(ConflictOutput<T> conflictOutput) {
         this.conflictOutput = conflictOutput;
diff --git a/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java b/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
@@ -13,6 +13,7 @@
 import java.util.List;
 import static java.util.stream.Collectors.joining;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 import org.junit.jupiter.api.Test;
@@ -133,7 +134,7 @@ public void testNewFileCreation() {
      * Issue 89
      */
     @Test
-    public void testChagngePosition() throws IOException {
+    public void testChangePosition() throws IOException {
         final List<String> patchLines = fileToLines(TestConstants.MOCK_FOLDER + "issue89_patch.txt");
         final Patch<String> patch = UnifiedDiffUtils.parseUnifiedDiff(patchLines);
         List<Integer> realRemoveListOne = Collections.singletonList(3);
@@ -191,4 +192,20 @@ private void verify(List<String> origLines, List<String> revLines,
             fail(e.getMessage());
         }
     }
+    
+    
+    @Test
+    public void testFailingPatchByException() throws IOException {
+        final List<String> baseLines = fileToLines(TestConstants.MOCK_FOLDER + "issue10_base.txt");
+        final List<String> patchLines = fileToLines(TestConstants.MOCK_FOLDER + "issue10_patch.txt");
+        final Patch<String> p = UnifiedDiffUtils.parseUnifiedDiff(patchLines);
+        
+        //make original not fitting
+        baseLines.set(40, baseLines.get(40) + " corrupted ");
+        
+        assertThrows(PatchFailedException.class, () -> DiffUtils.patch(baseLines, p));
+        
+        
+        
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -19,14 +19,15 @@`
`19`	`19`	`*/`
`20`	`20`	`package com.github.difflib.patch;`
`21`	`21`
	`22`	`+import java.io.Serializable;`
`22`	`23`	`import java.util.List;`
`23`	`24`
`24`	`25`	`/**`
`25`	`26`	`*`
`26`	`27`	`* @author tw`
`27`	`28`	`*/`
`28`	`29`	`@FunctionalInterface`
`29`		`-public interface ConflictOutput<T> {`
	`30`	`+public interface ConflictOutput<T> extends Serializable {`
`30`	`31`
`31`	`32`	`public void processConflict(VerifyChunk verifyChunk, AbstractDelta<T> delta, List<T> result) throws PatchFailedException;`
`32`	`33`	`}`