Remove trailing comments

[mdsal.git] / binding / mdsal-binding-test-utils / src / main / java / org / opendaylight / mdsal / binding / testutils / DiffUtil.java

diff --git a/binding/mdsal-binding-test-utils/src/main/java/org/opendaylight/mdsal/binding/testutils/DiffUtil.java b/binding/mdsal-binding-test-utils/src/main/java/org/opendaylight/mdsal/binding/testutils/DiffUtil.java
index 3c0d048ce2319dffaedbbaf8fbaedb0e6021f9d2..167b885c20cc17b29a53fb9e94bd9aaf20addcc8 100644 (file)
--- a/binding/mdsal-binding-test-utils/src/main/java/org/opendaylight/mdsal/binding/testutils/DiffUtil.java
+++ b/binding/mdsal-binding-test-utils/src/main/java/org/opendaylight/mdsal/binding/testutils/DiffUtil.java
@@ -7,10 +7,12 @@
  */
 package org.opendaylight.mdsal.binding.testutils;
 
+import com.github.difflib.DiffUtils;
+import com.github.difflib.UnifiedDiffUtils;
+import com.github.difflib.algorithm.DiffException;
+import com.github.difflib.patch.Patch;
 import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
-import difflib.DiffUtils;
-import difflib.Patch;
 import java.util.List;
 
 /**
@@ -23,16 +25,18 @@ final class DiffUtil {
 
     // Configuration which we could tune as we use this more
     private static final int MAX_DIFFS = 1;
-    private static final int CONTEXT_LINES = 3; // number of lines of context output around each difference
+    // number of lines of context output around each difference
+    private static final int CONTEXT_LINES = 3;
 
     private static final Splitter SPLITTER = Splitter.on(System.getProperty("line.separator"));
     private static final Joiner JOINER = Joiner.on(System.getProperty("line.separator"));
 
-    public static String diff(String expectedText, String actualText) {
+    public static String diff(String expectedText, String actualText) throws DiffException {
         List<String> originalLines = SPLITTER.splitToList(expectedText);
         List<String> revisedLines = SPLITTER.splitToList(actualText);
         Patch<String> patch = DiffUtils.diff(originalLines, revisedLines);
-        List<String> diff = DiffUtils.generateUnifiedDiff("expected", "actual", originalLines, patch, CONTEXT_LINES);
+        List<String> diff =
+            UnifiedDiffUtils.generateUnifiedDiff("expected", "actual", originalLines, patch, CONTEXT_LINES);
 
         String header = "";
         int deltas = patch.getDeltas().size();
@@ -43,6 +47,7 @@ final class DiffUtil {
         return header + JOINER.join(diff);
     }
 
-    private DiffUtil() { }
+    private DiffUtil() {
 
+    }
 }