removed bean post processors

s50600822 · Dec 4, 2020 · 1254004 · 1254004
1 parent ed392ad
commit 1254004
Show file tree

Hide file tree

Showing 26 changed files with 93 additions and 227 deletions.
diff --git a/...ibs/src/main/java/com/netflix/conductor/contribs/metrics/LoggingMetricsConfiguration.java b/...ibs/src/main/java/com/netflix/conductor/contribs/metrics/LoggingMetricsConfiguration.java
@@ -40,7 +40,7 @@ public class LoggingMetricsConfiguration {
     // This way one can cleanly separate the metrics stream from rest of the logs
     private static final Logger METRICS_LOGGER = LoggerFactory.getLogger("ConductorMetrics");
 
-    @Value("${metrics.logger.reportPeriodSeconds:30}")
+    @Value("${conductor.metrics.logger.reportPeriodSeconds:30}")
     private long metricsReportInterval;
 
     @Bean

diff --git a/core/src/main/java/com/netflix/conductor/core/config/ConductorCoreConfiguration.java b/core/src/main/java/com/netflix/conductor/core/config/ConductorCoreConfiguration.java
@@ -12,25 +12,31 @@
  */
 package com.netflix.conductor.core.config;
 
+import static com.netflix.conductor.core.events.EventQueues.EVENT_QUEUE_PROVIDERS_QUALIFIER;
+
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.netflix.conductor.common.utils.ExternalPayloadStorage;
+import com.netflix.conductor.core.events.EventQueueProvider;
+import com.netflix.conductor.core.execution.mapper.TaskMapper;
 import com.netflix.conductor.core.listener.WorkflowStatusListener;
 import com.netflix.conductor.core.listener.WorkflowStatusListenerStub;
 import com.netflix.conductor.core.storage.DummyPayloadStorage;
 import com.netflix.conductor.core.sync.Lock;
 import com.netflix.conductor.core.sync.NoopLock;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import java.util.stream.Collectors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadFactory;
-
-@SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class ConductorCoreConfiguration {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ConductorCoreConfiguration.class);
@@ -62,4 +68,18 @@ public ExecutorService executorService(ConductorProperties conductorProperties)
             .build();
         return Executors.newFixedThreadPool(conductorProperties.getExecutorServiceMaxThreads(), threadFactory);
     }
+
+    @Bean
+    @Qualifier("taskProcessorsMap")
+    public Map<String, TaskMapper> getTaskMappers(List<TaskMapper> taskMappers) {
+        return taskMappers.stream()
+            .collect(Collectors.toMap(t -> t.getTaskType().name(), t -> t));
+    }
+
+    @Bean
+    @Qualifier(EVENT_QUEUE_PROVIDERS_QUALIFIER)
+    public Map<String, EventQueueProvider> getEventQueueProviders(List<EventQueueProvider> eventQueueProviders) {
+        return eventQueueProviders.stream()
+            .collect(Collectors.toMap(EventQueueProvider::getQueueType, e -> e));
+    }
 }
diff --git a/core/src/main/java/com/netflix/conductor/core/config/EventConfiguration.java b/core/src/main/java/com/netflix/conductor/core/config/EventConfiguration.java
@@ -36,7 +36,6 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
 
