Skip to content

Commit

Permalink
#159 Add null-check to landingPadSizeFromPayload method
Browse files Browse the repository at this point in the history
The 'landingPadSizeFromPayload()' method in 'ReceiveJournalDockedService.java' has been updated to handle possibly null landing pads with the help of Optional. An Optional.ofNullable has been added to elegantly handle any potential null values of the payload's landing pads. This offers a more robust and foolproof way of mapping landing pad sizes.
  • Loading branch information
pveeckhout committed Mar 24, 2024
1 parent f365f0e commit 4e8180a
Showing 1 changed file with 7 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import java.time.LocalDateTime;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ExecutorService;
import java.util.stream.Collectors;

Expand Down Expand Up @@ -65,11 +66,12 @@ private void createOrUpdateFromPayload(DockedMessage.V1.Payload payload, LocalDa
}

private Map<LandingPadSize, Integer> landingPadSizeFromPayload(DockedMessage.V1.Payload payload) {
return Map.of(
LandingPadSize.LARGE, payload.landingPads().large(),
LandingPadSize.MEDIUM, payload.landingPads().medium(),
LandingPadSize.SMALL, payload.landingPads().small()
);
return Optional.ofNullable(payload.landingPads())
.map(landingPads -> Map.of(
LandingPadSize.LARGE, landingPads.large(),
LandingPadSize.MEDIUM, landingPads.medium(),
LandingPadSize.SMALL, landingPads.small()
)).orElse(null);
}

private Map<String, Double> stationEconomiesFromPayload(DockedMessage.V1.Payload payload) {
Expand Down

0 comments on commit 4e8180a

Please sign in to comment.