From aa4e8261fe954e8ce7de3815bdd1b26fb311de63 Mon Sep 17 00:00:00 2001 From: fjtirado Date: Fri, 13 Feb 2026 18:16:23 +0100 Subject: [PATCH] Remove duplicated coded in scheduler inheritance hierarchy Signed-off-by: fjtirado --- .../scheduler/ExecutorServiceWorkflowScheduler.java | 13 ------------- .../impl/scheduler/ScheduledInstanceRunnable.java | 4 ++++ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/impl/core/src/main/java/io/serverlessworkflow/impl/scheduler/ExecutorServiceWorkflowScheduler.java b/impl/core/src/main/java/io/serverlessworkflow/impl/scheduler/ExecutorServiceWorkflowScheduler.java index 5115f5f5..d2e55b3a 100644 --- a/impl/core/src/main/java/io/serverlessworkflow/impl/scheduler/ExecutorServiceWorkflowScheduler.java +++ b/impl/core/src/main/java/io/serverlessworkflow/impl/scheduler/ExecutorServiceWorkflowScheduler.java @@ -15,14 +15,10 @@ */ package io.serverlessworkflow.impl.scheduler; -import io.cloudevents.CloudEvent; import io.serverlessworkflow.impl.WorkflowDefinition; -import io.serverlessworkflow.impl.WorkflowModel; -import io.serverlessworkflow.impl.events.EventRegistrationBuilderInfo; import java.time.Duration; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import java.util.function.Function; public abstract class ExecutorServiceWorkflowScheduler extends EventWorkflowScheduler { @@ -32,15 +28,6 @@ public ExecutorServiceWorkflowScheduler(ScheduledExecutorService service) { this.service = service; } - @Override - public ScheduledEventConsumer eventConsumer( - WorkflowDefinition definition, - Function converter, - EventRegistrationBuilderInfo builderInfo) { - return new ScheduledEventConsumer( - definition, converter, builderInfo, new ScheduledInstanceRunnable(definition)); - } - @Override public Cancellable scheduleEvery(WorkflowDefinition definition, Duration interval) { long delay = interval.toMillis(); diff --git a/impl/core/src/main/java/io/serverlessworkflow/impl/scheduler/ScheduledInstanceRunnable.java b/impl/core/src/main/java/io/serverlessworkflow/impl/scheduler/ScheduledInstanceRunnable.java index b767aedf..9371e52f 100644 --- a/impl/core/src/main/java/io/serverlessworkflow/impl/scheduler/ScheduledInstanceRunnable.java +++ b/impl/core/src/main/java/io/serverlessworkflow/impl/scheduler/ScheduledInstanceRunnable.java @@ -35,6 +35,10 @@ public void run() { @Override public void accept(WorkflowModel model) { + runScheduledInstance(definition, model); + } + + public static void runScheduledInstance(WorkflowDefinition definition, WorkflowModel model) { WorkflowInstance instance = definition.instance(model); definition.addScheduledInstance(instance); definition.application().executorService().execute(() -> instance.start());