remove redundant setScheduleTime

Netflix · Oct 10, 2022 · cc7b330 · cc7b330
1 parent 1490896
commit cc7b330
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 41 deletions.
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
@@ -88,9 +88,7 @@ public List<TaskModel> getMappedTasks(TaskMapperContext taskMapperContext) {
         decisionTask.setTaskDefName(TaskType.TASK_TYPE_DECISION);
         decisionTask.addInput("case", caseValue);
         decisionTask.addOutput("caseOutput", Collections.singletonList(caseValue));
-        final long currentTimeMillis = System.currentTimeMillis();
-        decisionTask.setScheduledTime(currentTimeMillis);
-        decisionTask.setStartTime(currentTimeMillis);
+        decisionTask.setStartTime(System.currentTimeMillis());
         decisionTask.setStatus(TaskModel.Status.IN_PROGRESS);
         tasksToBeScheduled.add(decisionTask);
 

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
@@ -87,9 +87,7 @@ public List<TaskModel> getMappedTasks(TaskMapperContext taskMapperContext) {
         TaskModel doWhileTask = taskMapperContext.createTaskModel();
         doWhileTask.setTaskType(TaskType.TASK_TYPE_DO_WHILE);
         doWhileTask.setStatus(TaskModel.Status.IN_PROGRESS);
-        final long currentTimeMillis = System.currentTimeMillis();
-        doWhileTask.setScheduledTime(currentTimeMillis);
-        doWhileTask.setStartTime(currentTimeMillis);
+        doWhileTask.setStartTime(System.currentTimeMillis());
         doWhileTask.setRateLimitPerFrequency(taskDefinition.getRateLimitPerFrequency());
         doWhileTask.setRateLimitFrequencyInSeconds(taskDefinition.getRateLimitFrequencyInSeconds());
         doWhileTask.setRetryCount(taskMapperContext.getRetryCount());

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
@@ -51,9 +51,7 @@ public List<TaskModel> getMappedTasks(TaskMapperContext taskMapperContext) {
         TaskModel joinTask = taskMapperContext.createTaskModel();
         joinTask.setTaskType(TaskType.TASK_TYPE_EXCLUSIVE_JOIN);
         joinTask.setTaskDefName(TaskType.TASK_TYPE_EXCLUSIVE_JOIN);
-        final long currentTimeMillis = System.currentTimeMillis();
-        joinTask.setScheduledTime(currentTimeMillis);
-        joinTask.setStartTime(currentTimeMillis);
+        joinTask.setStartTime(System.currentTimeMillis());
         joinTask.setInputData(joinInput);
         joinTask.setStatus(TaskModel.Status.IN_PROGRESS);
 

diff --git a/.../src/main/java/com/netflix/conductor/core/execution/mapper/ForkJoinDynamicTaskMapper.java b/.../src/main/java/com/netflix/conductor/core/execution/mapper/ForkJoinDynamicTaskMapper.java
@@ -251,10 +251,8 @@ TaskModel createDynamicForkTask(
         TaskModel forkDynamicTask = taskMapperContext.createTaskModel();
         forkDynamicTask.setTaskType(TaskType.TASK_TYPE_FORK);
         forkDynamicTask.setTaskDefName(TaskType.TASK_TYPE_FORK);
-        final long currentTimeMillis = System.currentTimeMillis();
-        forkDynamicTask.setScheduledTime(currentTimeMillis);
-        forkDynamicTask.setStartTime(currentTimeMillis);
-        forkDynamicTask.setEndTime(currentTimeMillis);
+        forkDynamicTask.setStartTime(System.currentTimeMillis());
+        forkDynamicTask.setEndTime(System.currentTimeMillis());
         List<String> forkedTaskNames =
                 dynForkTasks.stream()
                         .map(WorkflowTask::getTaskReferenceName)

diff --git a/core/src/main/java/com/netflix/conductor/core/execution/mapper/ForkJoinTaskMapper.java b/core/src/main/java/com/netflix/conductor/core/execution/mapper/ForkJoinTaskMapper.java
@@ -74,7 +74,6 @@ public List<TaskModel> getMappedTasks(TaskMapperContext taskMapperContext)
         forkTask.setTaskType(TaskType.TASK_TYPE_FORK);
         forkTask.setTaskDefName(TaskType.TASK_TYPE_FORK);
         long epochMillis = System.currentTimeMillis();
-        forkTask.setScheduledTime(epochMillis);
         forkTask.setStartTime(epochMillis);
         forkTask.setEndTime(epochMillis);
         forkTask.setInputData(taskInput);

diff --git a/core/src/main/java/com/netflix/conductor/core/execution/mapper/HumanTaskMapper.java b/core/src/main/java/com/netflix/conductor/core/execution/mapper/HumanTaskMapper.java
@@ -65,9 +65,7 @@ public List<TaskModel> getMappedTasks(TaskMapperContext taskMapperContext) {
         TaskModel humanTask = taskMapperContext.createTaskModel();
         humanTask.setTaskType(TASK_TYPE_HUMAN);
         humanTask.setInputData(humanTaskInput);
-        final long currentTimeMillis = System.currentTimeMillis();
-        humanTask.setScheduledTime(currentTimeMillis);
-        humanTask.setStartTime(currentTimeMillis);
+        humanTask.setStartTime(System.currentTimeMillis());
         humanTask.setStatus(TaskModel.Status.IN_PROGRESS);
         return List.of(humanTask);
     }

diff --git a/core/src/main/java/com/netflix/conductor/core/execution/mapper/InlineTaskMapper.java b/core/src/main/java/com/netflix/conductor/core/execution/mapper/InlineTaskMapper.java
@@ -73,9 +73,7 @@ public List<TaskModel> getMappedTasks(TaskMapperContext taskMapperContext) {
 
         TaskModel inlineTask = taskMapperContext.createTaskModel();
         inlineTask.setTaskType(TaskType.TASK_TYPE_INLINE);
-        final long currentTimeMillis = System.currentTimeMillis();
-        inlineTask.setScheduledTime(currentTimeMillis);
-        inlineTask.setStartTime(currentTimeMillis);
+        inlineTask.setStartTime(System.currentTimeMillis());
         inlineTask.setInputData(taskInput);
         inlineTask.setStatus(TaskModel.Status.IN_PROGRESS);
 

diff --git a/core/src/main/java/com/netflix/conductor/core/execution/mapper/JoinTaskMapper.java b/core/src/main/java/com/netflix/conductor/core/execution/mapper/JoinTaskMapper.java
@@ -62,9 +62,7 @@ public List<TaskModel> getMappedTasks(TaskMapperContext taskMapperContext) {
         TaskModel joinTask = taskMapperContext.createTaskModel();
         joinTask.setTaskType(TaskType.TASK_TYPE_JOIN);
         joinTask.setTaskDefName(TaskType.TASK_TYPE_JOIN);
-        final long currentTimeMillis = System.currentTimeMillis();
-        joinTask.setScheduledTime(currentTimeMillis);
-        joinTask.setStartTime(currentTimeMillis);
+        joinTask.setStartTime(System.currentTimeMillis());
         joinTask.setInputData(joinInput);
         joinTask.setStatus(TaskModel.Status.IN_PROGRESS);
 

diff --git a/.../src/main/java/com/netflix/conductor/core/execution/mapper/JsonJQTransformTaskMapper.java b/.../src/main/java/com/netflix/conductor/core/execution/mapper/JsonJQTransformTaskMapper.java
@@ -63,9 +63,7 @@ public List<TaskModel> getMappedTasks(TaskMapperContext taskMapperContext) {
                         workflowTask.getInputParameters(), workflowModel, taskId, taskDefinition);
 
         TaskModel jsonJQTransformTask = taskMapperContext.createTaskModel();
-        final long currentTimeMillis = System.currentTimeMillis();
-        jsonJQTransformTask.setScheduledTime(currentTimeMillis);
-        jsonJQTransformTask.setStartTime(currentTimeMillis);
+        jsonJQTransformTask.setStartTime(System.currentTimeMillis());
         jsonJQTransformTask.setInputData(taskInput);
         jsonJQTransformTask.setStatus(TaskModel.Status.IN_PROGRESS);
 

diff --git a/core/src/main/java/com/netflix/conductor/core/execution/mapper/LambdaTaskMapper.java b/core/src/main/java/com/netflix/conductor/core/execution/mapper/LambdaTaskMapper.java
@@ -74,9 +74,7 @@ public List<TaskModel> getMappedTasks(TaskMapperContext taskMapperContext) {
 
         TaskModel lambdaTask = taskMapperContext.createTaskModel();
         lambdaTask.setTaskType(TaskType.TASK_TYPE_LAMBDA);
-        final long currentTimeMillis = System.currentTimeMillis();
-        lambdaTask.setScheduledTime(currentTimeMillis);
-        lambdaTask.setStartTime(currentTimeMillis);
+        lambdaTask.setStartTime(System.currentTimeMillis());
         lambdaTask.setInputData(taskInput);
         lambdaTask.setStatus(TaskModel.Status.IN_PROGRESS);
 

diff --git a/core/src/main/java/com/netflix/conductor/core/execution/mapper/SetVariableTaskMapper.java b/core/src/main/java/com/netflix/conductor/core/execution/mapper/SetVariableTaskMapper.java
@@ -38,9 +38,7 @@ public List<TaskModel> getMappedTasks(TaskMapperContext taskMapperContext)
         LOGGER.debug("TaskMapperContext {} in SetVariableMapper", taskMapperContext);
 
         TaskModel varTask = taskMapperContext.createTaskModel();
-        final long currentTimeMillis = System.currentTimeMillis();
-        varTask.setScheduledTime(currentTimeMillis);
-        varTask.setStartTime(currentTimeMillis);
+        varTask.setStartTime(System.currentTimeMillis());
         varTask.setInputData(taskMapperContext.getTaskInput());
         varTask.setStatus(TaskModel.Status.IN_PROGRESS);
 

diff --git a/core/src/main/java/com/netflix/conductor/core/execution/mapper/SwitchTaskMapper.java b/core/src/main/java/com/netflix/conductor/core/execution/mapper/SwitchTaskMapper.java
@@ -94,9 +94,7 @@ public List<TaskModel> getMappedTasks(TaskMapperContext taskMapperContext) {
         switchTask.setTaskDefName(TaskType.TASK_TYPE_SWITCH);
         switchTask.getInputData().put("case", evalResult);
         switchTask.addOutput("evaluationResult", List.of(evalResult));
-        final long currentTimeMillis = System.currentTimeMillis();
-        switchTask.setScheduledTime(currentTimeMillis);
-        switchTask.setStartTime(currentTimeMillis);
+        switchTask.setStartTime(System.currentTimeMillis());
         switchTask.setStatus(TaskModel.Status.IN_PROGRESS);
         tasksToBeScheduled.add(switchTask);
 

diff --git a/core/src/main/java/com/netflix/conductor/core/execution/mapper/TerminateTaskMapper.java b/core/src/main/java/com/netflix/conductor/core/execution/mapper/TerminateTaskMapper.java
@@ -58,9 +58,7 @@ public List<TaskModel> getMappedTasks(TaskMapperContext taskMapperContext) {
 
         TaskModel task = taskMapperContext.createTaskModel();
         task.setTaskType(TASK_TYPE_TERMINATE);
-        final long currentTimeMillis = System.currentTimeMillis();
-        task.setScheduledTime(currentTimeMillis);
-        task.setStartTime(currentTimeMillis);
+        task.setStartTime(System.currentTimeMillis());
         task.setInputData(taskInput);
         task.setStatus(TaskModel.Status.IN_PROGRESS);
         return List.of(task);

diff --git a/core/src/main/java/com/netflix/conductor/core/execution/mapper/WaitTaskMapper.java b/core/src/main/java/com/netflix/conductor/core/execution/mapper/WaitTaskMapper.java
@@ -67,9 +67,7 @@ public List<TaskModel> getMappedTasks(TaskMapperContext taskMapperContext) {
         TaskModel waitTask = taskMapperContext.createTaskModel();
         waitTask.setTaskType(TASK_TYPE_WAIT);
         waitTask.setInputData(waitTaskInput);
-        final long currentTimeMillis = System.currentTimeMillis();
-        waitTask.setScheduledTime(currentTimeMillis);
-        waitTask.setStartTime(currentTimeMillis);
+        waitTask.setStartTime(System.currentTimeMillis());
         waitTask.setStatus(TaskModel.Status.IN_PROGRESS);
         return List.of(waitTask);
     }