diff --git a/archive-manager-server/src/main/java/de/ozgcloud/archive/common/xta/XtaImportConfirmationHandler.java b/archive-manager-server/src/main/java/de/ozgcloud/archive/common/xta/XtaImportConfirmationHandler.java index e3c34763c0a196308f29c22271bdd01af34df828..70ad2f443b80beba421d9169bc598479e22c8ccf 100644 --- a/archive-manager-server/src/main/java/de/ozgcloud/archive/common/xta/XtaImportConfirmationHandler.java +++ b/archive-manager-server/src/main/java/de/ozgcloud/archive/common/xta/XtaImportConfirmationHandler.java @@ -18,7 +18,6 @@ public class XtaImportConfirmationHandler { private XtaImportConfirmationHandler(XtaFile file) { importConfirmation = XtaFileReader.createAbgabeImportBestaetigen0402Reader().read(file); - } public Stream<XtaAbgabeAdapter> getAbgaben() { @@ -38,7 +37,7 @@ public class XtaImportConfirmationHandler { return abgabeType.isErfolgreich(); } - public String getFehlermeldung() { + public String getErrorMessage() { return abgabeType.getFehlermeldung().stream().collect(Collectors.joining(";")); } } diff --git a/archive-manager-server/src/main/java/de/ozgcloud/archive/quittung/QuittungService.java b/archive-manager-server/src/main/java/de/ozgcloud/archive/quittung/QuittungService.java index 94d809938d64566d3e4a67b35df63069e71a3f52..87a479849a0957c23a94a9eef892d78307d41ce4 100644 --- a/archive-manager-server/src/main/java/de/ozgcloud/archive/quittung/QuittungService.java +++ b/archive-manager-server/src/main/java/de/ozgcloud/archive/quittung/QuittungService.java @@ -81,6 +81,6 @@ class QuittungService { } void publishCommandFailedEvent(XtaAbgabeAdapter contentHandler, Command pendingCommand) { - eventPublisher.publishEvent(new CommandFailedEvent(pendingCommand.getId(), contentHandler.getFehlermeldung())); + eventPublisher.publishEvent(new CommandFailedEvent(pendingCommand.getId(), contentHandler.getErrorMessage())); } } diff --git a/archive-manager-server/src/test/java/de/ozgcloud/archive/common/xta/XtaFileReaderTest.java b/archive-manager-server/src/test/java/de/ozgcloud/archive/common/xta/XtaFileReaderTest.java index 78fe01559c3e4b56b5ec4e1025a400a8af95be18..73c88d4bfc0d48758e059b3e1936fcfa1cb6f142 100644 --- a/archive-manager-server/src/test/java/de/ozgcloud/archive/common/xta/XtaFileReaderTest.java +++ b/archive-manager-server/src/test/java/de/ozgcloud/archive/common/xta/XtaFileReaderTest.java @@ -54,7 +54,7 @@ class XtaFileReaderTest { @SneakyThrows void shouldThrowTechnicalException() { var reader = XtaFileReader.createAbgabeImportBestaetigen0402Reader(); - XtaFile unknownFile = XtaFileTestFactory.create(); + XtaFile unknownFile = XtaFileTestFactory.create(XtaFileTestFactory.DUMMY_XML_FILE_PATH); assertThrows(TechnicalException.class, () -> reader.read(unknownFile)); } diff --git a/archive-manager-server/src/test/java/de/ozgcloud/archive/common/xta/XtaImportConfirmationHandlerTest.java b/archive-manager-server/src/test/java/de/ozgcloud/archive/common/xta/XtaImportConfirmationHandlerTest.java index 7670320b89e43a2e2df958b584e4d3e8f86ac512..3e36d432775aa4feeb8bd23679aee7fcfbae5f09 100644 --- a/archive-manager-server/src/test/java/de/ozgcloud/archive/common/xta/XtaImportConfirmationHandlerTest.java +++ b/archive-manager-server/src/test/java/de/ozgcloud/archive/common/xta/XtaImportConfirmationHandlerTest.java @@ -102,7 +102,7 @@ class XtaImportConfirmationHandlerTest { @Test void shouldReturnErrorMessage() { - var errorMessage = initAbgabeHandler().getFehlermeldung(); + var errorMessage = initAbgabeHandler().getErrorMessage(); assertThat(errorMessage).isEqualTo(AbgabeImportBestaetigen0402TestFactory.FEHLERMELDUNG); } diff --git a/archive-manager-server/src/test/java/de/ozgcloud/archive/quittung/QuittungServiceTest.java b/archive-manager-server/src/test/java/de/ozgcloud/archive/quittung/QuittungServiceTest.java index 0ca69e545e1239bc36dfd3e3c5ac741597a5aa39..c6e600aa2848d2dc97011ddf78f6e7ed2ff4cfc1 100644 --- a/archive-manager-server/src/test/java/de/ozgcloud/archive/quittung/QuittungServiceTest.java +++ b/archive-manager-server/src/test/java/de/ozgcloud/archive/quittung/QuittungServiceTest.java @@ -80,7 +80,7 @@ class QuittungServiceTest { } } - @DisplayName("Consume message") + @DisplayName("Consume Quittung") @Nested class TestConsumeQuittung { @@ -287,7 +287,7 @@ class QuittungServiceTest { @DisplayName("should publish command failed event") @Test void shouldPublishCommandFailedEvent() { - when(abgabeHandler.getFehlermeldung()).thenReturn(AbgabeImportBestaetigen0402TestFactory.FEHLERMELDUNG); + when(abgabeHandler.getErrorMessage()).thenReturn(AbgabeImportBestaetigen0402TestFactory.FEHLERMELDUNG); service.publishCommandFailedEvent(abgabeHandler, command);