From 8bfc56e8db943ebcb4902b11330dbc75c1ba647e Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 26 Jan 2024 16:41:45 +0100
Subject: [PATCH] OZG-4375 OZG-4867 CR
---
.../alfa/vorgang/FormDataExportAdjuster.java | 12 ++++++------
.../alfa/vorgang/FormDataExportAdjusterTest.java | 14 +++++++-------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/alfa-xdomea/src/main/java/de/ozgcloud/alfa/vorgang/FormDataExportAdjuster.java b/alfa-xdomea/src/main/java/de/ozgcloud/alfa/vorgang/FormDataExportAdjuster.java
index ee3802fbf5..82c3c1524f 100644
--- a/alfa-xdomea/src/main/java/de/ozgcloud/alfa/vorgang/FormDataExportAdjuster.java
+++ b/alfa-xdomea/src/main/java/de/ozgcloud/alfa/vorgang/FormDataExportAdjuster.java
@@ -12,26 +12,26 @@ class FormDataExportAdjuster {
static final String VALUE_KEY = "value";
public static Map<String, Object> adjustFormDataForExport(Map<String, Object> formData) {
- return removeValueKeys(formData);
+ return replaceValueKeys(formData);
}
- static Map<String, Object> removeValueKeys(Map<String, Object> formData) {
+ static Map<String, Object> replaceValueKeys(Map<String, Object> formData) {
Map<String, Object> result = new HashMap<>();
for (var entry : formData.entrySet()) {
- result.put(entry.getKey(), removeValueKeysFromValue(entry.getValue()));
+ result.put(entry.getKey(), replaceValueKeysInValue(entry.getValue()));
}
return result;
}
@SuppressWarnings("unchecked")
- private static Object removeValueKeysFromValue(Object value) {
+ private static Object replaceValueKeysInValue(Object value) {
if (!(value instanceof Map)) {
return value;
}
Map<String, Object> formData = (Map<String, Object>) value;
return containsValueKeyOnly(formData) ?
- removeValueKeysFromValue(formData.get(VALUE_KEY)) :
- removeValueKeys(formData);
+ replaceValueKeysInValue(formData.get(VALUE_KEY)) :
+ replaceValueKeys(formData);
}
private static boolean containsValueKeyOnly(Map<String, Object> formData) {
diff --git a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/vorgang/FormDataExportAdjusterTest.java b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/vorgang/FormDataExportAdjusterTest.java
index 7bf7579b62..4dd12aab91 100644
--- a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/vorgang/FormDataExportAdjusterTest.java
+++ b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/vorgang/FormDataExportAdjusterTest.java
@@ -17,25 +17,25 @@ public class FormDataExportAdjusterTest {
private final Map<String, Object> formData = Map.of("key", "value");
@Test
- void shouldCallRemoveValueKeys() {
+ void shouldCallReplaceValueKeys() {
try (MockedStatic<FormDataExportAdjuster> adjusterMock = mockStatic(FormDataExportAdjuster.class)) {
adjusterMock.when(() -> FormDataExportAdjuster.adjustFormDataForExport(any())).thenCallRealMethod();
FormDataExportAdjuster.adjustFormDataForExport(formData);
- adjusterMock.verify(() -> FormDataExportAdjuster.removeValueKeys(formData));
+ adjusterMock.verify(() -> FormDataExportAdjuster.replaceValueKeys(formData));
}
}
}
@Nested
- class TestRemoveValueKeys {
+ class TestReplaceValueKeys {
@Test
void shouldPreserveValueKeyWithoutParent() {
Map<String, Object> formData = Map.of("value", "Kiel");
- var formDataWithoutValueKeys = FormDataExportAdjuster.removeValueKeys(formData);
+ var formDataWithoutValueKeys = FormDataExportAdjuster.replaceValueKeys(formData);
assertThat(formDataWithoutValueKeys).isEqualTo(formData);
}
@@ -45,7 +45,7 @@ public class FormDataExportAdjusterTest {
Map<String, Object> formData = Map.of("ort", Map.of("value", "Kiel"));
Map<String, Object> expected = Map.of("ort", "Kiel");
- var formDataWithoutValueKeys = FormDataExportAdjuster.removeValueKeys(formData);
+ var formDataWithoutValueKeys = FormDataExportAdjuster.replaceValueKeys(formData);
assertThat(formDataWithoutValueKeys).isEqualTo(expected);
}
@@ -54,7 +54,7 @@ public class FormDataExportAdjusterTest {
void shouldPreserveValueKeyIfHasSiblings() {
Map<String, Object> formData = Map.of("ort", Map.of("value", "Kiel", "value2", "Kiel"));
- var formDataWithoutValueKeys = FormDataExportAdjuster.removeValueKeys(formData);
+ var formDataWithoutValueKeys = FormDataExportAdjuster.replaceValueKeys(formData);
assertThat(formDataWithoutValueKeys).isEqualTo(formData);
}
@@ -65,7 +65,7 @@ public class FormDataExportAdjusterTest {
Map.of("value", Map.of("OrganisationseinheitenAuswahl", Map.of("value", "123456"))));
Map<String, Object> expected = Map.of("empfangendestelle", Map.of("OrganisationseinheitenAuswahl", "123456"));
- var formDataWithoutValueKeys = FormDataExportAdjuster.removeValueKeys(formData);
+ var formDataWithoutValueKeys = FormDataExportAdjuster.replaceValueKeys(formData);
assertThat(formDataWithoutValueKeys).isEqualTo(expected);
}
--
GitLab