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

Merge pull request 'OZG-4461 single processorName fix' (#7) from...

Merge pull request 'OZG-4461 single processorName fix' (#7) from OZG-4461-ProcessNamesFix into master

Reviewed-on: https://git.ozg-sh.de/mgm/ozgcloud-processor-manager/pulls/7
parents d60bfd10 1d818ad9
Branches
Tags 2.2.0
No related merge requests found
...@@ -75,8 +75,12 @@ class ProcessorEventListener { ...@@ -75,8 +75,12 @@ class ProcessorEventListener {
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private Collection<String> getProcessorNames(Command command) { Collection<String> getProcessorNames(Command command) {
return (Collection<String>) MapUtils.getObject(command.getBodyObject(), COMMAND_PROCESSOR_NAMES_KEY, Collections.emptyList()); var processorNames = MapUtils.getObject(command.getBodyObject(), COMMAND_PROCESSOR_NAMES_KEY, Collections.emptyList());
if (processorNames instanceof String processorNamesStr) {
return Collections.singleton(processorNamesStr);
}
return (Collection<String>) processorNames;
} }
private ProcessorResult addVorgangId(ProcessorResult result, String vorgangId) { private ProcessorResult addVorgangId(ProcessorResult result, String vorgangId) {
......
...@@ -6,6 +6,7 @@ import static org.mockito.Mockito.*; ...@@ -6,6 +6,7 @@ import static org.mockito.Mockito.*;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Stream; import java.util.stream.Stream;
...@@ -131,7 +132,8 @@ class ProcessorEventListenerTest { ...@@ -131,7 +132,8 @@ class ProcessorEventListenerTest {
private final Vorgang vorgang = VorgangTestFactory.create(); private final Vorgang vorgang = VorgangTestFactory.create();
private final Collection<String> processorNames = List.of("dummy1", "dummy2"); private final Collection<String> processorNames = List.of("dummy1", "dummy2");
private final Command command = CommandTestFactory.createBuilder().bodyObject(Map.of(ProcessorEventListener.COMMAND_PROCESSOR_NAMES_KEY, processorNames)).build(); private final Command command = CommandTestFactory.createBuilder()
.bodyObject(Map.of(ProcessorEventListener.COMMAND_PROCESSOR_NAMES_KEY, processorNames)).build();
private final CommandCreatedEvent event = new CommandCreatedEvent(command); private final CommandCreatedEvent event = new CommandCreatedEvent(command);
@DisplayName("process flow") @DisplayName("process flow")
...@@ -176,6 +178,31 @@ class ProcessorEventListenerTest { ...@@ -176,6 +178,31 @@ class ProcessorEventListenerTest {
} }
} }
@DisplayName("get processorNames")
@Nested
class TestGetProcessorNames {
@Test
void shouldReturnSingletonList() {
var processorNames = vorgangEventListener.getProcessorNames(createCommand("singleName"));
assertThat(processorNames).isInstanceOf(Collection.class).containsExactly("singleName");
}
@Test
void shouldReturnList() {
var processorNames = vorgangEventListener.getProcessorNames(createCommand(List.of("name", "otherName")));
assertThat(processorNames).isInstanceOf(Collection.class).containsExactly("name", "otherName");
}
private Command createCommand(Object processorNames) {
var map = new HashMap<String, Object>();
map.put(ProcessorEventListener.COMMAND_PROCESSOR_NAMES_KEY, processorNames);
return CommandTestFactory.createBuilder().bodyObject(map).build();
}
}
@DisplayName("publish command processed event") @DisplayName("publish command processed event")
@Nested @Nested
class TestPublishCommandProcessedEvent { class TestPublishCommandProcessedEvent {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment