chore(system): replace DSL.trueCondition by DSL.noCondition

jOOQ will then generates a query with no WHERE clause or no AND clause instead of WHERE true or WHERE 1=1

.github/workflows/main-build.yml

@@ -28,7 +28,7 @@ jobs:
     steps:
       # Targeting develop branch from develop
       - name: Trigger EE Workflow (develop push, no payload)
-        uses: peter-evans/repository-dispatch@5fc4efd1a4797ddb68ffd0714a238564e4cc0e6f
+        uses: peter-evans/repository-dispatch@28959ce8df70de7be546dd1250a005dd32156697
         if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' }}
         with:
           token: ${{ secrets.GH_PERSONAL_TOKEN }}

.github/workflows/pull-request.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Check EE repo for branch with same name
       if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false }}
       id: check-ee-branch
-      uses: actions/github-script@v7
+      uses: actions/github-script@v8
       with:
         github-token: ${{ secrets.GH_PERSONAL_TOKEN }}
         script: |
@@ -40,7 +40,7 @@ jobs:
 
       # Targeting pull request (only if not from a fork and EE has no branch with same name)
     - name: Trigger EE Workflow (pull request, with payload)
-      uses: peter-evans/repository-dispatch@5fc4efd1a4797ddb68ffd0714a238564e4cc0e6f
+      uses: peter-evans/repository-dispatch@28959ce8df70de7be546dd1250a005dd32156697
       if: ${{ github.event_name == 'pull_request'
         && github.event.pull_request.number != ''
         && github.event.pull_request.head.repo.fork == false
@@ -50,7 +50,7 @@ jobs:
         repository: kestra-io/kestra-ee
         event-type: "oss-updated"
         client-payload: >-
-          {"commit_sha":"${{ github.sha }}","pr_repo":"${{ github.repository }}"}
+          {"commit_sha":"${{ github.event.pull_request.head.sha }}","pr_repo":"${{ github.repository }}"}
 
   file-changes:
     if: ${{ github.event.pull_request.draft == false }}

build.gradle

@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "net.e175.klaus:zip-prefixer:0.3.1"
+        classpath "net.e175.klaus:zip-prefixer:0.4.0"
     }
 }
 

cli/src/main/java/io/kestra/cli/App.java

@@ -8,11 +8,10 @@ import io.kestra.cli.commands.plugins.PluginCommand;
 import io.kestra.cli.commands.servers.ServerCommand;
 import io.kestra.cli.commands.sys.SysCommand;
 import io.kestra.cli.commands.templates.TemplateCommand;
+import io.kestra.cli.services.EnvironmentProvider;
 import io.micronaut.configuration.picocli.MicronautFactory;
-import io.micronaut.configuration.picocli.PicocliRunner;
 import io.micronaut.context.ApplicationContext;
 import io.micronaut.context.ApplicationContextBuilder;
-import io.micronaut.context.env.Environment;
 import io.micronaut.core.annotation.Introspected;
 import org.slf4j.bridge.SLF4JBridgeHandler;
 import picocli.CommandLine;
