OZG-3260 code cleanup

common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/FormDataUtils.java

@@ -30,8 +30,12 @@ public class FormDataUtils {
 		return this;
 	}
 
+	public FormData.FormDataBuilder builder() {
+		return baseFormData.toBuilder().formData(Collections.unmodifiableMap(modifieableData));
+	}
+
 	public FormData build() {
-		return baseFormData.toBuilder().formData(Collections.unmodifiableMap(modifieableData)).build();
+		return builder().build();
 	}
 
 	@SuppressWarnings("unchecked")

intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/SemantikFormDataMapper.java

@@ -26,6 +26,7 @@ package de.itvsh.kop.eingangsadapter.intelliform;
 import static de.itvsh.kop.eingangsadapter.semantik.enginebased.AbstractFileMapper.*;
 
 import java.io.ByteArrayInputStream;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -41,6 +42,7 @@ import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
 import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroup;
 import lombok.RequiredArgsConstructor;
 
+//TODO Naming prüfen - er scheint mir nicht semantik zu mappen und befindet sich auch nicht im entsprechenden Modul
 @Component
 @RequiredArgsConstructor
 class SemantikFormDataMapper {
@@ -94,7 +96,7 @@ class SemantikFormDataMapper {
 
 		addHeader(document, formDataMap);
 
-		return FormData.builder().formData(formDataMap).build();
+		return FormData.builder().formData(Collections.unmodifiableMap(formDataMap)).build();
 	}
 
 	private byte[] getXmlFormData(DepositData depositData) {

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

@@ -26,7 +26,6 @@ package de.itvsh.kop.eingangsadapter.semantik.enginebased;
 import static de.itvsh.kop.eingangsadapter.semantik.enginebased.FormSolutionsEngineBasedAdapter.*;
 import static de.itvsh.kop.eingangsadapter.semantik.enginebased.FormSolutionsPanelMapper.*;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -36,6 +35,7 @@ import org.springframework.stereotype.Component;
 
 import de.itvsh.kop.eingangsadapter.common.formdata.Antragsteller;
 import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
+import de.itvsh.kop.eingangsadapter.common.formdata.FormDataUtils;
 
 @Component
 public class FormSolutionsAntragstellerMapper implements FormSolutionsEngineBasedMapper {
@@ -49,9 +49,10 @@ public class FormSolutionsAntragstellerMapper implements FormSolutionsEngineBase
 
 	@Override
 	public FormData parseFormData(FormData formData) {
-		return formData.toBuilder()
+		return FormDataUtils.from(formData)
+				.remove(POSTKORBHANDLE)
+				.builder()
 				.antragsteller(buildAntragsteller(formData))
-				.formData(removeProcessedData(formData))
 				.build();
 	}
 
@@ -105,10 +106,4 @@ public class FormSolutionsAntragstellerMapper implements FormSolutionsEngineBase
 		return ((List<Map<String, Object>>) ((Map<String, Object>) formData.get(ASSISTANT)).get(PANELS));
 	}
 
-	Map<String, Object> removeProcessedData(FormData formData) {
-		var formDataMap = new HashMap<String, Object>(formData.getFormData());
-		formDataMap.remove(POSTKORBHANDLE);
-
-		return Collections.unmodifiableMap(formDataMap);
-	}
 }

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

@@ -23,13 +23,12 @@
  */
 package de.itvsh.kop.eingangsadapter.semantik.enginebased;
 
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
 import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
+import de.itvsh.kop.eingangsadapter.common.formdata.FormDataUtils;
 
 public class FormSolutionsEngineBasedAdapter implements EngineBasedSemantikAdapter {
 
@@ -54,11 +53,10 @@ public class FormSolutionsEngineBasedAdapter implements EngineBasedSemantikAdapt
 	}
 
 	FormData removeProcessedData(FormData formData) {
-		var formDataMap = new HashMap<String, Object>(formData.getFormData());
-		formDataMap.remove(ASSISTANT);
-		formDataMap.remove(ANLIEGEN_ID);
-		formDataMap.remove(KOMMUNALVERWALTUNG_ID);
-
-		return formData.toBuilder().formData(Collections.unmodifiableMap(formDataMap)).build();
+		return FormDataUtils.from(formData)
+				.remove(ASSISTANT)
+				.remove(ANLIEGEN_ID)
+				.remove(KOMMUNALVERWALTUNG_ID)
+				.build();
 	}
 }

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

