Extract a method for easier unit testing.

1 files changed, 9 insertions, 4 deletions

diff --git a/abi-check-plugin/src/main/java/com/yahoo/abicheck/mojo/AbiCheck.java b/abi-check-plugin/src/main/java/com/yahoo/abicheck/mojo/AbiCheck.java
index 9187b1e45ac..cd9b545fe8d 100644
--- a/abi-check-plugin/src/main/java/com/yahoo/abicheck/mojo/AbiCheck.java
+++ b/abi-check-plugin/src/main/java/com/yahoo/abicheck/mojo/AbiCheck.java
@@ -166,10 +166,7 @@ public class AbiCheck extends AbstractMojo {
         writeSpec(signatures, specFileName);
       } else {
         Map<String, JavaClassSignature> abiSpec = readSpec(specFileName);
-        if (!SetMatcher.compare(abiSpec.keySet(), signatures.keySet(),
-            item -> matchingClasses(item, abiSpec.get(item), signatures.get(item), getLog()),
-            item -> getLog().error(String.format("Missing class: %s", item)),
-            item -> getLog().error(String.format("Extra class: %s", item)))) {
+        if (!compareSignatures(abiSpec, signatures)) {
           throw new MojoFailureException("ABI spec mismatch");
         }
       }
@@ -177,4 +174,12 @@ public class AbiCheck extends AbstractMojo {
       throw new MojoExecutionException("Error processing class signatures", e);
     }
   }
+
+  private boolean compareSignatures(Map<String, JavaClassSignature> expected,
+      Map<String, JavaClassSignature> actual) {
+    return SetMatcher.compare(expected.keySet(), actual.keySet(),
+        item -> matchingClasses(item, expected.get(item), actual.get(item), getLog()),
+        item -> getLog().error(String.format("Missing class: %s", item)),
+        item -> getLog().error(String.format("Extra class: %s", item)));
+  }
 }