OZG-7501 OZG-7899 Use MapUtils in mapper

vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingRequestMapper.java

@@ -25,26 +25,27 @@ package de.ozgcloud.vorgang.vorgang.redirect;
 
 import java.util.Map;
 
+import org.apache.commons.collections4.MapUtils;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 
 import de.ozgcloud.command.Command;
 
-@Mapper
+@Mapper(imports = MapUtils.class)
 interface ForwardingRequestMapper {
 
 	@Mapping(target = "version", source = "relationVersion")
 	@Mapping(target = "organisationEinheit", source = "bodyObject")
 	ForwardingRequest fromCommand(Command command);
 
-	@Mapping(target = "id", expression = "java((String) body.get(\"organisationsEinheitId\"))")
-	@Mapping(target = "name", expression = "java((String) body.get(\"name\"))")
+	@Mapping(target = "id", expression = "java(MapUtils.getString(body, \"organisationEinheitId\"))")
+	@Mapping(target = "name", expression = "java(MapUtils.getString(body, \"name\"))")
 	@Mapping(target = "address", source = ".")
 	OrganisationEinheit toOrganisationEinheit(Map<String, Object> body);
 
-	@Mapping(target = "street", expression = "java((String) body.get(\"strasse\"))")
-	@Mapping(target = "houseNumber", expression = "java((String) body.get(\"hausnummer\"))")
-	@Mapping(target = "zipCode", expression = "java((String) body.get(\"plz\"))")
-	@Mapping(target = "city", expression = "java((String) body.get(\"ort\"))")
+	@Mapping(target = "street", expression = "java(MapUtils.getString(body, \"strasse\"))")
+	@Mapping(target = "houseNumber", expression = "java(MapUtils.getString(body, \"hausnummer\"))")
+	@Mapping(target = "zipCode", expression = "java(MapUtils.getString(body, \"plz\"))")
+	@Mapping(target = "city", expression = "java(MapUtils.getString(body, \"ort\"))")
 	Address toAddress(Map<String, Object> body);
 }

vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingRequestMapperTest.java

@@ -41,7 +41,7 @@ class ForwardingRequestMapperTest {
 	@Spy
 	private ForwardingRequestMapper mapper = Mappers.getMapper(ForwardingRequestMapper.class);
 	private final Map<String, Object> bodyObject = Map.of(
-			"organisationsEinheitId", OrganisationEinheitTestFactory.ID,
+			"organisationEinheitId", OrganisationEinheitTestFactory.ID,
 			"name", OrganisationEinheitTestFactory.NAME,
 			"strasse", AddressTestFactory.STREET,
 			"hausnummer", AddressTestFactory.HOUSE_NUMBER,