Skip to content

Handle when row.getCell() is null #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bact wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Handle when row.getCell() is null #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a682fe0
Handle when cell is null
bact Aug 2, 2026
a431072
Short circuit when row.getCell() is null
bact Aug 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/org/spdx/spreadsheetstore/AnnotationsSheet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,8 @@ public String getElmementId(int rowNum) {
if (row == null) {
return null;
}
return row.getCell(ID_COL).getStringCellValue();
Cell cell = row.getCell(ID_COL);
return cell != null ? cell.getStringCellValue() : null;
}

/**
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/spdx/spreadsheetstore/RelationshipsSheet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,8 @@ public String getElmementId(int rowNum) {
if (row == null) {
return null;
}
return row.getCell(ID_COL).getStringCellValue();
Cell cell = row.getCell(ID_COL);
return cell != null ? cell.getStringCellValue() : null;
}

public Relationship getRelationship(int rowNum) throws SpreadsheetException {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/spdx/spreadsheetstore/SnippetSheet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,8 +448,8 @@ private String rangeToStr(StartEndPointer rangePointer) throws InvalidSPDXAnalys
}
SpdxFile snippetFromFile = (SpdxFile)moFromFile.get();

if (Objects.isNull(row.getCell(BYTE_RANGE_COL)) && row.getCell(BYTE_RANGE_COL).getStringCellValue().trim().isEmpty()) {
throw new SpreadsheetException("Missing reqired byte range for Snippet ID "+id);
if (Objects.isNull(row.getCell(BYTE_RANGE_COL)) || row.getCell(BYTE_RANGE_COL).getStringCellValue().trim().isEmpty()) {
throw new SpreadsheetException("Missing required byte range for Snippet ID "+id);
}
String range = row.getCell(BYTE_RANGE_COL).getStringCellValue();
int start = 0;
Expand Down
Loading