OZG-4456 refactor xml mapper

intelliform-adapter/src/main/java/de/ozgcloud/eingang/SemantikAdapterConfiguration.java

@@ -25,9 +25,6 @@ package de.ozgcloud.eingang;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.http.converter.xml.MappingJackson2XmlHttpMessageConverter;
-
-import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 
 import de.ozgcloud.eingang.semantik.enginebased.EngineBasedSemantikAdapter;
 import de.ozgcloud.eingang.semantik.enginebased.afm.AfmEngineBasedAdapter;
@@ -40,8 +37,4 @@ public class SemantikAdapterConfiguration {
 		return new AfmEngineBasedAdapter();
 	}
 
-	@Bean
-	public XmlMapper xmlMapper(MappingJackson2XmlHttpMessageConverter messageConverter) {
-		return (XmlMapper) messageConverter.getObjectMapper();
-	}
 }
\ No newline at end of file

semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/XmlMapperSupplier.java

+package de.ozgcloud.eingang.semantik.enginebased.afm;
+
+import org.springframework.stereotype.Component;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+
+@Component
+public class XmlMapperSupplier {
+
+	private final XmlMapper xmlMapper;
+
+	public XmlMapperSupplier() {
+		xmlMapper = new XmlMapper();
+		xmlMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+	}
+
+	public XmlMapper getMapper() {
+		return xmlMapper;
+	}
+}

semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/ZustaendigeStelleMetadataMapper.java

@@ -14,8 +14,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.fasterxml.jackson.dataformat.xml.XmlMapper;
-
 import de.itvsh.kop.common.errorhandling.TechnicalException;
 import de.ozgcloud.eingang.common.formdata.FormData;
 import de.ozgcloud.eingang.common.formdata.IncomingFile;
@@ -41,7 +39,7 @@ public class ZustaendigeStelleMetadataMapper {
 	static final String KEY_BEHOERDE_TELEFON = "behoerde_telefon";
 
 	@Autowired
-	private XmlMapper xmlMapper;
+	private XmlMapperSupplier xmlMapperSupplier;
 
 	public FormData parseZustaendigeStelleData(FormData formData) {
 		return formData.getRepresentations().stream().filter(IS_BEHOERDE_METADATA).findAny()
@@ -57,7 +55,7 @@ public class ZustaendigeStelleMetadataMapper {
 
 	Optional<ZustaendigeStelleData> readXmlContent(IncomingFile metadata) {
 		try {
-			return Optional.of(xmlMapper.readValue(metadata.getContentStream(), ZustaendigeStelleData.class));
+			return Optional.of(xmlMapperSupplier.getMapper().readValue(metadata.getContentStream(), ZustaendigeStelleData.class));
 		} catch (IOException | TechnicalException e) {
 			LOG.error("Error parsing {}", BEHOERDE_METADATA_FILE_NAME, e);
 		}

semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/ZustaendigeStelleMetadataMapperITCase.java

@@ -8,11 +8,6 @@ import java.io.File;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.converter.xml.MappingJackson2XmlHttpMessageConverter;
-
-import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 
 import de.itvsh.kop.common.test.ITCase;
 import de.itvsh.kop.common.test.TestUtils;
@@ -52,13 +47,4 @@ class ZustaendigeStelleMetadataMapperITCase {
 
 		assertThat(zustaendigeStelleData).isEmpty();
 	}
-}
-
-@Configuration
-class TestConfiguration {
-
-	@Bean
-	public XmlMapper xmlMapper(MappingJackson2XmlHttpMessageConverter messageConverter) {
-		return (XmlMapper) messageConverter.getObjectMapper();
-	}
 }
\ No newline at end of file