From d62184df2c5949198a8417fc8e24a407c28d5a3a Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Wed, 29 Jul 2020 14:17:03 +0200 Subject: [PATCH] TSK-1344: Added public method Report#createRow to allow manual addition of report rows --- .../java/pro/taskana/monitor/api/reports/Report.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/taskana-core/src/main/java/pro/taskana/monitor/api/reports/Report.java b/lib/taskana-core/src/main/java/pro/taskana/monitor/api/reports/Report.java index a898a20d8..e1980d30a 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/monitor/api/reports/Report.java +++ b/lib/taskana-core/src/main/java/pro/taskana/monitor/api/reports/Report.java @@ -34,8 +34,8 @@ public abstract class Report columnHeaders, String[] rowDesc) { this.rowDesc = rowDesc; - sumRow = createRow("Total", columnHeaders.size()); this.columnHeaders = new ArrayList<>(columnHeaders); + sumRow = createRow("Total"); } public final Map> getRows() { @@ -69,16 +69,14 @@ public abstract class Report row = null; if (columnHeaders.isEmpty()) { - row = reportRows.computeIfAbsent(item.getKey(), key -> createRow(key, columnHeaders.size())); + row = reportRows.computeIfAbsent(item.getKey(), this::createRow); row.updateTotalValue(item); sumRow.updateTotalValue(item); } else { for (int i = 0; i < columnHeaders.size(); i++) { if (columnHeaders.get(i).fits(item)) { if (row == null) { - row = - reportRows.computeIfAbsent( - item.getKey(), key -> createRow(key, columnHeaders.size())); + row = reportRows.computeIfAbsent(item.getKey(), this::createRow); } row.addItem(item, i); sumRow.addItem(item, i); @@ -104,6 +102,10 @@ public abstract class Report createRow(String key) { + return createRow(key, columnHeaders.size()); + } + protected Row createRow(String key, int columnSize) { return new SingleRow<>(key, columnSize); }