From 0aa2cc96c92bf7302fce5e1c37f5db2bbbacb04d Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 5 Dec 2024 08:46:47 +0100
Subject: [PATCH] OZG-7144 fix ifmapper
---
.../afm/AfmZustaendigeStelleMapper.java | 2 +-
.../IntelliFormRepresentationAdapter.java | 16 ++++++----------
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapper.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapper.java
index 9b5d6f86b..084fff17a 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapper.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapper.java
@@ -44,7 +44,7 @@ class AfmZustaendigeStelleMapper implements AfmEngineBasedMapper {
public static final String EMAIL = "emailadresse";
public static final String ORGANISATIONSEINHEITEN_ID = "OrganisationseinheitenID";
public static final String ORGANISATIONSEINHEITEN_ID_ALT = "organisationseinheitid";
- public static final String ORGANISATIONSEINHEITEN_ID_PARAMETER = "CUSTOMPARAMETER_ORGANISATIONEINHEITENID";
+ public static final String ORGANISATIONSEINHEITEN_ID_PARAMETER = "CUSTOMPARAMETER_ORGANISATIONSEINHEITENID";
public static final String TAG_BEZEICHNUNG = "OrganisationseinheitenBEZEICHNUNG";
@Autowired
diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/intelliform/IntelliFormRepresentationAdapter.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/intelliform/IntelliFormRepresentationAdapter.java
index d96052447..01ee10881 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/intelliform/IntelliFormRepresentationAdapter.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/intelliform/IntelliFormRepresentationAdapter.java
@@ -41,8 +41,7 @@ public class IntelliFormRepresentationAdapter {
"t:customer",
"t:customer-id",
"t:client",
- "t:client-id"
- );
+ "t:client-id");
public static final List<String> CUSTOM_HEADER_ATTRIBUTE_NAMES = List.of(
"u:saml_legacypostkorbhandle",
"u:saml_givenname",
@@ -54,15 +53,13 @@ public class IntelliFormRepresentationAdapter {
"u:saml_postaladdress",
"u:saml_postalcode",
"u:saml_localityname",
- ServiceKontoFactory.KEY_BAYERN_ID_TRUST_LEVEL
- );
+ ServiceKontoFactory.KEY_BAYERN_ID_TRUST_LEVEL);
private static final Collector<Map.Entry<String, ?>, ?, Map<String, Object>> ORDERED_MAP_ENTRY_COLLECTOR = Collectors.toMap(
Map.Entry::getKey,
Map.Entry::getValue,
(u, v) -> v,
- LinkedHashMap::new
- );
+ LinkedHashMap::new);
private final XmlToJavaMapsMapper xmlToJavaMapsMapper;
@@ -97,15 +94,14 @@ public class IntelliFormRepresentationAdapter {
var document = findIntelliFormXMLRepresentation(formData)
.orElseThrow(() -> new TechnicalException("Expect to find IntelliForm XML representation!"));
- return FormData.builder()
+ return formData.toBuilder()
.representations(formData.getRepresentations())
.attachments(formData.getAttachments())
.formData(Stream.concat(
getFormDataEntriesFromDocument(document, formData.getAttachments()),
Map.of(
- HEADER_FIELD, createHeaderMap(document)
- ).entrySet().stream()
- ).collect(ORDERED_MAP_ENTRY_COLLECTOR))
+ HEADER_FIELD, createHeaderMap(document)).entrySet().stream())
+ .collect(ORDERED_MAP_ENTRY_COLLECTOR))
.build();
}
--
GitLab