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 f8eabb1f508c4acf6f53330b3bae49ba2fefd678..5a38b0661eece1053f78247321e1489364769121 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 0cdf2991d73c8a57ab8eb3a92db137acfbfea029..9d228e3cff3ab2b538ec9373a4a21713701022c7 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 d83360b1b8fd72d86dd30b51f1c7a6f4ec4d6485..ab255ec57a6abe56148f27786967e175dbb9b380 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 7eb007923536c5e66cf0f3a5b843b6d60cb0723f..ce0098a786b44bfb074c559fef1adcfc9561acc6 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 ce01b4d35f3c4ee7121640b2552cf9215c972740..31558e952f16cbb16f7c2a5dd1f84406dd2de25f 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));