diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/SemantikAdapter.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/SemantikAdapter.java index c0b4731304a75ebca4d1716b5b3d22b26b23891a..47a3d8570d4b2b6c3b3b7aaa5a5d2bba58271f57 100644 --- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/SemantikAdapter.java +++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/SemantikAdapter.java @@ -23,17 +23,16 @@ */ package de.ozgcloud.eingang.semantik; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + import de.ozgcloud.eingang.common.formdata.FormData; import de.ozgcloud.eingang.router.VorgangService; import de.ozgcloud.eingang.semantik.enginebased.EngineBasedSemantikAdapter; import de.ozgcloud.eingang.semantik.formbased.FormBasedSemantikAdapter; -import lombok.extern.log4j.Log4j2; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; -@Log4j2 @Service public class SemantikAdapter { @@ -53,12 +52,7 @@ public class SemantikAdapter { private FormData parseByEngineAdapter(FormData formData) { for (var adapter : getResponsibleEngineAdapters(formData)) { - try { - formData = adapter.parseFormData(formData); - } catch (Exception e) { - LOG.error("beim Vorgang {} ist ein Fehler beim Parsing aufgetreten", formData.getId()); - LOG.error("Error while parsing form data", e); - } + formData = adapter.parseFormData(formData); } return formData; } diff --git a/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaRemoteServiceITCase.java b/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaRemoteServiceITCase.java index 1770479f0e1710ee56eab57ce40aaf5594faae4a..cc85f76f2d5cff5cf9556a7613493647f05f740b 100644 --- a/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaRemoteServiceITCase.java +++ b/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaRemoteServiceITCase.java @@ -1,7 +1,7 @@ package de.ozgcloud.eingang.xta; -import de.ozgcloud.eingang.Application; -import jakarta.validation.Valid; +import static org.assertj.core.api.Assertions.*; + import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -9,20 +9,17 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; -import java.util.Arrays; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatNoException; +import de.ozgcloud.eingang.Application; +import jakarta.validation.Valid; @Disabled("real live test - do only activate for manual testing") @ActiveProfiles({ "itcase", "local" }) @SpringBootTest(classes = Application.class, // - properties = { "ozgcloud.xta.identifier=vbe:010550120100", - "ozgcloud.xta.server.name=li33-0005.dp.dsecurecloud.de", - "ozgcloud.xta.server.address=li33-0005.dp.dsecurecloud.de", + properties = { "ozgcloud.xta.server.name=LI33-0005", + "ozgcloud.xta.server.address=LI33-0005:3000", "ozgcloud.xta.server.protocol=https", "ozgcloud.xta.keystore.file=file:./KOP_SH_KIEL_DEV.p12", - "ozgcloud.xta.keystore.password= " // replace this with real password + "ozgcloud.xta.keystore.password=geheim" // replace this with real password }) class XtaRemoteServiceITCase { @@ -55,18 +52,11 @@ class XtaRemoteServiceITCase { @Nested class TestGetMessage { - @Autowired - XtaIncomingFilesMapper xtaIncomingFilesMapper; - @Test void shouldSendRequest() { - var result = remoteService.getMessage("urn:de:xta:messageid:dataport_xta_210:89335585-8ef9-4544-875d-415cb10eb5b2"); + var result = remoteService.getMessage("urn:de:xta:messageid:dataport_xta_210:20eb297a-e224-45a0-9376-5ebd4d9bcc9a"); assertThat(result).isNotNull(); - var results = Arrays.asList(new XtaFile[] { result }); - - var incomingFiles = xtaIncomingFilesMapper.toIncomingFiles(results); - assertThat(incomingFiles).isNotNull(); } }