This is an automated email from the ASF dual-hosted git repository.
mpochatkin 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 c4c0811f2e IGNITE-21615 Modify config update message (#3452)
c4c0811f2e is described below
commit c4c0811f2e24d7a3c9c11c49a67f29c48b7c471c
Author: Mikhail <[email protected]>
AuthorDate: Mon Mar 25 17:09:45 2024 +0300
IGNITE-21615 Modify config update message (#3452)
---
.../apache/ignite/internal/cli/commands/ItConfigCommandTest.java | 5 ++++-
.../internal/cli/call/configuration/NodeConfigUpdateCall.java | 6 +++++-
.../java/org/apache/ignite/internal/cli/IgniteCliInterfaceTest.java | 5 ++++-
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/ItConfigCommandTest.java
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/ItConfigCommandTest.java
index b575c93415..a8046dca15 100644
---
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/ItConfigCommandTest.java
+++
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/ItConfigCommandTest.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.cli.commands;
import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.apache.ignite.internal.cli.core.style.AnsiStringSupport.fg;
import static
org.apache.ignite.internal.testframework.IgniteTestUtils.testNodeName;
import static
org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -33,6 +34,7 @@ import org.apache.ignite.IgnitionManager;
import org.apache.ignite.InitParameters;
import org.apache.ignite.internal.app.IgniteImpl;
import org.apache.ignite.internal.cli.AbstractCliTest;
+import org.apache.ignite.internal.cli.core.style.AnsiStringSupport.Color;
import org.apache.ignite.internal.testframework.TestIgnitionManager;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
@@ -88,7 +90,8 @@ public class ItConfigCommandTest extends AbstractCliTest {
assertEquals(0, exitCode);
assertThat(
out.toString(UTF_8),
- containsString("Node configuration was updated successfully")
+ containsString("Node configuration updated. "
+ + fg(Color.YELLOW).mark("Restart the node to apply
changes."))
);
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/NodeConfigUpdateCall.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/NodeConfigUpdateCall.java
index c641eb665a..6d5790eb3d 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/NodeConfigUpdateCall.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/NodeConfigUpdateCall.java
@@ -17,11 +17,14 @@
package org.apache.ignite.internal.cli.call.configuration;
+import static org.apache.ignite.internal.cli.core.style.AnsiStringSupport.fg;
+
import jakarta.inject.Singleton;
import org.apache.ignite.internal.cli.core.call.Call;
import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
import org.apache.ignite.internal.cli.core.exception.IgniteCliApiException;
import org.apache.ignite.internal.cli.core.rest.ApiClientFactory;
+import org.apache.ignite.internal.cli.core.style.AnsiStringSupport.Color;
import org.apache.ignite.rest.client.api.NodeConfigurationApi;
import org.apache.ignite.rest.client.invoker.ApiException;
@@ -51,7 +54,8 @@ public class NodeConfigUpdateCall implements
Call<NodeConfigUpdateCallInput, Str
private DefaultCallOutput<String> updateNodeConfig(NodeConfigurationApi
api, NodeConfigUpdateCallInput input)
throws ApiException {
api.updateNodeConfiguration(input.getConfig());
- return DefaultCallOutput.success("Node configuration was updated
successfully");
+ return DefaultCallOutput.success("Node configuration updated. "
+ + fg(Color.YELLOW).mark("Restart the node to apply changes."));
}
private NodeConfigurationApi createApiClient(NodeConfigUpdateCallInput
input) {
diff --git
a/modules/cli/src/test/java/org/apache/ignite/internal/cli/IgniteCliInterfaceTest.java
b/modules/cli/src/test/java/org/apache/ignite/internal/cli/IgniteCliInterfaceTest.java
index 8864c6805a..7ce754c99b 100644
---
a/modules/cli/src/test/java/org/apache/ignite/internal/cli/IgniteCliInterfaceTest.java
+++
b/modules/cli/src/test/java/org/apache/ignite/internal/cli/IgniteCliInterfaceTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.cli;
import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.stream.Collectors.toList;
import static
org.apache.ignite.internal.cli.commands.cliconfig.TestConfigManagerHelper.copyResourceToTempFile;
+import static org.apache.ignite.internal.cli.core.style.AnsiStringSupport.fg;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.startsWith;
@@ -34,6 +35,7 @@ import static org.mockserver.model.JsonBody.json;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
+import org.apache.ignite.internal.cli.core.style.AnsiStringSupport.Color;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
@@ -149,7 +151,8 @@ public class IgniteCliInterfaceTest extends AbstractCliTest
{
assertThatExitCodeMeansSuccess(exitCode);
- assertOutputEqual("Node configuration was updated
successfully");
+ assertOutputEqual("Node configuration updated. "
+ + fg(Color.YELLOW).mark("Restart the node to apply
changes."));
assertThatStderrIsEmpty();
}
}
