Skip to content
Snippets Groups Projects
Commit 9f23ea40 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-6666 adjust naming

parent b6674f2b
No related branches found
No related tags found
No related merge requests found
...@@ -53,11 +53,12 @@ public class PostfachEventListener { ...@@ -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())}"; 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 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 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(), KEY_ITEM_NAME), AttachedItemRemoteService.ITEM_NAME)
&& StringUtils.equals(MapUtils.getString(command.getBodyObject(), PostfachNachricht.FIELD_DIRECTION), "IN"); && StringUtils.equals(MapUtils.getString(command.getBodyObject(), PostfachNachricht.FIELD_DIRECTION), "IN");
private static final String IS_INCOMING_NACHRICHT_ITEM_CREATED_CONDITION = private static final String IS_INCOMING_POSTFACH_NACHRICHT_ITEM_CREATED_CONDITION =
"{T(de.ozgcloud.nachrichten.postfach.PostfachEventListener).IS_INCOMING_NACHRICHT_CREATED.test(event.getCommand())}"; "{T(de.ozgcloud.nachrichten.postfach.PostfachEventListener).IS_INCOMING_POSTFACH_NACHRICHT_CREATED.test(event.getCommand())}";
private final PostfachService service; private final PostfachService service;
private final ApplicationEventPublisher publisher; private final ApplicationEventPublisher publisher;
...@@ -131,8 +132,8 @@ public class PostfachEventListener { ...@@ -131,8 +132,8 @@ public class PostfachEventListener {
} }
} }
@EventListener(condition = IS_INCOMING_NACHRICHT_ITEM_CREATED_CONDITION) @EventListener(condition = IS_INCOMING_POSTFACH_NACHRICHT_ITEM_CREATED_CONDITION)
public void onIncomingNachrichtItemCreated(VorgangAttachedItemCreatedEvent event) { public void onIncomingPostfachNachrichtItemCreated(VorgangAttachedItemCreatedEvent event) {
publisher.publishEvent(new PostfachNachrichtReceived(event.getCommand(), event.getCreatedResource())); publisher.publishEvent(new PostfachNachrichtReceived(event.getCommand(), event.getCreatedResource()));
} }
} }
\ No newline at end of file
...@@ -221,7 +221,7 @@ class PostfachEventListenerTest { ...@@ -221,7 +221,7 @@ class PostfachEventListenerTest {
@DisplayName("On create incoming nachricht item") @DisplayName("On create incoming nachricht item")
@Nested @Nested
class TestOnCreateIncomingNachrichtItem { class TestOnCreateIncomingPostfachNachrichtItem {
private static final String CREATED_RESOURCE = "created-resource"; private static final String CREATED_RESOURCE = "created-resource";
@Captor @Captor
...@@ -237,7 +237,7 @@ class PostfachEventListenerTest { ...@@ -237,7 +237,7 @@ class PostfachEventListenerTest {
@Test @Test
void shouldPublishPostfachNachrichtReceivedEvent() { void shouldPublishPostfachNachrichtReceivedEvent() {
listener.onIncomingNachrichtItemCreated(vorgangAttachedItemCreatedEvent); listener.onIncomingPostfachNachrichtItemCreated(vorgangAttachedItemCreatedEvent);
verify(publisher).publishEvent(eventCaptor.capture()); verify(publisher).publishEvent(eventCaptor.capture());
assertThat(eventCaptor.getValue()).satisfies(event -> { assertThat(eventCaptor.getValue()).satisfies(event -> {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment