OZG-4375 OZG-4790 Renamings

alfa-xdomea/src/main/java/de/ozgcloud/alfa/vorgang/FormDataMapper.java

@@ -32,7 +32,7 @@ class FormDataMapper {
 	public Antragsdaten toAntragsdaten(@NotNull VorgangWithEingang vorgang) {
 		return Optional.ofNullable(vorgang.getEingang())
 				.map(Eingang::getFormData)
-				.map(FormDataFlattener::flatten)
+				.map(ValueKeysRemover::removeValueKeys)
 				.map(this::buildAntragsdaten)
 				.orElseGet(Antragsdaten::new);
 	}

alfa-xdomea/src/main/java/de/ozgcloud/alfa/vorgang/FormDataFlattener.java → alfa-xdomea/src/main/java/de/ozgcloud/alfa/vorgang/ValueKeysRemover.java

@@ -3,31 +3,27 @@ package de.ozgcloud.alfa.vorgang;
 import java.util.HashMap;
 import java.util.Map;
 
-class FormDataFlattener {
+class ValueKeysRemover {
 
 	static final String VALUE_KEY = "value";
 
-	public static Map<String, Object> flatten(Map<String, Object> formData) {
-		return getDataWithoutValueKeys(formData);
-	}
-
-	private static Map<String, Object> getDataWithoutValueKeys(Map<String, Object> data) {
+	public static Map<String, Object> removeValueKeys(Map<String, Object> formData) {
 		Map<String, Object> result = new HashMap<>();
-		for (var entry : data.entrySet()) {
-			result.put(entry.getKey(), getDataWithoutValueKey(entry.getValue()));
+		for (var entry : formData.entrySet()) {
+			result.put(entry.getKey(), removeValueKeysFromValue(entry.getValue()));
 		}
 		return result;
 	}
 
 	@SuppressWarnings("unchecked")
-	private static Object getDataWithoutValueKey(Object data) {
-		if (!(data instanceof Map)) {
-			return data;
+	private static Object removeValueKeysFromValue(Object value) {
+		if (!(value instanceof Map)) {
+			return value;
 		}
-		Map<String, Object> formData = (Map<String, Object>) data;
+		Map<String, Object> formData = (Map<String, Object>) value;
 		return containsValueKeyAsSingleEntry(formData) ?
-				getDataWithoutValueKey(formData.get(VALUE_KEY)) :
-				getDataWithoutValueKeys(formData);
+				removeValueKeysFromValue(formData.get(VALUE_KEY)) :
+				removeValueKeys(formData);
 	}
 
 	private static boolean containsValueKeyAsSingleEntry(Map<String, Object> formData) {

alfa-xdomea/src/test/java/de/ozgcloud/alfa/vorgang/FormDataMapperTest.java

@@ -45,15 +45,15 @@ class FormDataMapperTest {
 
 		@Test
 		void shouldCallBuildAntragsdaten() {
-			try (MockedStatic<FormDataFlattener> formDataFlattener = mockStatic(FormDataFlattener.class)) {
+			try (MockedStatic<ValueKeysRemover> valueKeysRemover = mockStatic(ValueKeysRemover.class)) {
 				var vorgang = VorgangWithEingangTestFactory.create();
-				Map<String, Object> flattenedFormData = Map.of(UUID.randomUUID().toString(), "value1");
-				formDataFlattener.when(() -> FormDataFlattener.flatten(any())).thenReturn(flattenedFormData);
+				Map<String, Object> formDataWithoutValueKeys = Map.of(UUID.randomUUID().toString(), "value1");
+				valueKeysRemover.when(() -> ValueKeysRemover.removeValueKeys(any())).thenReturn(formDataWithoutValueKeys);
 				doReturn(new Object()).when(formDataMapper).formatValue(any(), any());
 
 				formDataMapper.toAntragsdaten(vorgang);
 
-				verify(formDataMapper).buildAntragsdaten(flattenedFormData);
+				verify(formDataMapper).buildAntragsdaten(formDataWithoutValueKeys);
 			}
 		}
 

alfa-xdomea/src/test/java/de/ozgcloud/alfa/vorgang/FormDataFlattenerTest.java → alfa-xdomea/src/test/java/de/ozgcloud/alfa/vorgang/ValueKeysRemoverTest.java

@@ -7,18 +7,18 @@ import java.util.Map;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
-public class FormDataFlattenerTest {
+public class ValueKeysRemoverTest {
 
 	@Nested
-	class TestFlatten {
+	class TestRemoveValueKeys {
 
 		@Test
 		void shouldPreserveValueKeyWithoutParent() {
 			Map<String, Object> formData = Map.of("value", "Kiel");
 
-			var flattened = FormDataFlattener.flatten(formData);
+			var formDataWithoutValueKeys = ValueKeysRemover.removeValueKeys(formData);
 
-			assertThat(flattened).isEqualTo(formData);
+			assertThat(formDataWithoutValueKeys).isEqualTo(formData);
 		}
 
 		@Test
@@ -26,18 +26,18 @@ public class FormDataFlattenerTest {
 			Map<String, Object> formData = Map.of("ort", Map.of("value", "Kiel"));
 			Map<String, Object> expected = Map.of("ort", "Kiel");
 
-			var flattened = FormDataFlattener.flatten(formData);
+			var formDataWithoutValueKeys = ValueKeysRemover.removeValueKeys(formData);
 
-			assertThat(flattened).isEqualTo(expected);
+			assertThat(formDataWithoutValueKeys).isEqualTo(expected);
 		}
 
 		@Test
 		void shouldPreserveValueKeyIfHasSiblings() {
 			Map<String, Object> formData = Map.of("ort", Map.of("value", "Kiel", "value2", "Kiel"));
 
-			var flattened = FormDataFlattener.flatten(formData);
+			var formDataWithoutValueKeys = ValueKeysRemover.removeValueKeys(formData);
 
-			assertThat(flattened).isEqualTo(formData);
+			assertThat(formDataWithoutValueKeys).isEqualTo(formData);
 		}
 
 		@Test
@@ -63,9 +63,9 @@ public class FormDataFlattenerTest {
 					)
 			);
 
-			var flattened = FormDataFlattener.flatten(formData);
+			var formDataWithoutValueKeys = ValueKeysRemover.removeValueKeys(formData);
 
-			assertThat(flattened).isEqualTo(expected);
+			assertThat(formDataWithoutValueKeys).isEqualTo(expected);
 		}
 	}
 }