Flaugh24 commented on code in PR #1267:
URL: https://github.com/apache/ignite-3/pull/1267#discussion_r1018000527
##########
modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/OptionsConstants.java:
##########
@@ -38,6 +38,9 @@ public class OptionsConstants {
/** Node URL option description. */
public static final String NODE_URL_DESC = "URL of ignite node";
+ /** Node URL or name option description. */
+ public static final String NODE_URL_OR_NAME_DESC = "URL or name of ignite
node";
Review Comment:
done
##########
modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/NodeUrlMixin.java:
##########
@@ -17,23 +17,63 @@
package org.apache.ignite.internal.cli.commands.node;
+import static
org.apache.ignite.internal.cli.commands.OptionsConstants.NODE_NAME_DESC;
+import static
org.apache.ignite.internal.cli.commands.OptionsConstants.NODE_NAME_OPTION;
+import static
org.apache.ignite.internal.cli.commands.OptionsConstants.NODE_NAME_OPTION_SHORT;
import static
org.apache.ignite.internal.cli.commands.OptionsConstants.NODE_URL_DESC;
import static
org.apache.ignite.internal.cli.commands.OptionsConstants.NODE_URL_OPTION;
import static
org.apache.ignite.internal.cli.commands.OptionsConstants.URL_OPTION_SHORT;
+import jakarta.inject.Inject;
import java.net.URL;
+import org.apache.ignite.internal.cli.NodeNameRegistry;
import org.apache.ignite.internal.cli.core.converters.UrlConverter;
+import org.apache.ignite.internal.cli.deprecated.IgniteCliException;
+import picocli.CommandLine.ArgGroup;
import picocli.CommandLine.Option;
/**
* Mixin class for node URL option.
*/
public class NodeUrlMixin {
- /** Node URL option. */
- @Option(names = {URL_OPTION_SHORT, NODE_URL_OPTION}, description =
NODE_URL_DESC, converter = UrlConverter.class)
- private URL nodeUrl;
+ @ArgGroup
+ private Options options;
+
+ @Inject
+ NodeNameRegistry nodeNameRegistry;
+
+ private static class Options {
+
+ /**
+ * Node URL option.
+ */
+ @Option(names = {URL_OPTION_SHORT, NODE_URL_OPTION}, description =
NODE_URL_DESC, converter = UrlConverter.class)
+ private URL nodeUrl;
+
+ /**
+ * Node name option.
+ */
+ @Option(names = {NODE_NAME_OPTION_SHORT, NODE_NAME_OPTION},
description = NODE_NAME_DESC)
+ private String nodeName;
+ }
+
+ /**
+ * Returns node URL.
+ *
+ * @return Node URL
+ */
public String getNodeUrl() {
- return nodeUrl != null ? nodeUrl.toString() : null;
+ if (options == null) {
+ return null;
+ } else {
+ if (options.nodeUrl != null) {
+ return options.nodeUrl.toString();
+ } else {
+ return nodeNameRegistry.getNodeUrl(options.nodeName)
+ .orElseThrow(() -> new IgniteCliException("Node " +
options.nodeName
+ + " not found. Provide valid name or use
URL"));
Review Comment:
done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