@@ -20,11 +19,9 @@ import picocli.CommandLine;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.concurrent.Callable;
+import java.util.stream.Stream;
 
 @CommandLine.Command(
     name = "kestra",
@@ -49,24 +46,50 @@ import java.util.concurrent.Callable;
 @Introspected
 public class App implements Callable<Integer> {
     public static void main(String[] args) {
-        execute(App.class, new String [] { Environment.CLI }, args);
+        System.exit(runCli(args));
+    }
+
+    public static int runCli(String[] args, String... extraEnvironments) {
+        return runCli(App.class, args, extraEnvironments);
+    }
+
+    public static int runCli(Class<?> cls, String[] args, String... extraEnvironments) {
+        ServiceLoader<EnvironmentProvider> environmentProviders = ServiceLoader.load(EnvironmentProvider.class);
+        String[] baseEnvironments = environmentProviders.findFirst().map(EnvironmentProvider::getCliEnvironments).orElseGet(() -> new String[0]);
+        return execute(
+            cls,
+            Stream.concat(
+                Arrays.stream(baseEnvironments),
+                Arrays.stream(extraEnvironments)
+            ).toArray(String[]::new),
+            args
+        );
     }
 
     @Override
     public Integer call() throws Exception {
-        return PicocliRunner.call(App.class, "--help");
+        return runCli(new String[0]);
     }
 
-    protected static void execute(Class<?> cls, String[] environments, String... args) {
+    protected static int execute(Class<?> cls, String[] environments, String... args) {
         // Log Bridge
         SLF4JBridgeHandler.removeHandlersForRootLogger();
         SLF4JBridgeHandler.install();
 
         // Init ApplicationContext
-        ApplicationContext applicationContext = App.applicationContext(cls, environments, args);
+        CommandLine commandLine = getCommandLine(cls, args);
+
+        ApplicationContext applicationContext = App.applicationContext(cls, commandLine, environments);
+
+        Class<?> targetCommand = commandLine.getCommandSpec().userObject().getClass();
+
+        if (!AbstractCommand.class.isAssignableFrom(targetCommand) && args.length == 0) {
+            // if no command provided, show help
+            args = new String[]{"--help"};
+        }
 
         // Call Picocli command
-        int exitCode = 0;
+        int exitCode;
         try {
              exitCode = new CommandLine(cls, new MicronautFactory(applicationContext)).execute(args);
         } catch (CommandLine.InitializationException e){
@@ -77,7 +100,23 @@ public class App implements Callable<Integer> {
         applicationContext.close();
 
         // exit code
-        System.exit(Objects.requireNonNullElse(exitCode, 0));
+        return exitCode;
+    }
+
+    private static CommandLine getCommandLine(Class<?> cls, String[] args) {
+        CommandLine cmd = new CommandLine(cls, CommandLine.defaultFactory());
+        continueOnParsingErrors(cmd);
+
+        CommandLine.ParseResult parseResult = cmd.parseArgs(args);
+        List<CommandLine> parsedCommands = parseResult.asCommandLineList();
+
+        return parsedCommands.getLast();
+    }
+
+    public static ApplicationContext applicationContext(Class<?> mainClass,
+                                                        String[] environments,
+                                                        String... args) {
+        return App.applicationContext(mainClass, getCommandLine(mainClass, args), environments);
     }
 
 
@@ -85,25 +124,17 @@ public class App implements Callable<Integer> {
      * Create an {@link ApplicationContext} with additional properties based on configuration files (--config) and
      * forced Properties from current command.
      *
-     * @param args args passed to java app
      * @return the application context created
      */
     protected static ApplicationContext applicationContext(Class<?> mainClass,
-                                                           String[] environments,
-                                                           String[] args) {
+                                                           CommandLine commandLine,
+                                                           String[] environments) {
 
         ApplicationContextBuilder builder = ApplicationContext
             .builder()
             .mainClass(mainClass)
             .environments(environments);
 
-        CommandLine cmd = new CommandLine(mainClass, CommandLine.defaultFactory());
-        continueOnParsingErrors(cmd);
-
-        CommandLine.ParseResult parseResult = cmd.parseArgs(args);
-        List<CommandLine> parsedCommands = parseResult.asCommandLineList();
-
-        CommandLine commandLine = parsedCommands.getLast();
         Class<?> cls = commandLine.getCommandSpec().userObject().getClass();
 
         if (AbstractCommand.class.isAssignableFrom(cls)) {

cli/src/main/java/io/kestra/cli/commands/configs/sys/ConfigCommand.java

@@ -1,6 +1,5 @@
 package io.kestra.cli.commands.configs.sys;
 
-import io.micronaut.configuration.picocli.PicocliRunner;
 import lombok.extern.slf4j.Slf4j;
 import io.kestra.cli.AbstractCommand;
 import io.kestra.cli.App;
@@ -20,8 +19,6 @@ public class ConfigCommand extends AbstractCommand {
     public Integer call() throws Exception {
         super.call();
 
-        PicocliRunner.call(App.class, "configs",  "--help");
-
-        return 0;
+        return App.runCli(new String[]{"configs",  "--help"});
     }
 }

cli/src/main/java/io/kestra/cli/commands/flows/FlowCommand.java

@@ -1,6 +1,5 @@
 package io.kestra.cli.commands.flows;
 
-import io.micronaut.configuration.picocli.PicocliRunner;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import io.kestra.cli.AbstractCommand;
@@ -29,8 +28,6 @@ public class FlowCommand extends AbstractCommand {
     public Integer call() throws Exception {
         super.call();
 
-        PicocliRunner.call(App.class, "flow",  "--help");
-
-        return 0;
+        return App.runCli(new String[]{"flow",  "--help"});
     }
 }

cli/src/main/java/io/kestra/cli/commands/flows/namespaces/FlowNamespaceCommand.java

@@ -1,7 +1,6 @@
 package io.kestra.cli.commands.flows.namespaces;
 
 import io.kestra.cli.App;
-import io.micronaut.configuration.picocli.PicocliRunner;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import io.kestra.cli.AbstractCommand;
@@ -22,8 +21,6 @@ public class FlowNamespaceCommand extends AbstractCommand {
     public Integer call() throws Exception {
         super.call();
 
-        PicocliRunner.call(App.class, "flow", "namespace",  "--help");
-
-        return 0;
+        return App.runCli(new String[]{"flow", "namespace",  "--help"});
     }
 }

cli/src/main/java/io/kestra/cli/commands/migrations/MigrationCommand.java

@@ -3,7 +3,6 @@ package io.kestra.cli.commands.migrations;
 import io.kestra.cli.AbstractCommand;
 import io.kestra.cli.App;
 import io.kestra.cli.commands.migrations.metadata.MetadataMigrationCommand;
-import io.micronaut.configuration.picocli.PicocliRunner;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import picocli.CommandLine;
@@ -24,8 +23,6 @@ public class MigrationCommand extends AbstractCommand {
     public Integer call() throws Exception {
         super.call();
 
-        PicocliRunner.call(App.class, "migrate",  "--help");
-
-        return 0;
+        return App.runCli(new String[]{"migrate",  "--help"});
     }
 }

cli/src/main/java/io/kestra/cli/commands/namespaces/NamespaceCommand.java

@@ -4,7 +4,6 @@ import io.kestra.cli.AbstractCommand;
 import io.kestra.cli.App;
 import io.kestra.cli.commands.namespaces.files.NamespaceFilesCommand;
 import io.kestra.cli.commands.namespaces.kv.KvCommand;
-import io.micronaut.configuration.picocli.PicocliRunner;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import picocli.CommandLine;
@@ -25,8 +24,6 @@ public class NamespaceCommand extends AbstractCommand {
     public Integer call() throws Exception {
         super.call();
 
-        PicocliRunner.call(App.class, "namespace", "--help");
-
-        return 0;
+        return App.runCli(new String[]{"namespace", "--help"});
     }
 }

cli/src/main/java/io/kestra/cli/commands/namespaces/files/NamespaceFilesCommand.java

@@ -2,7 +2,6 @@ package io.kestra.cli.commands.namespaces.files;
 
 import io.kestra.cli.AbstractCommand;
 import io.kestra.cli.App;
-import io.micronaut.configuration.picocli.PicocliRunner;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import picocli.CommandLine;
@@ -22,8 +21,6 @@ public class NamespaceFilesCommand extends AbstractCommand {
     public Integer call() throws Exception {
         super.call();
 
-        PicocliRunner.call(App.class, "namespace", "files",  "--help");
-
-        return 0;
+        return App.runCli(new String[]{"namespace", "files",  "--help"});
     }
 }

cli/src/main/java/io/kestra/cli/commands/namespaces/kv/KvCommand.java

@@ -2,7 +2,6 @@ package io.kestra.cli.commands.namespaces.kv;
 
 import io.kestra.cli.AbstractCommand;
 import io.kestra.cli.App;
-import io.micronaut.configuration.picocli.PicocliRunner;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import picocli.CommandLine;
@@ -22,8 +21,6 @@ public class KvCommand extends AbstractCommand {
     public Integer call() throws Exception {
         super.call();
 
-        PicocliRunner.call(App.class, "namespace", "kv",  "--help");
-
-        return 0;
+        return App.runCli(new String[]{"namespace", "kv",  "--help"});
     }
 }

cli/src/main/java/io/kestra/cli/commands/plugins/PluginCommand.java

@@ -2,7 +2,6 @@ package io.kestra.cli.commands.plugins;
 
 import io.kestra.cli.AbstractCommand;
 import io.kestra.cli.App;
-import io.micronaut.configuration.picocli.PicocliRunner;
 import lombok.SneakyThrows;
 import picocli.CommandLine.Command;
 
@@ -25,9 +24,7 @@ public class PluginCommand extends AbstractCommand {
     public Integer call() throws Exception {
         super.call();
 
-        PicocliRunner.call(App.class, "plugins", "--help");
-
-        return 0;
+        return App.runCli(new String[]{"plugins", "--help"});
     }
 
     @Override

cli/src/main/java/io/kestra/cli/commands/servers/ServerCommand.java

@@ -1,6 +1,5 @@
 package io.kestra.cli.commands.servers;
 
-import io.micronaut.configuration.picocli.PicocliRunner;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import io.kestra.cli.AbstractCommand;
@@ -28,8 +27,6 @@ public class ServerCommand extends AbstractCommand {
     public Integer call() throws Exception {
         super.call();
 
-        PicocliRunner.call(App.class, "server",  "--help");
-
-        return 0;
+        return App.runCli(new String[]{"server",  "--help"});
     }
 }

cli/src/main/java/io/kestra/cli/commands/sys/SysCommand.java

@@ -2,7 +2,6 @@ package io.kestra.cli.commands.sys;
 
 import io.kestra.cli.commands.sys.database.DatabaseCommand;
 import io.kestra.cli.commands.sys.statestore.StateStoreCommand;
-import io.micronaut.configuration.picocli.PicocliRunner;
 import lombok.extern.slf4j.Slf4j;
 import io.kestra.cli.AbstractCommand;
 import io.kestra.cli.App;
@@ -25,8 +24,6 @@ public class SysCommand extends AbstractCommand {
     public Integer call() throws Exception {
         super.call();
 
-        PicocliRunner.call(App.class, "sys",  "--help");
-
-        return 0;
+        return App.runCli(new String[]{"sys",  "--help"});
     }
 }

cli/src/main/java/io/kestra/cli/commands/sys/database/DatabaseCommand.java

@@ -2,7 +2,6 @@ package io.kestra.cli.commands.sys.database;
 
 import io.kestra.cli.AbstractCommand;
 import io.kestra.cli.App;
-import io.micronaut.configuration.picocli.PicocliRunner;
 import lombok.SneakyThrows;
 import picocli.CommandLine;
 
@@ -20,8 +19,6 @@ public class DatabaseCommand extends AbstractCommand {
     public Integer call() throws Exception {
         super.call();
 
-        PicocliRunner.call(App.class, "sys", "database", "--help");
-
-        return 0;
+        return App.runCli(new String[]{"sys", "database", "--help"});
     }
 }

cli/src/main/java/io/kestra/cli/commands/sys/statestore/StateStoreCommand.java

@@ -2,7 +2,6 @@ package io.kestra.cli.commands.sys.statestore;
 
 import io.kestra.cli.AbstractCommand;
 import io.kestra.cli.App;
-import io.micronaut.configuration.picocli.PicocliRunner;
 import lombok.SneakyThrows;
 import picocli.CommandLine;
 
@@ -20,8 +19,6 @@ public class StateStoreCommand extends AbstractCommand {
     public Integer call() throws Exception {
         super.call();
 
-        PicocliRunner.call(App.class, "sys", "state-store", "--help");
-
-        return 0;
+        return App.runCli(new String[]{"sys", "state-store", "--help"});
     }
 }

cli/src/main/java/io/kestra/cli/commands/templates/TemplateCommand.java

@@ -4,7 +4,6 @@ import io.kestra.cli.AbstractCommand;
 import io.kestra.cli.App;
 import io.kestra.cli.commands.templates.namespaces.TemplateNamespaceCommand;
 import io.kestra.core.models.templates.TemplateEnabled;
-import io.micronaut.configuration.picocli.PicocliRunner;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import picocli.CommandLine;
@@ -27,8 +26,6 @@ public class TemplateCommand extends AbstractCommand {
     public Integer call() throws Exception {
         super.call();
 
-        PicocliRunner.call(App.class, "template",  "--help");
-
-        return 0;
+        return App.runCli(new String[]{"template",  "--help"});
     }
 }

cli/src/main/java/io/kestra/cli/commands/templates/namespaces/TemplateNamespaceCommand.java

@@ -3,7 +3,6 @@ package io.kestra.cli.commands.templates.namespaces;
 import io.kestra.cli.AbstractCommand;
 import io.kestra.cli.App;
 import io.kestra.core.models.templates.TemplateEnabled;
-import io.micronaut.configuration.picocli.PicocliRunner;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import picocli.CommandLine;
@@ -24,8 +23,6 @@ public class TemplateNamespaceCommand extends AbstractCommand {
     public Integer call() throws Exception {
         super.call();
 
-        PicocliRunner.call(App.class, "template", "namespace", "--help");
-
-        return 0;
+        return App.runCli(new String[]{"template", "namespace", "--help"});
     }
 }

cli/src/main/java/io/kestra/cli/services/DefaultEnvironmentProvider.java

@@ -0,0 +1,16 @@
+package io.kestra.cli.services;
+
+import io.micronaut.context.env.Environment;
+
+import java.util.Arrays;
+import java.util.stream.Stream;
+
+public class DefaultEnvironmentProvider implements EnvironmentProvider {
+    @Override
+    public String[] getCliEnvironments(String... extraEnvironments) {
+        return Stream.concat(
+            Stream.of(Environment.CLI),
+            Arrays.stream(extraEnvironments)
+        ).toArray(String[]::new);
+    }
+}

cli/src/main/java/io/kestra/cli/services/EnvironmentProvider.java

@@ -0,0 +1,5 @@
+package io.kestra.cli.services;
+
+public interface EnvironmentProvider {
+    String[] getCliEnvironments(String... extraEnvironments);
+}

cli/src/main/resources/META-INF/services/io.kestra.cli.services.EnvironmentProvider

@@ -0,0 +1 @@
+io.kestra.cli.services.DefaultEnvironmentProvider

cli/src/test/java/io/kestra/cli/AppTest.java

@@ -1,14 +1,11 @@
 package io.kestra.cli;
 
 import io.kestra.core.models.ServerType;
-import io.micronaut.configuration.picocli.MicronautFactory;
-import io.micronaut.configuration.picocli.PicocliRunner;
 import io.micronaut.context.ApplicationContext;
 import io.micronaut.context.env.Environment;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
-import picocli.CommandLine;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
@@ -22,11 +19,15 @@ class AppTest {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         System.setOut(new PrintStream(out));
 
-        try (ApplicationContext ctx = ApplicationContext.run(Environment.CLI, Environment.TEST)) {
-            PicocliRunner.call(App.class, ctx, "--help");
+        // No arg will print help
+        assertThat(App.runCli(new String[0])).isZero();
+        assertThat(out.toString()).contains("kestra");
 
-            assertThat(out.toString()).contains("kestra");
-        }
+        out.reset();
+
+        // Explicit help command
+        assertThat(App.runCli(new String[]{"--help"})).isZero();
+        assertThat(out.toString()).contains("kestra");
     }
 
     @ParameterizedTest
@@ -38,11 +39,12 @@ class AppTest {
         final String[] args = new String[]{"server", serverType, "--help"};
 
         try (ApplicationContext ctx = App.applicationContext(App.class, new String [] { Environment.CLI }, args)) {
-            new CommandLine(App.class, new MicronautFactory(ctx)).execute(args);
-
             assertTrue(ctx.getProperty("kestra.server-type", ServerType.class).isEmpty());
-            assertThat(out.toString()).startsWith("Usage: kestra server " + serverType);
         }
+
+        assertThat(App.runCli(args)).isZero();
+
+        assertThat(out.toString()).startsWith("Usage: kestra server " + serverType);
     }
 
     @Test
@@ -52,12 +54,10 @@ class AppTest {
 
         final String[] argsWithMissingParams = new String[]{"flow", "namespace", "update"};
 
-        try (ApplicationContext ctx = App.applicationContext(App.class, new String [] { Environment.CLI }, argsWithMissingParams)) {
-            new CommandLine(App.class, new MicronautFactory(ctx)).execute(argsWithMissingParams);
+        assertThat(App.runCli(argsWithMissingParams)).isEqualTo(2);
 
-            assertThat(out.toString()).startsWith("Missing required parameters: ");
-            assertThat(out.toString()).contains("Usage: kestra flow namespace update ");
-            assertThat(out.toString()).doesNotContain("MissingParameterException: ");
-        }
+        assertThat(out.toString()).startsWith("Missing required parameters: ");
+        assertThat(out.toString()).contains("Usage: kestra flow namespace update ");
+        assertThat(out.toString()).doesNotContain("MissingParameterException: ");
     }
 }

cli/src/test/resources/application-test.yml

@@ -21,6 +21,7 @@ kestra:
   server:
     liveness:
       enabled: false
+    termination-grace-period: 5s
 micronaut:
   http:
     services:

core/src/main/java/io/kestra/core/models/conditions/ConditionContext.java

@@ -3,7 +3,6 @@ package io.kestra.core.models.conditions;
 import io.kestra.core.models.flows.FlowInterface;
 import lombok.*;
 import io.kestra.core.models.executions.Execution;
-import io.kestra.core.models.flows.Flow;
 import io.kestra.core.models.triggers.multipleflows.MultipleConditionStorageInterface;
 import io.kestra.core.runners.RunContext;
 

core/src/main/java/io/kestra/core/models/executions/LogEntry.java

@@ -3,7 +3,7 @@ package io.kestra.core.models.executions;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.kestra.core.models.DeletedInterface;
 import io.kestra.core.models.TenantInterface;
-import io.kestra.core.models.flows.Flow;
+import io.kestra.core.models.flows.FlowInterface;
 import io.kestra.core.models.triggers.AbstractTrigger;
 import io.kestra.core.models.triggers.TriggerContext;
 import io.swagger.v3.oas.annotations.Hidden;
@@ -97,7 +97,7 @@ public class LogEntry implements DeletedInterface, TenantInterface {
             .build();
     }
 
-    public static LogEntry of(Flow flow, AbstractTrigger abstractTrigger, ExecutionKind executionKind) {
+    public static LogEntry of(FlowInterface flow, AbstractTrigger abstractTrigger) {
         return LogEntry.builder()
             .tenantId(flow.getTenantId())
             .namespace(flow.getNamespace())
@@ -107,7 +107,7 @@ public class LogEntry implements DeletedInterface, TenantInterface {
             .build();
     }
 
-    public static LogEntry of(TriggerContext triggerContext, AbstractTrigger abstractTrigger, ExecutionKind executionKind) {
+    public static LogEntry of(TriggerContext triggerContext, AbstractTrigger abstractTrigger) {
         return LogEntry.builder()
             .tenantId(triggerContext.getTenantId())
             .namespace(triggerContext.getNamespace())

core/src/main/java/io/kestra/core/models/hierarchies/SubflowGraphTask.java

@@ -48,7 +48,7 @@ public class SubflowGraphTask extends AbstractGraphTask {
 
     public record SubflowTaskWrapper<T extends Output>(RunContext runContext, ExecutableTask<T> subflowTask) implements TaskInterface, ExecutableTask<T> {
         @Override
-        public List<SubflowExecution<?>> createSubflowExecutions(RunContext runContext, FlowMetaStoreInterface flowExecutorInterface, Flow currentFlow, Execution currentExecution, TaskRun currentTaskRun) throws InternalException {
+        public List<SubflowExecution<?>> createSubflowExecutions(RunContext runContext, FlowMetaStoreInterface flowExecutorInterface, FlowInterface currentFlow, Execution currentExecution, TaskRun currentTaskRun) throws InternalException {
             return subflowTask.createSubflowExecutions(runContext, flowExecutorInterface, currentFlow, currentExecution, currentTaskRun);
         }
 

core/src/main/java/io/kestra/core/models/tasks/ExecutableTask.java

@@ -24,7 +24,7 @@ public interface ExecutableTask<T extends Output>{
      */
     List<SubflowExecution<?>> createSubflowExecutions(RunContext runContext,
                                                       FlowMetaStoreInterface flowExecutorInterface,
-                                                      Flow currentFlow, Execution currentExecution,
+                                                      FlowInterface currentFlow, Execution currentExecution,
                                                       TaskRun currentTaskRun) throws InternalException;
 
     /**

core/src/main/java/io/kestra/core/models/triggers/Trigger.java

@@ -74,7 +74,7 @@ public class Trigger extends TriggerContext implements HasUID {
         );
     }
 
-    public static String uid(Flow flow, AbstractTrigger abstractTrigger) {
+    public static String uid(FlowInterface flow, AbstractTrigger abstractTrigger) {
         return IdUtils.fromParts(
             flow.getTenantId(),
             flow.getNamespace(),

core/src/main/java/io/kestra/core/models/triggers/multipleflows/MultipleConditionWindow.java

@@ -2,14 +2,12 @@ package io.kestra.core.models.triggers.multipleflows;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.kestra.core.models.HasUID;
-import io.kestra.core.models.flows.Flow;
 import io.kestra.core.models.flows.FlowId;
 import io.kestra.core.utils.IdUtils;
 import lombok.Builder;
 import lombok.Value;
 
 import java.time.ZonedDateTime;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 

core/src/main/java/io/kestra/core/reporter/reports/FeatureUsageReport.java

@@ -23,12 +23,12 @@ import java.util.Objects;
 
 @Singleton
 public class FeatureUsageReport extends AbstractReportable<FeatureUsageReport.UsageEvent> {
-    
+
     private final FlowRepositoryInterface flowRepository;
     private final ExecutionRepositoryInterface executionRepository;
     private final DashboardRepositoryInterface dashboardRepository;
     private final boolean enabled;
-    
+
     @Inject
     public FeatureUsageReport(FlowRepositoryInterface flowRepository,
                               ExecutionRepositoryInterface executionRepository,
@@ -37,26 +37,26 @@ public class FeatureUsageReport extends AbstractReportable<FeatureUsageReport.Us
         this.flowRepository = flowRepository;
         this.executionRepository = executionRepository;
         this.dashboardRepository = dashboardRepository;
-        
+
         ServerType serverType = KestraContext.getContext().getServerType();
         this.enabled = ServerType.EXECUTOR.equals(serverType) || ServerType.STANDALONE.equals(serverType);
     }
-    
+
     @Override
     public UsageEvent report(final Instant now, TimeInterval interval) {
         return UsageEvent
             .builder()
             .flows(FlowUsage.of(flowRepository))
             .executions(ExecutionUsage.of(executionRepository, interval.from(), interval.to()))
-            .dashboards(new Count(dashboardRepository.count()))
+            .dashboards(new Count(dashboardRepository.countAllForAllTenants()))
             .build();
     }
-    
+
     @Override
     public boolean isEnabled() {
         return enabled;
     }
-    
+
     @Override
     public UsageEvent report(Instant now, TimeInterval interval, String tenant) {
         Objects.requireNonNull(tenant, "tenant is null");
@@ -67,7 +67,7 @@ public class FeatureUsageReport extends AbstractReportable<FeatureUsageReport.Us
             .executions(ExecutionUsage.of(tenant, executionRepository, interval.from(), interval.to()))
             .build();
     }
-    
+
     @SuperBuilder(toBuilder = true)
     @Getter
     @Jacksonized

core/src/main/java/io/kestra/core/repositories/DashboardRepositoryInterface.java

@@ -16,14 +16,14 @@ import java.util.Map;
 import java.util.Optional;
 
 public interface DashboardRepositoryInterface {
-    
+
     /**
      * Gets the total number of Dashboards.
      *
      * @return the total number.
      */
-    long count();
-    
+    long countAllForAllTenants();
+
     Boolean isEnabled();
 
     Optional<Dashboard> get(String tenantId, String id);

core/src/main/java/io/kestra/core/repositories/TriggerRepositoryInterface.java

@@ -39,7 +39,7 @@ public interface TriggerRepositoryInterface extends QueryBuilderInterface<Trigge
      * @param tenantId the tenant of the triggers
      * @return The count.
      */
-    int count(@Nullable String tenantId);
+    long countAll(@Nullable String tenantId);
 
     /**
      * Find all triggers that match the query, return a flux of triggers

core/src/main/java/io/kestra/core/runners/ExecutableUtils.java

@@ -26,7 +26,6 @@ import org.apache.commons.lang3.stream.Streams;
 import java.time.Instant;
 import java.time.ZonedDateTime;
 import java.util.*;
-import java.util.stream.Collectors;
 
 import static io.kestra.core.trace.Tracer.throwCallable;
 import static io.kestra.core.utils.Rethrow.throwConsumer;
@@ -67,7 +66,7 @@ public final class ExecutableUtils {
         RunContext runContext,
         FlowMetaStoreInterface flowExecutorInterface,
         Execution currentExecution,
-        Flow currentFlow,
+        FlowInterface currentFlow,
         T currentTask,
         TaskRun currentTaskRun,
         Map<String, Object> inputs,

core/src/main/java/io/kestra/core/runners/FlowInputOutput.java

@@ -7,7 +7,6 @@ import io.kestra.core.exceptions.KestraRuntimeException;
 import io.kestra.core.models.executions.Execution;
 import io.kestra.core.models.flows.Data;
 import io.kestra.core.models.flows.DependsOn;
-import io.kestra.core.models.flows.Flow;
 import io.kestra.core.models.flows.FlowInterface;
 import io.kestra.core.models.flows.Input;
 import io.kestra.core.models.flows.Output;
@@ -64,11 +63,11 @@ import static io.kestra.core.utils.Rethrow.throwFunction;
 public class FlowInputOutput {
     private static final Pattern URI_PATTERN = Pattern.compile("^[a-z]+:\\/\\/(?:www\\.)?[-a-zA-Z0-9@:%._\\+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6}\\b(?:[-a-zA-Z0-9()@:%_\\+.~#?&\\/=]*)$");
     private static final ObjectMapper YAML_MAPPER = JacksonMapper.ofYaml();
-    
+
     private final StorageInterface storageInterface;
     private final Optional<String> secretKey;
     private final RunContextFactory runContextFactory;
-    
+
     @Inject
     public FlowInputOutput(
         StorageInterface storageInterface,
@@ -79,7 +78,7 @@ public class FlowInputOutput {
         this.runContextFactory = runContextFactory;
         this.secretKey = Optional.ofNullable(secretKey);
     }
-    
+
     /**
      * Validate all the inputs of a given execution of a flow.
      *
@@ -89,15 +88,15 @@ public class FlowInputOutput {
      * @return The list of {@link InputAndValue}.
      */
     public Mono<List<InputAndValue>> validateExecutionInputs(final List<Input<?>> inputs,
-                                                             final Flow flow,
+                                                             final FlowInterface flow,
                                                              final Execution execution,
                                                              final Publisher<CompletedPart> data) {
         if (ListUtils.isEmpty(inputs)) return Mono.just(Collections.emptyList());
-        
+
         return readData(inputs, execution, data, false)
             .map(inputData -> resolveInputs(inputs, flow, execution, inputData, false));
     }
-    
+
     /**
      * Reads all the inputs of a given execution of a flow.
      *
@@ -111,7 +110,7 @@ public class FlowInputOutput {
                                                          final Publisher<CompletedPart> data) {
         return this.readExecutionInputs(flow.getInputs(), flow, execution, data);
     }
-    
+
     /**
      * Reads all the inputs of a given execution of a flow.
      *
@@ -126,7 +125,7 @@ public class FlowInputOutput {
                                                          final Publisher<CompletedPart> data) {
         return readData(inputs, execution, data, true).map(inputData -> this.readExecutionInputs(inputs, flow, execution, inputData));
     }
-    
+
     private Mono<Map<String, Object>> readData(List<Input<?>> inputs, Execution execution, Publisher<CompletedPart> data, boolean uploadFiles) {
         return Flux.from(data)
             .publishOn(Schedulers.boundedElastic())
@@ -235,7 +234,7 @@ public class FlowInputOutput {
         }
         return MapUtils.flattenToNestedMap(resolved);
     }
-    
+
     /**
      * Utility method for retrieving types inputs.
      *
@@ -252,7 +251,7 @@ public class FlowInputOutput {
     ) {
         return resolveInputs(inputs, flow, execution, data, true);
     }
-    
+
     public List<InputAndValue> resolveInputs(
         final List<Input<?>> inputs,
         final FlowInterface flow,
@@ -325,7 +324,7 @@ public class FlowInputOutput {
                 }
             });
             resolvable.setInput(input);
-            
+
             Object value = resolvable.get().value();
 
             // resolve default if needed

core/src/main/java/io/kestra/core/runners/RunContextFactory.java

@@ -6,7 +6,6 @@ import com.google.common.annotations.VisibleForTesting;
 import io.kestra.core.metrics.MetricRegistry;
 import io.kestra.core.models.executions.Execution;
 import io.kestra.core.models.executions.TaskRun;
-import io.kestra.core.models.flows.Flow;
 import io.kestra.core.models.flows.FlowInterface;
 import io.kestra.core.models.flows.Type;
 import io.kestra.core.models.property.PropertyContext;
@@ -41,7 +40,7 @@ public class RunContextFactory {
 
     @Inject
     protected VariableRenderer variableRenderer;
-    
+
     @Inject
     protected SecureVariableRendererFactory secureVariableRendererFactory;
 
@@ -81,11 +80,11 @@ public class RunContextFactory {
     public RunContextInitializer initializer() {
         return applicationContext.getBean(RunContextInitializer.class);
     }
-    
+
     public RunContext of(FlowInterface flow, Execution execution) {
         return of(flow, execution, Function.identity());
     }
-    
+
     public RunContext of(FlowInterface flow, Execution execution, boolean decryptVariable) {
         return of(flow, execution, Function.identity(), decryptVariable);
     }
@@ -93,12 +92,12 @@ public class RunContextFactory {
     public RunContext of(FlowInterface flow, Execution execution, Function<RunVariables.Builder, RunVariables.Builder> runVariableModifier) {
         return of(flow, execution, runVariableModifier, true);
     }
-    
+
     public RunContext of(FlowInterface flow, Execution execution, Function<RunVariables.Builder, RunVariables.Builder> runVariableModifier, boolean decryptVariables) {
         RunContextLogger runContextLogger = runContextLoggerFactory.create(execution);
-        
+
         VariableRenderer variableRenderer = decryptVariables ? this.variableRenderer : secureVariableRendererFactory.createOrGet();
-        
+
         return newBuilder()
             // Logger
             .withLogger(runContextLogger)
@@ -150,8 +149,8 @@ public class RunContextFactory {
             .build();
     }
 
-    public RunContext of(Flow flow, AbstractTrigger trigger) {
-        RunContextLogger runContextLogger = runContextLoggerFactory.create(flow, trigger, null);
+    public RunContext of(FlowInterface flow, AbstractTrigger trigger) {
+        RunContextLogger runContextLogger = runContextLoggerFactory.create(flow, trigger);
         return newBuilder()
             // Logger
             .withLogger(runContextLogger)
@@ -170,7 +169,7 @@ public class RunContextFactory {
 
 
     @VisibleForTesting
-    public RunContext of(final Flow flow, final Map<String, Object> variables) {
+    public RunContext of(final FlowInterface flow, final Map<String, Object> variables) {
         RunContextLogger runContextLogger = new RunContextLogger();
         return newBuilder()
             .withLogger(runContextLogger)

core/src/main/java/io/kestra/core/runners/RunContextInitializer.java

@@ -213,7 +213,7 @@ public class RunContextInitializer {
         runContext.init(applicationContext);
 
         final String triggerExecutionId = IdUtils.create();
-        final RunContextLogger runContextLogger = contextLoggerFactory.create(triggerContext, trigger, null);
+        final RunContextLogger runContextLogger = contextLoggerFactory.create(triggerContext, trigger);
 
         final Map<String, Object> variables = new HashMap<>(runContext.getVariables());
         variables.put(RunVariables.SECRET_CONSUMER_VARIABLE_NAME, (Consumer<String>) runContextLogger::usedSecret);

core/src/main/java/io/kestra/core/runners/RunContextLoggerFactory.java

@@ -4,7 +4,7 @@ import io.kestra.core.models.executions.Execution;
 import io.kestra.core.models.executions.ExecutionKind;
 import io.kestra.core.models.executions.LogEntry;
 import io.kestra.core.models.executions.TaskRun;
-import io.kestra.core.models.flows.Flow;
+import io.kestra.core.models.flows.FlowInterface;
 import io.kestra.core.models.tasks.Task;
 import io.kestra.core.models.triggers.AbstractTrigger;
 import io.kestra.core.models.triggers.TriggerContext;
@@ -46,19 +46,19 @@ public class RunContextLoggerFactory {
         );
     }
 
-    public RunContextLogger create(TriggerContext triggerContext, AbstractTrigger trigger, ExecutionKind executionKind) {
+    public RunContextLogger create(TriggerContext triggerContext, AbstractTrigger trigger) {
         return new RunContextLogger(
             logQueue,
-            LogEntry.of(triggerContext, trigger, executionKind),
+            LogEntry.of(triggerContext, trigger),
             trigger.getLogLevel(),
             trigger.isLogToFile()
         );
     }
 
-    public RunContextLogger create(Flow flow, AbstractTrigger trigger, ExecutionKind executionKind) {
+    public RunContextLogger create(FlowInterface flow, AbstractTrigger trigger) {
         return new RunContextLogger(
             logQueue,
-            LogEntry.of(flow, trigger, executionKind),
+            LogEntry.of(flow, trigger),
             trigger.getLogLevel(),
             trigger.isLogToFile()
         );

core/src/main/java/io/kestra/core/runners/RunVariables.java

@@ -5,8 +5,8 @@ import io.kestra.core.exceptions.IllegalVariableEvaluationException;
 import io.kestra.core.models.Label;
 import io.kestra.core.models.executions.Execution;
 import io.kestra.core.models.executions.TaskRun;
-import io.kestra.core.models.flows.Flow;
 import io.kestra.core.models.flows.FlowInterface;
+import io.kestra.core.models.flows.GenericFlow;
 import io.kestra.core.models.flows.Input;
 import io.kestra.core.models.flows.State;
 import io.kestra.core.models.flows.input.SecretInput;
@@ -73,7 +73,7 @@ public final class RunVariables {
     }
 
     /**
-     * Creates an immutable map representation of the given {@link Flow}.
+     * Creates an immutable map representation of the given {@link FlowInterface}.
      *
      * @param flow The flow from which to create variables.
      * @return a new immutable {@link Map}.
@@ -283,7 +283,7 @@ public final class RunVariables {
                 if (flow != null && flow.getInputs() != null) {
                     // Create a new PropertyContext with 'flow' variables which are required by some pebble expressions.
                     PropertyContextWithVariables context = new PropertyContextWithVariables(propertyContext, Map.of("flow", RunVariables.of(flow)));
-                    
+
                     // we add default inputs value from the flow if not already set, this will be useful for triggers
                     flow.getInputs().stream()
                         .filter(input -> input.getDefaults() != null && !inputs.containsKey(input.getId()))
@@ -326,7 +326,7 @@ public final class RunVariables {
                 }
 
                 if (flow == null) {
-                    Flow flowFromExecution = Flow.builder()
+                    FlowInterface flowFromExecution = GenericFlow.builder()
                         .id(execution.getFlowId())
                         .tenantId(execution.getTenantId())
                         .revision(execution.getFlowRevision())
@@ -393,17 +393,17 @@ public final class RunVariables {
     }
 
     private RunVariables(){}
-    
+
     private record PropertyContextWithVariables(
         PropertyContext delegate,
         Map<String, Object> variables
     ) implements PropertyContext {
-        
+
         @Override
         public String render(String inline, Map<String, Object> variables) throws IllegalVariableEvaluationException {
             return delegate.render(inline, variables.isEmpty() ? this.variables : variables);
         }
-        
+
         @Override
         public Map<String, Object> render(Map<String, Object> inline, Map<String, Object> variables) throws IllegalVariableEvaluationException {
             return delegate.render(inline, variables.isEmpty() ? this.variables : variables);

core/src/main/java/io/kestra/core/runners/SchedulerTriggerStateInterface.java

@@ -1,7 +1,6 @@
 package io.kestra.core.runners;
 
 import io.kestra.core.models.conditions.ConditionContext;
-import io.kestra.core.models.flows.Flow;
 import io.kestra.core.models.flows.FlowWithSource;
 import io.kestra.core.models.triggers.AbstractTrigger;
 import io.kestra.core.models.triggers.Trigger;
@@ -28,7 +27,7 @@ public interface SchedulerTriggerStateInterface {
 
     Trigger update(Trigger trigger);
 
-    Trigger update(Flow flow, AbstractTrigger abstractTrigger, ConditionContext conditionContext) throws Exception;
+    Trigger update(FlowWithSource flow, AbstractTrigger abstractTrigger, ConditionContext conditionContext) throws Exception;
 
     /**
      * QueueException required for Kafka implementation

core/src/main/java/io/kestra/core/storages/StorageContext.java

@@ -3,7 +3,6 @@ package io.kestra.core.storages;
 import com.google.common.annotations.VisibleForTesting;
 import io.kestra.core.models.executions.Execution;
 import io.kestra.core.models.executions.TaskRun;
-import io.kestra.core.models.flows.Flow;
 import io.kestra.core.models.flows.FlowId;
 import io.kestra.core.utils.Hashing;
 import io.kestra.core.utils.Slugify;
@@ -62,9 +61,9 @@ public class StorageContext {
             taskRun.getValue()
         );
     }
-    
+
     /**
-     * Factory method for constructing a new {@link StorageContext} scoped to a given {@link Flow}.
+     * Factory method for constructing a new {@link StorageContext} scoped to a given {@link FlowId}.
      */
     public static StorageContext forFlow(FlowId flow) {
         return new StorageContext(flow.getTenantId(), flow.getNamespace(), flow.getId());
@@ -227,7 +226,7 @@ public class StorageContext {
     }
 
     /**
-     * Gets the base storage URI for the current {@link io.kestra.core.models.flows.Flow}.
+     * Gets the base storage URI for the current {@link FlowId}.
      *
      * @return the {@link URI}.
      */

core/src/main/java/io/kestra/core/utils/UriProvider.java

@@ -1,9 +1,9 @@
 package io.kestra.core.utils;
 
+import io.kestra.core.models.flows.FlowInterface;
 import io.micronaut.context.annotation.Value;
 import org.apache.commons.lang3.StringUtils;
 import io.kestra.core.models.executions.Execution;
-import io.kestra.core.models.flows.Flow;
 
 import java.net.URI;
 import io.micronaut.core.annotation.Nullable;
@@ -44,7 +44,7 @@ public class UriProvider {
             execution.getFlowId());
     }
 
-    public URI flowUrl(Flow flow) {
+    public URI flowUrl(FlowInterface flow) {
         return this.build("/ui/" +
             (flow.getTenantId() != null ? flow.getTenantId() + "/" : "") +
             "flows/" +

core/src/main/java/io/kestra/plugin/core/debug/Return.java

@@ -44,33 +44,15 @@ import java.util.Optional;
                 """
         ),
         @Example(
-            full = true,
             code = """
-                id: return
-                namespace: company.team
-
-                inputs:
-                  - id: token
-                    type: STRING
-                    displayName: "API Token"
-                  
-                  - id: username
-                    type: STRING
-                    displayName: "Username"
-
-                  - id: password
-                    type: STRING
-                    displayName: "Password"
-
-                tasks:
-                  - id: compute_header
-                    type: io.kestra.plugin.core.debug.Return
-                    format: >-
-                      {%- if inputs.token is not empty -%}
-                      Bearer {{ inputs.token }}
-                      {%- elseif inputs.username is not empty and inputs.password is not empty -%}
-                      Basic {{ (inputs.username + ':' + inputs.password) | base64encode }}
-                      {%- endif -%}
+                id: compute_header
+                type: io.kestra.plugin.core.debug.Return
+                format: >-
+                    {%- if inputs.token is not empty -%}
+                    Bearer {{ inputs.token }}
+                    {%- elseif inputs.username is not empty and inputs.password is not empty -%}
+                    Basic {{ (inputs.username + ':' + inputs.password) | base64encode }}
+                    {%- endif -%}
                 """
         )
     },

core/src/main/java/io/kestra/plugin/core/flow/ForEachItem.java

@@ -10,7 +10,6 @@ import io.kestra.core.models.annotations.Example;
 import io.kestra.core.models.annotations.Plugin;
 import io.kestra.core.models.annotations.PluginProperty;
 import io.kestra.core.models.executions.*;
-import io.kestra.core.models.flows.Flow;
 import io.kestra.core.models.flows.FlowInterface;
 import io.kestra.core.models.flows.State;
 import io.kestra.core.models.hierarchies.GraphCluster;
@@ -466,7 +465,7 @@ public class ForEachItem extends Task implements FlowableTask<VoidOutput>, Child
         public List<SubflowExecution<?>> createSubflowExecutions(
             RunContext runContext,
             FlowMetaStoreInterface flowExecutorInterface,
-            Flow currentFlow,
+            FlowInterface currentFlow,
             Execution currentExecution,
             TaskRun currentTaskRun
         ) throws InternalException {

core/src/main/java/io/kestra/plugin/core/flow/Subflow.java

@@ -174,7 +174,7 @@ public class Subflow extends Task implements ExecutableTask<Subflow.Output>, Chi
     @Override
     public List<SubflowExecution<?>> createSubflowExecutions(RunContext runContext,
                                                              FlowMetaStoreInterface flowExecutorInterface,
-                                                             io.kestra.core.models.flows.Flow currentFlow,
+                                                             FlowInterface currentFlow,
                                                              Execution currentExecution,
                                                              TaskRun currentTaskRun) throws InternalException {
         Map<String, Object> inputs = new HashMap<>();

core/src/main/java/io/kestra/plugin/core/trigger/Webhook.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.kestra.core.models.annotations.PluginProperty;
+import io.kestra.core.models.flows.FlowInterface;
 import io.kestra.core.validations.WebhookValidation;
 import io.micronaut.http.HttpRequest;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -156,8 +157,8 @@ public class Webhook extends AbstractTrigger implements TriggerOutput<Webhook.Ou
            """
     )
     private Boolean wait = false;
-    
-    
+
+
     @Schema(
         title = "The inputs to pass to the triggered flow"
     )
@@ -172,7 +173,7 @@ public class Webhook extends AbstractTrigger implements TriggerOutput<Webhook.Ou
     )
     private Boolean returnOutputs = false;
 
-    public Optional<Execution> evaluate(HttpRequest<String> request, io.kestra.core.models.flows.Flow flow) {
+    public Optional<Execution> evaluate(HttpRequest<String> request, FlowInterface flow) {
         String body = request.getBody().orElse(null);
 
         Execution.ExecutionBuilder builder = Execution.builder()

core/src/test/java/io/kestra/core/repositories/AbstractTriggerRepositoryTest.java

@@ -192,7 +192,7 @@ public abstract class AbstractTriggerRepositoryTest {
             .build()
         );
         // When
-        int count = triggerRepository.count(tenant);
+        long count = triggerRepository.countAll(tenant);
         // Then
         assertThat(count).isEqualTo(1);
     }

core/src/test/resources/application-test.yml

@@ -58,7 +58,8 @@ kestra:
       purge:
         initial-delay: 1h
         fixed-delay: 1d
-        retention: 30d
+        retention: 30dPeriod
+    termination-grace-period: 5s
 
   anonymous-usage-report:
     enabled: false

core/src/test/resources/flows/valids/sleep-long.yml

@@ -4,7 +4,7 @@ namespace: io.kestra.tests
 tasks:
   - id: sleep-long
     type: io.kestra.plugin.core.flow.Sleep
-    duration: PT300S
+    duration: PT30S
 
 afterExecution:
   - id: output

docker-compose-dind.yml

@@ -17,7 +17,7 @@ services:
   postgres:
     image: postgres:18
     volumes:
-      - postgres-data:/var/lib/postgresql/18/docker
+      - postgres-data:/var/lib/postgresql
     environment:
       POSTGRES_DB: kestra
       POSTGRES_USER: kestra

docker-compose.yml

@@ -8,7 +8,7 @@ services:
   postgres:
     image: postgres:18
     volumes:
-      - postgres-data:/var/lib/postgresql/18/docker
+      - postgres-data:/var/lib/postgresql
     environment:
       POSTGRES_DB: kestra
       POSTGRES_USER: kestra

executor/src/main/java/io/kestra/executor/ExecutorService.java

@@ -5,8 +5,8 @@ import io.kestra.core.exceptions.InternalException;
 import io.kestra.core.metrics.MetricRegistry;
 import io.kestra.core.models.Label;
 import io.kestra.core.models.executions.*;
-import io.kestra.core.models.flows.Flow;
 import io.kestra.core.models.flows.FlowInterface;
+import io.kestra.core.models.flows.FlowWithSource;
 import io.kestra.core.models.flows.State;
 import io.kestra.core.models.flows.sla.Violation;
 import io.kestra.core.models.tasks.*;
@@ -237,7 +237,7 @@ public class ExecutorService {
         return newExecution;
     }
 
-    private Optional<WorkerTaskResult> childWorkerTaskResult(Flow flow, Execution execution, TaskRun parentTaskRun) throws InternalException {
+    private Optional<WorkerTaskResult> childWorkerTaskResult(FlowWithSource flow, Execution execution, TaskRun parentTaskRun) throws InternalException {
         Task parent = flow.findTaskByTaskId(parentTaskRun.getTaskId());
 
         if (parent instanceof FlowableTask<?> flowableParent) {
@@ -393,7 +393,7 @@ public class ExecutorService {
     }
 
     private Executor onEnd(Executor executor) {
-        final Flow flow = executor.getFlow();
+        final FlowWithSource flow = executor.getFlow();
 
         Execution newExecution = executor.getExecution()
             .withState(executor.getExecution().guessFinalState(flow));
@@ -1134,7 +1134,7 @@ public class ExecutorService {
         }
     }
 
-    public void addWorkerTaskResult(Executor executor, Supplier<Flow> flow, WorkerTaskResult workerTaskResult) throws InternalException {
+    public void addWorkerTaskResult(Executor executor, Supplier<FlowWithSource> flow, WorkerTaskResult workerTaskResult) throws InternalException {
         // dynamic tasks
         Execution newExecution = this.addDynamicTaskRun(
             executor.getExecution(),
@@ -1175,7 +1175,7 @@ public class ExecutorService {
     }
 
     // Note: as the flow is only used in an error branch and it can take time to load, we pass it thought a Supplier
-    private Execution addDynamicTaskRun(Execution execution, Supplier<Flow> flow, WorkerTaskResult workerTaskResult) throws InternalException {
+    private Execution addDynamicTaskRun(Execution execution, Supplier<FlowWithSource> flow, WorkerTaskResult workerTaskResult) throws InternalException {
         ArrayList<TaskRun> taskRuns = new ArrayList<>(ListUtils.emptyOnNull(execution.getTaskRunList()));
 
         // declared dynamic tasks

executor/src/main/java/io/kestra/executor/SLAService.java

@@ -1,7 +1,7 @@
 package io.kestra.executor;
 
 import io.kestra.core.models.executions.Execution;
-import io.kestra.core.models.flows.Flow;
+import io.kestra.core.models.flows.FlowInterface;
 import io.kestra.core.models.flows.sla.ExecutionChangedSLA;
 import io.kestra.core.models.flows.sla.SLA;
 import io.kestra.core.models.flows.sla.Violation;
@@ -19,7 +19,7 @@ public class SLAService {
      * Evaluate execution changed SLA of a flow for an execution.
      * Each violated SLA will be logged.
      */
-    public List<Violation> evaluateExecutionChangedSLA(RunContext runContext, Flow flow, Execution execution) {
+    public List<Violation> evaluateExecutionChangedSLA(RunContext runContext, FlowInterface flow, Execution execution) {
         return ListUtils.emptyOnNull(flow.getSla()).stream()
             .filter(ExecutionChangedSLA.class::isInstance)
             .map(

executor/src/test/resources/application-test.yml

@@ -54,6 +54,7 @@ kestra:
         - "/api/v1/executions/webhook/"
     liveness:
       enabled: false
+    termination-grace-period: 5s
     service:
       purge:
         initial-delay: 1h

jdbc-h2/src/main/java/io/kestra/repository/h2/H2DashboardRepository.java

@@ -2,6 +2,7 @@ package io.kestra.repository.h2;
 
 import io.kestra.core.events.CrudEvent;
 import io.kestra.core.models.dashboards.Dashboard;
+import io.kestra.core.queues.QueueService;
 import io.kestra.core.repositories.QueryBuilderInterface;
 import io.kestra.jdbc.repository.AbstractJdbcDashboardRepository;
 import io.micronaut.context.event.ApplicationEventPublisher;
@@ -17,9 +18,10 @@ import java.util.List;
 public class H2DashboardRepository extends AbstractJdbcDashboardRepository {
     @Inject
     public H2DashboardRepository(@Named("dashboards") H2Repository<Dashboard> repository,
+                                 QueueService queueService,
                                  ApplicationEventPublisher<CrudEvent<Dashboard>> eventPublisher,
                                  List<QueryBuilderInterface<?>> queryBuilders) {
-        super(repository, eventPublisher, queryBuilders);
+        super(repository, queueService, eventPublisher, queryBuilders);
     }
 
     @Override

jdbc-h2/src/main/java/io/kestra/repository/h2/H2DashboardRepositoryService.java

@@ -16,6 +16,6 @@ public abstract class H2DashboardRepositoryService {
             conditions.add(jdbcRepository.fullTextCondition(List.of("fulltext"), query));
         }
 
-        return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
+        return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
     }
 }

jdbc-h2/src/main/java/io/kestra/repository/h2/H2ExecutionRepository.java

@@ -2,6 +2,7 @@ package io.kestra.repository.h2;
 
 import io.kestra.core.models.QueryFilter;
 import io.kestra.core.models.executions.Execution;
+import io.kestra.core.queues.QueueService;
 import io.kestra.core.utils.DateUtils;
 import io.kestra.core.utils.Either;
 import io.kestra.jdbc.repository.AbstractJdbcExecutionRepository;
@@ -22,10 +23,11 @@ import java.util.*;
 public class H2ExecutionRepository extends AbstractJdbcExecutionRepository {
     @Inject
     public H2ExecutionRepository(@Named("executions") H2Repository<Execution> repository,
+                                 QueueService queueService,
                                  ApplicationContext applicationContext,
                                  AbstractJdbcExecutorStateStorage executorStateStorage,
                                  JdbcFilterService filterService) {
-        super(repository, applicationContext, executorStateStorage, filterService);
+        super(repository, queueService, applicationContext, executorStateStorage, filterService);
     }
 
     @Override

jdbc-h2/src/main/java/io/kestra/repository/h2/H2ExecutionRepositoryService.java

@@ -32,7 +32,7 @@ public abstract class H2ExecutionRepositoryService {
             });
         }
 
-        return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
+        return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
     }
 
     public static Condition findLabelCondition(Either<Map<?, ?>, String> input, QueryFilter.Op operation) {
@@ -64,6 +64,6 @@ public abstract class H2ExecutionRepositoryService {
         if (!inConditions.isEmpty()) {
             conditions.add(DSL.or(inConditions));
         }
-        return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
+        return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
     }
 }

jdbc-h2/src/main/java/io/kestra/repository/h2/H2FlowRepositoryService.java

@@ -31,7 +31,7 @@ public abstract class H2FlowRepositoryService {
             });
         }
 
-        return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
+        return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
     }
 
     public static Condition findSourceCodeCondition(AbstractJdbcRepository<? extends FlowInterface> jdbcRepository, String query) {
@@ -54,6 +54,6 @@ public abstract class H2FlowRepositoryService {
             });
 
         }
-        return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
+        return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
     }
 }

jdbc-h2/src/main/java/io/kestra/repository/h2/H2KvMetadataRepository.java

@@ -1,27 +1,20 @@
 package io.kestra.repository.h2;
 
-import io.kestra.core.models.QueryFilter;
 import io.kestra.core.models.kv.PersistedKvMetadata;
+import io.kestra.core.queues.QueueService;
 import io.kestra.jdbc.repository.AbstractJdbcKvMetadataRepository;
-import io.kestra.jdbc.services.JdbcFilterService;
 import io.micronaut.context.ApplicationContext;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
 import jakarta.inject.Singleton;
 import org.jooq.Condition;
-import org.jooq.Field;
-import org.jooq.impl.DSL;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
 
 @Singleton
 @H2RepositoryEnabled
 public class H2KvMetadataRepository extends AbstractJdbcKvMetadataRepository {
     @Inject
-    public H2KvMetadataRepository(@Named("kvMetadata") H2Repository<PersistedKvMetadata> repository) {
-        super(repository);
+    public H2KvMetadataRepository(@Named("kvMetadata") H2Repository<PersistedKvMetadata> repository, QueueService queueService, ApplicationContext applicationContext) {
+        super(repository, queueService);
     }
 
 

jdbc-h2/src/main/java/io/kestra/repository/h2/H2KvMetadataRepositoryService.java

@@ -16,6 +16,6 @@ public abstract class H2KvMetadataRepositoryService {
             conditions.add(jdbcRepository.fullTextCondition(List.of("fulltext"), query));
         }
 
-        return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
+        return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
     }
 }

jdbc-h2/src/main/java/io/kestra/repository/h2/H2LogRepository.java

@@ -1,6 +1,7 @@
 package io.kestra.repository.h2;
 
 import io.kestra.core.models.executions.LogEntry;
+import io.kestra.core.queues.QueueService;
 import io.kestra.core.utils.DateUtils;
 import io.kestra.jdbc.repository.AbstractJdbcLogRepository;
 import io.kestra.jdbc.services.JdbcFilterService;
@@ -19,8 +20,9 @@ import java.util.List;
 public class H2LogRepository extends AbstractJdbcLogRepository {
     @Inject
     public H2LogRepository(@Named("logs") H2Repository<LogEntry> repository,
+                           QueueService queueService,
                            JdbcFilterService filterService) {
-        super(repository, filterService);
+        super(repository, queueService, filterService);
     }
 
     @Override

jdbc-h2/src/main/java/io/kestra/repository/h2/H2MetricRepository.java

@@ -1,6 +1,7 @@
 package io.kestra.repository.h2;
 
 import io.kestra.core.models.executions.MetricEntry;
+import io.kestra.core.queues.QueueService;
 import io.kestra.core.utils.DateUtils;
 import io.kestra.jdbc.repository.AbstractJdbcMetricRepository;
 import io.kestra.jdbc.services.JdbcFilterService;
@@ -17,8 +18,9 @@ import java.util.Date;
 public class H2MetricRepository extends AbstractJdbcMetricRepository {
     @Inject
     public H2MetricRepository(@Named("metrics") H2Repository<MetricEntry> repository,
+                              QueueService queueService,
                               JdbcFilterService filterService) {
-        super(repository, filterService);
+        super(repository, queueService, filterService);
     }
 
     @Override

jdbc-h2/src/main/java/io/kestra/repository/h2/H2Repository.java

@@ -76,7 +76,7 @@ public class H2Repository<T> extends io.kestra.jdbc.AbstractJdbcRepository<T> {
 
     public Condition fullTextCondition(List<String> fields, String query) {
         if (query == null || query.equals("*")) {
-            return DSL.trueCondition();
+            return DSL.noCondition();
         }
 
         if (fields.size() > 1) {
@@ -105,12 +105,12 @@ public class H2Repository<T> extends io.kestra.jdbc.AbstractJdbcRepository<T> {
                         .sort(select, pageable)
                         .asTable("page")
                     )
-                    .where(DSL.trueCondition()),
+                    .where(DSL.noCondition()),
                 pageable
             )
             .fetch();
 
-        Integer totalCount = results.size() > 0 ? results.getFirst().get("total_count", Integer.class) : 0;
+        Integer totalCount = !results.isEmpty() ? results.getFirst().get("total_count", Integer.class) : 0;
 
         List<E> map = results
             .map((Record record) -> mapper.map((R) record));

jdbc-h2/src/main/java/io/kestra/repository/h2/H2SettingRepository.java

@@ -1,6 +1,7 @@
 package io.kestra.repository.h2;
 
 import io.kestra.core.models.Setting;
+import io.kestra.core.queues.QueueService;
 import io.kestra.jdbc.repository.AbstractJdbcSettingRepository;
 import io.micronaut.context.ApplicationContext;
 import jakarta.inject.Inject;
@@ -12,7 +13,8 @@ import jakarta.inject.Singleton;
 public class H2SettingRepository extends AbstractJdbcSettingRepository {
     @Inject
     public H2SettingRepository(@Named("settings") H2Repository<Setting> repository,
+                               QueueService queueService,
                                ApplicationContext applicationContext) {
-        super(repository, applicationContext);
+        super(repository, queueService, applicationContext);
     }
 }

jdbc-h2/src/main/java/io/kestra/repository/h2/H2TemplateRepository.java

@@ -2,6 +2,7 @@ package io.kestra.repository.h2;
 
 import io.kestra.core.models.templates.Template;
 import io.kestra.core.models.templates.TemplateEnabled;
+import io.kestra.core.queues.QueueService;
 import io.kestra.jdbc.repository.AbstractJdbcTemplateRepository;
 import io.micronaut.context.ApplicationContext;
 import jakarta.inject.Inject;
@@ -17,8 +18,9 @@ import java.util.List;
 public class H2TemplateRepository extends AbstractJdbcTemplateRepository {
     @Inject
     public H2TemplateRepository(@Named("templates") H2Repository<Template> repository,
+                                QueueService queueService,
                                 ApplicationContext applicationContext) {
-        super(repository, applicationContext);
+        super(repository, queueService, applicationContext);
     }
 
     @Override

jdbc-h2/src/main/java/io/kestra/repository/h2/H2TriggerRepository.java

@@ -1,6 +1,7 @@
 package io.kestra.repository.h2;
 
 import io.kestra.core.models.triggers.Trigger;
+import io.kestra.core.queues.QueueService;
 import io.kestra.core.utils.DateUtils;
 import io.kestra.jdbc.repository.AbstractJdbcTriggerRepository;
 import io.kestra.jdbc.services.JdbcFilterService;
@@ -17,8 +18,9 @@ import java.util.Date;
 public class H2TriggerRepository extends AbstractJdbcTriggerRepository {
     @Inject
     public H2TriggerRepository(@Named("triggers") H2Repository<Trigger> repository,
+                               QueueService queueService,
                                JdbcFilterService filterService) {
-        super(repository, filterService);
+        super(repository, queueService, filterService);
     }
 
     @Override

jdbc-h2/src/test/resources/application-test.yml

@@ -19,6 +19,7 @@ kestra:
   server:
     liveness:
       enabled: false
+    termination-grace-period: 5s
     service:
       purge:
         initial-delay: 1h

jdbc-mysql/src/main/java/io/kestra/repository/mysql/MysqlDashboardRepository.java

@@ -2,6 +2,7 @@ package io.kestra.repository.mysql;
 
 import io.kestra.core.events.CrudEvent;
 import io.kestra.core.models.dashboards.Dashboard;
+import io.kestra.core.queues.QueueService;
 import io.kestra.core.repositories.QueryBuilderInterface;
 import io.kestra.jdbc.repository.AbstractJdbcDashboardRepository;
 import io.micronaut.context.event.ApplicationEventPublisher;
@@ -17,9 +18,10 @@ import java.util.List;
 public class MysqlDashboardRepository extends AbstractJdbcDashboardRepository {
     @Inject
     public MysqlDashboardRepository(@Named("dashboards") MysqlRepository<Dashboard> repository,
+                                    QueueService queueService,
                                     ApplicationEventPublisher<CrudEvent<Dashboard>> eventPublisher,
                                     List<QueryBuilderInterface<?>> queryBuilders) {
-        super(repository, eventPublisher, queryBuilders);
+        super(repository, queueService, eventPublisher, queryBuilders);
     }
 
     @Override

jdbc-mysql/src/main/java/io/kestra/repository/mysql/MysqlDashboardRepositoryService.java

@@ -17,6 +17,6 @@ public abstract class MysqlDashboardRepositoryService {
             conditions.add(jdbcRepository.fullTextCondition(Arrays.asList("title"), query));
         }
 
-        return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
+        return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
     }
 }

jdbc-mysql/src/main/java/io/kestra/repository/mysql/MysqlExecutionRepository.java

@@ -2,6 +2,7 @@ package io.kestra.repository.mysql;
 
 import io.kestra.core.models.QueryFilter;
 import io.kestra.core.models.executions.Execution;
+import io.kestra.core.queues.QueueService;
 import io.kestra.core.utils.DateUtils;
 import io.kestra.core.utils.Either;
 import io.kestra.jdbc.repository.AbstractJdbcExecutionRepository;
@@ -25,10 +26,11 @@ import static io.kestra.core.models.QueryFilter.Op.EQUALS;
 public class MysqlExecutionRepository extends AbstractJdbcExecutionRepository {
     @Inject
     public MysqlExecutionRepository(@Named("executions") MysqlRepository<Execution> repository,
+                                    QueueService queueService,
                                     ApplicationContext applicationContext,
                                     AbstractJdbcExecutorStateStorage executorStateStorage,
                                     JdbcFilterService filterService) {
-        super(repository, applicationContext, executorStateStorage, filterService);
+        super(repository, queueService, applicationContext, executorStateStorage, filterService);
     }
 
     @Override

jdbc-mysql/src/main/java/io/kestra/repository/mysql/MysqlExecutionRepositoryService.java

@@ -27,7 +27,7 @@ public abstract class MysqlExecutionRepositoryService {
                 });
             }
 
-            return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
+            return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
     }
 
     public static Condition findLabelCondition(Either<Map<?, ?>, String> input, QueryFilter.Op operation) {
@@ -63,7 +63,7 @@ public abstract class MysqlExecutionRepositoryService {
         if(!inConditions.isEmpty()){
             conditions.add(DSL.or(inConditions));
         }
-        return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
+        return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
     }
 
 }

jdbc-mysql/src/main/java/io/kestra/repository/mysql/MysqlFlowRepositoryService.java

@@ -27,7 +27,7 @@ public abstract class MysqlFlowRepositoryService {
             });
         }
 
-        return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
+        return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
     }
 
     public static Condition findSourceCodeCondition(AbstractJdbcRepository<? extends FlowInterface> jdbcRepository, String query) {
@@ -45,6 +45,6 @@ public abstract class MysqlFlowRepositoryService {
 
             });
         }
-        return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
+        return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
     }
 }

jdbc-mysql/src/main/java/io/kestra/repository/mysql/MysqlKvMetadataRepository.java

@@ -1,6 +1,7 @@
 package io.kestra.repository.mysql;
 
 import io.kestra.core.models.kv.PersistedKvMetadata;
+import io.kestra.core.queues.QueueService;
 import io.kestra.jdbc.repository.AbstractJdbcKvMetadataRepository;
 import io.micronaut.context.ApplicationContext;
 import jakarta.inject.Inject;
@@ -17,9 +18,10 @@ import java.util.List;
 public class MysqlKvMetadataRepository extends AbstractJdbcKvMetadataRepository {
     @Inject
     public MysqlKvMetadataRepository(
-        @Named("kvMetadata") MysqlRepository<PersistedKvMetadata> repository
+        @Named("kvMetadata") MysqlRepository<PersistedKvMetadata> repository,
+        QueueService queueService
     ) {
-        super(repository);
+        super(repository, queueService);
     }
 
     @Override

jdbc-mysql/src/main/java/io/kestra/repository/mysql/MysqlKvMetadataRepositoryService.java

@@ -16,6 +16,6 @@ public abstract class MysqlKvMetadataRepositoryService {
             conditions.add(jdbcRepository.fullTextCondition(List.of("name"), query));
         }
 
-        return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
+        return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
     }
 }

jdbc-mysql/src/main/java/io/kestra/repository/mysql/MysqlLogRepository.java

@@ -1,6 +1,7 @@
 package io.kestra.repository.mysql;
 
 import io.kestra.core.models.executions.LogEntry;
+import io.kestra.core.queues.QueueService;
 import io.kestra.core.utils.DateUtils;
 import io.kestra.jdbc.repository.AbstractJdbcLogRepository;
 import io.kestra.jdbc.services.JdbcFilterService;
@@ -19,8 +20,9 @@ import java.util.Date;
 public class MysqlLogRepository extends AbstractJdbcLogRepository {
     @Inject
     public MysqlLogRepository(@Named("logs") MysqlRepository<LogEntry> repository,
+                              QueueService queueService,
                               JdbcFilterService filterService) {
-        super(repository, filterService);
+        super(repository, queueService, filterService);
     }
 
     @Override

jdbc-mysql/src/main/java/io/kestra/repository/mysql/MysqlMetricRepository.java

@@ -1,6 +1,7 @@
 package io.kestra.repository.mysql;
 
 import io.kestra.core.models.executions.MetricEntry;
+import io.kestra.core.queues.QueueService;
 import io.kestra.core.utils.DateUtils;
 import io.kestra.jdbc.repository.AbstractJdbcMetricRepository;
 import io.kestra.jdbc.services.JdbcFilterService;
@@ -18,8 +19,9 @@ import java.util.Date;
 public class MysqlMetricRepository extends AbstractJdbcMetricRepository {
     @Inject
     public MysqlMetricRepository(@Named("metrics") MysqlRepository<MetricEntry> repository,
+                                 QueueService queueService,
                                  JdbcFilterService filterService) {
-        super(repository, filterService);
+        super(repository, queueService, filterService);
     }
 
     @Override

jdbc-mysql/src/main/java/io/kestra/repository/mysql/MysqlRepository.java

@@ -43,7 +43,7 @@ public class MysqlRepository<T> extends AbstractJdbcRepository<T> {
     @Override
     public Condition fullTextCondition(List<String> fields, String query) {
         if (query == null || query.equals("*")) {
-            return DSL.trueCondition();
+            return DSL.noCondition();
         }
 
         String match = Arrays

jdbc-mysql/src/main/java/io/kestra/repository/mysql/MysqlSettingRepository.java

@@ -1,6 +1,7 @@
 package io.kestra.repository.mysql;
 
 import io.kestra.core.models.Setting;
+import io.kestra.core.queues.QueueService;
 import io.kestra.jdbc.repository.AbstractJdbcSettingRepository;
 import io.micronaut.context.ApplicationContext;
 import jakarta.inject.Inject;
@@ -12,7 +13,8 @@ import jakarta.inject.Singleton;
 public class MysqlSettingRepository extends AbstractJdbcSettingRepository {
     @Inject
     public MysqlSettingRepository(@Named("settings") MysqlRepository<Setting> repository,
+                                  QueueService queueService,
                                   ApplicationContext applicationContext) {
-        super(repository, applicationContext);
+        super(repository, queueService, applicationContext);
     }
 }

jdbc-mysql/src/main/java/io/kestra/repository/mysql/MysqlTemplateRepository.java

@@ -2,6 +2,7 @@ package io.kestra.repository.mysql;
 
 import io.kestra.core.models.templates.Template;
 import io.kestra.core.models.templates.TemplateEnabled;
+import io.kestra.core.queues.QueueService;
 import io.kestra.jdbc.repository.AbstractJdbcTemplateRepository;
 import io.micronaut.context.ApplicationContext;
 import jakarta.inject.Inject;
@@ -17,8 +18,9 @@ import java.util.Arrays;
 public class MysqlTemplateRepository extends AbstractJdbcTemplateRepository {
     @Inject
     public MysqlTemplateRepository(@Named("templates") MysqlRepository<Template> repository,
+                                   QueueService queueService,
                                    ApplicationContext applicationContext) {
-        super(repository, applicationContext);
+        super(repository, queueService, applicationContext);
     }
 
     @Override

jdbc-mysql/src/main/java/io/kestra/repository/mysql/MysqlTriggerRepository.java

@@ -1,8 +1,11 @@
 package io.kestra.repository.mysql;
 
 import io.kestra.core.models.triggers.Trigger;
+import io.kestra.core.runners.ScheduleContextInterface;
+import io.kestra.core.queues.QueueService;
 import io.kestra.core.utils.DateUtils;
 import io.kestra.jdbc.repository.AbstractJdbcTriggerRepository;
+import io.kestra.jdbc.runner.JdbcSchedulerContext;
 import io.kestra.jdbc.services.JdbcFilterService;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
@@ -11,6 +14,10 @@ import org.jooq.Condition;
 import org.jooq.Field;
 import org.jooq.impl.DSL;
 
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.temporal.Temporal;
 import java.util.Date;
 import java.util.List;
 
@@ -19,17 +26,25 @@ import java.util.List;
 public class MysqlTriggerRepository extends AbstractJdbcTriggerRepository {
     @Inject
     public MysqlTriggerRepository(@Named("triggers") MysqlRepository<Trigger> repository,
+                                  QueueService queueService,
                                   JdbcFilterService filterService) {
-        super(repository, filterService);
+        super(repository, queueService, filterService);
     }
 
     @Override
     protected Condition fullTextCondition(String query) {
-        return query == null ? DSL.trueCondition() : jdbcRepository.fullTextCondition(List.of("namespace", "flow_id", "trigger_id", "execution_id"), query);
+        return query == null ? DSL.noCondition() : jdbcRepository.fullTextCondition(List.of("namespace", "flow_id", "trigger_id", "execution_id"), query);
     }
 
     @Override
     protected Field<Date> formatDateField(String dateField, DateUtils.GroupType groupType) {
         return MysqlRepositoryUtils.formatDateField(dateField, groupType);
     }
+
+    @Override
+    protected Temporal toNextExecutionTime(ZonedDateTime now) {
+        // next_execution_date in the table is stored in UTC
+        // convert 'now' to UTC LocalDateTime to avoid any timezone/offset interpretation by the database.
+        return now.withZoneSameInstant(ZoneOffset.UTC).toLocalDateTime();
+    }
 }

jdbc-mysql/src/test/resources/application-test.yml

@@ -25,6 +25,7 @@ kestra:
   server:
     liveness:
       enabled: false
+    termination-grace-period: 5s
     service:
       purge:
         initial-delay: 1h

jdbc-postgres/src/main/java/io/kestra/repository/postgres/PostgresDashboardRepository.java

@@ -2,6 +2,7 @@ package io.kestra.repository.postgres;
 
 import io.kestra.core.events.CrudEvent;
 import io.kestra.core.models.dashboards.Dashboard;
+import io.kestra.core.queues.QueueService;
 import io.kestra.core.repositories.QueryBuilderInterface;
 import io.kestra.jdbc.repository.AbstractJdbcDashboardRepository;
 import io.micronaut.context.event.ApplicationEventPublisher;
@@ -17,9 +18,10 @@ import java.util.List;
 public class PostgresDashboardRepository extends AbstractJdbcDashboardRepository {
     @Inject
     public PostgresDashboardRepository(@Named("dashboards") PostgresRepository<Dashboard> repository,
+                                       QueueService queueService,
                                        ApplicationEventPublisher<CrudEvent<Dashboard>> eventPublisher,
                                        List<QueryBuilderInterface<?>> queryBuilders) {
-        super(repository, eventPublisher, queryBuilders);
+        super(repository, queueService, eventPublisher, queryBuilders);
     }
 
     @Override

jdbc-postgres/src/main/java/io/kestra/repository/postgres/PostgresDashboardRepositoryService.java

@@ -17,6 +17,6 @@ public abstract class PostgresDashboardRepositoryService {
             conditions.add(jdbcRepository.fullTextCondition(Collections.singletonList("fulltext"), query));
         }
 
-        return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
+        return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
     }
 }

jdbc-postgres/src/main/java/io/kestra/repository/postgres/PostgresExecutionRepository.java

@@ -3,6 +3,7 @@ package io.kestra.repository.postgres;
 import io.kestra.core.models.QueryFilter;
 import io.kestra.core.models.executions.Execution;
 import io.kestra.core.models.flows.State;
+import io.kestra.core.queues.QueueService;
 import io.kestra.core.utils.DateUtils;
 import io.kestra.core.utils.Either;
 import io.kestra.jdbc.repository.AbstractJdbcExecutionRepository;
@@ -24,10 +25,11 @@ import java.util.*;
 public class PostgresExecutionRepository extends AbstractJdbcExecutionRepository {
     @Inject
     public PostgresExecutionRepository(@Named("executions") PostgresRepository<Execution> repository,
+                                       QueueService queueService,
                                        ApplicationContext applicationContext,
                                        AbstractJdbcExecutorStateStorage executorStateStorage,
                                        JdbcFilterService filterService) {
-        super(repository, applicationContext, executorStateStorage, filterService);
+        super(repository, queueService, applicationContext, executorStateStorage, filterService);
     }
 
     @Override

jdbc-postgres/src/main/java/io/kestra/repository/postgres/PostgresExecutionRepositoryService.java

@@ -26,7 +26,7 @@ public abstract class PostgresExecutionRepositoryService {
             });
         }
 
-        return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
+        return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
     }
 
     public static Condition findLabelCondition(Either<Map<?, ?>, String> input, QueryFilter.Op operation) {
@@ -60,7 +60,7 @@ public abstract class PostgresExecutionRepositoryService {
         if (!inConditions.isEmpty()) {
             conditions.add(DSL.or(inConditions));
         }
-        return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
+        return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
     }
 
     public static Condition statesFilter(List<State.Type> state) {

jdbc-postgres/src/main/java/io/kestra/repository/postgres/PostgresFlowRepositoryService.java

@@ -28,7 +28,7 @@ public abstract class PostgresFlowRepositoryService {
             });
         }
 
-        return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
+        return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
     }
 
     public static Condition findSourceCodeCondition(AbstractJdbcRepository<? extends FlowInterface> jdbcRepository, String query) {
@@ -49,7 +49,7 @@ public abstract class PostgresFlowRepositoryService {
                 }
             });
         }
-        return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
+        return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
     }
 
 

jdbc-postgres/src/main/java/io/kestra/repository/postgres/PostgresKvMetadataRepository.java

@@ -1,6 +1,7 @@
 package io.kestra.repository.postgres;
 
 import io.kestra.core.models.kv.PersistedKvMetadata;
+import io.kestra.core.queues.QueueService;
 import io.kestra.jdbc.repository.AbstractJdbcKvMetadataRepository;
 import io.micronaut.context.ApplicationContext;
 import jakarta.inject.Inject;
@@ -17,9 +18,10 @@ import java.util.List;
 public class PostgresKvMetadataRepository extends AbstractJdbcKvMetadataRepository {
     @Inject
     public PostgresKvMetadataRepository(
-        @Named("kvMetadata") PostgresRepository<PersistedKvMetadata> repository
+        @Named("kvMetadata") PostgresRepository<PersistedKvMetadata> repository,
+        QueueService queueService
     ) {
-        super(repository);
+        super(repository, queueService);
     }
 
     @Override

jdbc-postgres/src/main/java/io/kestra/repository/postgres/PostgresKvMetadataRepositoryService.java

@@ -16,6 +16,6 @@ public abstract class PostgresKvMetadataRepositoryService {
             conditions.add(jdbcRepository.fullTextCondition(List.of("fulltext"), query));
         }
 
-        return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
+        return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
     }
 }

jdbc-postgres/src/main/java/io/kestra/repository/postgres/PostgresLogRepository.java

@@ -2,6 +2,7 @@ package io.kestra.repository.postgres;
 
 import io.kestra.core.models.dashboards.filters.AbstractFilter;
 import io.kestra.core.models.executions.LogEntry;
+import io.kestra.core.queues.QueueService;
 import io.kestra.core.utils.DateUtils;
 import io.kestra.jdbc.repository.AbstractJdbcLogRepository;
 import io.kestra.jdbc.services.JdbcFilterService;
@@ -26,8 +27,9 @@ public class PostgresLogRepository extends AbstractJdbcLogRepository {
 
     @Inject
     public PostgresLogRepository(@Named("logs") PostgresRepository<LogEntry> repository,
+                                 QueueService queueService,
                                  JdbcFilterService filterService) {
-        super(repository, filterService);
+        super(repository, queueService, filterService);
     }
 
     @Override

jdbc-postgres/src/main/java/io/kestra/repository/postgres/PostgresMetricRepository.java

@@ -1,6 +1,7 @@
 package io.kestra.repository.postgres;
 
 import io.kestra.core.models.executions.MetricEntry;
+import io.kestra.core.queues.QueueService;
 import io.kestra.core.utils.DateUtils;
 import io.kestra.jdbc.repository.AbstractJdbcMetricRepository;
 import io.kestra.jdbc.services.JdbcFilterService;
@@ -17,8 +18,9 @@ import java.util.Date;
 public class PostgresMetricRepository extends AbstractJdbcMetricRepository {
     @Inject
     public PostgresMetricRepository(@Named("metrics") PostgresRepository<MetricEntry> repository,
+                                    QueueService queueService,
                                     JdbcFilterService filterService) {
-        super(repository, filterService);
+        super(repository, queueService, filterService);
     }
 
     @Override

jdbc-postgres/src/main/java/io/kestra/repository/postgres/PostgresRepository.java

@@ -42,7 +42,7 @@ public class PostgresRepository<T> extends io.kestra.jdbc.AbstractJdbcRepository
     @Override
     public Condition fullTextCondition(List<String> fields, String query) {
         if (query == null || query.equals("*")) {
-            return DSL.trueCondition();
+            return DSL.noCondition();
         }
 
         if (fields.size() > 1) {
@@ -106,7 +106,7 @@ public class PostgresRepository<T> extends io.kestra.jdbc.AbstractJdbcRepository
                     .sort(select, pageable)
                     .asTable("page")
                 )
-                .where(DSL.trueCondition()),
+                .where(DSL.noCondition()),
             pageable
         )
             .fetch();

jdbc-postgres/src/main/java/io/kestra/repository/postgres/PostgresSettingRepository.java

@@ -1,6 +1,7 @@
 package io.kestra.repository.postgres;
 
 import io.kestra.core.models.Setting;
+import io.kestra.core.queues.QueueService;
 import io.kestra.jdbc.repository.AbstractJdbcSettingRepository;
 import io.micronaut.context.ApplicationContext;
 import jakarta.inject.Inject;
@@ -12,7 +13,8 @@ import jakarta.inject.Singleton;
 public class PostgresSettingRepository extends AbstractJdbcSettingRepository {
     @Inject
     public PostgresSettingRepository(@Named("settings") PostgresRepository<Setting> repository,
+                                     QueueService queueService,
                                      ApplicationContext applicationContext) {
-        super(repository, applicationContext);
+        super(repository, queueService, applicationContext);
     }
 }

jdbc-postgres/src/main/java/io/kestra/repository/postgres/PostgresTemplateRepository.java

@@ -2,6 +2,7 @@ package io.kestra.repository.postgres;
 
 import io.kestra.core.models.templates.Template;
 import io.kestra.core.models.templates.TemplateEnabled;
+import io.kestra.core.queues.QueueService;
 import io.kestra.jdbc.repository.AbstractJdbcTemplateRepository;
 import io.micronaut.context.ApplicationContext;
 import jakarta.inject.Inject;
@@ -17,8 +18,9 @@ import java.util.Collections;
 public class PostgresTemplateRepository extends AbstractJdbcTemplateRepository {
     @Inject
     public PostgresTemplateRepository(@Named("templates") PostgresRepository<Template> repository,
+                                      QueueService queueService,
                                       ApplicationContext applicationContext) {
-        super(repository, applicationContext);
+        super(repository, queueService, applicationContext);
     }
 
     @Override

jdbc-postgres/src/main/java/io/kestra/repository/postgres/PostgresTriggerRepository.java

@@ -1,6 +1,7 @@
 package io.kestra.repository.postgres;
 
 import io.kestra.core.models.triggers.Trigger;
+import io.kestra.core.queues.QueueService;
 import io.kestra.core.utils.DateUtils;
 import io.kestra.jdbc.repository.AbstractJdbcTriggerRepository;
 import io.kestra.jdbc.services.JdbcFilterService;
@@ -17,8 +18,9 @@ import java.util.Date;
 public class PostgresTriggerRepository extends AbstractJdbcTriggerRepository {
     @Inject
     public PostgresTriggerRepository(@Named("triggers") PostgresRepository<Trigger> repository,
+                                     QueueService queueService,
                                      JdbcFilterService filterService) {
-        super(repository, filterService);
+        super(repository, queueService, filterService);
     }
 
     @Override

jdbc-postgres/src/test/resources/application-test.yml

@@ -40,6 +40,7 @@ kestra:
   server:
     liveness:
       enabled: false
+    termination-grace-period: 5s
     service:
       purge:
         initial-delay: 1h

jdbc/src/main/java/io/kestra/jdbc/AbstractJdbcRepository.java

@@ -74,7 +74,7 @@ public abstract class AbstractJdbcRepository<T> {
             .of(io.kestra.jdbc.repository.AbstractJdbcRepository.field("value"), MAPPER.writeValueAsString(entity))
         );
     }
-    
+
     public int count(Condition condition) {
         return getDslContextWrapper()
             .transactionResult(configuration -> DSL
@@ -85,7 +85,7 @@ public abstract class AbstractJdbcRepository<T> {
                 .fetchOne(0, Integer.class)
             );
     }
-    
+
     public void persist(T entity) {
         this.persist(entity, null);
     }
@@ -223,8 +223,7 @@ public abstract class AbstractJdbcRepository<T> {
             .from(this
                 .sort(select, Pageable.from(Sort.of(Order.asc(orderField))))
                 .asTable("page")
-            )
-            .where(DSL.trueCondition());
+            );
     }
 
     @SneakyThrows

jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcCrudRepository.java

@@ -0,0 +1,439 @@
+package io.kestra.jdbc.repository;
+
+import io.kestra.core.queues.QueueService;
+import io.kestra.core.repositories.ArrayListTotal;
+import io.kestra.core.utils.ListUtils;
+import io.micronaut.data.model.Pageable;
+import org.jooq.*;
+import org.jooq.Record;
+import org.jooq.impl.DSL;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.FluxSink;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+/**
+ * Base JDBC repository for CRUD operations.
+ * <p>
+ * NOTE: it uses the <code>defaultFilter(tenantId)</code> for querying.
+ * If the child repository uses a default filter, it should override it.
+ * <p>
+ * For example, to avoid supporting the <code>deleted</code> column:
+ * <pre>{@code
+ * @Override
+ * protected Condition defaultFilter(String tenantId) {
+ *     return buildTenantCondition(tenantId);
+ * }
+ *
+ * @Override
+ * protected Condition defaultFilter() {
+ *     return DSL.noCondition();
+ * }
+ * }</pre>
+ *
+ * @param <T> the type of the persisted entity.
+ */
+public abstract class AbstractJdbcCrudRepository<T> extends AbstractJdbcRepository {
+    protected static final Field<String> KEY_FIELD = field("key", String.class);
+    protected static final Field<String> VALUE_FIELD = field("value", String.class);
+
+    protected io.kestra.jdbc.AbstractJdbcRepository<T> jdbcRepository;
+    protected QueueService queueService;
+
+    public AbstractJdbcCrudRepository(io.kestra.jdbc.AbstractJdbcRepository<T> jdbcRepository, QueueService queueService) {
+        this.jdbcRepository = jdbcRepository;
+        this.queueService = queueService;
+    }
+
+    /**
+     * Creates an item: persist it inside the database and return it.
+     * It uses an insert on conflict update to avoid concurrent write issues.
+     */
+    public T create(T item) {
+        Map<Field<Object>, Object> fields = this.jdbcRepository.persistFields(item);
+        this.jdbcRepository.persist(item, fields);
+
+        return item;
+    }
+
+    /**
+     * Save an item: persist it inside the database and return it.
+     * It uses an insert on conflict update to avoid concurrent write issues.
+     */
+    public T save(T item) {
+        Map<Field<Object>, Object> fields = this.jdbcRepository.persistFields(item);
+        this.jdbcRepository.persist(item, fields);
+
+        return item;
+    }
+
+    /**
+     * Creates an item: persist it inside the database and return it.
+     * It uses an insert on conflict update to avoid concurrent write issues.
+     */
+    public T save(DSLContext context, T item) {
+        Map<Field<Object>, Object> fields = this.jdbcRepository.persistFields(item);
+        this.jdbcRepository.persist(item, context, fields);
+
+        return item;
+    }
+
+    /**
+     * Save a list of items: persist them inside the database and return the updated count.
+     */
+    public int saveBatch(List<T> items) {
+        if (ListUtils.isEmpty(items)) {
+            return 0;
+        }
+
+        return this.jdbcRepository.persistBatch(items);
+    }
+
+    /**
+     * Update an item: persist it inside the database and return it.
+     * It uses an update statement, so the item must be already present in the database.
+     */
+    public T update(T current) {
+        return this.jdbcRepository
+            .getDslContextWrapper()
+            .transactionResult(configuration -> {
+                DSL.using(configuration)
+                    .update(this.jdbcRepository.getTable())
+                    .set(this.jdbcRepository.persistFields((current)))
+                    .where(KEY_FIELD.eq(queueService.key(current)))
+                    .execute();
+
+                return current;
+            });
+    }
+
+    /**
+     * Find one item that matches the condition.
+     * <p>
+     * It uses LIMIT 1 and doesn't throw if the query returns more than one result.
+     *
+     * @see #findOne(String, Condition, boolean, OrderField...)
+     * @see #findOne(Condition, Condition, OrderField...)
+     */
+    @SafeVarargs
+    protected final <F> Optional<T> findOne(String tenantId, Condition condition, OrderField<F>... orderByFields) {
+        return findOne(defaultFilter(tenantId), condition, orderByFields);
+    }
+
+    /**
+     * Find one item that matches the condition.
+     * You can use <code>allowDeleted</code> to decide whether deleted items should be included or not.
+     * <p>
+     * It uses LIMIT 1 and doesn't throw if the query returns more than one result.
+     *
+     * @see #findOne(String, Condition, OrderField...)
+     * @see #findOne(Condition, Condition, OrderField[])
+     */
+    @SafeVarargs
+    protected final <F> Optional<T> findOne(String tenantId, Condition condition, boolean allowDeleted, OrderField<F>... orderByFields) {
+        return findOne(defaultFilter(tenantId, allowDeleted), condition, orderByFields);
+    }
+
+    /**
+     * Find one item that matches the condition.
+     * <p>
+     * It uses LIMIT 1 and doesn't throw if the query returns more than one result.
+     *
+     * @see #findOne(String, Condition, OrderField...)
+     * @see #findOne(String, Condition, boolean, OrderField...)
+     */
+    @SafeVarargs
+    protected final <F> Optional<T> findOne(Condition defaultFilter, Condition condition, OrderField<F>... orderByFields) {
+        return this.jdbcRepository
+            .getDslContextWrapper()
+            .transactionResult(configuration -> {
+                var select = DSL
+                    .using(configuration)
+                    .select(VALUE_FIELD)
+                    .from(this.jdbcRepository.getTable())
+                    .where(defaultFilter)
+                    .and(condition);
+
+                if (orderByFields != null) {
+                    select.orderBy(orderByFields);
+                }
+
+                select.limit(1);
+
+                return this.jdbcRepository.fetchOne(select);
+            });
+    }
+
+    /**
+     * List all items that match the condition.
+     *
+     * @see #findAsync(String, Condition, OrderField...)
+     * @see #findPage(Pageable, String, Condition, OrderField...)
+     */
+    @SafeVarargs
+    protected final <F> List<T> find(String tenantId, Condition condition, OrderField<F>... orderByFields) {
+        return find(defaultFilter(tenantId), condition, orderByFields);
+    }
+
+    /**
+     * List all items that match the condition.
+     * You can use <code>allowDeleted</code> to decide whether deleted items should be included or not.
+     *
+     * @see #findAsync(String, Condition, boolean, OrderField...)
+     * @see #findPage(Pageable, String, Condition, boolean, OrderField...)
+     */
+    @SafeVarargs
+    protected final <F> List<T> find(String tenantId, Condition condition, boolean allowDeleted, OrderField<F>... orderByFields) {
+        return find(defaultFilter(tenantId, allowDeleted), condition, orderByFields);
+    }
+
+    /**
+     * List all items that match the condition.
+     *
+     * @see #findAsync(Condition, Condition, OrderField...)
+     * @see #findPage(Pageable, Condition, Condition, OrderField...)
+     */
+    @SafeVarargs
+    protected final <F> List<T> find(Condition defaultFilter, Condition condition, OrderField<F>... orderByFields) {
+        return this.jdbcRepository
+            .getDslContextWrapper()
+            .transactionResult(configuration -> {
+                var select = DSL
+                    .using(configuration)
+                    .select(VALUE_FIELD)
+                    .from(this.jdbcRepository.getTable())
+                    .where(defaultFilter)
+                    .and(condition);
+
+                if (orderByFields != null) {
+                    select.orderBy(orderByFields);
+                }
+
+                return this.jdbcRepository.fetch(select);
+            });
+    }
+
+    /**
+     * Find all items that match the condition and return a reactive stream.
+     * To avoid any potential issues with databases that load all the resultset in memory, it batches the results by <code>FETCH_SIZE</code>.
+     *
+     * @see #find(String, Condition, OrderField...)
+     * @see #findPage(Pageable, String, Condition, OrderField...)
+     */
+    @SafeVarargs
+    protected final <F> Flux<T> findAsync(String tenantId, Condition condition, OrderField<F>... orderByFields) {
+        return findAsync(defaultFilter(tenantId), condition, orderByFields);
+    }
+
+    /**
+     * Find all items that match the condition and return a reactive stream.
+     * To avoid any potential issues with databases that load all the resultset in memory, it batches the results by <code>FETCH_SIZE</code>.
+     * You can use <code>allowDeleted</code> to decide whether deleted items should be included or not.
+     *
+     * @see #find(String, Condition, boolean, OrderField...)
+     * @see #findPage(Pageable, String, Condition, boolean, OrderField...)
+     */
+    @SafeVarargs
+    protected final <F> Flux<T> findAsync(String tenantId, Condition condition, boolean allowDeleted, OrderField<F>... orderByFields) {
+        return findAsync(defaultFilter(tenantId, allowDeleted), condition, orderByFields);
+    }
+
+    /**
+     * Find all items that match the condition and return a reactive stream.
+     * To avoid any potential issues with databases that load all the resultset in memory, it batches the results by <code>FETCH_SIZE</code>.
+     *
+     * @see #find(Condition, Condition, OrderField...)
+     * @see #findPage(Pageable, Condition, Condition, OrderField...)
+     */
+    @SafeVarargs
+    protected final <F> Flux<T> findAsync(Condition defaultFilter, Condition condition, OrderField<F>... orderByFields) {
+        return Flux.create(emitter -> this.jdbcRepository
+            .getDslContextWrapper()
+            .transaction(configuration -> {
+                DSLContext context = DSL.using(configuration);
+
+                var select = context
+                    .select(VALUE_FIELD)
+                    .from(this.jdbcRepository.getTable())
+                    .where(defaultFilter)
+                    .and(condition);
+
+                if (orderByFields != null) {
+                    select.orderBy(orderByFields);
+                }
+
+                try (Stream<Record1<String>> stream = select.fetchSize(FETCH_SIZE).stream()){
+                    stream.map((Record record) -> jdbcRepository.map(record))
+                        .forEach(emitter::next);
+                } finally {
+                    emitter.complete();
+                }
+            }), FluxSink.OverflowStrategy.BUFFER);
+    }
+
+    /**
+     * Find a page of items that match the condition and return them.
+     *
+     * @see #find(String, Condition, OrderField...)
+     * @see #findAsync(String, Condition, OrderField...)
+     */
+    @SafeVarargs
+    protected final <F> ArrayListTotal<T> findPage(Pageable pageable, String tenantId, Condition condition, OrderField<F>... orderByFields) {
+        return findPage(pageable, defaultFilter(tenantId), condition, orderByFields);
+    }
+
+    /**
+     * Find a page of items that match the condition and return them.
+     * You can use <code>allowDeleted</code> to decide whether deleted items should be included or not.
+     *
+     * @see #find(String, Condition, boolean, OrderField...)
+     * @see #findAsync(String, Condition, boolean, OrderField...)
+     */
+    @SafeVarargs
+    protected final <F> ArrayListTotal<T> findPage(Pageable pageable, String tenantId, Condition condition, boolean allowDeleted, OrderField<F>... orderByFields) {
+        return findPage(pageable, defaultFilter(tenantId, allowDeleted), condition, orderByFields);
+    }
+
+    /**
+     * Find a page of items that match the condition and return them.
+     *
+     * @see #find(Condition, Condition, OrderField...)
+     * @see #findAsync(Condition, Condition, OrderField...)
+     */
+    @SafeVarargs
+    protected final <F> ArrayListTotal<T> findPage(Pageable pageable, Condition defaultFilter, Condition condition, OrderField<F>... orderByFields) {
+        return this.jdbcRepository
+            .getDslContextWrapper()
+            .transactionResult(configuration -> {
+                DSLContext context = DSL.using(configuration);
+
+                var select = context
+                    .select(VALUE_FIELD)
+                    .from(this.jdbcRepository.getTable())
+                    .where(defaultFilter)
+                    .and(condition);
+
+                if (orderByFields != null) {
+                    select.orderBy(orderByFields);
+                }
+
+                return this.jdbcRepository.fetchPage(context, select, pageable);
+            });
+    }
+
+    /**
+     * Find all items.
+     *
+     * @see #findAllAsync(String)
+     */
+    public List<T> findAll(String tenantId) {
+        return findAll(defaultFilter(tenantId));
+    }
+
+    /**
+     * Find all items.
+     *
+     * @see #findAllAsync(Condition)
+     */
+    protected List<T> findAll(Condition defaultFilter) {
+        return this.jdbcRepository
+            .getDslContextWrapper()
+            .transactionResult(configuration -> {
+                var select = DSL
+                    .using(configuration)
+                    .select(VALUE_FIELD)
+                    .from(this.jdbcRepository.getTable())
+                    .where(defaultFilter);
+
+                return this.jdbcRepository.fetch(select);
+            });
+    }
+
+    /**
+     * Find all items and return a reactive stream.
+     * To avoid any potential issues with databases that load all the resultset in memory, it batches the results by <code>FETCH_SIZE</code>.
+     *
+     * @see #findAll(String)
+     */
+    public Flux<T> findAllAsync(String tenantId) {
+        return findAllAsync(defaultFilter(tenantId));
+    }
+
+    /**
+     * Find all items and return a reactive stream.
+     * To avoid any potential issues with databases that load all the resultset in memory, it batches the results by <code>FETCH_SIZE</code>.
+     *
+     * @see #findAll(Condition)
+     */
+    protected Flux<T> findAllAsync(Condition defaultFilter) {
+        return Flux.create(emitter -> this.jdbcRepository
+            .getDslContextWrapper()
+            .transaction(configuration -> {
+                DSLContext context = DSL.using(configuration);
+
+                var select = context
+                    .select(VALUE_FIELD)
+                    .from(this.jdbcRepository.getTable())
+                    .where(defaultFilter);
+
+                try (Stream<Record1<String>> stream = select.fetchSize(FETCH_SIZE).stream()){
+                    stream.map((Record record) -> jdbcRepository.map(record))
+                        .forEach(emitter::next);
+                } finally {
+                    emitter.complete();
+                }
+            }), FluxSink.OverflowStrategy.BUFFER);
+    }
+
+    /**
+     * Find all items, for all tenants.
+     * WARNING: this method should never be used inside the API as it didn't enforce tenant selection!
+     */
+    public List<T> findAllForAllTenants() {
+        return this.jdbcRepository
+            .getDslContextWrapper()
+            .transactionResult(configuration -> {
+                var select = DSL
+                    .using(configuration)
+                    .select(VALUE_FIELD)
+                    .from(this.jdbcRepository.getTable())
+                    .where(this.defaultFilter());
+
+                return this.jdbcRepository.fetch(select);
+            });
+    }
+
+    /**
+     * Count items that match the condition.
+     *
+     * @see #countAll(String)
+     * @see #countAllForAllTenants()
+     */
+    protected long count(String tenantId, Condition condition) {
+        return this.jdbcRepository.count(this.defaultFilter(tenantId).and(condition));
+    }
+
+    /**
+     * Count all items.
+     *
+     * @see #count(String, Condition)
+     * @see #countAllForAllTenants()
+     */
+    public long countAll(String tenantId) {
+        return this.jdbcRepository.count(this.defaultFilter(tenantId));
+    }
+
+    /**
+     * Count all items for all tenants.
+     * WARNING: this method should never be used inside the API as it didn't enforce tenant selection!
+     *
+     * @see #count(String, Condition)
+     * @see #countAll(String)
+     */
+    public long countAllForAllTenants() {
+        return this.jdbcRepository.count(this.defaultFilter());
+    }
+}

jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcDashboardRepository.java

@@ -7,6 +7,7 @@ import io.kestra.core.models.dashboards.DataFilter;
 import io.kestra.core.models.dashboards.DataFilterKPI;
 import io.kestra.core.models.dashboards.charts.DataChart;
 import io.kestra.core.models.dashboards.charts.DataChartKPI;
+import io.kestra.core.queues.QueueService;
 import io.kestra.core.repositories.ArrayListTotal;
 import io.kestra.core.repositories.DashboardRepositoryInterface;
 import io.kestra.core.repositories.QueryBuilderInterface;
@@ -14,7 +15,6 @@ import io.kestra.plugin.core.dashboard.chart.kpis.KpiOption;
 import io.micronaut.context.event.ApplicationEventPublisher;
 import io.micronaut.data.model.Pageable;
 import jakarta.validation.ConstraintViolationException;
-import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.jooq.*;
 import org.jooq.impl.DSL;
@@ -30,19 +30,17 @@ import java.util.Optional;
 import static io.kestra.core.utils.MathUtils.roundDouble;
 
 @Slf4j
-@AllArgsConstructor
-public abstract class AbstractJdbcDashboardRepository extends AbstractJdbcRepository implements DashboardRepositoryInterface {
-    protected io.kestra.jdbc.AbstractJdbcRepository<Dashboard> jdbcRepository;
+public abstract class AbstractJdbcDashboardRepository extends AbstractJdbcCrudRepository<Dashboard> implements DashboardRepositoryInterface {
     private final ApplicationEventPublisher<CrudEvent<Dashboard>> eventPublisher;
+    private final List<QueryBuilderInterface<?>> queryBuilders;
 
-    List<QueryBuilderInterface<?>> queryBuilders;
-
-    /**
-     * {@inheritDoc}
-     **/
-    @Override
-    public long count() {
-        return jdbcRepository.count(this.defaultFilter());
+    public AbstractJdbcDashboardRepository(io.kestra.jdbc.AbstractJdbcRepository<Dashboard> jdbcRepository,
+                                           QueueService queueService,
+                                           ApplicationEventPublisher<CrudEvent<Dashboard>> eventPublisher,
+                                           List<QueryBuilderInterface<?>> queryBuilders) {
+        super(jdbcRepository, queueService);
+        this.eventPublisher = eventPublisher;
+        this.queryBuilders = queryBuilders;
     }
 
 
@@ -77,58 +75,12 @@ public abstract class AbstractJdbcDashboardRepository extends AbstractJdbcReposi
 
     @Override
     public ArrayListTotal<Dashboard> list(Pageable pageable, String tenantId, String query) {
-        return this.jdbcRepository
-            .getDslContextWrapper()
-            .transactionResult(configuration -> {
-                DSLContext context = DSL.using(configuration);
-
-                SelectConditionStep<Record1<Object>> select = context
-                    .select(
-                        field("value")
-                    )
-                    .from(jdbcRepository.getTable())
-                    .where(this.defaultFilter(tenantId));
-
-                select = select.and(this.findCondition(query));
-
-                return this.jdbcRepository.fetchPage(context, select, pageable);
-            });
-    }
-
-    @Override
-    public List<Dashboard> findAll(String tenantId) {
-        return this.jdbcRepository
-            .getDslContextWrapper()
-            .transactionResult(configuration -> {
-                DSLContext context = DSL.using(configuration);
-
-                SelectConditionStep<Record1<Object>> select = context
-                    .select(
-                        field("value")
-                    )
-                    .from(jdbcRepository.getTable())
-                    .where(this.defaultFilter(tenantId));
-
-                return this.jdbcRepository.fetch(select);
-            });
+        return findPage(pageable, tenantId, this.findCondition(query));
     }
 
     @Override
     public List<Dashboard> findAllWithNoAcl(String tenantId) {
-        return this.jdbcRepository
-            .getDslContextWrapper()
-            .transactionResult(configuration -> {
-                DSLContext context = DSL.using(configuration);
-
-                SelectConditionStep<Record1<Object>> select = context
-                    .select(
-                        field("value")
-                    )
-                    .from(jdbcRepository.getTable())
-                    .where(this.defaultFilterWithNoACL(tenantId));
-
-                return this.jdbcRepository.fetch(select);
-            });
+        return findAll(this.defaultFilterWithNoACL(tenantId));
     }
 
     @Override

jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcExecutionRepository.java

@@ -17,6 +17,7 @@ import io.kestra.core.models.flows.FlowScope;
 import io.kestra.core.models.flows.State;
 import io.kestra.core.queues.QueueFactoryInterface;
 import io.kestra.core.queues.QueueInterface;
+import io.kestra.core.queues.QueueService;
 import io.kestra.core.repositories.ArrayListTotal;
 import io.kestra.core.repositories.ExecutionRepositoryInterface;
 import io.kestra.core.runners.Executor;
@@ -57,14 +58,13 @@ import java.util.stream.Stream;
 
 import static io.kestra.core.models.QueryFilter.Field.KIND;
 
-public abstract class AbstractJdbcExecutionRepository extends AbstractJdbcRepository implements ExecutionRepositoryInterface, JdbcQueueIndexerInterface<Execution> {
+public abstract class AbstractJdbcExecutionRepository extends AbstractJdbcCrudRepository<Execution> implements ExecutionRepositoryInterface, JdbcQueueIndexerInterface<Execution> {
     private static final int FETCH_SIZE = 100;
     private static final Field<String> STATE_CURRENT_FIELD = field("state_current", String.class);
     private static final Field<String> NAMESPACE_FIELD = field("namespace", String.class);
     private static final Field<Object> START_DATE_FIELD = field("start_date");
     private static final Condition NORMAL_KIND_CONDITION = field("kind").isNull();
 
-    protected final io.kestra.jdbc.AbstractJdbcRepository<Execution> jdbcRepository;
     private final ApplicationEventPublisher<CrudEvent<Execution>> eventPublisher;
     private final ApplicationContext applicationContext;
     protected final AbstractJdbcExecutorStateStorage executorStateStorage;
@@ -100,11 +100,12 @@ public abstract class AbstractJdbcExecutionRepository extends AbstractJdbcReposi
     @SuppressWarnings("unchecked")
     public AbstractJdbcExecutionRepository(
         io.kestra.jdbc.AbstractJdbcRepository<Execution> jdbcRepository,
+        QueueService queueService,
         ApplicationContext applicationContext,
         AbstractJdbcExecutorStateStorage executorStateStorage,
         JdbcFilterService filterService
     ) {
-        this.jdbcRepository = jdbcRepository;
+        super(jdbcRepository, queueService);
         this.executorStateStorage = executorStateStorage;
         this.eventPublisher = applicationContext.getBean(ApplicationEventPublisher.class);
         this.namespaceUtils = applicationContext.getBean(NamespaceUtils.class);
@@ -130,27 +131,8 @@ public abstract class AbstractJdbcExecutionRepository extends AbstractJdbcReposi
     @Override
     public Flux<Execution> findAllByTriggerExecutionId(String tenantId,
                                                        String triggerExecutionId) {
-        return Flux.create(
-            emitter -> this.jdbcRepository
-                .getDslContextWrapper()
-                .transaction(configuration -> {
-                    SelectConditionStep<Record1<Object>> select = DSL
-                        .using(configuration)
-                        .select(field("value"))
-                        .from(this.jdbcRepository.getTable())
-                        .where(this.defaultFilter(tenantId))
-                        .and(field("trigger_execution_id").eq(triggerExecutionId));
-
-                    // fetchSize will fetch rows 100 by 100 even for databases where the driver loads all in memory
-                    // using a stream will fetch lazily, otherwise all fetches would be done before starting emitting the items
-                    try (var stream = select.fetchSize(FETCH_SIZE).stream()) {
-                        stream.map(this.jdbcRepository::map).forEach(emitter::next);
-                    } finally {
-                        emitter.complete();
-                    }
-                }),
-            FluxSink.OverflowStrategy.BUFFER
-        );
+        var condition = field("trigger_execution_id").eq(triggerExecutionId);
+        return findAsync(tenantId, condition);
     }
 
     /**
@@ -158,20 +140,10 @@ public abstract class AbstractJdbcExecutionRepository extends AbstractJdbcReposi
      **/
     @Override
     public Optional<Execution> findLatestForStates(String tenantId, String namespace, String flowId, List<State.Type> states) {
-        return jdbcRepository
-            .getDslContextWrapper()
-            .transactionResult(configuration -> {
-                Select<Record1<Object>> from = DSL
-                    .using(configuration)
-                    .select(field("value"))
-                    .from(this.jdbcRepository.getTable())
-                    .where(this.defaultFilter(tenantId, false))
-                    .and(field("namespace").eq(namespace))
-                    .and(field("flow_id").eq(flowId))
-                    .and(statesFilter(states))
-                    .orderBy(field("start_date").desc());
-                return this.jdbcRepository.fetchOne(from);
-            });
+        var condition = field("namespace").eq(namespace)
+            .and(field("flow_id").eq(flowId))
+            .and(this.statesFilter(states));
+        return findOne(tenantId, condition, field("start_date").desc());
     }
 
     @Override
@@ -185,19 +157,12 @@ public abstract class AbstractJdbcExecutionRepository extends AbstractJdbcReposi
     }
 
     public Optional<Execution> findById(String tenantId, String id, boolean allowDeleted, boolean withAccessControl) {
-        return jdbcRepository
-            .getDslContextWrapper()
-            .transactionResult(configuration -> {
-                Select<Record1<Object>> from = DSL
-                    .using(configuration)
-                    .select(field("value"))
-                    .from(this.jdbcRepository.getTable())
-                    .where(withAccessControl ? this.defaultFilter(tenantId, allowDeleted) : this.defaultFilterWithNoACL(tenantId, allowDeleted))
-                    .and(field("key").eq(id));
-                return this.jdbcRepository.fetchOne(from);
-            });
+        Condition defaultFilter = withAccessControl ? this.defaultFilter(tenantId, allowDeleted) : this.defaultFilterWithNoACL(tenantId, allowDeleted);
+        Condition condition = field("key").eq(id);
+        return findOne(defaultFilter, condition);
     }
 
+
     abstract protected Condition findCondition(String query, Map<String, String> labels);
 
     protected Condition findQueryCondition(String query) {
@@ -218,20 +183,7 @@ public abstract class AbstractJdbcExecutionRepository extends AbstractJdbcReposi
         @Nullable List<QueryFilter> filters
 
     ) {
-        return this.jdbcRepository
-            .getDslContextWrapper()
-            .transactionResult(configuration -> {
-                DSLContext context = DSL.using(configuration);
-
-                SelectConditionStep<Record1<Object>> select = this.findSelect(
-                    context,
-                    tenantId,
-                    filters
-
-                );
-
-                return this.jdbcRepository.fetchPage(context, select, pageable);
-            });
+        return findPage(pageable, tenantId, this.computeFindCondition(filters));
     }
 
     @Override
@@ -283,27 +235,11 @@ public abstract class AbstractJdbcExecutionRepository extends AbstractJdbcReposi
         );
     }
 
-    private SelectConditionStep<Record1<Object>> findSelect(
-        DSLContext context,
-        @Nullable String tenantId,
-        @Nullable List<QueryFilter> filters
-    ) {
-
-        SelectConditionStep<Record1<Object>> select = context
-            .select(
-                field("value")
-            )
-            .from(this.jdbcRepository.getTable())
-            .where(this.defaultFilter(tenantId, false));
-
+    private Condition computeFindCondition(@Nullable List<QueryFilter> filters) {
         boolean hasKindFilter = filters != null && filters.stream()
             .anyMatch(f -> KIND.value().equalsIgnoreCase(f.field().name()) );
-        if (!hasKindFilter) {
-            select = select.and(NORMAL_KIND_CONDITION);
-        }
-        select = select.and(this.filter(filters, "start_date", Resource.EXECUTION));
-
-        return select;
+        return hasKindFilter ?  this.filter(filters, "start_date", Resource.EXECUTION) :
+            this.filter(filters, "start_date", Resource.EXECUTION).and(NORMAL_KIND_CONDITION);
     }
 
     private SelectConditionStep<Record1<Object>> findSelect(
@@ -345,43 +281,10 @@ public abstract class AbstractJdbcExecutionRepository extends AbstractJdbcReposi
         return select;
     }
 
-    @Override
-    public Flux<Execution> findAllAsync(@Nullable String tenantId) {
-        return Flux.create(emitter -> this.jdbcRepository
-            .getDslContextWrapper()
-            .transaction(configuration -> {
-                DSLContext context = DSL.using(configuration);
-
-                SelectConditionStep<Record1<Object>> select = context
-                    .select(field("value"))
-                    .from(this.jdbcRepository.getTable())
-                    .where(this.defaultFilter(tenantId));
-
-                try (Stream<Record1<Object>> stream = select.fetchSize(FETCH_SIZE).stream()) {
-                    stream.map((Record record) -> jdbcRepository.map(record))
-                        .forEach(emitter::next);
-                } finally {
-                    emitter.complete();
-                }
-            }), FluxSink.OverflowStrategy.BUFFER);
-    }
-
     @Override
     public ArrayListTotal<Execution> findByFlowId(String tenantId, String namespace, String id, Pageable pageable) {
-        return this.jdbcRepository
-            .getDslContextWrapper()
-            .transactionResult(configuration -> {
-                DSLContext context = DSL.using(configuration);
-
-                SelectConditionStep<Record1<Object>> select = context
-                    .select(field("value"))
-                    .from(this.jdbcRepository.getTable())
-                    .where(this.defaultFilter(tenantId))
-                    .and(field("namespace").eq(namespace))
-                    .and(field("flow_id").eq(id));
-
-                return this.jdbcRepository.fetchPage(context, select, pageable);
-            });
+        var condition = field("namespace").eq(namespace).and(field("flow_id").eq(id));
+        return findPage(pageable, tenantId, condition);
     }
 
     @Override
@@ -867,18 +770,16 @@ public abstract class AbstractJdbcExecutionRepository extends AbstractJdbcReposi
                     .from(this.jdbcRepository.getTable())
                     .where(this.defaultFilter(tenantId))
                     .and(NORMAL_KIND_CONDITION)
-                    .and(DSL.or(
-                        ListUtils.emptyOnNull(flows).isEmpty() ?
-                            DSL.trueCondition()
+                    .and(ListUtils.isEmpty(flows) ?
+                        DSL.noCondition()
                         :
-                            DSL.or(
-                                flows.stream()
-                                    .map(flow -> DSL.and(
-                                        field("namespace").eq(flow.getNamespace()),
-                                        field("flow_id").eq(flow.getId())
-                                    ))
-                                    .toList()
-                            )
+                        DSL.or(
+                            flows.stream()
+                                .map(flow -> DSL.and(
+                                    field("namespace").eq(flow.getNamespace()),
+                                    field("flow_id").eq(flow.getId())
+                                ))
+                                .toList()
                         )
                     );
 
@@ -892,47 +793,6 @@ public abstract class AbstractJdbcExecutionRepository extends AbstractJdbcReposi
             });
     }
 
-
-    @Override
-    public Execution save(Execution execution) {
-        Map<Field<Object>, Object> fields = this.jdbcRepository.persistFields(execution);
-        this.jdbcRepository.persist(execution, fields);
-
-        return execution;
-    }
-
-    @Override
-    public Execution save(DSLContext dslContext, Execution execution) {
-        Map<Field<Object>, Object> fields = this.jdbcRepository.persistFields(execution);
-        this.jdbcRepository.persist(execution, dslContext, fields);
-
-        return execution;
-    }
-
-    @Override
-    public int saveBatch(List<Execution> items) {
-        if (ListUtils.isEmpty(items)) {
-            return 0;
-        }
-
-        return this.jdbcRepository.persistBatch(items);
-    }
-
-    @Override
-    public Execution update(Execution execution) {
-        return this.jdbcRepository
-            .getDslContextWrapper()
-            .transactionResult(configuration -> {
-                DSL.using(configuration)
-                    .update(this.jdbcRepository.getTable())
-                    .set(this.jdbcRepository.persistFields((execution)))
-                    .where(field("key").eq(execution.getId()))
-                    .execute();
-
-                return execution;
-            });
-    }
-
     @SneakyThrows
     @Override
     public Execution delete(Execution execution) {

jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcFlowTopologyRepository.java

@@ -1,7 +1,6 @@
 package io.kestra.jdbc.repository;
 
 import io.kestra.core.models.flows.FlowInterface;
-import io.kestra.core.models.flows.FlowWithSource;
 import io.kestra.core.models.topologies.FlowTopology;
 import io.kestra.core.repositories.FlowTopologyRepositoryInterface;
 import io.kestra.jdbc.runner.JdbcQueueIndexerInterface;
@@ -169,6 +168,7 @@ public abstract class AbstractJdbcFlowTopologyRepository extends AbstractJdbcRep
             .set(this.jdbcRepository.persistFields(flowTopology));
     }
 
+
     @Override
     public FlowTopology save(FlowTopology flowTopology) {
         this.jdbcRepository.persist(flowTopology);
@@ -184,6 +184,7 @@ public abstract class AbstractJdbcFlowTopologyRepository extends AbstractJdbcRep
         return flowTopology;
     }
 
+
     protected Condition buildTenantCondition(String prefix, String tenantId) {
         return tenantId == null ? field(prefix + "_tenant_id").isNull() : field(prefix + "_tenant_id").eq(tenantId);
     }