Flaugh24 commented on code in PR #1267: URL: https://github.com/apache/ignite-3/pull/1267#discussion_r1018000852
########## 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 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; + + public NodeNameOrUrlConverter(NodeNameRegistry nodeNameRegistry) { + this.nodeNameRegistry = nodeNameRegistry; + } + + private static URL stringToUrl(String str) { + try { + return new URL(str); + } catch (MalformedURLException e) { + throw new TypeConversionException("Invalid URL '" + str + "' (" + e.getMessage() + ")"); + } + } + + @Override + public NodeUrl convert(String input) throws Exception { + boolean isUrl = URL_PATTERN.matcher(input).find(); + if (isUrl) { + return new NodeUrl(stringToUrl(input)); + } else { + return new NodeUrl(findNodeUrlByNodeName(input)); + } + } + + private URL findNodeUrlByNodeName(String name) { + return nodeNameRegistry.getNodeUrl(name) + .map(NodeNameOrUrlConverter::stringToUrl) Review Comment: done ########## modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/completer/NodeNameDynamicCompleter.java: ########## @@ -0,0 +1,66 @@ +/* + * 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.repl.completer; + +import java.util.Collections; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; +import org.apache.ignite.internal.cli.NodeNameRegistry; + +/** + * Completes typed words with node names. + */ +public class NodeNameDynamicCompleter implements DynamicCompleter { + + /** Words, after those the completer should have been activated. */ + private final Set<String> activationPostfixes; + + /** Node names registry. */ + private final NodeNameRegistry nodeNameRegistry; + + /** Default constructor that creates an instance from a given set of postfixes that trigger the completion. */ + public NodeNameDynamicCompleter(Set<String> activationPostfixes, NodeNameRegistry nodeNameRegistry) { + this.activationPostfixes = activationPostfixes; + this.nodeNameRegistry = nodeNameRegistry; + } + + @Override + public List<String> complete(String[] words) { + String lastWord = beforeLastNotEmptyWord(0, words); + String beforeLastWord = beforeLastNotEmptyWord(1, words); + if (activationPostfixes.contains(lastWord)) { + return nodeNameRegistry.getAllNames(); + } else if (activationPostfixes.contains(beforeLastWord)) { + return nodeNameRegistry.getAllNames().stream() + .filter(it -> it.startsWith(lastWord)) + .collect(Collectors.toList()); + } else { + return Collections.emptyList(); + } + } + + private static String beforeLastNotEmptyWord(int index, String[] words) { + for (int i = words.length - 1 - index; i >= 0; i--) { + if (!words[i].isEmpty()) { 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]
