From e50c3ad9e711961bdeca33f2439d703d59159a77 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 7 Nov 2023 19:43:24 +0100
Subject: [PATCH] SCCON fix NPE when label is missing

---
 .../eingang/enterprise/entry/FormDataMapper.java   | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/enterprise-adapter/src/main/java/de/ozgcloud/eingang/enterprise/entry/FormDataMapper.java b/enterprise-adapter/src/main/java/de/ozgcloud/eingang/enterprise/entry/FormDataMapper.java
index 7ea8b6c58..4ecc509d8 100644
--- a/enterprise-adapter/src/main/java/de/ozgcloud/eingang/enterprise/entry/FormDataMapper.java
+++ b/enterprise-adapter/src/main/java/de/ozgcloud/eingang/enterprise/entry/FormDataMapper.java
@@ -1,5 +1,7 @@
 package de.ozgcloud.eingang.enterprise.entry;
 
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -54,11 +56,19 @@ public interface FormDataMapper {
 	}
 
 	default Map<String, Object> mapFormField(EntryFormDataField field) {
-		return Map.of(LABEL_KEY, field.getLabel(), VALUE_KEY, field.getValue());
+		var map = new HashMap<String, Object>();
+		map.put(LABEL_KEY, field.getLabel());
+		map.put(VALUE_KEY, field.getValue());
+
+		return Collections.unmodifiableMap(map);
 	}
 
 	default Map<String, Object> mapSubForm(EntryFormDataSubForm subForm) {
-		return Map.of(LABEL_KEY, subForm.getLabel(), VALUE_KEY, mapFormItems(subForm.getFormItems()));
+		var map = new HashMap<String, Object>();
+		map.put(LABEL_KEY, subForm.getLabel());
+		map.put(VALUE_KEY, mapFormItems(subForm.getFormItems()));
+
+		return Collections.unmodifiableMap(map);
 	}
 
 	default PostfachAddress map(de.ozgcloud.eingang.enterprise.entry.EntryData.PostfachAddress address) {
-- 
GitLab