@@ -25,13 +25,12 @@ package de.itvsh.kop.eingangsadapter.semantik.enginebased;
 
 import static de.itvsh.kop.eingangsadapter.semantik.enginebased.FormSolutionsEngineBasedAdapter.*;
 
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
 
 import org.springframework.stereotype.Component;
 
 import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
+import de.itvsh.kop.eingangsadapter.common.formdata.FormDataUtils;
 import de.itvsh.kop.eingangsadapter.common.formdata.FormHeader;
 
 @Component
@@ -43,9 +42,10 @@ public class FormSolutionsHeaderMapper implements FormSolutionsEngineBasedMapper
 
 	@Override
 	public FormData parseFormData(FormData formData) {
-		return formData.toBuilder()
+		return FormDataUtils.from(formData)
+				.remove(TRANSACTION_ID)
+				.builder()
 				.header(buildFormHeader(formData))
-				.formData(removeProcessedData(formData))
 				.build();
 	}
 
@@ -60,22 +60,17 @@ public class FormSolutionsHeaderMapper implements FormSolutionsEngineBasedMapper
 
 	private String getIdentifier(FormData formData) {
 		return (String) getAssistant(formData).get(IDENTIFIER);
-		// TODO immutable machen
 	}
 
 	private String getRequestId(FormData formData) {
 		return (String) formData.getFormData().get(TRANSACTION_ID);
 	}
 
-	@SuppressWarnings("unchecked")
 	private Map<String, Object> getAssistant(FormData formData) {
-		return (Map<String, Object>) formData.getFormData().get(ASSISTANT);
+		return FormDataUtils.getSubMap(formData, ASSISTANT);
 	}
 
 	Map<String, Object> removeProcessedData(FormData processedData) {
-		var formDataMap = new HashMap<String, Object>(processedData.getFormData());
-		formDataMap.remove(TRANSACTION_ID);
-
-		return Collections.unmodifiableMap(formDataMap);
+		return FormDataUtils.from(processedData).remove(TRANSACTION_ID).build().getFormData();
 	}
 }

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

@@ -67,6 +67,13 @@ class FormSolutionsAntragstellerMapperTest {
 			assertThat(result).usingRecursiveComparison().ignoringFields("antragsteller", "formData").isEqualTo(formData);
 		}
 
+		@Test
+		void shouldRemovePostkorbhandle() {
+			var result = parseFormData();
+
+			assertThat(result.getFormData()).doesNotContainKey(FormSolutionsAntragstellerMapper.POSTKORBHANDLE);
+		}
+
 		private FormData parseFormData() {
 			return mapper.parseFormData(formData);
 		}
@@ -100,17 +107,5 @@ class FormSolutionsAntragstellerMapperTest {
 				return mapper.buildAntragsteller(formData);
 			}
 		}
-
-		@DisplayName("remove processed data")
-		@Nested
-		class TestRemoveProcessedData {
-
-			@Test
-			void shouldRemovePostkorbhandle() {
-				var formDataMap = mapper.removeProcessedData(formData);
-
-				assertThat(formDataMap).doesNotContainKey(FormSolutionsAntragstellerMapper.POSTKORBHANDLE);
-			}
-		}
 	}
 }
\ No newline at end of file

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

@@ -54,17 +54,17 @@ class FormSolutionsHeaderMapperTest {
 		}
 
 		@Test
-		void shouldCallRemoveProcessedData() {
-			parseFormData();
+		void shouldReturnValue() {
+			var result = parseFormData();
 
-			verify(mapper).removeProcessedData(formData);
+			assertThat(result).usingRecursiveComparison().ignoringFields("header", "formData").isEqualTo(formData);
 		}
 
 		@Test
-		void shouldReturnValue() {
+		void shouldRemoveTransactionId() {
 			var result = parseFormData();
 
-			assertThat(result).usingRecursiveComparison().ignoringFields("header", "formData").isEqualTo(formData);
+			assertThat(result.getFormData()).doesNotContainKey(FormSolutionsHeaderMapper.TRANSACTION_ID);
 		}
 
 		private FormData parseFormData() {