From a8adff59aa2d94d88edcdabeeadf75cb0d8d5cf5 Mon Sep 17 00:00:00 2001
From: OZG-Cloud Team <noreply@ozg-sh.de>
Date: Sun, 4 Dec 2022 16:04:54 +0100
Subject: [PATCH] refactoring todos for hotfix
# Conflicts:
# semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/AbstractFileMapper.java
# semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsAntragstellerMapper.java
# semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsHeaderMapper.java
# semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsZustaendigeStelleMapper.java
---
.../formsolutions/FormSolutionsRequestMapper.java | 3 ++-
.../de/itvsh/kop/eingangsadapter/semantik/SemantikAdapter.java | 2 +-
.../semantik/enginebased/AbstractFileMapper.java | 1 +
.../semantik/enginebased/FormSolutionsHeaderMapper.java | 1 +
.../semantik/enginebased/FormSolutionsPanelMapper.java | 2 ++
5 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/formsolutions-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsRequestMapper.java b/formsolutions-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsRequestMapper.java
index f8eabb1f..5a38b066 100644
--- a/formsolutions-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsRequestMapper.java
+++ b/formsolutions-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsRequestMapper.java
@@ -70,9 +70,10 @@ class FormSolutionsRequestMapper {
}
}
+//TEST
private FormData removeProcessedData(FormData formData) {
Map<String, Object> data = formData.getFormData();
-
+//TODO immutable berucksichtigen
data.remove(ZIP);
data.remove(PDF);
data.remove(JSON);
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/SemantikAdapter.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/SemantikAdapter.java
index 0cdf2991..9d228e3c 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/SemantikAdapter.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/SemantikAdapter.java
@@ -42,7 +42,7 @@ public class SemantikAdapter {
@Autowired
private VorgangService vorgangService;
- public void processFormData(FormData formData) {
+ public void processFormDGata(FormData formData) {
formData = parseByEngineAdapter(formData);
formData = parseByFormAdapter(formData);
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/AbstractFileMapper.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/AbstractFileMapper.java
index d83360b1..ab255ec5 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/AbstractFileMapper.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/AbstractFileMapper.java
@@ -85,6 +85,7 @@ public abstract class AbstractFileMapper implements EngineBasedMapper {
protected FormData removeProcessedData(FormData formData) {
var cleanedFormData = new HashMap<String, Object>(formData.getFormData());
cleanedFormData.remove(MAPPED_FILES);
+ // TODO copyOf erlaubt keine null values -daher ausbauen
return formData.toBuilder().formData(Collections.unmodifiableMap(cleanedFormData)).build();
}
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsHeaderMapper.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsHeaderMapper.java
index 7eb00792..ce0098a7 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsHeaderMapper.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsHeaderMapper.java
@@ -60,6 +60,7 @@ public class FormSolutionsHeaderMapper implements FormSolutionsEngineBasedMapper
private String getIdentifier(FormData formData) {
return (String) getAssistant(formData).get(IDENTIFIER);
+ // TODO immutable machen
}
private String getRequestId(FormData formData) {
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsPanelMapper.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsPanelMapper.java
index ce01b4d3..31558e95 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsPanelMapper.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsPanelMapper.java
@@ -51,6 +51,8 @@ public class FormSolutionsPanelMapper implements FormSolutionsEngineBasedMapper
@Override
public FormData parseFormData(FormData formData) {
var res = mapPanels(getPanels(formData));
+ // TODO was passiert hier? Sieht nach dem join von zwei maps aus nur irre
+ // komilziert
Map<String, Object> combinedMap = Stream.concat(res.entrySet().stream(), formData.getFormData().entrySet().stream())
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
--
GitLab