-@SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
 @Configuration(proxyBeanMethods = false)
 public class EventConfiguration {
 

diff --git a/core/src/main/java/com/netflix/conductor/core/config/EventQueueConfiguration.java b/core/src/main/java/com/netflix/conductor/core/config/EventQueueConfiguration.java
diff --git a/core/src/main/java/com/netflix/conductor/core/config/EventQueueProviders.java b/core/src/main/java/com/netflix/conductor/core/config/EventQueueProviders.java
diff --git a/core/src/main/java/com/netflix/conductor/core/config/TaskMapperConfiguration.java b/core/src/main/java/com/netflix/conductor/core/config/TaskMapperConfiguration.java
diff --git a/core/src/main/java/com/netflix/conductor/core/config/TaskMappers.java b/core/src/main/java/com/netflix/conductor/core/config/TaskMappers.java
diff --git a/core/src/main/java/com/netflix/conductor/core/execution/mapper/DecisionTaskMapper.java b/core/src/main/java/com/netflix/conductor/core/execution/mapper/DecisionTaskMapper.java
@@ -21,16 +21,15 @@
 import com.netflix.conductor.core.events.ScriptEvaluator;
 import com.netflix.conductor.core.exception.TerminateWorkflowException;
 import com.netflix.conductor.core.execution.SystemTaskType;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
-import javax.script.ScriptException;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import javax.script.ScriptException;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
 
 /**
  * An implementation of {@link TaskMapper} to map a {@link WorkflowTask} of type {@link TaskType#DECISION} to a List
@@ -43,8 +42,8 @@ public class DecisionTaskMapper implements TaskMapper {
     private static final Logger LOGGER = LoggerFactory.getLogger(DecisionTaskMapper.class);
 
     @Override
-    public String getTaskType() {
-        return TaskType.DECISION.name();
+    public TaskType getTaskType() {
+        return TaskType.DECISION;
     }
 
     /**

diff --git a/core/src/main/java/com/netflix/conductor/core/execution/mapper/DoWhileTaskMapper.java b/core/src/main/java/com/netflix/conductor/core/execution/mapper/DoWhileTaskMapper.java
@@ -21,33 +21,35 @@
 import com.netflix.conductor.common.utils.TaskUtils;
 import com.netflix.conductor.core.execution.SystemTaskType;
 import com.netflix.conductor.dao.MetadataDAO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 /**
  * An implementation of {@link TaskMapper} to map a {@link WorkflowTask} of type {@link TaskType#DO_WHILE} to a {@link
  * Task} of type {@link SystemTaskType#DO_WHILE}
  */
+@SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
 @Component
 public class DoWhileTaskMapper implements TaskMapper {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DoWhileTaskMapper.class);
 
     private final MetadataDAO metadataDAO;
 
+    @Autowired
     public DoWhileTaskMapper(MetadataDAO metadataDAO) {
         this.metadataDAO = metadataDAO;
     }
 
     @Override
-    public String getTaskType() {
-        return TaskType.DO_WHILE.name();
+    public TaskType getTaskType() {
+        return TaskType.DO_WHILE;
     }
 
     /**

diff --git a/core/src/main/java/com/netflix/conductor/core/execution/mapper/DynamicTaskMapper.java b/core/src/main/java/com/netflix/conductor/core/execution/mapper/DynamicTaskMapper.java
@@ -22,19 +22,20 @@
 import com.netflix.conductor.core.exception.TerminateWorkflowException;
 import com.netflix.conductor.core.utils.ParametersUtils;
 import com.netflix.conductor.dao.MetadataDAO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 /**
  * An implementation of {@link TaskMapper} to map a {@link WorkflowTask} of type {@link TaskType#DYNAMIC} to a {@link
  * Task} based on definition derived from the dynamic task name defined in {@link WorkflowTask#getInputParameters()}
  */
+@SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
 @Component
 public class DynamicTaskMapper implements TaskMapper {
 
@@ -43,14 +44,15 @@ public class DynamicTaskMapper implements TaskMapper {
     private final ParametersUtils parametersUtils;
     private final MetadataDAO metadataDAO;
 
+    @Autowired
     public DynamicTaskMapper(ParametersUtils parametersUtils, MetadataDAO metadataDAO) {
         this.parametersUtils = parametersUtils;
         this.metadataDAO = metadataDAO;
     }
 
     @Override
-    public String getTaskType() {
-        return TaskType.DYNAMIC.name();
+    public TaskType getTaskType() {
+        return TaskType.DYNAMIC;
     }
 
     /**

diff --git a/core/src/main/java/com/netflix/conductor/core/execution/mapper/EventTaskMapper.java b/core/src/main/java/com/netflix/conductor/core/execution/mapper/EventTaskMapper.java
@@ -20,6 +20,7 @@
 import com.netflix.conductor.core.utils.ParametersUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.Collections;
@@ -33,13 +34,14 @@ public class EventTaskMapper implements TaskMapper {
 
     private final ParametersUtils parametersUtils;
 
+    @Autowired
     public EventTaskMapper(ParametersUtils parametersUtils) {
         this.parametersUtils = parametersUtils;
     }
 
     @Override
-    public String getTaskType() {
-        return TaskType.EVENT.name();
+    public TaskType getTaskType() {
+        return TaskType.EVENT;
     }
 
     @Override

diff --git a/core/src/main/java/com/netflix/conductor/core/execution/mapper/ExclusiveJoinTaskMapper.java b/core/src/main/java/com/netflix/conductor/core/execution/mapper/ExclusiveJoinTaskMapper.java
@@ -32,8 +32,8 @@ public class ExclusiveJoinTaskMapper implements TaskMapper {
     public static final Logger LOGGER = LoggerFactory.getLogger(ExclusiveJoinTaskMapper.class);
 
     @Override
-    public String getTaskType() {
-        return TaskType.EXCLUSIVE_JOIN.name();
+    public TaskType getTaskType() {
+        return TaskType.EXCLUSIVE_JOIN;
     }
 
     @Override