IGNITE-17786 Add --verbose option to all commands

modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/ClusterInitCall.java

@@ -22,7 +22,6 @@
 import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
 import org.apache.ignite.internal.cli.core.exception.IgniteCliApiException;
 import org.apache.ignite.rest.client.api.ClusterManagementApi;
-import org.apache.ignite.rest.client.invoker.ApiClient;
 import org.apache.ignite.rest.client.invoker.ApiException;
 import org.apache.ignite.rest.client.invoker.Configuration;
 import org.apache.ignite.rest.client.model.InitCommand;
@@ -50,8 +49,6 @@ public DefaultCallOutput<String> execute(ClusterInitCallInput input) {
     }
 
     private ClusterManagementApi createApiClient(ClusterInitCallInput input) {
-        ApiClient client = Configuration.getDefaultApiClient();
-        client.setBasePath(input.getClusterUrl());
-        return new ClusterManagementApi(client);
+        return new ClusterManagementApi(Configuration.getDefaultApiClient().setBasePath(input.getClusterUrl()));
     }
 }

modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/status/ClusterStatusCall.java

@@ -26,8 +26,8 @@
 import org.apache.ignite.internal.cli.core.call.UrlCallInput;
 import org.apache.ignite.internal.cli.core.exception.IgniteCliApiException;
 import org.apache.ignite.rest.client.api.ClusterManagementApi;
-import org.apache.ignite.rest.client.invoker.ApiClient;
 import org.apache.ignite.rest.client.invoker.ApiException;
+import org.apache.ignite.rest.client.invoker.Configuration;
 import org.apache.ignite.rest.client.model.ClusterState;
 
 /**
@@ -72,6 +72,6 @@ private int fetchNumberOfAllNodes(UrlCallInput input) {
     }
 
     private ClusterState fetchClusterState(String url) throws ApiException {
-        return new ClusterManagementApi(new ApiClient().setBasePath(url)).clusterState();
+        return new ClusterManagementApi(Configuration.getDefaultApiClient().setBasePath(url)).clusterState();
     }
 }

modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/ClusterConfigShowCall.java

@@ -22,7 +22,6 @@
 import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
 import org.apache.ignite.internal.cli.core.exception.IgniteCliApiException;
 import org.apache.ignite.rest.client.api.ClusterConfigurationApi;
-import org.apache.ignite.rest.client.invoker.ApiClient;
 import org.apache.ignite.rest.client.invoker.ApiException;
 import org.apache.ignite.rest.client.invoker.Configuration;
 
@@ -51,8 +50,6 @@ private JsonString readClusterConfig(ClusterConfigurationApi api, ClusterConfigS
     }
 
     private ClusterConfigurationApi createApiClient(ClusterConfigShowCallInput input) {
-        ApiClient client = Configuration.getDefaultApiClient();
-        client.setBasePath(input.getClusterUrl());
-        return new ClusterConfigurationApi(client);
+        return new ClusterConfigurationApi(Configuration.getDefaultApiClient().setBasePath(input.getClusterUrl()));
     }
 }

modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/ClusterConfigUpdateCall.java

@@ -22,7 +22,6 @@
 import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
 import org.apache.ignite.internal.cli.core.exception.IgniteCliApiException;
 import org.apache.ignite.rest.client.api.ClusterConfigurationApi;
-import org.apache.ignite.rest.client.invoker.ApiClient;
 import org.apache.ignite.rest.client.invoker.ApiException;
 import org.apache.ignite.rest.client.invoker.Configuration;
 
@@ -50,8 +49,6 @@ private DefaultCallOutput<String> updateClusterConfig(ClusterConfigurationApi ap
     }
 
     private ClusterConfigurationApi createApiClient(ClusterConfigUpdateCallInput input) {
-        ApiClient client = Configuration.getDefaultApiClient();
-        client.setBasePath(input.getClusterUrl());
-        return new ClusterConfigurationApi(client);
+        return new ClusterConfigurationApi(Configuration.getDefaultApiClient().setBasePath(input.getClusterUrl()));
     }
 }

modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/NodeConfigShowCall.java

@@ -22,7 +22,6 @@
 import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
 import org.apache.ignite.internal.cli.core.exception.IgniteCliApiException;
 import org.apache.ignite.rest.client.api.NodeConfigurationApi;
-import org.apache.ignite.rest.client.invoker.ApiClient;
 import org.apache.ignite.rest.client.invoker.ApiException;
 import org.apache.ignite.rest.client.invoker.Configuration;
 
@@ -51,8 +50,6 @@ private JsonString readNodeConfig(NodeConfigurationApi api, NodeConfigShowCallIn
     }
 
     private NodeConfigurationApi createApiClient(NodeConfigShowCallInput input) {
-        ApiClient client = Configuration.getDefaultApiClient();
-        client.setBasePath(input.getNodeUrl());
-        return new NodeConfigurationApi(client);
+        return new NodeConfigurationApi(Configuration.getDefaultApiClient().setBasePath(input.getNodeUrl()));
     }
 }

modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/NodeConfigUpdateCall.java

@@ -22,7 +22,6 @@
 import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
 import org.apache.ignite.internal.cli.core.exception.IgniteCliApiException;
 import org.apache.ignite.rest.client.api.NodeConfigurationApi;
-import org.apache.ignite.rest.client.invoker.ApiClient;
 import org.apache.ignite.rest.client.invoker.ApiException;
 import org.apache.ignite.rest.client.invoker.Configuration;
 
@@ -50,8 +49,6 @@ private DefaultCallOutput<String> updateNodeConfig(NodeConfigurationApi api, Nod
     }
 
     private NodeConfigurationApi createApiClient(NodeConfigUpdateCallInput input) {
-        ApiClient client = Configuration.getDefaultApiClient();
-        client.setBasePath(input.getNodeUrl());
-        return new NodeConfigurationApi(client);
+        return new NodeConfigurationApi(Configuration.getDefaultApiClient().setBasePath(input.getNodeUrl()));
     }
 }

modules/cli/src/main/java/org/apache/ignite/internal/cli/call/node/status/NodeStatusCall.java

@@ -24,8 +24,8 @@
 import org.apache.ignite.internal.cli.core.call.UrlCallInput;
 import org.apache.ignite.internal.cli.core.exception.IgniteCliApiException;
 import org.apache.ignite.rest.client.api.NodeManagementApi;
-import org.apache.ignite.rest.client.invoker.ApiClient;
 import org.apache.ignite.rest.client.invoker.ApiException;
+import org.apache.ignite.rest.client.invoker.Configuration;
 import org.apache.ignite.rest.client.model.NodeState;
 
 /**
@@ -51,6 +51,6 @@ public CallOutput<NodeStatus> execute(UrlCallInput input) {
     }
 
     private NodeState fetchNodeState(String url) throws ApiException {
-        return new NodeManagementApi(new ApiClient().setBasePath(url)).nodeState();
+        return new NodeManagementApi(Configuration.getDefaultApiClient().setBasePath(url)).nodeState();
     }
 }

modules/cli/src/main/java/org/apache/ignite/internal/cli/call/node/version/NodeVersionCall.java

@@ -24,8 +24,8 @@
 import org.apache.ignite.internal.cli.core.call.UrlCallInput;
 import org.apache.ignite.internal.cli.core.exception.IgniteCliApiException;
 import org.apache.ignite.rest.client.api.NodeManagementApi;
-import org.apache.ignite.rest.client.invoker.ApiClient;
 import org.apache.ignite.rest.client.invoker.ApiException;
+import org.apache.ignite.rest.client.invoker.Configuration;
 
 /** Call to get node version. */
 @Singleton
