This is an automated email from the ASF dual-hosted git repository.
apkhmv pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new ddeb050ede4 IGNITE-28048 Change inputProvider type (#7696)
ddeb050ede4 is described below
commit ddeb050ede41af4e8a360b5a98815631317e4919
Author: Vadim Pakhnushev <[email protected]>
AuthorDate: Wed Mar 4 16:22:24 2026 +0300
IGNITE-28048 Change inputProvider type (#7696)
---
.../cli/configs/commands/ConfigurationConverterCmd.java | 3 +--
.../migrationtools/cli/persistence/commands/ListCachesCmd.java | 2 +-
.../migrationtools/cli/persistence/commands/MigrateCacheCmd.java | 2 +-
.../migrationtools/cli/sql/commands/SqlDdlGeneratorCmd.java | 2 +-
modules/cli/README.md | 3 +--
.../main/java/org/apache/ignite/internal/cli/ReplManager.java | 2 +-
.../internal/cli/commands/cliconfig/CliConfigGetCommand.java | 6 ++++--
.../internal/cli/commands/cliconfig/CliConfigRemoveCommand.java | 6 ++++--
.../internal/cli/commands/cliconfig/CliConfigSetCommand.java | 6 ++++--
.../internal/cli/commands/cliconfig/CliConfigShowCommand.java | 2 +-
.../cliconfig/profile/CliConfigProfileActivateCommand.java | 2 +-
.../cliconfig/profile/CliConfigProfileCreateCommand.java | 6 ++++--
.../commands/cliconfig/profile/CliConfigProfileListCommand.java | 2 +-
.../commands/cliconfig/profile/CliConfigProfileShowCommand.java | 2 +-
.../cli/commands/cluster/config/ClusterConfigShowCommand.java | 2 +-
.../cli/commands/cluster/config/ClusterConfigUpdateCommand.java | 2 +-
.../internal/cli/commands/cluster/init/ClusterInitCommand.java | 2 +-
.../cli/commands/cluster/init/ClusterInitReplCommand.java | 2 +-
.../cluster/metric/ClusterMetricSourceDisableCommand.java | 2 +-
.../cluster/metric/ClusterMetricSourceEnableCommand.java | 2 +-
.../commands/cluster/metric/ClusterMetricSourceListCommand.java | 2 +-
.../cli/commands/cluster/status/ClusterStatusCommand.java | 3 +--
.../cli/commands/cluster/topology/LogicalTopologyCommand.java | 2 +-
.../cli/commands/cluster/topology/PhysicalTopologyCommand.java | 2 +-
.../cli/commands/cluster/unit/ClusterUnitDeployCommand.java | 2 +-
.../cli/commands/cluster/unit/ClusterUnitDeployReplCommand.java | 2 +-
.../cli/commands/cluster/unit/ClusterUnitListCommand.java | 2 +-
.../cli/commands/cluster/unit/ClusterUnitUndeployCommand.java | 2 +-
.../commands/cluster/unit/ClusterUnitUndeployReplCommand.java | 2 +-
.../ignite/internal/cli/commands/connect/ConnectCommand.java | 3 +--
.../ignite/internal/cli/commands/connect/DisconnectCommand.java | 3 +--
.../internal/cli/commands/node/config/NodeConfigShowCommand.java | 3 +--
.../cli/commands/node/config/NodeConfigShowReplCommand.java | 2 +-
.../cli/commands/node/config/NodeConfigUpdateCommand.java | 3 +--
.../cli/commands/node/config/NodeConfigUpdateReplCommand.java | 2 +-
.../cli/commands/node/metric/NodeMetricSetListCommand.java | 2 +-
.../cli/commands/node/metric/NodeMetricSetListReplCommand.java | 2 +-
.../cli/commands/node/metric/NodeMetricSourceDisableCommand.java | 2 +-
.../commands/node/metric/NodeMetricSourceDisableReplCommand.java | 2 +-
.../cli/commands/node/metric/NodeMetricSourceEnableCommand.java | 2 +-
.../commands/node/metric/NodeMetricSourceEnableReplCommand.java | 2 +-
.../cli/commands/node/metric/NodeMetricSourceListCommand.java | 2 +-
.../commands/node/metric/NodeMetricSourceListReplCommand.java | 2 +-
.../internal/cli/commands/node/status/NodeStatusCommand.java | 3 +--
.../internal/cli/commands/node/status/NodeStatusReplCommand.java | 2 +-
.../internal/cli/commands/node/unit/NodeUnitInspectCommand.java | 2 +-
.../cli/commands/node/unit/NodeUnitInspectReplCommand.java | 2 +-
.../internal/cli/commands/node/unit/NodeUnitListCommand.java | 2 +-
.../internal/cli/commands/node/unit/NodeUnitListReplCommand.java | 2 +-
.../internal/cli/commands/node/version/NodeVersionCommand.java | 3 +--
.../cli/commands/node/version/NodeVersionReplCommand.java | 2 +-
.../recovery/cluster/migrate/MigrateToClusterCommand.java | 2 +-
.../cli/commands/recovery/cluster/reset/ResetClusterCommand.java | 2 +-
.../recovery/partitions/reset/ResetPartitionsCommand.java | 2 +-
.../recovery/partitions/restart/RestartPartitionsCommand.java | 2 +-
.../recovery/partitions/states/PartitionStatesCommand.java | 2 +-
.../apache/ignite/internal/cli/commands/sql/SqlExecCommand.java | 3 +--
.../ignite/internal/cli/commands/sql/SqlExecReplCommand.java | 2 +-
.../cli/commands/sql/planner/InvalidateCacheCommand.java | 2 +-
.../cli/commands/zone/datanodes/ResetDataNodesCommand.java | 2 +-
.../internal/cli/core/call/AbstractCallExecutionPipeline.java | 9 ++++-----
.../internal/cli/core/call/AsyncCallExecutionPipeline.java | 9 +++------
.../cli/core/call/AsyncCallExecutionPipelineBuilder.java | 9 ++++-----
.../internal/cli/core/call/SingleCallExecutionPipeline.java | 9 +++------
.../cli/core/call/SingleCallExecutionPipelineBuilder.java | 9 ++++-----
.../org/apache/ignite/internal/cli/core/call/PipelineTest.java | 8 ++++----
66 files changed, 94 insertions(+), 105 deletions(-)
diff --git
a/migration-tools/modules/migration-tools-cli/src/main/java/org/apache/ignite/migrationtools/cli/configs/commands/ConfigurationConverterCmd.java
b/migration-tools/modules/migration-tools-cli/src/main/java/org/apache/ignite/migrationtools/cli/configs/commands/ConfigurationConverterCmd.java
index 1f10ad83d65..293ebac7137 100644
---
a/migration-tools/modules/migration-tools-cli/src/main/java/org/apache/ignite/migrationtools/cli/configs/commands/ConfigurationConverterCmd.java
+++
b/migration-tools/modules/migration-tools-cli/src/main/java/org/apache/ignite/migrationtools/cli/configs/commands/ConfigurationConverterCmd.java
@@ -48,13 +48,12 @@ public class ConfigurationConverterCmd extends BaseCommand
implements Callable<I
@CommandLine.Mixin
private ClassloaderOption classloaderOption;
- /** {@inheritDoc} */
@Override
public Integer call() {
var call = new ConfigurationConverterCall();
return runPipeline(CallExecutionPipeline.builder(call)
.exceptionHandlers(ErrorLoadingInputConfigurationHandlers.create())
- .inputProvider(() -> new
ConfigurationConverterCall.Input(inputFile, locCfgFile, distCfgFile,
includeDefaults,
+ .input(new ConfigurationConverterCall.Input(inputFile,
locCfgFile, distCfgFile, includeDefaults,
classloaderOption.clientClassLoader()))
);
}
diff --git
a/migration-tools/modules/migration-tools-cli/src/main/java/org/apache/ignite/migrationtools/cli/persistence/commands/ListCachesCmd.java
b/migration-tools/modules/migration-tools-cli/src/main/java/org/apache/ignite/migrationtools/cli/persistence/commands/ListCachesCmd.java
index db8c50a2c91..8548dc6b381 100644
---
a/migration-tools/modules/migration-tools-cli/src/main/java/org/apache/ignite/migrationtools/cli/persistence/commands/ListCachesCmd.java
+++
b/migration-tools/modules/migration-tools-cli/src/main/java/org/apache/ignite/migrationtools/cli/persistence/commands/ListCachesCmd.java
@@ -39,7 +39,7 @@ public class ListCachesCmd extends BaseCommand implements
Callable<Integer> {
var call = new ListCachesCall();
return runPipeline(CallExecutionPipeline.builder(call)
.exceptionHandlers(ErrorLoadingInputConfigurationHandlers.create())
- .inputProvider(() -> new ListCachesCall.Input(parent.params()))
+ .input(new ListCachesCall.Input(parent.params()))
.decorator(data -> () -> PlainTableRenderer.render(new
String[] {"id", "name"},
data.stream().map(o -> new String[]
{String.valueOf(o.cacheId()), o.cacheName()}).toArray(Object[][]::new)))
);
diff --git
a/migration-tools/modules/migration-tools-cli/src/main/java/org/apache/ignite/migrationtools/cli/persistence/commands/MigrateCacheCmd.java
b/migration-tools/modules/migration-tools-cli/src/main/java/org/apache/ignite/migrationtools/cli/persistence/commands/MigrateCacheCmd.java
index 05bd96a013d..e2847913478 100644
---
a/migration-tools/modules/migration-tools-cli/src/main/java/org/apache/ignite/migrationtools/cli/persistence/commands/MigrateCacheCmd.java
+++
b/migration-tools/modules/migration-tools-cli/src/main/java/org/apache/ignite/migrationtools/cli/persistence/commands/MigrateCacheCmd.java
@@ -63,7 +63,7 @@ public class MigrateCacheCmd extends BaseCommand implements
Callable<Integer> {
.exceptionHandler(new
IgniteClientConnectionExceptionHandler())
.exceptionHandler(new DataStreamerExceptionHandler())
.exceptionHandlers(ErrorLoadingInputConfigurationHandlers.create())
- .inputProvider(() -> new
RetriableMigrateCacheCall.Input(
+ .input(new RetriableMigrateCacheCall.Input(
parent.params(),
migrateCacheParams,
retryParams,
diff --git
a/migration-tools/modules/migration-tools-cli/src/main/java/org/apache/ignite/migrationtools/cli/sql/commands/SqlDdlGeneratorCmd.java
b/migration-tools/modules/migration-tools-cli/src/main/java/org/apache/ignite/migrationtools/cli/sql/commands/SqlDdlGeneratorCmd.java
index 135c60368c9..3fa0350d189 100644
---
a/migration-tools/modules/migration-tools-cli/src/main/java/org/apache/ignite/migrationtools/cli/sql/commands/SqlDdlGeneratorCmd.java
+++
b/migration-tools/modules/migration-tools-cli/src/main/java/org/apache/ignite/migrationtools/cli/sql/commands/SqlDdlGeneratorCmd.java
@@ -58,7 +58,7 @@ public class SqlDdlGeneratorCmd extends BaseCommand
implements Callable<Integer>
var call = new SqlDdlGeneratorCall();
return runPipeline(CallExecutionPipeline.builder(call)
.exceptionHandlers(ErrorLoadingInputConfigurationHandlers.create())
- .inputProvider(() -> new SqlDdlGeneratorCall.Input(
+ .input(new SqlDdlGeneratorCall.Input(
inputFile,
targetFile,
stopOnError,
diff --git a/modules/cli/README.md b/modules/cli/README.md
index 345a7672d09..429827507d2 100644
--- a/modules/cli/README.md
+++ b/modules/cli/README.md
@@ -99,11 +99,10 @@ public class NodeConfigShowCommand extends BaseCommand
implements Callable<Integ
@Inject
private NodeConfigShowCall call;
- /** {@inheritDoc} */
@Override
public Integer call() {
return CallExecutionPipeline.builder(call)
- .inputProvider(this::buildCallInput)
+ .input(buildCallInput())
.output(spec.commandLine().getOut())
.errOutput(spec.commandLine().getErr())
.decorator(new JsonDecorator())
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/ReplManager.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/ReplManager.java
index 38850d7b531..df3c8b568db 100644
--- a/modules/cli/src/main/java/org/apache/ignite/internal/cli/ReplManager.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/ReplManager.java
@@ -67,7 +67,7 @@ public class ReplManager {
.withDefaultValueProvider(defaultValueProvider)
.withCallExecutionPipelineProvider((executor,
exceptionHandlers, line) ->
CallExecutionPipeline.builder(executor)
- .inputProvider(() -> new StringCallInput(line))
+ .input(new StringCallInput(line))
.output(System.out)
.errOutput(System.err)
.exceptionHandlers(new
DefaultExceptionHandlers())
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigGetCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigGetCommand.java
index 3e0024a6c7f..b78119120b8 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigGetCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigGetCommand.java
@@ -45,9 +45,11 @@ public class CliConfigGetCommand extends BaseCommand
implements Callable<Integer
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(CliConfigGetCallInput.builder()
+ .input(CliConfigGetCallInput.builder()
.key(key)
- .profileName(profileName.getProfileName())::build)
+ .profileName(profileName.getProfileName())
+ .build()
+ )
);
}
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigRemoveCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigRemoveCommand.java
index 35a32e72661..63c7bd6a4fb 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigRemoveCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigRemoveCommand.java
@@ -43,9 +43,11 @@ public class CliConfigRemoveCommand extends BaseCommand
implements Callable<Inte
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(CliConfigRemoveCallInput.builder()
+ .input(CliConfigRemoveCallInput.builder()
.key(key)
- .profileName(profileName.getProfileName())::build)
+ .profileName(profileName.getProfileName())
+ .build()
+ )
);
}
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigSetCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigSetCommand.java
index 6f605c56148..13d5908ab79 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigSetCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigSetCommand.java
@@ -46,9 +46,11 @@ public class CliConfigSetCommand extends BaseCommand
implements Callable<Integer
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(CliConfigSetCallInput.builder()
+ .input(CliConfigSetCallInput.builder()
.parameters(parameters)
- .profileName(profileName.getProfileName())::build)
+ .profileName(profileName.getProfileName())
+ .build()
+ )
);
}
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigShowCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigShowCommand.java
index b1bb91d927a..490fff1c3b7 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigShowCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigShowCommand.java
@@ -41,7 +41,7 @@ public class CliConfigShowCommand extends BaseCommand
implements Callable<Intege
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() -> new
StringCallInput(profileName.getProfileName()))
+ .input(new StringCallInput(profileName.getProfileName()))
);
}
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileActivateCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileActivateCommand.java
index ba3b7519872..ec97f992825 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileActivateCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileActivateCommand.java
@@ -40,7 +40,7 @@ public class CliConfigProfileActivateCommand extends
BaseCommand implements Call
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() -> new StringCallInput(profileName))
+ .input(new StringCallInput(profileName))
);
}
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileCreateCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileCreateCommand.java
index 384e9de5bc8..d5f6521b4e3 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileCreateCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileCreateCommand.java
@@ -52,10 +52,12 @@ public class CliConfigProfileCreateCommand extends
BaseCommand implements Callab
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(CliConfigProfileCreateCallInput.builder()
+ .input(CliConfigProfileCreateCallInput.builder()
.profileName(profileName)
.copyFrom(copyFrom)
- .activate(activate)::build)
+ .activate(activate)
+ .build()
+ )
);
}
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileListCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileListCommand.java
index 21095dc4940..364b8a8705f 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileListCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileListCommand.java
@@ -37,7 +37,7 @@ public class CliConfigProfileListCommand extends BaseCommand
implements Callable
@Override
public Integer call() throws Exception {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(EmptyCallInput::new)
+ .input(new EmptyCallInput())
);
}
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileShowCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileShowCommand.java
index 0a722a85375..c0bb3554f26 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileShowCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileShowCommand.java
@@ -37,7 +37,7 @@ public class CliConfigProfileShowCommand extends BaseCommand
implements Callable
@Override
public Integer call() throws Exception {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(EmptyCallInput::new)
+ .input(new EmptyCallInput())
);
}
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/config/ClusterConfigShowCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/config/ClusterConfigShowCommand.java
index a01dbe5436b..66be0907ba3 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/config/ClusterConfigShowCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/config/ClusterConfigShowCommand.java
@@ -53,7 +53,7 @@ public class ClusterConfigShowCommand extends BaseCommand
implements Callable<In
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(this::buildCallInput)
+ .input(buildCallInput())
.decorator(format.decorator())
.exceptionHandler(createHandler("Cannot show cluster config"))
);
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/config/ClusterConfigUpdateCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/config/ClusterConfigUpdateCommand.java
index e133f55317a..a5f4bea3fcf 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/config/ClusterConfigUpdateCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/config/ClusterConfigUpdateCommand.java
@@ -47,7 +47,7 @@ public class ClusterConfigUpdateCommand extends BaseCommand
implements Callable<
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(this::buildCallInput)
+ .input(buildCallInput())
.exceptionHandler(createHandler("Cannot update cluster
config"))
);
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/init/ClusterInitCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/init/ClusterInitCommand.java
index e48838c72e3..6373d05596f 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/init/ClusterInitCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/init/ClusterInitCommand.java
@@ -48,7 +48,7 @@ public class ClusterInitCommand extends BaseCommand
implements Callable<Integer>
@Override
public Integer call() {
return runPipeline(asyncBuilder(callFactory)
- .inputProvider(this::buildCallInput)
+ .input(buildCallInput())
.enableSpinner(SPINNER_PREFIX)
.updateIntervalMillis(SPINNER_UPDATE_INTERVAL_MILLIS)
);
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/init/ClusterInitReplCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/init/ClusterInitReplCommand.java
index 1c0e4bcb683..b1de22fe497 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/init/ClusterInitReplCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/init/ClusterInitReplCommand.java
@@ -96,7 +96,7 @@ public class ClusterInitReplCommand extends BaseCommand
implements Runnable {
private int runAsync(ClusterInitCallInput input) {
return runPipeline(
asyncBuilder(this::createCall)
- .inputProvider(() -> input)
+ .input(input)
.enableSpinner(SPINNER_PREFIX)
.updateIntervalMillis(SPINNER_UPDATE_INTERVAL_MILLIS)
);
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/metric/ClusterMetricSourceDisableCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/metric/ClusterMetricSourceDisableCommand.java
index a710c4bfd9b..bbd61018a0a 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/metric/ClusterMetricSourceDisableCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/metric/ClusterMetricSourceDisableCommand.java
@@ -42,7 +42,7 @@ public class ClusterMetricSourceDisableCommand extends
BaseCommand implements Ca
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() ->
metricSource.buildDisableCallInput(clusterUrl.getClusterUrl()))
+
.input(metricSource.buildDisableCallInput(clusterUrl.getClusterUrl()))
.exceptionHandler(createHandler("Cannot disable metrics"))
);
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/metric/ClusterMetricSourceEnableCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/metric/ClusterMetricSourceEnableCommand.java
index f1e61e84fae..22b448a8d2d 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/metric/ClusterMetricSourceEnableCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/metric/ClusterMetricSourceEnableCommand.java
@@ -42,7 +42,7 @@ public class ClusterMetricSourceEnableCommand extends
BaseCommand implements Cal
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() ->
metricSource.buildEnableCallInput(clusterUrl.getClusterUrl()))
+
.input(metricSource.buildEnableCallInput(clusterUrl.getClusterUrl()))
.exceptionHandler(createHandler("Cannot enable metrics"))
);
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/metric/ClusterMetricSourceListCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/metric/ClusterMetricSourceListCommand.java
index 89fa891a78b..80a442db62d 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/metric/ClusterMetricSourceListCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/metric/ClusterMetricSourceListCommand.java
@@ -47,7 +47,7 @@ public class ClusterMetricSourceListCommand extends
BaseCommand implements Calla
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() -> new
UrlCallInput(clusterUrl.getClusterUrl()))
+ .input(new UrlCallInput(clusterUrl.getClusterUrl()))
.decorator(new ClusterMetricSourceListDecorator(plain))
.exceptionHandler(createHandler("Cannot list metric sources"))
);
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/status/ClusterStatusCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/status/ClusterStatusCommand.java
index 43f35f0950c..984dcfaa5a5 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/status/ClusterStatusCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/status/ClusterStatusCommand.java
@@ -41,11 +41,10 @@ public class ClusterStatusCommand extends BaseCommand
implements Callable<Intege
@Inject
private ClusterStatusCall call;
- /** {@inheritDoc} */
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() -> new
UrlCallInput(clusterUrl.getClusterUrl()))
+ .input(new UrlCallInput(clusterUrl.getClusterUrl()))
);
}
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/topology/LogicalTopologyCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/topology/LogicalTopologyCommand.java
index 46eabab3b3e..950c7490619 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/topology/LogicalTopologyCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/topology/LogicalTopologyCommand.java
@@ -50,7 +50,7 @@ public class LogicalTopologyCommand extends BaseCommand
implements Callable<Inte
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() -> new
UrlCallInput(clusterUrl.getClusterUrl()))
+ .input(new UrlCallInput(clusterUrl.getClusterUrl()))
.decorator(new TopologyDecorator(plain))
.exceptionHandler(createHandler("Cannot show logical
topology"))
);
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/topology/PhysicalTopologyCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/topology/PhysicalTopologyCommand.java
index 6d396f8471d..0fe01d68646 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/topology/PhysicalTopologyCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/topology/PhysicalTopologyCommand.java
@@ -50,7 +50,7 @@ public class PhysicalTopologyCommand extends BaseCommand
implements Callable<Int
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() -> new
UrlCallInput(clusterUrl.getClusterUrl()))
+ .input(new UrlCallInput(clusterUrl.getClusterUrl()))
.decorator(new TopologyDecorator(plain))
);
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/unit/ClusterUnitDeployCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/unit/ClusterUnitDeployCommand.java
index 9683eae7b82..6a99e4db830 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/unit/ClusterUnitDeployCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/unit/ClusterUnitDeployCommand.java
@@ -43,7 +43,7 @@ public class ClusterUnitDeployCommand extends BaseCommand
implements Callable<In
@Override
public Integer call() throws Exception {
return runPipeline(asyncBuilder(callFactory)
- .inputProvider(() ->
options.toDeployUnitCallInput(clusterUrl.getClusterUrl()))
+
.input(options.toDeployUnitCallInput(clusterUrl.getClusterUrl()))
.exceptionHandler(createHandler("Cannot deploy unit"))
);
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/unit/ClusterUnitDeployReplCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/unit/ClusterUnitDeployReplCommand.java
index 35e39af26d4..52d0224dde9 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/unit/ClusterUnitDeployReplCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/unit/ClusterUnitDeployReplCommand.java
@@ -43,7 +43,7 @@ public class ClusterUnitDeployReplCommand extends BaseCommand
implements Callabl
@Override
public Integer call() throws Exception {
return runPipeline(asyncBuilder(callFactory)
- .inputProvider(() ->
options.toDeployUnitCallInput(clusterUrl.getClusterUrl()))
+
.input(options.toDeployUnitCallInput(clusterUrl.getClusterUrl()))
.exceptionHandler(createHandler("Cannot deploy unit"))
);
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/unit/ClusterUnitListCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/unit/ClusterUnitListCommand.java
index 1e589cda670..31f90171b28 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/unit/ClusterUnitListCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/unit/ClusterUnitListCommand.java
@@ -51,7 +51,7 @@ public class ClusterUnitListCommand extends BaseCommand
implements Callable<Inte
@Override
public Integer call() throws Exception {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() ->
listOptions.toListUnitCallInput(clusterUrl.getClusterUrl()))
+
.input(listOptions.toListUnitCallInput(clusterUrl.getClusterUrl()))
.decorator(new UnitListDecorator(plain))
.exceptionHandler(createHandler("Cannot list units"))
);
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/unit/ClusterUnitUndeployCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/unit/ClusterUnitUndeployCommand.java
index d988fe3b4f5..645c4e43aad 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/unit/ClusterUnitUndeployCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/unit/ClusterUnitUndeployCommand.java
@@ -53,7 +53,7 @@ public class ClusterUnitUndeployCommand extends BaseCommand
implements Callable<
@Override
public Integer call() throws Exception {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() -> UndeployUnitCallInput.builder()
+ .input(UndeployUnitCallInput.builder()
.id(id)
.version(version)
.clusterUrl(clusterUrl.getClusterUrl())
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/unit/ClusterUnitUndeployReplCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/unit/ClusterUnitUndeployReplCommand.java
index 4e2db074762..e2f4d5879c1 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/unit/ClusterUnitUndeployReplCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/unit/ClusterUnitUndeployReplCommand.java
@@ -53,7 +53,7 @@ public class ClusterUnitUndeployReplCommand extends
BaseCommand implements Calla
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() -> UndeployUnitCallInput.builder()
+ .input(UndeployUnitCallInput.builder()
.id(id)
.version(version)
.clusterUrl(clusterUrl.getClusterUrl())
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/connect/ConnectCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/connect/ConnectCommand.java
index cd70f9a8c0b..042144c5e92 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/connect/ConnectCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/connect/ConnectCommand.java
@@ -66,7 +66,6 @@ public class ConnectCommand extends BaseCommand implements
Callable<Integer> {
@Inject
private Provider<ReplManager> replManagerProvider;
- /** {@inheritDoc} */
@Override
public Integer call() {
ReplManager replManager = replManagerProvider.get();
@@ -74,7 +73,7 @@ public class ConnectCommand extends BaseCommand implements
Callable<Integer> {
replManager.subscribe();
int exitCode = runPipeline(CallExecutionPipeline.builder(connectCall)
- .inputProvider(this::connectCallInput)
+ .input(connectCallInput())
);
if (exitCode == 0) {
replManager.startReplMode();
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/connect/DisconnectCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/connect/DisconnectCommand.java
index 4b06b6af1da..3ed37b96c28 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/connect/DisconnectCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/connect/DisconnectCommand.java
@@ -32,11 +32,10 @@ public class DisconnectCommand extends BaseCommand
implements Runnable {
@Inject
private DisconnectCall call;
- /** {@inheritDoc} */
@Override
public void run() {
runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(EmptyCallInput::new)
+ .input(new EmptyCallInput())
);
}
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigShowCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigShowCommand.java
index 1e2c64b6830..1e4f6c9c131 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigShowCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigShowCommand.java
@@ -48,11 +48,10 @@ public class NodeConfigShowCommand extends BaseCommand
implements Callable<Integ
@Mixin
private FormatMixin format;
- /** {@inheritDoc} */
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(this::buildCallInput)
+ .input(buildCallInput())
.decorator(format.decorator())
);
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigShowReplCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigShowReplCommand.java
index 64be56d04c9..54f74fcf86f 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigShowReplCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigShowReplCommand.java
@@ -51,7 +51,7 @@ public class NodeConfigShowReplCommand extends BaseCommand
implements Callable<I
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(this::nodeConfigShowCallInput)
+ .input(nodeConfigShowCallInput())
.decorator(format.decorator())
);
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigUpdateCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigUpdateCommand.java
index f9a0a8ae814..e6168edc346 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigUpdateCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigUpdateCommand.java
@@ -44,11 +44,10 @@ public class NodeConfigUpdateCommand extends BaseCommand
implements Callable<Int
@Inject
private NodeConfigUpdateCall call;
- /** {@inheritDoc} */
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(this::buildCallInput)
+ .input(buildCallInput())
);
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigUpdateReplCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigUpdateReplCommand.java
index dfd68c6aa2e..d8cc39fb1e8 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigUpdateReplCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigUpdateReplCommand.java
@@ -48,7 +48,7 @@ public class NodeConfigUpdateReplCommand extends BaseCommand
implements Callable
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(this::nodeConfigUpdateCallInput)
+ .input(nodeConfigUpdateCallInput())
);
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricSetListCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricSetListCommand.java
index 05e86f2082b..5e274931481 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricSetListCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricSetListCommand.java
@@ -48,7 +48,7 @@ public class NodeMetricSetListCommand extends BaseCommand
implements Callable<In
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() -> new UrlCallInput(nodeUrl.getNodeUrl()))
+ .input(new UrlCallInput(nodeUrl.getNodeUrl()))
.decorator(new MetricSetListDecorator(plain))
.exceptionHandler(createHandler("Cannot list metrics"))
);
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricSetListReplCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricSetListReplCommand.java
index 0f2951efd44..ddad25dab59 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricSetListReplCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricSetListReplCommand.java
@@ -48,7 +48,7 @@ public class NodeMetricSetListReplCommand extends BaseCommand
implements Callabl
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() -> new UrlCallInput(nodeUrl.getNodeUrl()))
+ .input(new UrlCallInput(nodeUrl.getNodeUrl()))
.exceptionHandler(createHandler("Cannot list metrics"))
.decorator(new MetricSetListDecorator(plain))
);
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricSourceDisableCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricSourceDisableCommand.java
index 26063f52e31..8863475991a 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricSourceDisableCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricSourceDisableCommand.java
@@ -43,7 +43,7 @@ public class NodeMetricSourceDisableCommand extends
BaseCommand implements Calla
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() ->
metricSource.buildDisableCallInput(nodeUrl.getNodeUrl()))
+
.input(metricSource.buildDisableCallInput(nodeUrl.getNodeUrl()))
.exceptionHandler(createHandler("Cannot disable metrics"))
);
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricSourceDisableReplCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricSourceDisableReplCommand.java
index cde13df384e..a583eb5ca50 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricSourceDisableReplCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricSourceDisableReplCommand.java
@@ -43,7 +43,7 @@ public class NodeMetricSourceDisableReplCommand extends
BaseCommand implements C
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() ->
metricSource.buildDisableCallInput(nodeUrl.getNodeUrl()))
+
.input(metricSource.buildDisableCallInput(nodeUrl.getNodeUrl()))
.exceptionHandler(createHandler("Cannot disable metrics"))
);
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricSourceEnableCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricSourceEnableCommand.java
index 20bf6cf48c6..deeb3645e09 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricSourceEnableCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricSourceEnableCommand.java
@@ -43,7 +43,7 @@ public class NodeMetricSourceEnableCommand extends
BaseCommand implements Callab
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() ->
metricSource.buildEnableCallInput(nodeUrl.getNodeUrl()))
+ .input(metricSource.buildEnableCallInput(nodeUrl.getNodeUrl()))
.exceptionHandler(createHandler("Cannot enable metrics"))
);
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricSourceEnableReplCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricSourceEnableReplCommand.java
index b6c32b20225..7a5e33dfeed 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricSourceEnableReplCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricSourceEnableReplCommand.java
@@ -43,7 +43,7 @@ public class NodeMetricSourceEnableReplCommand extends
BaseCommand implements Ca
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() ->
metricSource.buildEnableCallInput(nodeUrl.getNodeUrl()))
+ .input(metricSource.buildEnableCallInput(nodeUrl.getNodeUrl()))
.exceptionHandler(createHandler("Cannot enable metrics"))
);
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricSourceListCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricSourceListCommand.java
index 9be93dbc2f6..5b99691953d 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricSourceListCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricSourceListCommand.java
@@ -48,7 +48,7 @@ public class NodeMetricSourceListCommand extends BaseCommand
implements Callable
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() -> new UrlCallInput(nodeUrl.getNodeUrl()))
+ .input(new UrlCallInput(nodeUrl.getNodeUrl()))
.decorator(new MetricSourceListDecorator(plain))
.exceptionHandler(createHandler("Cannot list metric sources"))
);
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricSourceListReplCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricSourceListReplCommand.java
index 3e0baaaa2c1..8c7466c4ed5 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricSourceListReplCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricSourceListReplCommand.java
@@ -48,7 +48,7 @@ public class NodeMetricSourceListReplCommand extends
BaseCommand implements Call
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() -> new UrlCallInput(nodeUrl.getNodeUrl()))
+ .input(new UrlCallInput(nodeUrl.getNodeUrl()))
.exceptionHandler(createHandler("Cannot list metric sources"))
.decorator(new MetricSourceListDecorator(plain))
);
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/status/NodeStatusCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/status/NodeStatusCommand.java
index 371b642516e..2f9b83cc438 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/status/NodeStatusCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/status/NodeStatusCommand.java
@@ -39,11 +39,10 @@ public class NodeStatusCommand extends BaseCommand
implements Callable<Integer>
@Inject
private NodeStatusCall call;
- /** {@inheritDoc} */
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() -> new UrlCallInput(nodeUrl.getNodeUrl()))
+ .input(new UrlCallInput(nodeUrl.getNodeUrl()))
);
}
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/status/NodeStatusReplCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/status/NodeStatusReplCommand.java
index 37fb07a9cf0..b23431fb635 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/status/NodeStatusReplCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/status/NodeStatusReplCommand.java
@@ -42,7 +42,7 @@ public class NodeStatusReplCommand extends BaseCommand
implements Callable<Integ
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() -> new UrlCallInput(nodeUrl.getNodeUrl()))
+ .input(new UrlCallInput(nodeUrl.getNodeUrl()))
);
}
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/unit/NodeUnitInspectCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/unit/NodeUnitInspectCommand.java
index 78def525c41..bb994d7165b 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/unit/NodeUnitInspectCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/unit/NodeUnitInspectCommand.java
@@ -57,7 +57,7 @@ public class NodeUnitInspectCommand extends BaseCommand
implements Callable<Inte
@Override
public Integer call() throws Exception {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() -> UnitInspectCallInput.builder()
+ .input(UnitInspectCallInput.builder()
.unitId(unitId)
.version(version)
.url(nodeUrl.getNodeUrl())
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/unit/NodeUnitInspectReplCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/unit/NodeUnitInspectReplCommand.java
index 0c737c00595..dc92e32f284 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/unit/NodeUnitInspectReplCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/unit/NodeUnitInspectReplCommand.java
@@ -57,7 +57,7 @@ public class NodeUnitInspectReplCommand extends BaseCommand
implements Callable<
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() -> UnitInspectCallInput.builder()
+ .input(UnitInspectCallInput.builder()
.unitId(unitId)
.version(version)
.url(nodeUrl.getNodeUrl())
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/unit/NodeUnitListCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/unit/NodeUnitListCommand.java
index b31c5fc9a4f..ec2bfa22709 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/unit/NodeUnitListCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/unit/NodeUnitListCommand.java
@@ -51,7 +51,7 @@ public class NodeUnitListCommand extends BaseCommand
implements Callable<Integer
@Override
public Integer call() throws Exception {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() ->
listOptions.toListUnitCallInput(nodeUrl.getNodeUrl()))
+ .input(listOptions.toListUnitCallInput(nodeUrl.getNodeUrl()))
.decorator(new UnitListDecorator(plain))
.exceptionHandler(createHandler("Cannot list units"))
);
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/unit/NodeUnitListReplCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/unit/NodeUnitListReplCommand.java
index 2005fa77698..58afcebd705 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/unit/NodeUnitListReplCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/unit/NodeUnitListReplCommand.java
@@ -50,7 +50,7 @@ public class NodeUnitListReplCommand extends BaseCommand
implements Callable<Int
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() ->
listOptions.toListUnitCallInput(nodeUrl.getNodeUrl()))
+ .input(listOptions.toListUnitCallInput(nodeUrl.getNodeUrl()))
.exceptionHandler(createHandler("Cannot list units"))
.decorator(new UnitListDecorator(plain))
);
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/version/NodeVersionCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/version/NodeVersionCommand.java
index 84d9bd7b303..6edf0198bb0 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/version/NodeVersionCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/version/NodeVersionCommand.java
@@ -36,11 +36,10 @@ public class NodeVersionCommand extends BaseCommand
implements Callable<Integer>
@Inject
private NodeVersionCall call;
- /** {@inheritDoc} */
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() -> new UrlCallInput(nodeUrl.getNodeUrl()))
+ .input(new UrlCallInput(nodeUrl.getNodeUrl()))
);
}
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/version/NodeVersionReplCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/version/NodeVersionReplCommand.java
index 95c80c9a903..d8a037487aa 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/version/NodeVersionReplCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/version/NodeVersionReplCommand.java
@@ -39,7 +39,7 @@ public class NodeVersionReplCommand extends BaseCommand
implements Callable<Inte
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(nodeVersionCall)
- .inputProvider(() -> new UrlCallInput(nodeUrl.getNodeUrl()))
+ .input(new UrlCallInput(nodeUrl.getNodeUrl()))
);
}
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/recovery/cluster/migrate/MigrateToClusterCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/recovery/cluster/migrate/MigrateToClusterCommand.java
index 868f59b7635..4f90d1329fb 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/recovery/cluster/migrate/MigrateToClusterCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/recovery/cluster/migrate/MigrateToClusterCommand.java
@@ -38,7 +38,7 @@ public class MigrateToClusterCommand extends BaseCommand
implements Callable<Int
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() -> MigrateToClusterCallInput.of(options))
+ .input(MigrateToClusterCallInput.of(options))
);
}
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/recovery/cluster/reset/ResetClusterCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/recovery/cluster/reset/ResetClusterCommand.java
index 5187b9e262f..eecc58c502f 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/recovery/cluster/reset/ResetClusterCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/recovery/cluster/reset/ResetClusterCommand.java
@@ -43,7 +43,7 @@ public class ResetClusterCommand extends BaseCommand
implements Callable<Integer
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() -> ResetClusterCallInput.of(options,
clusterUrl.getClusterUrl()))
+ .input(ResetClusterCallInput.of(options,
clusterUrl.getClusterUrl()))
);
}
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/recovery/partitions/reset/ResetPartitionsCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/recovery/partitions/reset/ResetPartitionsCommand.java
index 4b40506a9d8..5110c207fc6 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/recovery/partitions/reset/ResetPartitionsCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/recovery/partitions/reset/ResetPartitionsCommand.java
@@ -43,7 +43,7 @@ public class ResetPartitionsCommand extends BaseCommand
implements Callable<Inte
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() -> ResetPartitionsCallInput.of(options,
clusterUrl.getClusterUrl()))
+ .input(ResetPartitionsCallInput.of(options,
clusterUrl.getClusterUrl()))
.exceptionHandler(createHandler("Cannot reset partitions"))
);
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/recovery/partitions/restart/RestartPartitionsCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/recovery/partitions/restart/RestartPartitionsCommand.java
index d939a97bd3c..9f1418ff906 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/recovery/partitions/restart/RestartPartitionsCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/recovery/partitions/restart/RestartPartitionsCommand.java
@@ -43,7 +43,7 @@ public class RestartPartitionsCommand extends BaseCommand
implements Callable<In
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() -> RestartPartitionsCallInput.of(options,
clusterUrl.getClusterUrl()))
+ .input(RestartPartitionsCallInput.of(options,
clusterUrl.getClusterUrl()))
.exceptionHandler(createHandler("Cannot restart partitions"))
);
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/recovery/partitions/states/PartitionStatesCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/recovery/partitions/states/PartitionStatesCommand.java
index a755ecd4414..d33482d8299 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/recovery/partitions/states/PartitionStatesCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/recovery/partitions/states/PartitionStatesCommand.java
@@ -44,7 +44,7 @@ public class PartitionStatesCommand extends BaseCommand
implements Callable<Inte
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() -> PartitionStatesCallInput.of(options,
clusterUrl.getClusterUrl()))
+ .input(PartitionStatesCallInput.of(options,
clusterUrl.getClusterUrl()))
.decorator(new TableDecorator(options.plain()))
.exceptionHandler(createHandler("Cannot list partition
states"))
);
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/SqlExecCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/SqlExecCommand.java
index c8ca189a8dc..cdf12d12e25 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/SqlExecCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/SqlExecCommand.java
@@ -80,13 +80,12 @@ public class SqlExecCommand extends BaseCommand implements
Callable<Integer> {
}
}
- /** {@inheritDoc} */
@Override
public Integer call() {
try (SqlManager sqlManager = new SqlManager(jdbc)) {
String executeCommand = execOptions.file != null ?
extract(execOptions.file) : execOptions.command;
return runPipeline(CallExecutionPipeline.builder(new
SqlQueryCall(sqlManager))
- .inputProvider(() -> new StringCallInput(executeCommand))
+ .input(new StringCallInput(executeCommand))
.exceptionHandler(SqlExceptionHandler.INSTANCE)
.decorator(new SqlQueryResultDecorator(plain, timed))
);
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/SqlExecReplCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/SqlExecReplCommand.java
index 986ea9465f3..aa247fb207b 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/SqlExecReplCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/SqlExecReplCommand.java
@@ -276,7 +276,7 @@ public class SqlExecReplCommand extends BaseCommand
implements Runnable {
ExceptionHandlers exceptionHandlers,
String line) {
return CallExecutionPipeline.builder(call)
- .inputProvider(() -> new StringCallInput(dropSemicolon(line)))
+ .input(new StringCallInput(dropSemicolon(line)))
.output(CommandLineContextProvider.getContext().out())
.errOutput(CommandLineContextProvider.getContext().err())
.exceptionHandlers(exceptionHandlers)
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/planner/InvalidateCacheCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/planner/InvalidateCacheCommand.java
index b7e2778bed9..421faadb4c1 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/planner/InvalidateCacheCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/planner/InvalidateCacheCommand.java
@@ -47,7 +47,7 @@ public class InvalidateCacheCommand extends BaseCommand
implements Callable<Inte
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() ->
InvalidateCacheCallInput.of(clusterUrl.getClusterUrl(), tables, List.of()))
+ .input(InvalidateCacheCallInput.of(clusterUrl.getClusterUrl(),
tables, List.of()))
.exceptionHandler(createHandler("Failed to invalidate SQL
planner cache"))
);
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/zone/datanodes/ResetDataNodesCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/zone/datanodes/ResetDataNodesCommand.java
index e6bfdcb3df8..83fb5bd8753 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/zone/datanodes/ResetDataNodesCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/zone/datanodes/ResetDataNodesCommand.java
@@ -44,7 +44,7 @@ public class ResetDataNodesCommand extends BaseCommand
implements Callable<Integ
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() -> ResetDataNodesCallInput.of(options,
clusterUrl.getClusterUrl()))
+ .input(ResetDataNodesCallInput.of(options,
clusterUrl.getClusterUrl()))
.exceptionHandler(createHandler("Cannot reset data nodes"))
);
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/AbstractCallExecutionPipeline.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/AbstractCallExecutionPipeline.java
index e13063394a8..ab36ef6ede5 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/AbstractCallExecutionPipeline.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/AbstractCallExecutionPipeline.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.cli.core.call;
import java.io.PrintWriter;
-import java.util.function.Supplier;
import org.apache.ignite.internal.cli.core.decorator.Decorator;
import org.apache.ignite.internal.cli.core.decorator.DecoratorRegistry;
import org.apache.ignite.internal.cli.core.decorator.TerminalOutput;
@@ -47,8 +46,8 @@ public abstract class AbstractCallExecutionPipeline<I extends
CallInput, T> impl
/** Handlers for any exceptions. */
protected final ExceptionHandlers exceptionHandlers;
- /** Provider for call's input. */
- protected final Supplier<I> inputProvider;
+ /** Call's input. */
+ protected final I input;
/** If non-empty, debug output will be printed to console. */
protected final boolean[] verbose;
@@ -58,14 +57,14 @@ public abstract class AbstractCallExecutionPipeline<I
extends CallInput, T> impl
PrintWriter errOutput,
ExceptionHandlers exceptionHandlers,
Decorator<T, TerminalOutput> decorator,
- Supplier<I> inputProvider,
+ I input,
boolean[] verbose
) {
this.output = output;
this.exceptionHandlers = exceptionHandlers;
this.errOutput = errOutput;
this.decorator = decorator;
- this.inputProvider = inputProvider;
+ this.input = input;
this.verbose = verbose;
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/AsyncCallExecutionPipeline.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/AsyncCallExecutionPipeline.java
index 104b804d06b..111cc389de6 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/AsyncCallExecutionPipeline.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/AsyncCallExecutionPipeline.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.cli.core.call;
import java.io.PrintWriter;
import java.util.concurrent.CompletionException;
-import java.util.function.Supplier;
import me.tongfei.progressbar.DelegatingProgressBarConsumer;
import me.tongfei.progressbar.ProgressBarBuilder;
import org.apache.ignite.internal.cli.core.decorator.Decorator;
@@ -41,18 +40,16 @@ public class AsyncCallExecutionPipeline<I extends
CallInput, T> extends Abstract
PrintWriter errOutput,
ExceptionHandlers exceptionHandlers,
Decorator<T, TerminalOutput> decorator,
- Supplier<I> inputProvider,
+ I input,
boolean[] verbose
) {
- super(output, errOutput, exceptionHandlers, decorator, inputProvider,
verbose);
+ super(output, errOutput, exceptionHandlers, decorator, input, verbose);
this.callFactory = callFactory;
this.progressBarBuilder = progressBarBuilder;
}
@Override
public int runPipelineInternal() {
- I callInput = inputProvider.get();
-
progressBarBuilder.setConsumer(new
DelegatingProgressBarConsumer(this::print) {
@Override
public void close() {
@@ -65,7 +62,7 @@ public class AsyncCallExecutionPipeline<I extends CallInput,
T> extends Abstract
try {
ProgressBarTracker tracker = new
ProgressBarTracker(progressBarBuilder);
CallOutput<T> result = callFactory.create(tracker)
- .execute(callInput)
+ .execute(input)
.whenComplete((el, err) -> tracker.close())
.join();
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/AsyncCallExecutionPipelineBuilder.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/AsyncCallExecutionPipelineBuilder.java
index 5354d896048..970a7ea5bfb 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/AsyncCallExecutionPipelineBuilder.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/AsyncCallExecutionPipelineBuilder.java
@@ -21,7 +21,6 @@ import java.io.OutputStream;
import java.io.PrintWriter;
import java.nio.charset.Charset;
import java.time.temporal.ChronoUnit;
-import java.util.function.Supplier;
import me.tongfei.progressbar.ProgressBarBuilder;
import me.tongfei.progressbar.ProgressBarStyle;
import org.apache.ignite.internal.cli.core.decorator.Decorator;
@@ -46,7 +45,7 @@ public class AsyncCallExecutionPipelineBuilder<I extends
CallInput, T> implement
private final ExceptionHandlers exceptionHandlers = new
DefaultExceptionHandlers();
- private Supplier<I> inputProvider;
+ private I input;
private PrintWriter output = wrapOutputStream(System.out);
@@ -69,8 +68,8 @@ public class AsyncCallExecutionPipelineBuilder<I extends
CallInput, T> implement
return encoding != null ? Charset.forName(encoding) :
Charset.defaultCharset();
}
- public AsyncCallExecutionPipelineBuilder<I, T> inputProvider(Supplier<I>
inputProvider) {
- this.inputProvider = inputProvider;
+ public AsyncCallExecutionPipelineBuilder<I, T> input(I input) {
+ this.input = input;
return this;
}
@@ -136,7 +135,7 @@ public class AsyncCallExecutionPipelineBuilder<I extends
CallInput, T> implement
@Override
public CallExecutionPipeline<I, T> build() {
return new AsyncCallExecutionPipeline<>(
- callFactory, progressBarBuilder, output, errOutput,
exceptionHandlers, decorator, inputProvider, verbose
+ callFactory, progressBarBuilder, output, errOutput,
exceptionHandlers, decorator, input, verbose
);
}
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/SingleCallExecutionPipeline.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/SingleCallExecutionPipeline.java
index 497d311c4a5..93f30f9c649 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/SingleCallExecutionPipeline.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/SingleCallExecutionPipeline.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.cli.core.call;
import java.io.PrintWriter;
-import java.util.function.Supplier;
import org.apache.ignite.internal.cli.core.decorator.Decorator;
import org.apache.ignite.internal.cli.core.decorator.TerminalOutput;
import org.apache.ignite.internal.cli.core.exception.ExceptionHandlers;
@@ -39,18 +38,16 @@ public class SingleCallExecutionPipeline<I extends
CallInput, T> extends Abstrac
PrintWriter errOutput,
ExceptionHandlers exceptionHandlers,
Decorator<T, TerminalOutput> decorator,
- Supplier<I> inputProvider,
+ I input,
boolean[] verbose
) {
- super(output, errOutput, exceptionHandlers, decorator, inputProvider,
verbose);
+ super(output, errOutput, exceptionHandlers, decorator, input, verbose);
this.call = call;
}
@Override
public int runPipelineInternal() {
- I callInput = inputProvider.get();
-
- CallOutput<T> callOutput = call.execute(callInput);
+ CallOutput<T> callOutput = call.execute(input);
return handleResult(callOutput);
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/SingleCallExecutionPipelineBuilder.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/SingleCallExecutionPipelineBuilder.java
index 0c7f230dea4..cd7b63a668f 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/SingleCallExecutionPipelineBuilder.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/SingleCallExecutionPipelineBuilder.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.cli.core.call;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.nio.charset.Charset;
-import java.util.function.Supplier;
import org.apache.ignite.internal.cli.core.decorator.Decorator;
import org.apache.ignite.internal.cli.core.decorator.TerminalOutput;
import org.apache.ignite.internal.cli.core.exception.ExceptionHandler;
@@ -34,7 +33,7 @@ public class SingleCallExecutionPipelineBuilder<I extends
CallInput, T> implemen
private ExceptionHandlers exceptionHandlers = new
DefaultExceptionHandlers();
- private Supplier<I> inputProvider;
+ private I input;
private PrintWriter output = wrapOutputStream(System.out);
@@ -57,8 +56,8 @@ public class SingleCallExecutionPipelineBuilder<I extends
CallInput, T> implemen
return encoding != null ? Charset.forName(encoding) :
Charset.defaultCharset();
}
- public SingleCallExecutionPipelineBuilder<I, T> inputProvider(Supplier<I>
inputProvider) {
- this.inputProvider = inputProvider;
+ public SingleCallExecutionPipelineBuilder<I, T> input(I input) {
+ this.input = input;
return this;
}
@@ -118,6 +117,6 @@ public class SingleCallExecutionPipelineBuilder<I extends
CallInput, T> implemen
@Override
public CallExecutionPipeline<I, T> build() {
- return new SingleCallExecutionPipeline<>(call, output, errOutput,
exceptionHandlers, decorator, inputProvider, verbose);
+ return new SingleCallExecutionPipeline<>(call, output, errOutput,
exceptionHandlers, decorator, input, verbose);
}
}
diff --git
a/modules/cli/src/test/java/org/apache/ignite/internal/cli/core/call/PipelineTest.java
b/modules/cli/src/test/java/org/apache/ignite/internal/cli/core/call/PipelineTest.java
index d499d44dc01..d500a41e32a 100644
---
a/modules/cli/src/test/java/org/apache/ignite/internal/cli/core/call/PipelineTest.java
+++
b/modules/cli/src/test/java/org/apache/ignite/internal/cli/core/call/PipelineTest.java
@@ -45,7 +45,7 @@ class PipelineTest {
void verbose() {
// When start pipeline with verbose
CallExecutionPipeline.builder(new ThrowingStrCall())
- .inputProvider(StringCallInput::new)
+ .input(new StringCallInput())
.exceptionHandler(new TestExceptionHandler())
.output(new PrintWriter(out))
.errOutput(new PrintWriter(errOut))
@@ -61,7 +61,7 @@ class PipelineTest {
void noVerbose() {
// When start pipeline without verbose
CallExecutionPipeline.builder(new ThrowingStrCall())
- .inputProvider(StringCallInput::new)
+ .input(new StringCallInput())
.exceptionHandler(new TestExceptionHandler())
.output(new PrintWriter(out))
.errOutput(new PrintWriter(errOut))
@@ -80,7 +80,7 @@ class PipelineTest {
// When start async pipeline with verbose
CallExecutionPipeline.asyncBuilder(ignoredProgressTracker -> asyncCall)
- .inputProvider(StringCallInput::new)
+ .input(new StringCallInput())
.exceptionHandler(new TestExceptionHandler())
.output(new PrintWriter(out))
.errOutput(new PrintWriter(errOut))
@@ -101,7 +101,7 @@ class PipelineTest {
// When start async pipeline with verbose
CallExecutionPipeline.asyncBuilder(ignoredProgressTracker -> asyncCall)
- .inputProvider(StringCallInput::new)
+ .input(new StringCallInput())
.exceptionHandler(new TestExceptionHandler())
.output(new PrintWriter(out))
.errOutput(new PrintWriter(errOut))
