Merge pull request #114 from jenkinsci/merge-api

Restore old API for `merge`
jenkinsci · Jun 7, 2024 · 83a2b88 · 83a2b88
2 parents a9dad65 + 767d01a
commit 83a2b88
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/java/edu/hm/hafner/coverage/Node.java b/src/main/java/edu/hm/hafner/coverage/Node.java
@@ -694,7 +694,7 @@ private String createTargetClassName(final ClassNode testClassNode) {
      *
      * @return a new tree with the merged {@link Node nodes}
      */
-    public static Node merge(final List<Node> nodes) {
+    public static Node merge(final List<? extends Node> nodes) {
         if (nodes.isEmpty()) {
             throw new IllegalArgumentException("Cannot merge an empty list of nodes");
         }
@@ -707,6 +707,7 @@ public static Node merge(final List<Node> nodes) {
 
         if (grouped.size() == 1) {
             return nodes.stream()
+                    .map(Node.class::cast)
                     .reduce(Node::merge)
                     .orElseThrow(() -> new NoSuchElementException("No node found"));
         }