SystemTaskRegistry builds the registry using task name instead of bea…

…n name.

core/src/main/java/com/netflix/conductor/core/execution/tasks/SystemTaskRegistry.java

@@ -16,8 +16,12 @@
 import org.springframework.stereotype.Component;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * A container class that holds a mapping of system task types {@link com.netflix.conductor.common.metadata.tasks.TaskType} to
@@ -28,14 +32,8 @@ public class SystemTaskRegistry {
 
     private final Map<String, WorkflowSystemTask> registry;
 
-    /**
-     * Spring creates a map of bean names to {@link WorkflowSystemTask} instances and injects it.
-     * <p>
-     * NOTE: It is important the {@link WorkflowSystemTask} instances are "qualified" with their respective
-     * {@link com.netflix.conductor.common.metadata.tasks.TaskType}.
-     */
-    public SystemTaskRegistry(Map<String, WorkflowSystemTask> registry) {
-        this.registry = registry;
+    public SystemTaskRegistry(Set<WorkflowSystemTask> tasks) {
+        this.registry = tasks.stream().collect(Collectors.toMap(WorkflowSystemTask::getName, Function.identity()));
     }
 
     public WorkflowSystemTask get(String taskType) {
@@ -48,6 +46,6 @@ public boolean isSystemTask(String taskType) {
     }
 
     public Collection<WorkflowSystemTask> all() {
-        return registry.values();
+        return Collections.unmodifiableCollection(registry.values());
     }
 }

core/src/test/java/com/netflix/conductor/core/execution/TestDeciderOutcomes.java

@@ -61,6 +61,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 
 import static com.netflix.conductor.common.metadata.tasks.TaskType.DECISION;
 import static com.netflix.conductor.common.metadata.tasks.TaskType.DYNAMIC;
@@ -111,8 +112,8 @@ public Join join() {
         }
 
         @Bean
-        public SystemTaskRegistry systemTaskRegistry(Map<String, WorkflowSystemTask> beanFactory) {
-            return new SystemTaskRegistry(beanFactory);
+        public SystemTaskRegistry systemTaskRegistry(Set<WorkflowSystemTask> tasks) {
+            return new SystemTaskRegistry(tasks);
         }
 
     }

core/src/test/java/com/netflix/conductor/core/execution/TestWorkflowExecutor.java

@@ -78,6 +78,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -165,8 +166,8 @@ public WorkflowSystemTask http2() {
         }
 
         @Bean
-        public SystemTaskRegistry systemTaskRegistry(Map<String, WorkflowSystemTask> registry) {
-            return new SystemTaskRegistry(registry);
+        public SystemTaskRegistry systemTaskRegistry(Set<WorkflowSystemTask> tasks) {
+            return new SystemTaskRegistry(tasks);
         }
     }
 

core/src/test/java/com/netflix/conductor/core/execution/tasks/TestSystemTaskWorkerCoordinator.java

@@ -20,6 +20,7 @@
 import org.junit.Test;
 
 import java.time.Duration;
+import java.util.Collections;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -52,23 +53,23 @@ public void setUp() {
     public void isSystemTask() {
         createTaskMapping();
         SystemTaskWorkerCoordinator systemTaskWorkerCoordinator = new SystemTaskWorkerCoordinator(queueDAO,
-            workflowExecutor, properties, executionService, null);
+            workflowExecutor, properties, executionService, Collections.emptyList());
         assertTrue(systemTaskWorkerCoordinator.isAsyncSystemTask(TEST_QUEUE + ISOLATION_CONSTANT));
     }
 
     @Test
     public void isSystemTaskNotPresent() {
         createTaskMapping();
         SystemTaskWorkerCoordinator systemTaskWorkerCoordinator = new SystemTaskWorkerCoordinator(queueDAO,
-            workflowExecutor, properties, executionService, null);
+            workflowExecutor, properties, executionService, Collections.emptyList());
         assertFalse(systemTaskWorkerCoordinator.isAsyncSystemTask(null));
     }
 
     @Test
     public void testIsFromCoordinatorExecutionNameSpace() {
         doReturn("exeNS").when(properties).getSystemTaskWorkerExecutionNamespace();
         SystemTaskWorkerCoordinator systemTaskWorkerCoordinator = new SystemTaskWorkerCoordinator(queueDAO,
-            workflowExecutor, properties, executionService, null);
+            workflowExecutor, properties, executionService, Collections.emptyList());
         assertTrue(
             systemTaskWorkerCoordinator.isFromCoordinatorExecutionNameSpace(TEST_QUEUE + EXECUTION_NAMESPACE_CONSTANT));
     }
@@ -77,6 +78,6 @@ private void createTaskMapping() {
         WorkflowSystemTask mockWorkflowTask = mock(WorkflowSystemTask.class);
         when(mockWorkflowTask.getName()).thenReturn(TEST_QUEUE);
         when(mockWorkflowTask.isAsync()).thenReturn(true);
-//        SystemTaskWorkerCoordinator.taskNameWorkflowTaskMapping.put(TEST_QUEUE, mockWorkflowTask);
+        SystemTaskWorkerCoordinator.taskNameWorkflowTaskMapping.put(TEST_QUEUE, mockWorkflowTask);
     }
 }