@@ -40,6 +40,6 @@ public CallOutput<String> execute(UrlCallInput input) {
     }
 
     private String getNodeVersion(String url) throws ApiException {
-        return new NodeManagementApi(new ApiClient().setBasePath(url)).nodeVersion();
+        return new NodeManagementApi(Configuration.getDefaultApiClient().setBasePath(url)).nodeVersion();
     }
 }

modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/BaseCommand.java

@@ -29,6 +29,9 @@ public abstract class BaseCommand {
     @Option(names = {"-h", "--help"}, usageHelp = true, description = "Show this help message and exit.")
     protected boolean usageHelpRequested;
 
+    @Option(names = {"-v", "--verbose"}, description = "Show additional information.")
+    protected boolean verbose;
+
     @Spec
     protected CommandSpec spec;
 }

modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigGetCommand.java

@@ -50,6 +50,7 @@ public Integer call() {
                         .profileName(profileName.getProfileName())::build)
                 .output(spec.commandLine().getOut())
                 .errOutput(spec.commandLine().getErr())
+                .verbose(verbose)
                 .build()
                 .runPipeline();
     }

modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigGetReplCommand.java

@@ -44,6 +44,7 @@ public Integer call() {
                         .key(key)::build)
                 .output(spec.commandLine().getOut())
                 .errOutput(spec.commandLine().getErr())
+                .verbose(verbose)
                 .build()
                 .runPipeline();
     }

modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigSetCommand.java

@@ -51,6 +51,7 @@ public Integer call() {
                         .profileName(profileName.getProfileName())::build)
                 .output(spec.commandLine().getOut())
                 .errOutput(spec.commandLine().getErr())
