Marmelator/redaction-report-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 129 Wiki Activity

Merge branch 'DM-578-npe' into 'master'

Browse Source 
DM-578 - Fix NPE in excel reports

Closes DM-578

See merge request redactmanager/redaction-report-service!29
This commit is contained in:
Andrei Isvoran 2023-11-17 10:50:38 +01:00
commit 7cac75e0a4
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ScmReportService.java
View File

@ -42,6 +42,12 @@ public class ScmReportService {
var firstRow = sheet.getRow(0);
int firstRowIndex = 1;
while (firstRow == null) {
firstRow = sheet.getRow(firstRowIndex);
firstRowIndex++;
}
int fileColumnIndex = 0;
int textColumnIndex = firstRow.getLastCellNum() - 1;
int valueIndexColumn = firstRow.getLastCellNum() - 2;
@ -55,6 +61,8 @@ public class ScmReportService {
Map<String, Integer> componentIndexMap = new HashMap<>();
Row finalFirstRow = firstRow;
componentLog.getComponentLogEntries().forEach(componentLogEntry -> {
if (componentLogEntry.getComponentValues().isEmpty()) {
@ -71,7 +79,7 @@ public class ScmReportService {
CellUtil.setVerticalAlignment(fileNameCell, VerticalAlignment.TOP);
// Component, file attributes and index cell
addOtherCells(sheet, excelModel, rowIndex, componentIndexMap, componentLogEntry, row, fileModel, firstRow, componentColumnIndex, textColumnIndex, valueIndexColumn);
addOtherCells(sheet, excelModel, rowIndex, componentIndexMap, componentLogEntry, row, fileModel, finalFirstRow, componentColumnIndex, textColumnIndex, valueIndexColumn);
});