Flaugh24 commented on code in PR #1267:
URL: https://github.com/apache/ignite-3/pull/1267#discussion_r1015333625
##########
modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/completer/DynamicCompleterFactory.java:
##########
@@ -89,4 +93,13 @@ public LazyDynamicCompleter
clusterConfigCompleter(Set<String> activationPrefixe
}
});
}
+
+ public LazyDynamicCompleter nodeNameCompleter(String...
activationPrefixes) {
Review Comment:
Done
##########
modules/cli/src/main/java/org/apache/ignite/internal/cli/core/converters/NodeNameOrUrlConverter.java:
##########
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.cli.core.converters;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.regex.Pattern;
+import org.apache.ignite.internal.cli.NodeNameRegistry;
+import org.apache.ignite.internal.cli.commands.node.NodeUrl;
+import org.apache.ignite.internal.cli.core.exception.ParameterException;
+import picocli.CommandLine;
+import picocli.CommandLine.TypeConversionException;
+
+/** Converter for {@link NodeUrl}. */
+public class NodeNameOrUrlConverter implements
CommandLine.ITypeConverter<NodeUrl> {
+
+ private static final Pattern URL_PATTERN = Pattern.compile("^.*[/:].*");
+ private final NodeNameRegistry nodeNameRegistry;
Review Comment:
Done
##########
modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/NodeUrlMixin.java:
##########
@@ -17,23 +17,62 @@
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]