+                .verbose(verbose)
                 .build()
                 .runPipeline();
     }

modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigSetReplCommand.java

@@ -45,6 +45,7 @@ public Integer call() {
                         .parameters(parameters)::build)
                 .output(spec.commandLine().getOut())
                 .errOutput(spec.commandLine().getErr())
+                .verbose(verbose)
                 .build()
                 .runPipeline();
     }

modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigShowCommand.java

@@ -46,6 +46,7 @@ public Integer call() {
                 .output(spec.commandLine().getOut())
                 .errOutput(spec.commandLine().getErr())
                 .decorator(new ProfileDecorator())
+                .verbose(verbose)
                 .build()
                 .runPipeline();
     }

modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigShowReplCommand.java

@@ -41,6 +41,7 @@ public Integer call() {
                 .output(spec.commandLine().getOut())
                 .errOutput(spec.commandLine().getErr())
                 .decorator(new ProfileDecorator())
+                .verbose(verbose)
                 .build()
                 .runPipeline();
     }

modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileActivateCommand.java

@@ -43,6 +43,7 @@ public Integer call() {
                 .inputProvider(() -> new StringCallInput(profileName))
                 .errOutput(spec.commandLine().getErr())
                 .output(spec.commandLine().getOut())
+                .verbose(verbose)
                 .build().runPipeline();
     }
 }

modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileCreateCommand.java

@@ -53,6 +53,7 @@ public Integer call() {
                         .activate(activate)::build)
                 .errOutput(spec.commandLine().getErr())
                 .output(spec.commandLine().getOut())
+                .verbose(verbose)
                 .build().runPipeline();
     }
 }

modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileListCommand.java

@@ -42,6 +42,7 @@ public Integer call() throws Exception {
                 .output(spec.commandLine().getOut())
                 .errOutput(spec.commandLine().getErr())
                 .decorator(new ProfileListDecorator())
+                .verbose(verbose)
                 .build()
                 .runPipeline();
     }

modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileShowCommand.java

@@ -40,6 +40,7 @@ public Integer call() throws Exception {
                 .inputProvider(EmptyCallInput::new)
                 .output(spec.commandLine().getOut())
                 .errOutput(spec.commandLine().getErr())
+                .verbose(verbose)
                 .build()
                 .runPipeline();
     }

modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/config/ClusterConfigShowCommand.java

@@ -59,6 +59,7 @@ public Integer call() {
                 .exceptionHandler(new ClusterNotInitializedExceptionHandler(
                         "Cannot show cluster config", "ignite cluster init"
                 ))
+                .verbose(verbose)
                 .build()
                 .runPipeline();
     }

modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/config/ClusterConfigShowReplCommand.java

@@ -58,6 +58,7 @@ public void run() {
                 .map(this::configShowCallInput)
                 .then(Flows.fromCall(call))
                 .exceptionHandler(new ClusterNotInitializedExceptionHandler("Cannot show cluster config", "cluster init"))
+                .verbose(verbose)
                 .print()
                 .start();
     }

modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/config/ClusterConfigUpdateCommand.java

@@ -55,6 +55,7 @@ public Integer call() {
                 .exceptionHandler(new ClusterNotInitializedExceptionHandler(
                         "Cannot update cluster config", "ignite cluster init"
                 ))
+                .verbose(verbose)
                 .build()
                 .runPipeline();
     }

modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/config/ClusterConfigUpdateReplCommand.java

@@ -55,6 +55,7 @@ public void run() {
                 .map(this::configUpdateCallInput)
                 .then(Flows.fromCall(call))
                 .exceptionHandler(new ClusterNotInitializedExceptionHandler("Cannot update cluster config", "cluster init"))
+                .verbose(verbose)
                 .print()
                 .start();
     }

modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/init/ClusterInitCommand.java

@@ -49,6 +49,7 @@ public Integer call() {
                 .inputProvider(this::buildCallInput)
                 .output(spec.commandLine().getOut())
                 .errOutput(spec.commandLine().getErr())
+                .verbose(verbose)
                 .build()
                 .runPipeline();
     }

modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/init/ClusterInitReplCommand.java

@@ -52,6 +52,7 @@ public void run() {
         question.askQuestionIfNotConnected(clusterUrl.getClusterUrl())
                 .map(this::buildCallInput)
                 .then(Flows.fromCall(call))
+                .verbose(verbose)
                 .print()
                 .start();
     }

modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/status/ClusterStatusCommand.java

