Merge pull request #45 from jenkinsci/nested-bug

fix recursion error in aggregation of `result`
jenkinsci · Sep 7, 2022 · ca6d0fa · ca6d0fa
2 parents 1ffb831 + abba60c
commit ca6d0fa
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/src/main/java/io/jenkins/plugins/reporter/charts/ItemSeriesBuilder.java b/src/main/java/io/jenkins/plugins/reporter/charts/ItemSeriesBuilder.java
@@ -5,10 +5,7 @@
 import io.jenkins.plugins.reporter.model.Item;
 import org.apache.commons.collections.ListUtils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -50,18 +47,21 @@ protected Map<String, Integer> computeSeries(ReportAction reportAction) {
             return items.stream().collect(Collectors.toMap(Item::getId, Item::getTotal));
         }
 
-        //TODO: fix missing recursion for aggregation
-        return reportAction.getReport().getResult().aggregate(i -> i.getId().equals(item.getId()));
+        return reportAction.getReport().getResult().aggregate(items);
     }
 
     private List<Item> findItems(String id, List<Item> items)
     {
         for (Item i: items) {
-            if (i.getId().equals(id) && i.hasItems()) {
-                return i.hasItems() ? i.getItems() : findItems(id, i.getItems());
+            if (i.getId().equals(id)) {
+                return i.hasItems() ? i.getItems() : Collections.singletonList(i);
+            } 
+
+            if (i.hasItems()) {
+                return findItems(id, i.getItems());
             }
         }
 
-        return new ArrayList<>();
+        return Collections.emptyList();
     }
 }
diff --git a/src/main/java/io/jenkins/plugins/reporter/model/Result.java b/src/main/java/io/jenkins/plugins/reporter/model/Result.java
@@ -67,14 +67,13 @@ public void setColors(Map<String, String> colors) {
     /**
      * Aggregates the results of all items. The values are added together, grouped by key. 
      * 
-     * @param filter
-     *          the filter to evaluate on the result.
+     * @param items
+     *              the items to aggregate the childs for.
      * @return the aggregated result.
      */
-    public LinkedHashMap<String, Integer> aggregate(Predicate<? super Item> filter) {
-        return getItems()
+    public LinkedHashMap<String, Integer> aggregate(List<Item> items) {
+        return items
                 .stream()
-                .filter(filter)
                 .map(Item::getResult)
                 .flatMap(map -> map.entrySet().stream())
                 .collect(Collectors.groupingBy(Map.Entry::getKey, LinkedHashMap::new, Collectors.summingInt(Map.Entry::getValue)));
@@ -86,6 +85,6 @@ public LinkedHashMap<String, Integer> aggregate(Predicate<? super Item> filter)
      * @return the aggregated result.
      */
     public LinkedHashMap<String, Integer> aggregate() {
-        return aggregate(item -> {return true;});
+        return aggregate(getItems());
     }
 }