Bump java-diff-utils to 4.7

https://github.com/java-diff-utils/java-diff-utils/blob/master/CHANGELOG.md#47

JIRA: MDSAL-558
Change-Id: I941892d6a0f50ba0a7fb3dcc1e66844b0de1af37
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding/mdsal-binding-test-utils/pom.xml b/binding/mdsal-binding-test-utils/pom.xml
index bf3f085c91960dff364fd07a7a7fedb65c86dfb8..8ae4d3177f4eb0f051ac0fdec726858e65a917aa 100644 (file)
--- a/binding/mdsal-binding-test-utils/pom.xml
+++ b/binding/mdsal-binding-test-utils/pom.xml
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>io.github.java-diff-utils</groupId>
             <artifactId>java-diff-utils</artifactId>
-            <version>4.4</version>
+            <version>4.7</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>

diff --git a/binding/mdsal-binding-test-utils/src/main/java/org/opendaylight/mdsal/binding/testutils/AssertDataObjects.java b/binding/mdsal-binding-test-utils/src/main/java/org/opendaylight/mdsal/binding/testutils/AssertDataObjects.java
index f80f2332a5ded9e48d3a48bec7edfab5707772d8..8646496f1bd085da5021c2765009a9ab4c81bed3 100644 (file)
--- a/binding/mdsal-binding-test-utils/src/main/java/org/opendaylight/mdsal/binding/testutils/AssertDataObjects.java
+++ b/binding/mdsal-binding-test-utils/src/main/java/org/opendaylight/mdsal/binding/testutils/AssertDataObjects.java
@@ -8,7 +8,6 @@
 package org.opendaylight.mdsal.binding.testutils;
 
 import ch.vorburger.xtendbeans.AssertBeans;
-import com.github.difflib.algorithm.DiffException;
 import java.util.Objects;
 import org.junit.ComparisonFailure;
 import org.opendaylight.yangtools.yang.binding.DataObject;
@@ -53,7 +52,7 @@ public final class AssertDataObjects {
      *
      * @see AssertBeans#assertEqualBeans(Object, Object)
      */
-    public static void assertEqualBeans(Object expected, Object actual) throws ComparisonFailure {
+    public static void assertEqualBeans(final Object expected, final Object actual) throws ComparisonFailure {
         if (!Objects.equals(expected, actual)) {
             String expectedText = GENERATOR.getExpression(expected);
             assertEqualByText(expectedText, actual);
@@ -65,17 +64,12 @@ public final class AssertDataObjects {
     }
 
     // package local method used only in the self tests of this utility (not intended for usage by client code)
-    static void assertEqualByText(String expectedText, Object actual) throws ComparisonFailure {
+    static void assertEqualByText(final String expectedText, final Object actual) throws ComparisonFailure {
         String actualText = GENERATOR.getExpression(actual);
         if (!expectedText.equals(actualText)) {
-            try {
-                String diff = DiffUtil.diff(expectedText, actualText);
-                LOG.warn("diff for ComparisonFailure about to be thrown:\n{}", diff);
-            } catch (DiffException e) {
-                LOG.error("Error generating a comparison diff", e);
-            }
+            String diff = DiffUtil.diff(expectedText, actualText);
+            LOG.warn("diff for ComparisonFailure about to be thrown:\n{}", diff);
             throw new ComparisonFailure("Expected and actual beans do not match", expectedText, actualText);
         }
     }
-
 }

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 167b885c20cc17b29a53fb9e94bd9aaf20addcc8..3a445ea227d38f6d0bc92b4dd99da1f09fa7dcfd 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
@@ -9,7 +9,6 @@ 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;
@@ -22,7 +21,6 @@ import java.util.List;
  */
 // package-local: no need to expose this, consider it an implementation detail; public API is the AssertDataObjects
 final class DiffUtil {
-
     // Configuration which we could tune as we use this more
     private static final int MAX_DIFFS = 1;
     // number of lines of context output around each difference
@@ -31,7 +29,11 @@ final class DiffUtil {
     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) throws DiffException {
+    private DiffUtil() {
+
+    }
+
+    static String diff(final String expectedText, final String actualText) {
         List<String> originalLines = SPLITTER.splitToList(expectedText);
         List<String> revisedLines = SPLITTER.splitToList(actualText);
         Patch<String> patch = DiffUtils.diff(originalLines, revisedLines);
@@ -46,8 +48,4 @@ final class DiffUtil {
         }
         return header + JOINER.join(diff);
     }
-
-    private DiffUtil() {
-
-    }
 }