petrov-mg commented on code in PR #10576:
URL: https://github.com/apache/ignite/pull/10576#discussion_r1130695103
##########
modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/CommandArgIterator.java:
##########
@@ -45,9 +49,14 @@ public class CommandArgIterator {
* @param argsIt Raw argument iterator.
* @param commonArgumentsAndHighLevelCommandSet All known subcomands.
*/
- public CommandArgIterator(Iterator<String> argsIt, Set<String>
commonArgumentsAndHighLevelCommandSet) {
+ public CommandArgIterator(
+ Iterator<String> argsIt,
+ Set<String> commonArgumentsAndHighLevelCommandSet,
+ Map<String, Command<?>> cmds
Review Comment:
We need to describe the new parameter in javadoc.
##########
modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java:
##########
@@ -155,14 +160,34 @@ public static IgniteLogger setupJavaLogger(String
appName, Class<?> cls) {
*
*/
public CommandHandler() {
- logger = setupJavaLogger("control-utility", CommandHandler.class);
+ this(setupJavaLogger("control-utility", CommandHandler.class));
}
/**
* @param logger Logger to use.
*/
public CommandHandler(IgniteLogger logger) {
this.logger = logger;
+ Iterable<CommandsProvider> it = U.loadService(CommandsProvider.class);
+
+ cmds = new HashMap<>();
+
+ new CommandsProviderImpl().commands().forEach((k, v) ->
cmds.put(k.toLowerCase(), v));
+
+ if (!F.isEmpty(it)) {
+ for (CommandsProvider provider : it) {
+ provider.commands().forEach((k, v) -> {
+ k = k.toLowerCase();
+
+ if (cmds.containsKey(k)) {
+ throw new IllegalArgumentException("Only one action
can be specified, but found at least two:" +
Review Comment:
It seem that the error message should be changed - we need to say that
command name conflict were found or something like that. And specifiy the
plugin name/class in the error message if possible.
##########
modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java:
##########
@@ -155,14 +160,34 @@ public static IgniteLogger setupJavaLogger(String
appName, Class<?> cls) {
*
*/
public CommandHandler() {
- logger = setupJavaLogger("control-utility", CommandHandler.class);
+ this(setupJavaLogger("control-utility", CommandHandler.class));
}
/**
* @param logger Logger to use.
*/
public CommandHandler(IgniteLogger logger) {
this.logger = logger;
+ Iterable<CommandsProvider> it = U.loadService(CommandsProvider.class);
+
+ cmds = new HashMap<>();
+
+ new CommandsProviderImpl().commands().forEach((k, v) ->
cmds.put(k.toLowerCase(), v));
+
+ if (!F.isEmpty(it)) {
+ for (CommandsProvider provider : it) {
Review Comment:
It seems useful to add logging of what exeternal commands were registered.
##########
modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/CommandsProviderImpl.java:
##########
@@ -0,0 +1,32 @@
+/*
+ * 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.commandline;
+
+import java.util.Arrays;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * Default implementation of CommandsProvider, based on {@link CommandList}
enum.
+ */
+public class CommandsProviderImpl implements CommandsProvider {
Review Comment:
It seems we can get rid of this class and move its logic to CommandList
static method.
##########
modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/Command.java:
##########
@@ -124,14 +124,34 @@ public default void usage(
CommandList cmd,
@Nullable Map<String, String> paramsDesc,
String... args
+ ) {
+ usage(logger, desc, cmd.text(), paramsDesc, args);
+ }
+
+ /**
+ * Print command usage.
+ *
+ * @param logger Logger to use.
+ * @param desc Command description.
+ * @param cmd Command.
+ * @param paramsDesc Description of parameters (optional).
+ * @param args Arguments.
+ */
+ public default void usage(
+ IgniteLogger logger,
+ String desc,
+ String cmd,
+ @Nullable Map<String, String> paramsDesc,
+ String... args
) {
logger.info("");
if (experimental())
logger.info(INDENT + "[EXPERIMENTAL]");
logger.info(INDENT + desc);
- logger.info(DOUBLE_INDENT + CommandLogger.join(" ", UTILITY_NAME, cmd,
CommandLogger.join(" ", args)));
+ logger.info(DOUBLE_INDENT + CommandLogger.join(" ", UTILITY_NAME, cmd,
Review Comment:
Why this change?
--
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]
