use Optional.ofNullable

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) {