This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 99dfd02d5ee IGNITE-14823 Command abbrevation (#11093)
99dfd02d5ee is described below
commit 99dfd02d5eea9f3688be0d6edf30f454f3010869
Author: Nikolay <nizhi...@apache.org>
AuthorDate: Wed Dec 13 16:36:55 2023 +0300
IGNITE-14823 Command abbrevation (#11093)
---
.../checkstyle/src/main/resources/abbrevations.csv | 3 ++-
.../internal/client/rest/GridProbeCommandTest.java | 16 ++++++++--------
.../rest/JettyRestProcessorAbstractSelfTest.java | 20 ++++++++++----------
.../compatibility/testframework/util/MavenUtils.java | 8 ++++----
.../ignite/internal/commandline/CommandHandler.java | 18 +++++++++---------
.../util/GridCommandHandlerFactoryAbstractTest.java | 6 +++---
.../apache/ignite/internal/util/GridJavaProcess.java | 16 ++++++++--------
.../rest/handlers/log/GridLogCommandHandlerTest.java | 12 ++++++------
.../handlers/query/GridQueryCommandHandlerTest.java | 18 +++++++++---------
9 files changed, 59 insertions(+), 58 deletions(-)
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv
b/modules/checkstyle/src/main/resources/abbrevations.csv
index e7d99cb554f..89da749de71 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -9,7 +9,8 @@ attribute,attr
attributes,attrs
buffer,buf
class,cls
-#command,cmd
+command,cmd
+commands,cmds
#config,cfg
#context,ctx
#count,cnt
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/client/rest/GridProbeCommandTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/rest/GridProbeCommandTest.java
index af09544db0d..5a0b83dc35e 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/client/rest/GridProbeCommandTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/client/rest/GridProbeCommandTest.java
@@ -146,21 +146,21 @@ public class GridProbeCommandTest extends
GridCommonAbstractTest {
}
}).start();
- Map<String, Object> probeRestCommandResponse;
+ Map<String, Object> probeRestCmdResponse;
log.info("awaiting plugin handler latch");
triggerPluginStartLatch.await();
log.info("starting rest command url call");
try {
- probeRestCommandResponse = executeProbeRestRequest();
+ probeRestCmdResponse = executeProbeRestRequest();
log.info("finished rest command url call");
}
finally {
triggerRestCmdLatch.countDown(); //make sure the grid shuts down
}
- assertTrue(probeRestCommandResponse.get("error").equals("grid has not
started"));
- assertEquals(GridRestResponse.SERVICE_UNAVAILABLE,
probeRestCommandResponse.get("successStatus"));
+ assertTrue(probeRestCmdResponse.get("error").equals("grid has not
started"));
+ assertEquals(GridRestResponse.SERVICE_UNAVAILABLE,
probeRestCmdResponse.get("successStatus"));
}
/**
@@ -172,12 +172,12 @@ public class GridProbeCommandTest extends
GridCommonAbstractTest {
public void testRestProbeCommandGridStarted() throws Exception {
startGrid("regular");
- Map<String, Object> probeRestCommandResponse;
+ Map<String, Object> probeRestCmdResponse;
- probeRestCommandResponse = executeProbeRestRequest();
+ probeRestCmdResponse = executeProbeRestRequest();
- assertTrue(probeRestCommandResponse.get("response").equals("grid has
started"));
- assertEquals(0, probeRestCommandResponse.get("successStatus"));
+ assertTrue(probeRestCmdResponse.get("response").equals("grid has
started"));
+ assertEquals(0, probeRestCmdResponse.get("successStatus"));
}
/**
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
index f57688657e9..b291dff5725 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
@@ -2807,7 +2807,7 @@ public abstract class JettyRestProcessorAbstractSelfTest
extends JettyRestProces
public void testCacheCommandsWithoutCacheName() throws Exception {
final String ERROR_MSG = "Failed to find mandatory parameter in
request: cacheName";
- EnumSet<GridRestCommand> cacheCommands =
EnumSet.of(GridRestCommand.DESTROY_CACHE,
+ EnumSet<GridRestCommand> cacheCmds =
EnumSet.of(GridRestCommand.DESTROY_CACHE,
GridRestCommand.GET_OR_CREATE_CACHE,
GridRestCommand.CACHE_CONTAINS_KEYS,
GridRestCommand.CACHE_CONTAINS_KEY,
@@ -2833,10 +2833,10 @@ public abstract class
JettyRestProcessorAbstractSelfTest extends JettyRestProces
GridRestCommand.CACHE_SIZE,
GridRestCommand.CACHE_METADATA);
- for (GridRestCommand command : cacheCommands) {
- String ret = content(null, command);
+ for (GridRestCommand cmd : cacheCmds) {
+ String ret = content(null, cmd);
- if (command == GridRestCommand.CACHE_METADATA)
+ if (cmd == GridRestCommand.CACHE_METADATA)
validateJsonResponse(ret);
else {
JsonNode json = JSON_MAPPER.readTree(ret);
@@ -2861,23 +2861,23 @@ public abstract class
JettyRestProcessorAbstractSelfTest extends JettyRestProces
public void testQueryCommandsWithoutCacheName() throws Exception {
final String ERROR_MSG = "Failed to find mandatory parameter in
request: cacheName";
- EnumSet<GridRestCommand> qryCommands =
EnumSet.of(GridRestCommand.EXECUTE_SQL_QUERY,
+ EnumSet<GridRestCommand> qryCmds =
EnumSet.of(GridRestCommand.EXECUTE_SQL_QUERY,
GridRestCommand.EXECUTE_SQL_FIELDS_QUERY,
GridRestCommand.EXECUTE_SCAN_QUERY,
GridRestCommand.FETCH_SQL_QUERY,
GridRestCommand.CLOSE_SQL_QUERY);
- for (GridRestCommand command : qryCommands) {
- String ret = content(null, command,
+ for (GridRestCommand cmd : qryCmds) {
+ String ret = content(null, cmd,
"pageSize", "1",
"qry", "SELECT * FROM table");
JsonNode json = JSON_MAPPER.readTree(ret);
assertFalse(json.isNull());
- if (command == GridRestCommand.EXECUTE_SQL_QUERY ||
- command == GridRestCommand.EXECUTE_SCAN_QUERY ||
- command == GridRestCommand.EXECUTE_SQL_FIELDS_QUERY)
+ if (cmd == GridRestCommand.EXECUTE_SQL_QUERY ||
+ cmd == GridRestCommand.EXECUTE_SCAN_QUERY ||
+ cmd == GridRestCommand.EXECUTE_SQL_FIELDS_QUERY)
assertTrue(json.get("error").asText().contains(ERROR_MSG));
else
assertFalse(json.get("error").asText().contains(ERROR_MSG));
diff --git
a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/util/MavenUtils.java
b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/util/MavenUtils.java
index a3d1b4f25ee..aeb9f27b649 100644
---
a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/util/MavenUtils.java
+++
b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/util/MavenUtils.java
@@ -192,13 +192,13 @@ public class MavenUtils {
String localProxyMavenSettingsFromEnv =
System.getenv("LOCAL_PROXY_MAVEN_SETTINGS");
- GridStringBuilder mavenCommandArgs = new SB("
").a(MAVEN_DEPENDENCY_PLUGIN).a(":get -Dartifact=" + artifact);
+ GridStringBuilder mavenCmdArgs = new SB("
").a(MAVEN_DEPENDENCY_PLUGIN).a(":get -Dartifact=" + artifact);
if (!isEmpty(localProxyMavenSettingsFromEnv))
localProxyMavenSettings =
Paths.get(localProxyMavenSettingsFromEnv);
if (Files.exists(localProxyMavenSettings))
- mavenCommandArgs.a(" -s " + localProxyMavenSettings.toString());
+ mavenCmdArgs.a(" -s " + localProxyMavenSettings.toString());
else {
Collection<String> repos = new ArrayList<>();
@@ -208,10 +208,10 @@ public class MavenUtils {
repos.addAll(mavenProjectRepositories());
if (!repos.isEmpty())
- mavenCommandArgs.a("
-DremoteRepositories=").a(String.join(",", repos));
+ mavenCmdArgs.a(" -DremoteRepositories=").a(String.join(",",
repos));
}
- exec(buildMvnCommand() + mavenCommandArgs.toString());
+ exec(buildMvnCommand() + mavenCmdArgs.toString());
X.println("Download is finished");
}
diff --git
a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
index eb941fca538..45297df7c04 100644
---
a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
+++
b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
@@ -237,7 +237,7 @@ public class CommandHandler {
logger.info("User: " + System.getProperty("user.name"));
logger.info("Time: " + startTime.format(formatter));
- String commandName = "";
+ String cmdName = "";
Throwable err = null;
boolean verbose = false;
@@ -253,7 +253,7 @@ public class CommandHandler {
ConnectionAndSslParameters<A> args = new ArgumentParser(logger,
registry).parseAndValidate(rawArgs);
- commandName =
toFormattedCommandName(args.cmdPath().peekLast().getClass()).toUpperCase();
+ cmdName =
toFormattedCommandName(args.cmdPath().peekLast().getClass()).toUpperCase();
try (CliCommandInvoker<A> invoker = new
CliCommandInvoker<>(args.command(), args.commandArg(),
getClientConfiguration(args))) {
int tryConnectMaxCount = 3;
@@ -275,7 +275,7 @@ public class CommandHandler {
}
}
- logger.info("Command [" + commandName + "] started");
+ logger.info("Command [" + cmdName + "] started");
logger.info("Arguments: " +
argumentsToString(rawArgs));
logger.info(U.DELIM);
@@ -333,13 +333,13 @@ public class CommandHandler {
}
}
- logger.info("Command [" + commandName + "] finished with code: " +
EXIT_CODE_OK);
+ logger.info("Command [" + cmdName + "] finished with code: " +
EXIT_CODE_OK);
return EXIT_CODE_OK;
}
catch (IllegalArgumentException e) {
logger.error("Check arguments. " + errorMessage(e));
- logger.info("Command [" + commandName + "] finished with code: " +
EXIT_CODE_INVALID_ARGUMENTS);
+ logger.info("Command [" + cmdName + "] finished with code: " +
EXIT_CODE_INVALID_ARGUMENTS);
if (verbose)
err = e;
@@ -349,7 +349,7 @@ public class CommandHandler {
catch (Throwable e) {
if (isAuthError(e)) {
logger.error("Authentication error. " + errorMessage(e));
- logger.info("Command [" + commandName + "] finished with code:
" + ERR_AUTHENTICATION_FAILED);
+ logger.info("Command [" + cmdName + "] finished with code: " +
ERR_AUTHENTICATION_FAILED);
if (verbose)
err = e;
@@ -371,7 +371,7 @@ public class CommandHandler {
}
- logger.info("Command [" + commandName + "] finished with code:
" + EXIT_CODE_CONNECTION_FAILED);
+ logger.info("Command [" + cmdName + "] finished with code: " +
EXIT_CODE_CONNECTION_FAILED);
if (verbose)
err = e;
@@ -383,7 +383,7 @@ public class CommandHandler {
IllegalArgumentException iae = X.cause(e,
IllegalArgumentException.class);
logger.error("Check arguments. " + errorMessage(iae));
- logger.info("Command [" + commandName + "] finished with code:
" + EXIT_CODE_INVALID_ARGUMENTS);
+ logger.info("Command [" + cmdName + "] finished with code: " +
EXIT_CODE_INVALID_ARGUMENTS);
if (verbose)
err = e;
@@ -392,7 +392,7 @@ public class CommandHandler {
}
logger.error(errorMessage(e));
- logger.info("Command [" + commandName + "] finished with code: " +
EXIT_CODE_UNEXPECTED_ERROR);
+ logger.info("Command [" + cmdName + "] finished with code: " +
EXIT_CODE_UNEXPECTED_ERROR);
err = e;
diff --git
a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerFactoryAbstractTest.java
b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerFactoryAbstractTest.java
index e360206a82a..2f979642d8b 100644
---
a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerFactoryAbstractTest.java
+++
b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerFactoryAbstractTest.java
@@ -198,14 +198,14 @@ public class GridCommandHandlerFactoryAbstractTest
extends GridCommonAbstractTes
/** {@inheritDoc} */
@Override public int execute(List<String> value) {
- String commandName = null;
+ String cmdName = null;
try {
ArgumentParser parser = new ArgumentParser(log, new
IgniteCommandRegistry());
ConnectionAndSslParameters<IgniteDataTransferObject> p =
parser.parseAndValidate(value);
- commandName =
toFormattedCommandName(p.cmdPath().peekLast().getClass()).toUpperCase();
+ cmdName =
toFormattedCommandName(p.cmdPath().peekLast().getClass()).toUpperCase();
Deque<Command<?, ?>> cmdPath = new ArrayDeque<>(p.cmdPath());
@@ -257,7 +257,7 @@ public class GridCommandHandlerFactoryAbstractTest extends
GridCommonAbstractTes
IllegalArgumentException iae = X.cause(e,
IllegalArgumentException.class);
log.error("Check arguments. " + errorMessage(iae));
- log.info("Command [" + commandName + "] finished with
code: " + EXIT_CODE_INVALID_ARGUMENTS);
+ log.info("Command [" + cmdName + "] finished with code: "
+ EXIT_CODE_INVALID_ARGUMENTS);
return EXIT_CODE_INVALID_ARGUMENTS;
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
index be2a6c275c9..dd88fdb0c38 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
@@ -140,12 +140,12 @@ public final class GridJavaProcess {
List<String> procParams = params == null || params.isEmpty() ?
Collections.<String>emptyList() : Arrays.asList(params.split(" "));
- List<String> procCommands = new ArrayList<>();
+ List<String> procCmds = new ArrayList<>();
String javaBin = resolveJavaBin(javaHome);
- procCommands.add(javaBin);
- procCommands.addAll(jvmArgs == null ? U.jvmArgs() : jvmArgs);
+ procCmds.add(javaBin);
+ procCmds.addAll(jvmArgs == null ? U.jvmArgs() : jvmArgs);
if (jvmArgs == null || (!jvmArgs.contains("-cp") &&
!jvmArgs.contains("-classpath"))) {
String classpath = System.getProperty("java.class.path");
@@ -158,14 +158,14 @@ public final class GridJavaProcess {
if (cp != null)
classpath += System.getProperty("path.separator") + cp;
- procCommands.add("-cp");
- procCommands.add(classpath);
+ procCmds.add("-cp");
+ procCmds.add(classpath);
}
- procCommands.add(clsName);
- procCommands.addAll(procParams);
+ procCmds.add(clsName);
+ procCmds.addAll(procParams);
- ProcessBuilder builder = new ProcessBuilder(procCommands);
+ ProcessBuilder builder = new ProcessBuilder(procCmds);
builder.redirectErrorStream(true);
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandlerTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandlerTest.java
index ff1c8118f2a..71627f91b39 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandlerTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandlerTest.java
@@ -74,10 +74,10 @@ public class GridLogCommandHandlerTest extends
GridCommonAbstractTest {
public void testSupportedCommands() throws Exception {
GridLogCommandHandler cmdHandler = new
GridLogCommandHandler(newContext());
- Collection<GridRestCommand> commands = cmdHandler.supportedCommands();
+ Collection<GridRestCommand> cmds = cmdHandler.supportedCommands();
- assertEquals(1, commands.size());
- assertTrue(commands.contains(GridRestCommand.LOG));
+ assertEquals(1, cmds.size());
+ assertTrue(cmds.contains(GridRestCommand.LOG));
}
/**
@@ -87,10 +87,10 @@ public class GridLogCommandHandlerTest extends
GridCommonAbstractTest {
public void testUnSupportedCommands() throws Exception {
GridLogCommandHandler cmdHandler = new
GridLogCommandHandler(newContext());
- Collection<GridRestCommand> commands = cmdHandler.supportedCommands();
+ Collection<GridRestCommand> cmds = cmdHandler.supportedCommands();
- assertEquals(1, commands.size());
- assertFalse(commands.contains(GridRestCommand.VERSION));
+ assertEquals(1, cmds.size());
+ assertFalse(cmds.contains(GridRestCommand.VERSION));
}
/**
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/query/GridQueryCommandHandlerTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/query/GridQueryCommandHandlerTest.java
index 72b57291078..a11dcfc5437 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/query/GridQueryCommandHandlerTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/query/GridQueryCommandHandlerTest.java
@@ -59,15 +59,15 @@ public class GridQueryCommandHandlerTest extends
GridCommonAbstractTest {
QueryCommandHandler cmdHnd = new QueryCommandHandler(ctx);
- Collection<GridRestCommand> commands = cmdHnd.supportedCommands();
+ Collection<GridRestCommand> cmds = cmdHnd.supportedCommands();
- assertEquals(5, commands.size());
+ assertEquals(5, cmds.size());
- assertTrue(commands.contains(GridRestCommand.EXECUTE_SQL_QUERY));
-
assertTrue(commands.contains(GridRestCommand.EXECUTE_SQL_FIELDS_QUERY));
- assertTrue(commands.contains(GridRestCommand.EXECUTE_SCAN_QUERY));
- assertTrue(commands.contains(GridRestCommand.FETCH_SQL_QUERY));
- assertTrue(commands.contains(GridRestCommand.CLOSE_SQL_QUERY));
+ assertTrue(cmds.contains(GridRestCommand.EXECUTE_SQL_QUERY));
+ assertTrue(cmds.contains(GridRestCommand.EXECUTE_SQL_FIELDS_QUERY));
+ assertTrue(cmds.contains(GridRestCommand.EXECUTE_SCAN_QUERY));
+ assertTrue(cmds.contains(GridRestCommand.FETCH_SQL_QUERY));
+ assertTrue(cmds.contains(GridRestCommand.CLOSE_SQL_QUERY));
}
/**
@@ -81,9 +81,9 @@ public class GridQueryCommandHandlerTest extends
GridCommonAbstractTest {
QueryCommandHandler cmdHnd = new QueryCommandHandler(ctx);
- Collection<GridRestCommand> commands = cmdHnd.supportedCommands();
+ Collection<GridRestCommand> cmds = cmdHnd.supportedCommands();
- assertFalse(commands.contains(GridRestCommand.LOG));
+ assertFalse(cmds.contains(GridRestCommand.LOG));
}
/**
