Fix test failures

README.md

@@ -27,7 +27,7 @@ Whether you're tracking metrics, analyzing trends, or monitoring performance, th
 ## Key Features
 
 - **Visualize Nested Data**: Display hierarchical data structures in pie charts, trend charts, and tables.
-- **Multiple File Formats**: Supports JSON, YAML, XML, and CSV files.
+- **Multiple File Formats**: Supports JSON, YAML, XML, CSV, and Excel (.xls, .xlsx) files.
 - **Dynamic UI**: Interactive charts and tables that update based on your data.
 - **Customizable Colors**: Define custom colors for your data points or use predefined color schemes.
 - **Trend Analysis**: Track data trends over multiple builds with history charts.
@@ -85,6 +85,34 @@ The plugin supports the following file formats for data input:
 #### YAML and XML
 - Similar hierarchical structures as JSON are supported.
 
+#### Excel (`excel` provider)
+- This provider parses a single Excel sheet from an `.xls` or `.xlsx` file. By default, it processes the **first sheet** in the workbook.
+- **Structure Expectation:**
+  - The parser automatically detects the header row (the first non-empty row).
+  - Columns *before* the first column containing predominantly numeric data are treated as hierarchy levels.
+  - Columns *from* the first numeric-looking column onwards are treated as data values, with their respective header names as keys for the results.
+- **Example Data (conceptual view of a sheet):**
+  ```
+  (Sheet1 in an .xlsx or .xls file)
+  Category, SubCategory, Metric1, Value2
+  Alpha, X, 10, 100
+  Alpha, Y, 15, 150
+  Beta, Z, 20, 200
+  ```
+  In this example:
+    - "Category" and "SubCategory" would form the hierarchy (e.g., Alpha -> X).
+    - "Metric1" and "Value2" would be the data keys with their corresponding numeric values.
+- Empty rows before the header or between data rows are typically ignored.
+
+#### Multi-Sheet Excel (`excelmulti` provider)
+- This provider parses **all sheets** in an Excel workbook (.xls or .xlsx).
+- **Header Consistency Requirement:**
+  - The header from the *first successfully parsed sheet* (first non-empty sheet with a valid header) is used as a reference.
+  - Subsequent sheets **must have an identical header** (same column names in the same order) to be included in the report.
+  - Sheets with headers that do not match the reference header will be skipped, and a warning will be logged.
+- **Data Structure per Sheet:** Within each sheet, the data structure expectation is the same as for the `excel` provider (auto-detected header, hierarchy based on pre-numeric columns, values from numeric columns onwards).
+- Item IDs are generated to be unique across sheets, typically by internally prefixing them with sheet-specific information.
+
 ---
 
 ## Color Management
@@ -95,7 +123,7 @@ The plugin allows you to customize the colors used in the visualizations. You ca
 
 To customize colors, add a `colors` object to your JSON, YAML, or XML file. The `colors` object should map metric keys or category names to specific colors. Colors can be defined using **HEX values** or **predefined color names**.
 
