From 95d25b52693ed3ad1394b8d43ce87130939e5048 Mon Sep 17 00:00:00 2001
From: Felix Reichenbach <felix.reichenbach@mgm-tp.com>
Date: Mon, 6 Jan 2025 14:30:31 +0100
Subject: [PATCH] OZG-7038 apply code review comments
---
.../archive/common/xta/XtaImportConfirmationHandler.java | 3 +--
.../java/de/ozgcloud/archive/quittung/QuittungService.java | 2 +-
.../de/ozgcloud/archive/common/xta/XtaFileReaderTest.java | 2 +-
.../archive/common/xta/XtaImportConfirmationHandlerTest.java | 2 +-
.../de/ozgcloud/archive/quittung/QuittungServiceTest.java | 4 ++--
5 files changed, 6 insertions(+), 7 deletions(-)
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 e3c3476..70ad2f4 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 94d8099..87a4798 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 78fe015..73c88d4 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 7670320..3e36d43 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 0ca69e5..c6e600a 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);
--
GitLab