Skip to content
Snippets Groups Projects
Commit 0033b2d0 authored by OZG-Cloud Team's avatar OZG-Cloud Team
Browse files

Revert "try catch Block in den Sematik Adapter hinzugefügt um mapping robuster zu machen"

This reverts commit 00e07174.
parent 38a4297e
No related branches found
No related tags found
No related merge requests found
...@@ -23,17 +23,16 @@ ...@@ -23,17 +23,16 @@
*/ */
package de.ozgcloud.eingang.semantik; 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.common.formdata.FormData;
import de.ozgcloud.eingang.router.VorgangService; import de.ozgcloud.eingang.router.VorgangService;
import de.ozgcloud.eingang.semantik.enginebased.EngineBasedSemantikAdapter; import de.ozgcloud.eingang.semantik.enginebased.EngineBasedSemantikAdapter;
import de.ozgcloud.eingang.semantik.formbased.FormBasedSemantikAdapter; 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 @Service
public class SemantikAdapter { public class SemantikAdapter {
...@@ -53,12 +52,7 @@ public class SemantikAdapter { ...@@ -53,12 +52,7 @@ public class SemantikAdapter {
private FormData parseByEngineAdapter(FormData formData) { private FormData parseByEngineAdapter(FormData formData) {
for (var adapter : getResponsibleEngineAdapters(formData)) { for (var adapter : getResponsibleEngineAdapters(formData)) {
try {
formData = adapter.parseFormData(formData); 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);
}
} }
return formData; return formData;
} }
......
package de.ozgcloud.eingang.xta; package de.ozgcloud.eingang.xta;
import de.ozgcloud.eingang.Application; import static org.assertj.core.api.Assertions.*;
import jakarta.validation.Valid;
import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
...@@ -9,17 +9,14 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -9,17 +9,14 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ActiveProfiles;
import java.util.Arrays; import de.ozgcloud.eingang.Application;
import jakarta.validation.Valid;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatNoException;
@Disabled("real live test - do only activate for manual testing") @Disabled("real live test - do only activate for manual testing")
@ActiveProfiles({ "itcase", "local" }) @ActiveProfiles({ "itcase", "local" })
@SpringBootTest(classes = Application.class, // @SpringBootTest(classes = Application.class, //
properties = { "ozgcloud.xta.identifier=vbe:010550120100", properties = { "ozgcloud.xta.server.name=LI33-0005",
"ozgcloud.xta.server.name=li33-0005.dp.dsecurecloud.de", "ozgcloud.xta.server.address=LI33-0005:3000",
"ozgcloud.xta.server.address=li33-0005.dp.dsecurecloud.de",
"ozgcloud.xta.server.protocol=https", "ozgcloud.xta.server.protocol=https",
"ozgcloud.xta.keystore.file=file:./KOP_SH_KIEL_DEV.p12", "ozgcloud.xta.keystore.file=file:./KOP_SH_KIEL_DEV.p12",
"ozgcloud.xta.keystore.password=<geheim>" // replace this with real password "ozgcloud.xta.keystore.password=<geheim>" // replace this with real password
...@@ -55,18 +52,11 @@ class XtaRemoteServiceITCase { ...@@ -55,18 +52,11 @@ class XtaRemoteServiceITCase {
@Nested @Nested
class TestGetMessage { class TestGetMessage {
@Autowired
XtaIncomingFilesMapper xtaIncomingFilesMapper;
@Test @Test
void shouldSendRequest() { 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(); assertThat(result).isNotNull();
var results = Arrays.asList(new XtaFile[] { result });
var incomingFiles = xtaIncomingFilesMapper.toIncomingFiles(results);
assertThat(incomingFiles).isNotNull();
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment