You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ap...@apache.org on 2023/05/26 14:52:25 UTC
[ignite-3] branch main updated: IGNITE-19572 Non-REPL node commands show node name option (#2111)
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 c6ee1d2bd0 IGNITE-19572 Non-REPL node commands show node name option (#2111)
c6ee1d2bd0 is described below
commit c6ee1d2bd0c7f9c3d19cebab1dc0984c7d914ee3
Author: Vadim Pakhnushev <86...@users.noreply.github.com>
AuthorDate: Fri May 26 17:52:19 2023 +0300
IGNITE-19572 Non-REPL node commands show node name option (#2111)
---
.../org/apache/ignite/internal/cli/commands/Options.java | 2 +-
.../ignite/internal/cli/commands/node/NodeUrlMixin.java | 3 ++-
.../internal/cli/commands/node/NodeUrlProfileMixin.java | 15 +++++++++++----
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/Options.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/Options.java
index f7bd4d2155..4256ac456a 100644
--- a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/Options.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/Options.java
@@ -99,7 +99,7 @@ public enum Options {
public static final String NODE_URL_OPTION = "--node-url";
/** Node URL option description. */
- public static final String NODE_URL_OPTION_DESC = "URL of ignite node";
+ public static final String NODE_URL_OPTION_DESC = "URL of an Ignite node";
/** Node URL or name option description. */
public static final String NODE_URL_OR_NAME_DESC = "URL or name of an Ignite node";
diff --git a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/NodeUrlMixin.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/NodeUrlMixin.java
index 8b408dfdc4..1280405422 100644
--- a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/NodeUrlMixin.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/NodeUrlMixin.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.cli.commands.node;
import static org.apache.ignite.internal.cli.commands.Options.Constants.NODE_NAME_OPTION;
+import static org.apache.ignite.internal.cli.commands.Options.Constants.NODE_NAME_OPTION_DESC;
import static org.apache.ignite.internal.cli.commands.Options.Constants.NODE_NAME_OPTION_SHORT;
import static org.apache.ignite.internal.cli.commands.Options.Constants.NODE_URL_OPTION;
import static org.apache.ignite.internal.cli.commands.Options.Constants.NODE_URL_OPTION_DESC;
@@ -54,7 +55,7 @@ public class NodeUrlMixin {
/**
* Node name option.
*/
- @Option(names = {NODE_NAME_OPTION_SHORT, NODE_NAME_OPTION}, description = NODE_URL_OPTION_DESC)
+ @Option(names = {NODE_NAME_OPTION_SHORT, NODE_NAME_OPTION}, description = NODE_NAME_OPTION_DESC)
private String nodeName;
}
diff --git a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/NodeUrlProfileMixin.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/NodeUrlProfileMixin.java
index 88969351ed..7564de8708 100644
--- a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/NodeUrlProfileMixin.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/NodeUrlProfileMixin.java
@@ -17,20 +17,27 @@
package org.apache.ignite.internal.cli.commands.node;
+import static org.apache.ignite.internal.cli.commands.Options.Constants.NODE_URL_OPTION;
+import static org.apache.ignite.internal.cli.commands.Options.Constants.NODE_URL_OPTION_DESC;
+import static org.apache.ignite.internal.cli.commands.Options.Constants.URL_OPTION_SHORT;
+
import jakarta.inject.Inject;
+import java.net.URL;
import org.apache.ignite.internal.cli.commands.ProfileMixin;
import org.apache.ignite.internal.cli.config.CliConfigKeys;
import org.apache.ignite.internal.cli.config.ConfigManager;
import org.apache.ignite.internal.cli.config.ConfigManagerProvider;
+import org.apache.ignite.internal.cli.core.converters.UrlConverter;
import picocli.CommandLine.Mixin;
+import picocli.CommandLine.Option;
/**
* Mixin class to combine node URL and profile options.
*/
public class NodeUrlProfileMixin {
/** Node URL option. */
- @Mixin
- private NodeUrlMixin nodeUrl;
+ @Option(names = {URL_OPTION_SHORT, NODE_URL_OPTION}, description = NODE_URL_OPTION_DESC, converter = UrlConverter.class)
+ private URL nodeUrl;
/** Profile to get default values from. */
@Mixin
@@ -45,8 +52,8 @@ public class NodeUrlProfileMixin {
* @return node URL
*/
public String getNodeUrl() {
- if (nodeUrl.getNodeUrl() != null) {
- return nodeUrl.getNodeUrl();
+ if (nodeUrl != null) {
+ return nodeUrl.toString();
} else {
ConfigManager configManager = configManagerProvider.get();
return configManager.getProperty(CliConfigKeys.CLUSTER_URL.value(), profileName.getProfileName());