Skip to content
Snippets Groups Projects
Commit dec27973 authored by OZGCloud's avatar OZGCloud
Browse files

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
parent 5474e68a
Branches
Tags
No related merge requests found
......@@ -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);
......
......@@ -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);
......
......@@ -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();
}
......
......@@ -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) {
......
......@@ -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));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment