From 9f23ea405fac3e664b548f44b310c574bb3af6bb Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 27 Sep 2024 09:32:06 +0200
Subject: [PATCH] OZG-6666 adjust naming
---
.../nachrichten/postfach/PostfachEventListener.java | 11 ++++++-----
.../postfach/PostfachEventListenerTest.java | 4 ++--
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/postfach/PostfachEventListener.java b/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/postfach/PostfachEventListener.java
index 88fdba8..e28ce4e 100644
--- a/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/postfach/PostfachEventListener.java
+++ b/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/postfach/PostfachEventListener.java
@@ -53,11 +53,12 @@ public class PostfachEventListener {
private static final String IS_SEND_POSTFACH_NACHRICHT_COMMAND = "{T(de.ozgcloud.nachrichten.postfach.PostfachEventListener).IS_SEND_POSTFACH_NACHRICHT.test(event.getSource())}";
public static final Predicate<Command> IS_SEND_POSTFACH_NACHRICHT = command -> StringUtils.equals(command.getOrder(), "SEND_POSTFACH_NACHRICHT");
public static final String KEY_ITEM_NAME = "itemName";
- public static final Predicate<Command> IS_INCOMING_NACHRICHT_CREATED = command -> StringUtils.equals(command.getOrder(), "CREATE_ATTACHED_ITEM")
+ public static final Predicate<Command> IS_INCOMING_POSTFACH_NACHRICHT_CREATED = command ->
+ StringUtils.equals(command.getOrder(), "CREATE_ATTACHED_ITEM")
&& StringUtils.equals(MapUtils.getString(command.getBodyObject(), KEY_ITEM_NAME), AttachedItemRemoteService.ITEM_NAME)
&& StringUtils.equals(MapUtils.getString(command.getBodyObject(), PostfachNachricht.FIELD_DIRECTION), "IN");
- private static final String IS_INCOMING_NACHRICHT_ITEM_CREATED_CONDITION =
- "{T(de.ozgcloud.nachrichten.postfach.PostfachEventListener).IS_INCOMING_NACHRICHT_CREATED.test(event.getCommand())}";
+ private static final String IS_INCOMING_POSTFACH_NACHRICHT_ITEM_CREATED_CONDITION =
+ "{T(de.ozgcloud.nachrichten.postfach.PostfachEventListener).IS_INCOMING_POSTFACH_NACHRICHT_CREATED.test(event.getCommand())}";
private final PostfachService service;
private final ApplicationEventPublisher publisher;
@@ -131,8 +132,8 @@ public class PostfachEventListener {
}
}
- @EventListener(condition = IS_INCOMING_NACHRICHT_ITEM_CREATED_CONDITION)
- public void onIncomingNachrichtItemCreated(VorgangAttachedItemCreatedEvent event) {
+ @EventListener(condition = IS_INCOMING_POSTFACH_NACHRICHT_ITEM_CREATED_CONDITION)
+ public void onIncomingPostfachNachrichtItemCreated(VorgangAttachedItemCreatedEvent event) {
publisher.publishEvent(new PostfachNachrichtReceived(event.getCommand(), event.getCreatedResource()));
}
}
\ No newline at end of file
diff --git a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/PostfachEventListenerTest.java b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/PostfachEventListenerTest.java
index 00e0d57..c419a76 100644
--- a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/PostfachEventListenerTest.java
+++ b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/PostfachEventListenerTest.java
@@ -221,7 +221,7 @@ class PostfachEventListenerTest {
@DisplayName("On create incoming nachricht item")
@Nested
- class TestOnCreateIncomingNachrichtItem {
+ class TestOnCreateIncomingPostfachNachrichtItem {
private static final String CREATED_RESOURCE = "created-resource";
@Captor
@@ -237,7 +237,7 @@ class PostfachEventListenerTest {
@Test
void shouldPublishPostfachNachrichtReceivedEvent() {
- listener.onIncomingNachrichtItemCreated(vorgangAttachedItemCreatedEvent);
+ listener.onIncomingPostfachNachrichtItemCreated(vorgangAttachedItemCreatedEvent);
verify(publisher).publishEvent(eventCaptor.capture());
assertThat(eventCaptor.getValue()).satisfies(event -> {
--
GitLab