@@ -50,6 +50,7 @@ public Integer call() {
                 .output(spec.commandLine().getOut())
                 .errOutput(spec.commandLine().getErr())
                 .decorator(new ClusterStatusDecorator())
+                .verbose(verbose)
                 .build()
                 .runPipeline();
     }

modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/status/ClusterStatusReplCommand.java

@@ -48,6 +48,7 @@ public void run() {
         question.askQuestionIfNotConnected(clusterUrl.getClusterUrl())
                 .map(UrlCallInput::new)
                 .then(Flows.fromCall(call))
+                .verbose(verbose)
                 .print()
                 .start();
     }

modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/connect/ConnectCommand.java

@@ -49,6 +49,7 @@ public void run() {
                 .inputProvider(() -> new ConnectCallInput(nodeUrl.toString()))
                 .output(spec.commandLine().getOut())
                 .errOutput(spec.commandLine().getErr())
+                .verbose(verbose)
                 .build()
                 .runPipeline();
     }

modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/connect/DisconnectCommand.java

@@ -39,6 +39,7 @@ public void run() {
                 .inputProvider(EmptyCallInput::new)
                 .output(spec.commandLine().getOut())
                 .errOutput(spec.commandLine().getErr())
+                .verbose(verbose)
                 .build()
                 .runPipeline();
     }

modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigShowCommand.java

@@ -53,6 +53,7 @@ public Integer call() {
                 .output(spec.commandLine().getOut())
                 .errOutput(spec.commandLine().getErr())
                 .decorator(new JsonDecorator())
+                .verbose(verbose)
                 .build()
                 .runPipeline();
     }

modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigShowReplCommand.java

@@ -53,6 +53,7 @@ public void run() {
         question.askQuestionIfNotConnected(nodeUrl.getNodeUrl())
                 .map(this::nodeConfigShowCallInput)
                 .then(Flows.fromCall(call))
+                .verbose(verbose)
                 .print()
                 .start();
     }

modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigUpdateCommand.java

@@ -51,6 +51,7 @@ public Integer call() {
                 .inputProvider(this::buildCallInput)
                 .output(spec.commandLine().getOut())
                 .errOutput(spec.commandLine().getErr())
+                .verbose(verbose)
                 .build()
                 .runPipeline();
     }

modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigUpdateReplCommand.java

@@ -53,6 +53,7 @@ public void run() {
         question.askQuestionIfNotConnected(nodeUrl.getNodeUrl())
                 .map(this::nodeConfigUpdateCallInput)
                 .then(Flows.fromCall(call))
+                .verbose(verbose)
                 .print()
                 .start();
     }

modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricDisableCommand.java

@@ -47,6 +47,7 @@ public Integer call() {
                 .inputProvider(() -> metricSource.buildDisableCallInput(nodeUrl.getNodeUrl()))
                 .output(spec.commandLine().getOut())
                 .errOutput(spec.commandLine().getErr())
+                .verbose(verbose)
                 .build()
                 .runPipeline();
     }

modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricDisableReplCommand.java

@@ -48,6 +48,7 @@ public void run() {
         question.askQuestionIfNotConnected(nodeUrl.getNodeUrl())
                 .map(metricSource::buildDisableCallInput)
                 .then(Flows.fromCall(call))
+                .verbose(verbose)
                 .print()
                 .start();
     }

modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricEnableCommand.java

@@ -47,6 +47,7 @@ public Integer call() {
                 .inputProvider(() -> metricSource.buildEnableCallInput(nodeUrl.getNodeUrl()))
                 .output(spec.commandLine().getOut())
                 .errOutput(spec.commandLine().getErr())
+                .verbose(verbose)
                 .build()
                 .runPipeline();
     }

modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricEnableReplCommand.java

@@ -48,6 +48,7 @@ public void run() {
         question.askQuestionIfNotConnected(nodeUrl.getNodeUrl())
                 .map(metricSource::buildEnableCallInput)
                 .then(Flows.fromCall(call))
+                .verbose(verbose)
                 .print()
                 .start();
     }

modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/metric/NodeMetricListCommand.java

@@ -46,6 +46,7 @@ public Integer call() {
                 .output(spec.commandLine().getOut())
                 .errOutput(spec.commandLine().getErr())
                 .decorator(new MetricListDecorator())
+                .verbose(verbose)
                 .build()
                 .runPipeline();
     }

modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/status/NodeStatusCommand.java

@@ -48,6 +48,7 @@ public Integer call() {
                 .output(spec.commandLine().getOut())
                 .errOutput(spec.commandLine().getErr())
                 .decorator(new NodeStatusDecorator())
+                .verbose(verbose)
                 .build()
                 .runPipeline();
     }