From 2895b2b81ad997cf08af12314fc16638424f6363 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Sun, 4 Dec 2022 13:21:11 +0100
Subject: [PATCH] refactoring todos for hotfix
---
.../formsolutions/FormSolutionsRequestMapper.java | 3 ++-
.../de/itvsh/kop/eingangsadapter/semantik/SemantikAdapter.java | 2 +-
.../semantik/enginebased/AbstractFileMapper.java | 1 +
.../semantik/enginebased/FormSolutionsAntragstellerMapper.java | 1 +
.../semantik/enginebased/FormSolutionsHeaderMapper.java | 1 +
.../semantik/enginebased/FormSolutionsPanelMapper.java | 2 ++
.../enginebased/FormSolutionsZustaendigeStelleMapper.java | 1 +
7 files changed, 9 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 f8eabb1f5..5a38b0661 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 0cdf2991d..9d228e3cf 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 34d9daf90..6b4ab4bcd 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
@@ -84,6 +84,7 @@ public abstract class AbstractFileMapper implements EngineBasedMapper {
protected FormData removeProcessedData(FormData formData) {
Map<String, Object> mutableMap = new HashMap<>(formData.getFormData());
mutableMap.remove(MAPPED_FILES);
+ // TODO copyOf erlaubt keine null values -daher ausbauen
return formData.toBuilder().formData(Map.copyOf(mutableMap)).build();
}
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsAntragstellerMapper.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsAntragstellerMapper.java
index beafef67c..9b6818248 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsAntragstellerMapper.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsAntragstellerMapper.java
@@ -62,6 +62,7 @@ public class FormSolutionsAntragstellerMapper implements FormSolutionsEngineBase
.build();
}
+ // TODO auf immutable ma umstellen
private Map<String, String> findAntragstellerData(Map<String, Object> formData) {
Map<String, String> names = new HashMap<>();
addContent(getPanels(formData), names);
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 fe82cb56e..ac13ff44b 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
@@ -51,6 +51,7 @@ public class FormSolutionsHeaderMapper implements FormSolutionsEngineBasedMapper
private Map<String, Object> removeTransactionId(FormData processedData) {
Map<String, Object> cleanedData = new HashMap<>(processedData.getFormData());
cleanedData.remove(TRANSACTION_ID);
+ // TODO immutable machen
return cleanedData;
}
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 ce01b4d35..31558e952 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));
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsZustaendigeStelleMapper.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsZustaendigeStelleMapper.java
index 27a381ef2..b0b1952fa 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsZustaendigeStelleMapper.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsZustaendigeStelleMapper.java
@@ -47,6 +47,7 @@ public class FormSolutionsZustaendigeStelleMapper implements FormSolutionsEngine
private Map<String, Object> removeZustaendigeStelle(FormData formData) {
var cleanedData = new HashMap<>(formData.getFormData());
cleanedData.remove(ZUSTAENDIGE_STELLE);
+ // TODO immutable machen
return cleanedData;
}
}
--
GitLab