Merge branch 'master' into ozg-2502

semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/AfmAntragstellerMapper.java

 package de.itvsh.kop.eingangsadapter.semantik.enginebased;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -39,9 +40,9 @@ class AfmAntragstellerMapper implements AfmEngineBasedMapper {
 				.map(antragstellerMap -> addAntragstellerData(builder, antragstellerMap))
 				.orElse(builder);
 
-		removeMappedData(formDataMap);
+		var cleanedMap = removeMappedData(formDataMap);
 		var antragsterller = filledBuilder.build();
-		return formData.toBuilder().antragsteller(antragsterller).build();
+		return formData.toBuilder().antragsteller(antragsterller).formData(cleanedMap).build();
 	}
 
 	private String getPostfachId(Map<String, Object> formDataMap) {
@@ -81,8 +82,10 @@ class AfmAntragstellerMapper implements AfmEngineBasedMapper {
 		return List.of(ANREDE, VORNAME, NACHNAME, GEBURTSNAME, GEBURTSDATUM, GEBURTSORT, EMAIL, TELEFON, STRASSE, HAUSNUMMER, PLZ, ORT);
 	}
 
-	private void removeMappedData(Map<String, Object> formDataMap) {
-		formDataMap.remove(ANTRAGSTELLER);
-		formDataMap.remove(POSTFACH_ID);
+	private Map<String, Object> removeMappedData(Map<String, Object> formDataMap) {
+		var editableMap = new HashMap<>(formDataMap);
+		editableMap.remove(ANTRAGSTELLER);
+		editableMap.remove(POSTFACH_ID);
+		return Collections.unmodifiableMap(editableMap);
 	}
 }
\ No newline at end of file

semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/AfmAntragstellerMapperTest.java

@@ -5,12 +5,12 @@ import static org.assertj.core.api.Assertions.*;
 import java.util.HashMap;
 import java.util.UUID;
 
+import org.assertj.core.data.MapEntry;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
 import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.semantik.enginebased.AfmAntragstellerMapper;
 
 class AfmAntragstellerMapperTest {
 
@@ -58,8 +58,8 @@ class AfmAntragstellerMapperTest {
 
 				@BeforeEach
 				void buildFormData() {
-					var antragstellerMap = AfmAntragstellerTestFactory.createAntragstelleMap();
-					antragstellerMap.put(NOT_MAPPED_FIELD, NOT_MAPPED_VALUE);
+					var antragstellerMap = AfmAntragstellerTestFactory.createAntragstelleMap(MapEntry.entry(NOT_MAPPED_FIELD, NOT_MAPPED_VALUE));
+
 					var formDataMap = new HashMap<String, Object>();
 					formDataMap.put(AfmAntragstellerMapper.ANTRAGSTELLER, antragstellerMap);
 

semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/AfmAntragstellerTestFactory.java

 package de.itvsh.kop.eingangsadapter.semantik.enginebased;
 
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
+import org.assertj.core.data.MapEntry;
+
 import de.itvsh.kop.eingangsadapter.common.formdata.Antragsteller;
-import de.itvsh.kop.eingangsadapter.semantik.enginebased.AfmAntragstellerMapper;
 
 public class AfmAntragstellerTestFactory {
 
@@ -49,10 +52,11 @@ public class AfmAntragstellerTestFactory {
 		var map = new HashMap<String, Object>();
 		map.put(AfmAntragstellerMapper.POSTFACH_ID, POSTFACH_ID);
 		map.put(AfmAntragstellerMapper.ANTRAGSTELLER, createAntragstelleMap());
-		return map;
+		return Collections.unmodifiableMap(map);
 	}
 
-	public static Map<String, Object> createAntragstelleMap() {
+	@SafeVarargs
+	public static Map<String, Object> createAntragstelleMap(MapEntry<String, Object>... additionalEntries) {
 		var map = new HashMap<String, Object>();
 		map.put(AfmAntragstellerMapper.ANREDE, ANREDE);
 		map.put(AfmAntragstellerMapper.VORNAME, VORNAME);
@@ -66,6 +70,9 @@ public class AfmAntragstellerTestFactory {
 		map.put(AfmAntragstellerMapper.HAUSNUMMER, HAUSNUMMER);
 		map.put(AfmAntragstellerMapper.PLZ, PLZ);
 		map.put(AfmAntragstellerMapper.ORT, ORT);
-		return map;
+
+		Arrays.stream(additionalEntries).forEach(entry -> map.put(entry.getKey(), entry.getValue()));
+
+		return Collections.unmodifiableMap(map);
 	}
 }
\ No newline at end of file