From ccc41c07e68ea5eefd37828353cd909f6216fd89 Mon Sep 17 00:00:00 2001
From: Krzysztof <krzysztof.witukiewicz@mgm-tp.com>
Date: Thu, 13 Mar 2025 17:49:22 +0100
Subject: [PATCH] OZG-7501 OZG-7899 Use MapUtils in mapper
---
.../vorgang/redirect/ForwardingRequestMapper.java | 15 ++++++++-------
.../redirect/ForwardingRequestMapperTest.java | 2 +-
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingRequestMapper.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingRequestMapper.java
index 0da7cd2ac..9f6301389 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingRequestMapper.java
+++ b/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);
}
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingRequestMapperTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingRequestMapperTest.java
index 08f42edb7..8708b569d 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingRequestMapperTest.java
+++ b/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,
--
GitLab