From 7f5b95c38b9abc9331036764b2cc7d9ace7e004c Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 10 Oct 2024 08:54:43 +0200
Subject: [PATCH] OZG-6858 improve code

---
 .../common/vorgang/NachrichtenVorgangMapper.java       | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/common/vorgang/NachrichtenVorgangMapper.java b/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/common/vorgang/NachrichtenVorgangMapper.java
index eaedc09..7dabcf0 100644
--- a/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/common/vorgang/NachrichtenVorgangMapper.java
+++ b/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/common/vorgang/NachrichtenVorgangMapper.java
@@ -1,8 +1,5 @@
 package de.ozgcloud.nachrichten.common.vorgang;
 
-import java.util.Optional;
-
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
@@ -20,11 +17,8 @@ interface NachrichtenVorgangMapper {
 	Vorgang fromVorgangWithEingang(GrpcVorgangWithEingang vorgangWithEingang);
 
 	default String getPostfachId(GrpcVorgangHead head) {
-		var postfachAddressList = head.getServiceKonto().getPostfachAddressesList();
-		return Optional.of(postfachAddressList)
-				.filter(CollectionUtils::isNotEmpty)
-				.map(list -> list.get(0))
-				.map(this::getPostfachId)
+		return head.getServiceKonto().getPostfachAddressesList().stream()
+				.map(this::getPostfachId).findFirst()
 				.orElse(StringUtils.EMPTY);
 	}
 
-- 
GitLab