From 36d7487505a0084bc935db07c62163cbe12c69ec Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 19 Dec 2024 15:11:41 +0100
Subject: [PATCH] OZG-7350 use map utils to get string from map
---
.../ozgcloud/collaboration/CollaborationEventListener.java | 5 +++--
.../ozgcloud/collaboration/fachstelle/FachstelleMapper.java | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationEventListener.java b/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationEventListener.java
index d078c9d..fd64680 100644
--- a/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationEventListener.java
+++ b/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationEventListener.java
@@ -26,6 +26,7 @@ package de.ozgcloud.collaboration;
import java.util.function.Consumer;
import java.util.function.Predicate;
+import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.ApplicationEventPublisher;
@@ -81,13 +82,13 @@ class CollaborationEventListener {
void createLevel1CollaborationRequest(CollaborationRequest collaborationRequest, Command command) {
var fachstelle = fachstelleService
- .getOrganisationEinheit((String) command.getBodyObject().get(CollaborationRequest.PROPERTY_ZUSTAENDIGE_STELLE));
+ .getOrganisationEinheit(MapUtils.getString(command.getBodyObject(), CollaborationRequest.PROPERTY_ZUSTAENDIGE_STELLE));
collaborationService.createCollaborationRequest(collaborationRequest.toBuilder().zustaendigeStelle(fachstelle).build());
}
void createLevel4CollaborationRequest(CollaborationRequest collaborationRequest, Command command) {
var fachstelle = fachstelleService
- .getExterneFachstelle((String) command.getBodyObject().get(CollaborationRequest.PROPERTY_ZUSTAENDIGE_STELLE));
+ .getExterneFachstelle(MapUtils.getString(command.getBodyObject(), CollaborationRequest.PROPERTY_ZUSTAENDIGE_STELLE));
collaborationService.createFachstellenBeteiligungRequest(collaborationRequest.toBuilder().zustaendigeStelle(fachstelle).build());
}
diff --git a/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/fachstelle/FachstelleMapper.java b/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/fachstelle/FachstelleMapper.java
index be0d27a..72cafa1 100644
--- a/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/fachstelle/FachstelleMapper.java
+++ b/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/fachstelle/FachstelleMapper.java
@@ -40,8 +40,8 @@ public interface FachstelleMapper {
default Fachstelle fromMap(Map<?, ?> fachstelleMap) {
return Fachstelle.builder()
- .technicalId((String) fachstelleMap.get(Fachstelle.PROPERTY_TECHNICAL_ID))
- .subjectId((String) fachstelleMap.get(Fachstelle.PROPERTY_SUBJECT_ID))
+ .technicalId(MapUtils.getString(fachstelleMap, Fachstelle.PROPERTY_TECHNICAL_ID))
+ .subjectId(MapUtils.getString(fachstelleMap, Fachstelle.PROPERTY_SUBJECT_ID))
.type(FachstelleType.valueOf(MapUtils.getString(fachstelleMap, Fachstelle.PROPERTY_TYPE)))
.build();
}
--
GitLab