From def55a240babe39f86e79e5c57aa73771ed8c921 Mon Sep 17 00:00:00 2001 From: Lukas Malte Monnerjahn <lukasmalte.monnerjahn@dataport.de> Date: Wed, 9 Oct 2024 09:51:24 +0200 Subject: [PATCH] use Optional.ofNullable --- .../xta/test/app/data/XtaMessageRepository.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/de/ozgcloud/xta/test/app/data/XtaMessageRepository.java b/src/main/java/de/ozgcloud/xta/test/app/data/XtaMessageRepository.java index dc107e5..b5bfd6c 100644 --- a/src/main/java/de/ozgcloud/xta/test/app/data/XtaMessageRepository.java +++ b/src/main/java/de/ozgcloud/xta/test/app/data/XtaMessageRepository.java @@ -37,14 +37,12 @@ public class XtaMessageRepository { } public Optional<XtaTransportReport> getTransportReport(String messageId) { - if (messages.containsKey(messageId)) { - return Optional.of(XtaTransportReport.builder() - .messageMetaData(messages.get(messageId).metaData()) - .status(messageIdToStatus.get(messageId)) - .reportTime(getNow()) - .build()); - } - return Optional.empty(); + return Optional.ofNullable(messages.get(messageId)) + .map(m -> XtaTransportReport.builder() + .messageMetaData(messages.get(messageId).metaData()) + .status(messageIdToStatus.get(messageId)) + .reportTime(getNow()) + .build()); } public List<XtaMessage> findOpenMessagesByReaderIdentifierValueLimitedTo(String readerIdentifierValue, int maxListItems) { -- GitLab