-> **Note**: Color customization is **not supported for CSV files** due to the format does not allow color attribute definition. For now, colors are attributed aleatory.
+> **Note**: Color customization is **not supported for CSV or Excel files** as these formats do not have a standard way to define color attributes within the data file itself for this plugin's use. For CSV and Excel, colors are attributed automatically by the charting libraries.
 
 #### Example in JSON:
 ```json
@@ -146,9 +174,17 @@ You can interact with the charts and tables to drill down into specific data poi
   - `relative`: Show percentage values.
   - `dual`: Show both absolute and relative values.
 - **`provider`**: Specify the file format and pattern for the data files.
-  - **`id`**: (Required for CSV) A unique identifier for the report.
+  - **`id`**: (Optional, but recommended for CSV, Excel, and ExcelMulti if multiple reports of the same type are used) A unique identifier for the report instance. This helps in creating distinct report URLs and managing history, especially if you have multiple CSV or Excel reports in the same job.
   - **`pattern`**: An Ant-style pattern to locate the data files.
 
+  **Examples for `provider`:**
+  - JSON: `provider: json(pattern: 'reports/**/*.json')`
+  - CSV: `provider: csv(id: 'my-csv-report', pattern: 'reports/data.csv')`
+  - Excel (single sheet): `provider: excel(pattern: 'reports/data.xlsx')`
+  - Excel (multi-sheet): `provider: excelmulti(pattern: 'reports/multi_sheet_data.xlsx')`
+  - You can also add an `id` to `excel` and `excelmulti` if needed:
+    `provider: excel(id: 'my-excel-report', pattern: 'reports/data.xlsx')`
+
 
 ## Examples
 

pom.xml

@@ -16,12 +16,11 @@
         <jenkins.baseline>2.504</jenkins.baseline>
         <jenkins.version>${jenkins.baseline}.1</jenkins.version>
         <jackson-dataformat.version>2.18.3</jackson-dataformat.version>
-        <hpi-plugin.version>3.61</hpi-plugin.version>
     </properties>
 
     <groupId>io.jenkins.plugins</groupId>
     <artifactId>nested-data-reporting</artifactId>
-    <version>${changelist}</version>
+    <version>0.0.1-SNAPSHOT</version>
     <packaging>hpi</packaging>
     <name>Nested Data Reporting</name>
     <description>Jenkins plugin to report data from nested as pie-charts, trend-charts and data tables.</description>
@@ -118,6 +117,25 @@
             <artifactId>jackson2-api</artifactId>
         </dependency>
 
+        <!-- Apache POI -->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>5.4.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>5.4.1</version>
+        </dependency>
+
+        <!-- JSR 305 for annotations -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+
         <!-- Workflow dependencies -->
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -164,7 +182,7 @@
             <plugin>
                 <groupId>org.jenkins-ci.tools</groupId>
                 <artifactId>maven-hpi-plugin</artifactId>
-                <version>${hpi-plugin.version}</version>
+                <version>3.65</version>
                 <extensions>true</extensions>
                 <configuration>
                     <compatibleSinceVersion>0.3</compatibleSinceVersion>

src/main/java/io/jenkins/plugins/reporter/charts/ItemPieChart.java

@@ -27,10 +27,19 @@ public PieChartModel create(Report report, Item item) {
         PieChartModel model = new PieChartModel(item.getId());
 
         if (item.getResult().size() == 1) {
-            item.getItems().forEach(i -> model.add(new PieData(i.getName(), i.getTotal()), report.getColor(i.getId())));
+            // item.getResult() has only one entry, typically when values are in sub-items.
+            // The original logic implies that if result.size() == 1, we should chart the totals of its children.
+            item.getItems().forEach(i -> model.add(new PieData(i.getName(), (int) i.getTotal()), report.getColor(i.getId())));
         } else {
-            item.getResult().forEach((key, value) -> model.add(new PieData(key, value),
-                    report.getColor(key)));
+            // item.getResult() has multiple entries, chart these directly.
+            item.getResult().forEach((key, value) -> {
+                if (value instanceof Number) {
+                    model.add(new PieData(key, ((Number) value).intValue()), report.getColor(key));
+                } else {
+                    // Optional: Log a warning if a non-numeric value is encountered for a chart key
+                    // System.err.println("Warning: Non-numeric value for key '" + key + "' in ItemPieChart, value: " + value);
+                }
+            });
         }
 
         return model;

src/main/java/io/jenkins/plugins/reporter/model/ExcelParserConfig.java

@@ -0,0 +1,29 @@
+package io.jenkins.plugins.reporter.model;
+
+import java.io.Serializable;
+
+public class ExcelParserConfig implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    // Future configuration options can be added here, for example:
+    // private int headerRowIndex = 0; // Default to the first row
+    // private int dataStartRowIndex = 1; // Default to the second row
+    // private String sheetName; // For single sheet parsing, if specified
+    // private boolean detectHeadersAutomatically = true;
+
+    public ExcelParserConfig() {
+        // Default constructor
+    }
+
+    // Add getters and setters here if fields are added in the future.
+    private boolean skipNonNumericValues = false; // Default value
+
+    public boolean isSkipNonNumericValues() {
+        return skipNonNumericValues;
+    }
+
+    public void setSkipNonNumericValues(boolean skipNonNumericValues) {
+        this.skipNonNumericValues = skipNonNumericValues;
+    }
+}

src/main/java/io/jenkins/plugins/reporter/model/Item.java

@@ -9,6 +9,7 @@
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -34,12 +35,12 @@ public class Item implements Serializable {
 
     @JsonProperty(value = "result", required = false)
     @JsonInclude(JsonInclude.Include.NON_NULL)
-    LinkedHashMap<String, Integer> result;
+    LinkedHashMap<String, Object> result;
 
     @Nullable
     @JsonProperty(value = "items", required = false)
     @JsonInclude(JsonInclude.Include.NON_NULL)
-    List<Item> items;
+    List<Item> items = new ArrayList<>();
 
     public String getId() {
         return id;
@@ -67,21 +68,40 @@ public void setName(String name) {
     }
 
     @JsonIgnore
-    public LinkedHashMap<String, Integer> getResult() {
+    public LinkedHashMap<String, Object> getResult() {
         if (result != null) {
             return result;
         }
 
-        return getItems()
+        if (items == null || items.isEmpty()) {
+            return new LinkedHashMap<>(); 
+        }
+
+        return items
                 .stream()
-                .map(Item::getResult)
+                .map(Item::getResult) 
+                .filter(Objects::nonNull) 
                 .flatMap(map -> map.entrySet().stream())
-                .collect(Collectors.groupingBy(Map.Entry::getKey, LinkedHashMap::new, Collectors.summingInt(Map.Entry::getValue)));
+                .collect(Collectors.toMap(
+                    Map.Entry::getKey,
+                    Map.Entry::getValue,
+                    (v1, v2) -> { 
+                        if (v1 instanceof Number && v2 instanceof Number) {
+                            return ((Number) v1).doubleValue() + ((Number) v2).doubleValue();
+                        }
+                        return v1; 
+                    },
+                    LinkedHashMap::new
+                ));
     }
 
     @JsonIgnore
-    public int getTotal() {
-        return getResult().values().stream().reduce(0, Integer::sum);
+    public double getTotal() { // Return double for potential sums of doubles
+        if (this.getResult() == null) return 0.0; // Handle case where getResult() might return null
+        return this.getResult().values().stream()
+            .filter(v -> v instanceof Number) // Only sum values that are Numbers
+            .mapToDouble(v -> ((Number) v).doubleValue())
+            .sum();
     }
 
     @JsonIgnore
@@ -97,7 +117,7 @@ public String getLabel(Report report, Integer value, double percentage) {
         return value.toString();
     }
 
-    public void setResult(LinkedHashMap<String, Integer> result) {
+    public void setResult(LinkedHashMap<String, Object> result) {
         this.result = result;
     }
 
@@ -114,6 +134,9 @@ public void setItems(List<Item> items) {
     }
 
     public void addItem(Item item) {
+        if (this.items == null) {
+            this.items = new ArrayList<>();
+        }
         this.items.add(item);
     }
 }

src/main/java/io/jenkins/plugins/reporter/model/ItemSeriesBuilder.java

@@ -36,19 +36,23 @@ protected Map<String, Integer> computeSeries(ReportResult reportResult) {
 
             if (item.getResult().size() == 1) {
                 return reportResult.getReport().getItems().stream()
-                        .collect(Collectors.toMap(Item::getId, Item::getTotal));
+                        .collect(Collectors.toMap(Item::getId, i -> (int) i.getTotal(), (v1, v2) -> v1, java.util.LinkedHashMap::new));
             }
 
-            return reportResult.getReport().aggregate();
+            Map<String, Double> doubleMap = reportResult.getReport().aggregate();
+            return doubleMap.entrySet().stream()
+                .collect(Collectors.toMap(Map.Entry::getKey, entry -> entry.getValue().intValue(), (v1, v2) -> v1, java.util.LinkedHashMap::new));
         }
 
         Item parent = reportResult.getReport().findItem(item.getId()).orElse(new Item());
         List<Item> items = parent.hasItems() ? parent.getItems() : Collections.singletonList(parent);
 
         if (item.getResult().size() == 1) {
-            return items.stream().collect(Collectors.toMap(Item::getId, Item::getTotal));
+            return items.stream().collect(Collectors.toMap(Item::getId, i -> (int) i.getTotal(), (v1, v2) -> v1, java.util.LinkedHashMap::new));
         }
 
-        return reportResult.getReport().aggregate(items);
+        Map<String, Double> doubleMap = reportResult.getReport().aggregate(items);
+        return doubleMap.entrySet().stream()
+            .collect(Collectors.toMap(Map.Entry::getKey, entry -> entry.getValue().intValue(), (v1, v2) -> v1, java.util.LinkedHashMap::new));
     }
 }