kestra-io · tchiotludo · Feb 3, 2023 · Feb 3, 2023
diff --git a/core/src/main/java/io/kestra/core/models/executions/Execution.java b/core/src/main/java/io/kestra/core/models/executions/Execution.java
@@ -260,7 +260,7 @@ public Optional<TaskRun> findLastNotTerminated() {
 
         return Streams.findLast(this.taskRunList
             .stream()
-            .filter(t -> !t.getState().isTerninated())
+            .filter(t -> !t.getState().isTerminated())
         );
     }
 
@@ -296,7 +296,7 @@ public Optional<TaskRun> findLastTerminated(List<ResolvedTask> resolvedTasks, Ta
 
         return Streams.findLast(this.findTaskRunByTasks(resolvedTasks, taskRun)
             .stream()
-            .filter(t -> t.getState().isTerninated())
+            .filter(t -> t.getState().isTerminated())
         );
     }
 
@@ -308,7 +308,7 @@ public boolean isTerminated(List<ResolvedTask> resolvedTasks, TaskRun parentTask
         long terminatedCount = this
             .findTaskRunByTasks(resolvedTasks, parentTaskRun)
             .stream()
-            .filter(taskRun -> taskRun.getState().isTerninated())
+            .filter(taskRun -> taskRun.getState().isTerminated())
             .count();
 
         return terminatedCount == resolvedTasks.size();
@@ -428,7 +428,7 @@ public boolean hasTaskRunJoinable(TaskRun taskRun)  {
         // don't have changed to failed but taskRunList will contain a failed
         // same for restart, the CREATED status is directly on execution taskrun
         // so we don't changed if current execution is terminated
-        if (current.getState().isTerninated() && !taskRun.getState().isTerninated()) {
+        if (current.getState().isTerminated() && !taskRun.getState().isTerminated()) {
             return false;
         }
 

diff --git a/core/src/main/java/io/kestra/core/models/executions/TaskRun.java b/core/src/main/java/io/kestra/core/models/executions/TaskRun.java
@@ -119,7 +119,7 @@ public TaskRun onRunningResend() {
         } else {
             ArrayList<TaskRunAttempt> taskRunAttempts = new ArrayList<>(taskRunBuilder.attempts);
             TaskRunAttempt lastAttempt = taskRunAttempts.get(taskRunBuilder.attempts.size() - 1);
-            if (!lastAttempt.getState().isTerninated()) {
+            if (!lastAttempt.getState().isTerminated()) {
                 taskRunAttempts.set(taskRunBuilder.attempts.size() - 1, lastAttempt.withState(State.Type.KILLED));
             } else {
                 taskRunAttempts.add(TaskRunAttempt.builder()

diff --git a/core/src/main/java/io/kestra/core/models/flows/State.java b/core/src/main/java/io/kestra/core/models/flows/State.java
@@ -85,7 +85,7 @@ public Instant getStartDate() {
 
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
     public Optional<Instant> getEndDate() {
-        if (!this.isTerninated()) {
+        if (!this.isTerminated()) {
             return Optional.empty();
         }
 
@@ -109,8 +109,8 @@ public Instant maxDate() {
     }
 
     @JsonIgnore
-    public boolean isTerninated() {
-        return this.current.isTerninated();
+    public boolean isTerminated() {
+        return this.current.isTerminated();
     }
 
     @JsonIgnore
@@ -153,7 +153,7 @@ public enum Type {
         FAILED,
         KILLED;
 
-        public boolean isTerninated() {
+        public boolean isTerminated() {
             return this == Type.FAILED || this == Type.WARNING || this == Type.SUCCESS || this == Type.KILLED || this == Type.PAUSED;
         }
 

diff --git a/core/src/main/java/io/kestra/core/runners/ExecutorService.java b/core/src/main/java/io/kestra/core/runners/ExecutorService.java
@@ -176,7 +176,7 @@ private Optional<WorkerTaskResult> childWorkerTaskResult(Flow flow, Execution ex
 
                 List<TaskRun> taskRunByTasks = execution.findTaskRunByTasks(currentTasks, parentTaskRun);
 
-                if (taskRunByTasks.stream().filter(t -> t.getState().isTerninated()).count() == taskRunByTasks.size()) {
+                if (taskRunByTasks.stream().filter(t -> t.getState().isTerminated()).count() == taskRunByTasks.size()) {
                     return childWorkerTaskTypeToWorkerTask(
                         Optional.of(State.Type.KILLED),
                         parent,
@@ -434,7 +434,7 @@ private Executor handleChildWorkerCreatedKilling(Executor executor) throws Inter
 
 
     private Executor handleListeners(Executor executor) {
-        if (!executor.getExecution().getState().isTerninated()) {
+        if (!executor.getExecution().getState().isTerminated()) {
             return executor;
         }
 
@@ -457,7 +457,7 @@ private Executor handleListeners(Executor executor) {
     }
 
     private Executor handleEnd(Executor executor) {
-        if (executor.getExecution().getState().isTerninated()) {
+        if (executor.getExecution().getState().isTerminated()) {
             return executor;
         }
 

diff --git a/core/src/main/java/io/kestra/core/schedulers/DefaultScheduler.java b/core/src/main/java/io/kestra/core/schedulers/DefaultScheduler.java
@@ -41,7 +41,7 @@ public void run() {
         QueueInterface<Trigger> triggerQueue = applicationContext.getBean(QueueInterface.class, Qualifiers.byName(QueueFactoryInterface.TRIGGER_NAMED));
 
         executionQueue.receive(execution -> {
-            if (execution.getState().getCurrent().isTerninated() && this.watchingTrigger.containsKey(execution.getId())) {
+            if (execution.getState().getCurrent().isTerminated() && this.watchingTrigger.containsKey(execution.getId())) {
                 Trigger trigger = watchingTrigger.get(execution.getId());
                 triggerQueue.emit(trigger.resetExecution());
                 triggerState.save(trigger.resetExecution());

diff --git a/core/src/main/java/io/kestra/core/services/ConditionService.java b/core/src/main/java/io/kestra/core/services/ConditionService.java
@@ -118,7 +118,7 @@ boolean valid(Flow flow, List<Condition> list, ConditionContext conditionContext
     }
 
     public boolean isTerminatedWithListeners(Flow flow, Execution execution) {
-        if (!execution.getState().isTerninated()) {
+        if (!execution.getState().isTerminated()) {
             return false;
         }
 

diff --git a/core/src/main/java/io/kestra/core/services/ExecutionService.java b/core/src/main/java/io/kestra/core/services/ExecutionService.java
@@ -51,7 +51,7 @@ public class ExecutionService {
     private LogRepositoryInterface logRepository;
 
     public Execution restart(final Execution execution, @Nullable Integer revision) throws Exception {
-        if (!execution.getState().isTerninated()) {
+        if (!execution.getState().isTerminated()) {
             throw new IllegalStateException("Execution must be terminated to be restarted, " +
                 "current state is '" + execution.getState().getCurrent() + "' !"
             );
@@ -116,7 +116,7 @@ private Set<String> taskRunToRestart(Execution execution, Flow flow, Predicate<T
     }
 
     public Execution replay(final Execution execution, String taskRunId, @Nullable Integer revision) throws Exception {
-        if (!execution.getState().isTerninated()) {
+        if (!execution.getState().isTerminated()) {
             throw new IllegalStateException("Execution must be terminated to be restarted, " +
                 "current state is '" + execution.getState().getCurrent() + "' !"
             );
@@ -174,7 +174,7 @@ public Execution replay(final Execution execution, String taskRunId, @Nullable I
     }
 
     public Execution markAs(final Execution execution, String taskRunId, State.Type newState) throws Exception {
-        if (!execution.getState().isTerninated()) {
+        if (!execution.getState().isTerminated()) {
             throw new IllegalStateException("Execution must be terminated to be restarted, " +
                 "current state is '" + execution.getState().getCurrent() + "' !"
             );

diff --git a/core/src/test/java/io/kestra/core/runners/ListenersTestTask.java b/core/src/test/java/io/kestra/core/runners/ListenersTestTask.java
@@ -39,7 +39,7 @@ public ListenersTestTask.Output run(RunContext runContext) throws Exception {
         Execution execution = retryInstance.run(
             NoSuchElementException.class,
             () -> executionRepository.findById(executionRendererId)
-                .filter(e -> e.getState().getCurrent().isTerninated())
+                .filter(e -> e.getState().getCurrent().isTerminated())
                 .orElseThrow(() -> new NoSuchElementException("Unable to find execution '" + executionRendererId + "'"))
         );
 

diff --git a/core/src/test/java/io/kestra/core/runners/WorkerTest.java b/core/src/test/java/io/kestra/core/runners/WorkerTest.java
@@ -65,7 +65,7 @@ void success() throws TimeoutException {
         workerTaskQueue.emit(workerTask("1"));
 
         Await.until(
-            () -> workerTaskResult.get() != null && workerTaskResult.get().getTaskRun().getState().isTerninated(),
+            () -> workerTaskResult.get() != null && workerTaskResult.get().getTaskRun().getState().isTerminated(),
             Duration.ofMillis(100),
             Duration.ofMinutes(1)
         );
@@ -99,7 +99,7 @@ void killed() throws InterruptedException, TimeoutException {
         executionKilledQueue.emit(ExecutionKilled.builder().executionId(workerTask.getTaskRun().getExecutionId()).build());
 
         Await.until(
-            () -> workerTaskResult.stream().filter(r -> r.getTaskRun().getState().isTerninated()).count() == 5,
+            () -> workerTaskResult.stream().filter(r -> r.getTaskRun().getState().isTerminated()).count() == 5,
             Duration.ofMillis(100),
             Duration.ofMinutes(1)
         );

diff --git a/core/src/test/java/io/kestra/core/tasks/flows/FlowCaseTest.java b/core/src/test/java/io/kestra/core/tasks/flows/FlowCaseTest.java
@@ -46,7 +46,7 @@ void run(String input, State.Type fromState, State.Type triggerState,  int count
         AtomicReference<Execution> triggered = new AtomicReference<>();
 
         executionQueue.receive(execution -> {
-            if (execution.getFlowId().equals("switch") && execution.getState().getCurrent().isTerninated()) {
+            if (execution.getFlowId().equals("switch") && execution.getState().getCurrent().isTerminated()) {
                 countDownLatch.countDown();
                 triggered.set(execution);
             }

diff --git a/jdbc/src/main/java/io/kestra/jdbc/runner/JdbcExecutor.java b/jdbc/src/main/java/io/kestra/jdbc/runner/JdbcExecutor.java
@@ -296,7 +296,7 @@ private void workerTaskResultQueue(WorkerTaskResult message) {
         }
 
         // send metrics on terminated
-        if (message.getTaskRun().getState().isTerninated()) {
+        if (message.getTaskRun().getState().isTerminated()) {
             metricRegistry
                 .counter(MetricRegistry.EXECUTOR_TASKRUN_ENDED_COUNT, metricRegistry.tags(message))
                 .increment();

diff --git a/jdbc/src/main/java/io/kestra/jdbc/runner/JdbcScheduler.java b/jdbc/src/main/java/io/kestra/jdbc/runner/JdbcScheduler.java
@@ -51,7 +51,7 @@ public void run() {
                 if (
                     execution.getTrigger() != null && (
                         execution.isDeleted() ||
-                            execution.getState().getCurrent().isTerninated()
+                            execution.getState().getCurrent().isTerminated()
                     )
                 ) {
                     triggerRepository

diff --git a/runner-kafka/src/main/java/io/kestra/runner/kafka/executors/ExecutorMain.java b/runner-kafka/src/main/java/io/kestra/runner/kafka/executors/ExecutorMain.java
@@ -628,7 +628,7 @@ private void toWorkerTaskResultSend(KStream<String, WorkerTaskResult> stream, St
 
     private void purgeWorkerRunning(KStream<String, WorkerTaskResult> workerTaskResultKStream) {
         workerTaskResultKStream
-            .filter((key, value) -> value.getTaskRun().getState().isTerninated(), Named.as("PurgeWorkerRunning.filterTerminated"))
+            .filter((key, value) -> value.getTaskRun().getState().isTerminated(), Named.as("PurgeWorkerRunning.filterTerminated"))
             .mapValues((readOnlyKey, value) -> (WorkerTaskRunning)null, Named.as("PurgeWorkerRunning.toNull"))
             .to(
                 kafkaAdminService.getTopicName(WorkerTaskRunning.class),

diff --git a/runner-kafka/src/main/java/io/kestra/runner/kafka/streams/ExecutorJoinerTransformer.java b/runner-kafka/src/main/java/io/kestra/runner/kafka/streams/ExecutorJoinerTransformer.java
@@ -83,7 +83,7 @@ public Executor transform(final String key, final Executor value) {
         }
 
         // send metrics on terminated
-        if (workerTaskResult.getTaskRun().getState().isTerninated()) {
+        if (workerTaskResult.getTaskRun().getState().isTerminated()) {
             metricRegistry
                 .counter(
                     MetricRegistry.EXECUTOR_TASKRUN_ENDED_COUNT,

diff --git a/...r-kafka/src/main/java/io/kestra/runner/kafka/streams/ExecutorKilledJoinerTransformer.java b/...r-kafka/src/main/java/io/kestra/runner/kafka/streams/ExecutorKilledJoinerTransformer.java
@@ -41,7 +41,7 @@ public Executor transform(final String key, final ExecutionKilled value) {
         }
 
         if (executor.getExecution().getState().getCurrent() != State.Type.KILLING &&
-            !executor.getExecution().getState().isTerninated()
+            !executor.getExecution().getState().isTerminated()
         ) {
             Execution newExecution = executor.getExecution().withState(State.Type.KILLING);
 

diff --git a/runner-memory/src/main/java/io/kestra/runner/memory/MemoryExecutor.java b/runner-memory/src/main/java/io/kestra/runner/memory/MemoryExecutor.java
@@ -299,7 +299,7 @@ private void workerTaskResultQueue(WorkerTaskResult message) {
             }
 
             // send metrics on terminated
-            if (message.getTaskRun().getState().isTerninated()) {
+            if (message.getTaskRun().getState().isTerminated()) {
                 metricRegistry
                     .counter(MetricRegistry.EXECUTOR_TASKRUN_ENDED_COUNT, metricRegistry.tags(message))
                     .increment();

diff --git a/webserver/src/main/java/io/kestra/webserver/controllers/ExecutionController.java b/webserver/src/main/java/io/kestra/webserver/controllers/ExecutionController.java
@@ -759,7 +759,7 @@ public HttpResponse<?> kill(
         @Parameter(description = "The execution id") String executionId
     ) {
         Optional<Execution> execution = executionRepository.findById(executionId);
-        if (execution.isPresent() && execution.get().getState().isTerninated()) {
+        if (execution.isPresent() && execution.get().getState().isTerminated()) {
             throw new IllegalStateException("Execution is already finished, can't kill it");
         }
 
@@ -789,7 +789,7 @@ public MutableHttpResponse<?> killByIds(
 
         for (String executionId : executionsId) {
             Optional<Execution> execution = executionRepository.findById(executionId);
-            if (execution.isPresent() && execution.get().getState().isTerninated()) {
+            if (execution.isPresent() && execution.get().getState().isTerminated()) {
                 invalids.add(ManualConstraintViolation.of(
                     "execution already finished",
                     executionId,