From 7431a3db1fc2738e806c1d398b3a842f07c1bb8e Mon Sep 17 00:00:00 2001 From: Aleksandr Skoblikov Date: Tue, 28 Apr 2026 16:21:33 +0300 Subject: [PATCH 1/2] dbeaver/pro#9089 wip --- .../io/cloudbeaver/model/cli/CloudBeaverCommandLine.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/server/bundles/io.cloudbeaver.model.cli/src/io/cloudbeaver/model/cli/CloudBeaverCommandLine.java b/server/bundles/io.cloudbeaver.model.cli/src/io/cloudbeaver/model/cli/CloudBeaverCommandLine.java index a022173d07..8d49054994 100644 --- a/server/bundles/io.cloudbeaver.model.cli/src/io/cloudbeaver/model/cli/CloudBeaverCommandLine.java +++ b/server/bundles/io.cloudbeaver.model.cli/src/io/cloudbeaver/model/cli/CloudBeaverCommandLine.java @@ -22,8 +22,11 @@ import org.jkiss.dbeaver.model.cli.ApplicationInstanceController; import org.jkiss.dbeaver.model.cli.CLIContextImpl; import org.jkiss.dbeaver.model.cli.CLIRunMeta; +import org.jkiss.dbeaver.model.cli.registry.CLICommandDescriptor; import picocli.CommandLine; +import java.util.List; + public class CloudBeaverCommandLine extends ApplicationCommandLine { private final CloudBeaverMixin mixin; @@ -53,9 +56,10 @@ protected CloudBeaverTopLevelCommand createTopLevelCommand( protected CommandLine initCommandLine( @Nullable ApplicationInstanceController applicationInstanceController, @NotNull CLIContextImpl context, - @NotNull CLIRunMeta runMeta + @NotNull CLIRunMeta runMeta, + List commandsToExecute ) { - var cmd = super.initCommandLine(applicationInstanceController, context, runMeta); + var cmd = super.initCommandLine(applicationInstanceController, context, runMeta, commandsToExecute); cmd.addMixin("cloudbeaver", mixin); return cmd; } From 0aa8b1042b23376e58bc7580dc1e6df9ac225d53 Mon Sep 17 00:00:00 2001 From: Aleksandr Skoblikov Date: Fri, 1 May 2026 02:06:50 +0300 Subject: [PATCH 2/2] dbeaver/pro#9089 optimize cli execution --- .../src/io/cloudbeaver/model/cli/CloudBeaverCommandLine.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/bundles/io.cloudbeaver.model.cli/src/io/cloudbeaver/model/cli/CloudBeaverCommandLine.java b/server/bundles/io.cloudbeaver.model.cli/src/io/cloudbeaver/model/cli/CloudBeaverCommandLine.java index 8d49054994..59732efd32 100644 --- a/server/bundles/io.cloudbeaver.model.cli/src/io/cloudbeaver/model/cli/CloudBeaverCommandLine.java +++ b/server/bundles/io.cloudbeaver.model.cli/src/io/cloudbeaver/model/cli/CloudBeaverCommandLine.java @@ -57,7 +57,7 @@ protected CommandLine initCommandLine( @Nullable ApplicationInstanceController applicationInstanceController, @NotNull CLIContextImpl context, @NotNull CLIRunMeta runMeta, - List commandsToExecute + @NotNull List commandsToExecute ) { var cmd = super.initCommandLine(applicationInstanceController, context, runMeta, commandsToExecute); cmd.addMixin("cloudbeaver", mixin);