Skip to content

Fix NPE in LineInfoCollector #706

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
vpaturet wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix NPE in LineInfoCollector #706

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 8 additions & 6 deletions src/main/java/no/entur/antu/netexdata/collectors/LineInfoCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import org.entur.netex.validation.validator.model.SimpleLine;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.rutebanken.netex.model.FlexibleLineTypeEnumeration;

public class LineInfoCollector extends NetexDataCollector {

Expand Down Expand Up @@ -40,7 +39,7 @@ protected void collectDataFromCommonFile(
// No Lines in common files
}

public void addLineName(String validationReportId, SimpleLine lineInfo) {
private void addLineName(String validationReportId, SimpleLine lineInfo) {
RLock lock = redissonClient.getLock(validationReportId);
try {
lock.lock();
Expand Down Expand Up @@ -70,12 +69,15 @@ private SimpleLine lineInfo(JAXBValidationContext validationContext) {
validationContext
.flexibleLines()
.stream()
.filter(f ->
f.getFlexibleLineType() == FlexibleLineTypeEnumeration.FIXED
)
.findFirst()
.map(line -> SimpleLine.of(line, validationContext.getFileName()))
.orElse(null)
.orElseThrow(() ->
new IllegalStateException(
"The line file " +
validationContext.getFileName() +
" contains neither a Line nor a FlexibleLine. This should have been caught by prior validation"
)
)
);
}
}