Skip to content
Snippets Groups Projects
Commit 486d10f3 authored by Krzysztof Witukiewicz's avatar Krzysztof Witukiewicz
Browse files

OZG-7501 OZG-7899 Rename forwardOrder

parent 48d9c324
Branches
Tags
1 merge request!22Ozg 7501 weiterleitung vorbereiten
This commit is part of merge request !22. Comments created here will be created in the context of that merge request.
...@@ -51,13 +51,13 @@ public class ForwardingEventListener { ...@@ -51,13 +51,13 @@ public class ForwardingEventListener {
private static final String IS_REDIRECT_EVENT_CONDITION = "{T(de.ozgcloud.vorgang.vorgang.redirect.ForwardingEventListener).IS_REDIRECT_MAIL_REQ.test(event.getSource())}"; private static final String IS_REDIRECT_EVENT_CONDITION = "{T(de.ozgcloud.vorgang.vorgang.redirect.ForwardingEventListener).IS_REDIRECT_MAIL_REQ.test(event.getSource())}";
private static final String IS_SUCCESSFULL_ORDER_CONDITION = "{T(de.ozgcloud.vorgang.vorgang.redirect.ForwardingEventListener).IS_SUCCESSFULL_ORDER.test(event.getSource())}"; private static final String IS_SUCCESSFULL_ORDER_CONDITION = "{T(de.ozgcloud.vorgang.vorgang.redirect.ForwardingEventListener).IS_SUCCESSFULL_ORDER.test(event.getSource())}";
private static final String IS_FAILED_ORDER_CONDITION = "{T(de.ozgcloud.vorgang.vorgang.redirect.ForwardingEventListener).IS_FAILED_ORDER.test(event.getSource())}"; private static final String IS_FAILED_ORDER_CONDITION = "{T(de.ozgcloud.vorgang.vorgang.redirect.ForwardingEventListener).IS_FAILED_ORDER.test(event.getSource())}";
private static final String IS_FORWARD_ORDER_CONDITION = "{T(de.ozgcloud.vorgang.vorgang.redirect.ForwardingEventListener).IS_FORWARD_ORDER.test(event.getSource())}"; private static final String IS_REDIRECT_VORGANG_ORDER_CONDITION = "{T(de.ozgcloud.vorgang.vorgang.redirect.ForwardingEventListener).IS_REDIRECT_VORGANG_ORDER.test(event.getSource())}";
private static final String IS_FORWARD_VORGANG_ORDER_CONDITION = "{T(de.ozgcloud.vorgang.vorgang.redirect.ForwardingEventListener).IS_FORWARD_VORGANG_ORDER.test(event.getSource())}"; private static final String IS_FORWARD_VORGANG_ORDER_CONDITION = "{T(de.ozgcloud.vorgang.vorgang.redirect.ForwardingEventListener).IS_FORWARD_VORGANG_ORDER.test(event.getSource())}";
public static final Predicate<MailSendRequest> IS_REDIRECT_MAIL_REQ = req -> req.getRequestReference() instanceof Forwarding; public static final Predicate<MailSendRequest> IS_REDIRECT_MAIL_REQ = req -> req.getRequestReference() instanceof Forwarding;
public static final Predicate<Command> IS_SUCCESSFULL_ORDER = command -> Order.FORWARD_SUCCESSFULL.isMeant(command.getOrder()); public static final Predicate<Command> IS_SUCCESSFULL_ORDER = command -> Order.FORWARD_SUCCESSFULL.isMeant(command.getOrder());
public static final Predicate<Command> IS_FAILED_ORDER = command -> Order.FORWARD_FAILED.isMeant(command.getOrder()); public static final Predicate<Command> IS_FAILED_ORDER = command -> Order.FORWARD_FAILED.isMeant(command.getOrder());
public static final Predicate<Command> IS_FORWARD_ORDER = command -> Order.REDIRECT_VORGANG.isMeant(command.getOrder()); public static final Predicate<Command> IS_REDIRECT_VORGANG_ORDER = command -> Order.REDIRECT_VORGANG.isMeant(command.getOrder());
public static final Predicate<Command> IS_FORWARD_VORGANG_ORDER = command -> Order.FORWARD_VORGANG.isMeant(command.getOrder()); public static final Predicate<Command> IS_FORWARD_VORGANG_ORDER = command -> Order.FORWARD_VORGANG.isMeant(command.getOrder());
private final ForwardingService service; private final ForwardingService service;
...@@ -66,8 +66,8 @@ public class ForwardingEventListener { ...@@ -66,8 +66,8 @@ public class ForwardingEventListener {
private final VorgangService vorgangService; private final VorgangService vorgangService;
private final LockMapper lockMapper; private final LockMapper lockMapper;
@EventListener(condition = IS_FORWARD_ORDER_CONDITION) @EventListener(condition = IS_REDIRECT_VORGANG_ORDER_CONDITION)
public void onForwardOrder(CommandCreatedEvent event) { public void onRedirectVorgangOrder(CommandCreatedEvent event) {
handleException(() -> service.forwardByCommand(event.getSource()), event.getSource().getId()); handleException(() -> service.forwardByCommand(event.getSource()), event.getSource().getId());
} }
......
...@@ -75,11 +75,11 @@ class ForwardingEventListenerTest { ...@@ -75,11 +75,11 @@ class ForwardingEventListenerTest {
private LockMapper lockMapper; private LockMapper lockMapper;
@Nested @Nested
class OnForwardOrderCommand { class OnRedirectVorgangCommand {
@Test @Test
void shouldCallService() { void shouldCallService() {
listener.onForwardOrder(CommandCreatedEventTestFactory.create()); listener.onRedirectVorgangOrder(CommandCreatedEventTestFactory.create());
verify(forwardingService).forwardByCommand(notNull()); verify(forwardingService).forwardByCommand(notNull());
} }
...@@ -88,7 +88,7 @@ class ForwardingEventListenerTest { ...@@ -88,7 +88,7 @@ class ForwardingEventListenerTest {
void shouldPublishFailedEventOnError() { void shouldPublishFailedEventOnError() {
when(forwardingService.forwardByCommand(any())).thenThrow(ConcurrentModificationException.class); when(forwardingService.forwardByCommand(any())).thenThrow(ConcurrentModificationException.class);
listener.onForwardOrder(CommandCreatedEventTestFactory.create()); listener.onRedirectVorgangOrder(CommandCreatedEventTestFactory.create());
verify(publisher).publishEvent(any(CommandFailedEvent.class)); verify(publisher).publishEvent(any(CommandFailedEvent.class));
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment