You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ji...@apache.org on 2017/06/14 16:00:34 UTC
[1/5] geode git commit: GEODE-2818: add aliases to the undeploy
command
Repository: geode
Updated Branches:
refs/heads/develop a4d790c3d -> a64332732
GEODE-2818: add aliases to the undeploy command
* this closes #560
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/a6433273
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/a6433273
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/a6433273
Branch: refs/heads/develop
Commit: a6433273251528d2cda3b5f1e6dc4dad4360275f
Parents: db8e1df
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Wed Jun 7 16:10:56 2017 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Wed Jun 14 08:59:51 2017 -0700
----------------------------------------------------------------------
.../internal/cli/commands/ConfigCommands.java | 7 +--
.../internal/cli/commands/DeployCommands.java | 50 +++++++++++---------
.../internal/cli/functions/DeployFunction.java | 3 --
.../cli/functions/UndeployFunction.java | 9 ++--
.../cli/GfshParserAutoCompletionTest.java | 6 +--
.../cli/commands/DeployCommandsDUnitTest.java | 36 +++++++++++++-
6 files changed, 74 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/a6433273/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConfigCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConfigCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConfigCommands.java
index 19c72c3..a8afa7d 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConfigCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConfigCommands.java
@@ -81,9 +81,10 @@ public class ConfigCommands implements GfshCommand {
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ)
public Result describeConfig(
@CliOption(key = CliStrings.MEMBER, optionContext = ConverterHint.ALL_MEMBER_IDNAME,
- help = CliStrings.DESCRIBE_CONFIG__MEMBER__HELP, mandatory = true)
-
- String memberNameOrId, @CliOption(key = CliStrings.DESCRIBE_CONFIG__HIDE__DEFAULTS, help = CliStrings.DESCRIBE_CONFIG__HIDE__DEFAULTS__HELP, unspecifiedDefaultValue = "true", specifiedDefaultValue = "true") boolean hideDefaults) {
+ help = CliStrings.DESCRIBE_CONFIG__MEMBER__HELP, mandatory = true) String memberNameOrId,
+ @CliOption(key = CliStrings.DESCRIBE_CONFIG__HIDE__DEFAULTS,
+ help = CliStrings.DESCRIBE_CONFIG__HIDE__DEFAULTS__HELP, unspecifiedDefaultValue = "true",
+ specifiedDefaultValue = "true") boolean hideDefaults) {
Result result = null;
try {
http://git-wip-us.apache.org/repos/asf/geode/blob/a6433273/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommands.java
index 43a748e..9b79e1d 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommands.java
@@ -15,6 +15,8 @@
package org.apache.geode.management.internal.cli.commands;
import static org.apache.commons.io.FileUtils.ONE_MB;
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.execute.ResultCollector;
@@ -66,7 +68,7 @@ public class DeployCommands implements GfshCommand {
* Deploy one or more JAR files to members of a group or all members.
*
* @param groups Group(s) to deploy the JAR to or null for all members
- * @param jar JAR file to deploy
+ * @param jars JAR file to deploy
* @param dir Directory of JAR files to deploy
* @return The result of the attempt to deploy
*/
@@ -77,7 +79,8 @@ public class DeployCommands implements GfshCommand {
public Result deploy(
@CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS}, help = CliStrings.DEPLOY__GROUP__HELP,
optionContext = ConverterHint.MEMBERGROUP) String[] groups,
- @CliOption(key = {CliStrings.JAR}, help = CliStrings.DEPLOY__JAR__HELP) String jar,
+ @CliOption(key = {CliStrings.JAR, CliStrings.JARS},
+ help = CliStrings.DEPLOY__JAR__HELP) String[] jars,
@CliOption(key = {CliStrings.DEPLOY__DIR}, help = CliStrings.DEPLOY__DIR__HELP) String dir) {
try {
@@ -157,8 +160,8 @@ public class DeployCommands implements GfshCommand {
@CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
help = CliStrings.UNDEPLOY__GROUP__HELP,
optionContext = ConverterHint.MEMBERGROUP) String[] groups,
- @CliOption(key = {CliStrings.JAR}, help = CliStrings.UNDEPLOY__JAR__HELP,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE) String jars) {
+ @CliOption(key = {CliStrings.JAR, CliStrings.JARS}, help = CliStrings.UNDEPLOY__JAR__HELP,
+ unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE) String[] jars) {
try {
TabularResultData tabularData = ResultBuilder.createTabularResultData();
@@ -175,6 +178,7 @@ public class DeployCommands implements GfshCommand {
List<CliFunctionResult> results = CliFunctionResult.cleanResults((List<?>) rc.getResult());
for (CliFunctionResult result : results) {
+
if (result.getThrowable() != null) {
tabularData.accumulate("Member", result.getMemberIdOrName());
tabularData.accumulate("Un-Deployed JAR", "");
@@ -200,8 +204,8 @@ public class DeployCommands implements GfshCommand {
Result result = ResultBuilder.buildResult(tabularData);
if (tabularData.getStatus().equals(Status.OK)) {
- persistClusterConfiguration(result, () -> getSharedConfiguration()
- .removeJars(jars == null ? null : jars.split(","), groups));
+ persistClusterConfiguration(result,
+ () -> getSharedConfiguration().removeJars(jars, groups));
}
return result;
} catch (VirtualMachineError e) {
@@ -283,29 +287,31 @@ public class DeployCommands implements GfshCommand {
@Override
public Result preExecution(GfshParseResult parseResult) {
- Map<String, String> paramValueMap = parseResult.getParamValueStrings();
-
- String jar = paramValueMap.get("jar");
- jar = jar == null ? null : jar.trim();
-
- String dir = paramValueMap.get("dir");
- dir = dir == null ? null : dir.trim();
-
- String group = paramValueMap.get("group");
- group = group == null ? null : group.trim();
-
- String jarOrDir = jar != null ? jar : dir;
+ // 2nd argument is the jar
+ String[] jars = (String[]) parseResult.getArguments()[1];
+ // 3rd arguemnt is the dir
+ String dir = (String) parseResult.getArguments()[2];
- if (jar == null && dir == null) {
+ if (ArrayUtils.isEmpty(jars) && StringUtils.isBlank(dir)) {
return ResultBuilder.createUserErrorResult(
"Parameter \"jar\" or \"dir\" is required. Use \"help <command name>\" for assistance.");
}
+ if (ArrayUtils.isNotEmpty(jars) && StringUtils.isNotBlank(dir)) {
+ return ResultBuilder
+ .createUserErrorResult("Parameters \"jar\" and \"dir\" can not both be specified.");
+ }
+
FileResult fileResult;
+ String[] filesToUpload = jars;
+ if (filesToUpload == null) {
+ filesToUpload = new String[] {dir};
+ }
try {
- fileResult = new FileResult(new String[] {jar != null ? jar : dir});
+
+ fileResult = new FileResult(filesToUpload);
} catch (FileNotFoundException fnfex) {
- return ResultBuilder.createGemFireErrorResult("'" + jarOrDir + "' not found.");
+ return ResultBuilder.createGemFireErrorResult("'" + filesToUpload + "' not found.");
} catch (IOException ioex) {
return ResultBuilder.createGemFireErrorResult("I/O error when reading jar/dir: "
+ ioex.getClass().getName() + ": " + ioex.getMessage());
@@ -320,7 +326,7 @@ public class DeployCommands implements GfshCommand {
if (readYesNo(message, Response.YES) == Response.NO) {
return ResultBuilder
- .createShellClientAbortOperationResult("Aborted deploy of " + jarOrDir + ".");
+ .createShellClientAbortOperationResult("Aborted deploy of " + filesToUpload + ".");
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a6433273/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DeployFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DeployFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DeployFunction.java
index f1b1cd6..401a368 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DeployFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DeployFunction.java
@@ -54,9 +54,6 @@ public class DeployFunction implements Function, InternalEntity {
final byte[][] jarBytes = (byte[][]) args[1];
InternalCache cache = getCache();
- final JarDeployer jarDeployer =
- new JarDeployer(cache.getInternalDistributedSystem().getConfig().getDeployWorkingDir());
-
DistributedMember member = cache.getDistributedSystem().getDistributedMember();
memberId = member.getId();
http://git-wip-us.apache.org/repos/asf/geode/blob/a6433273/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UndeployFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UndeployFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UndeployFunction.java
index 64ed367..031c855 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UndeployFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UndeployFunction.java
@@ -18,6 +18,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
+import org.apache.commons.lang.ArrayUtils;
import org.apache.geode.internal.ClassPathLoader;
import org.apache.logging.log4j.Logger;
@@ -51,7 +52,7 @@ public class UndeployFunction implements Function, InternalEntity {
try {
final Object[] args = (Object[]) context.getArguments();
- final String jarFilenameList = (String) args[0]; // Comma separated
+ final String[] jarFilenameList = (String[]) args[0]; // Comma separated
InternalCache cache = getCache();
final JarDeployer jarDeployer = ClassPathLoader.getLatest().getJarDeployer();
@@ -65,7 +66,7 @@ public class UndeployFunction implements Function, InternalEntity {
}
String[] undeployedJars = new String[0];
- if (jarFilenameList == null || jarFilenameList.equals("")) {
+ if (ArrayUtils.isEmpty(jarFilenameList)) {
final List<DeployedJar> jarClassLoaders = jarDeployer.findDeployedJars();
undeployedJars = new String[jarClassLoaders.size() * 2];
int index = 0;
@@ -81,9 +82,7 @@ public class UndeployFunction implements Function, InternalEntity {
}
} else {
List<String> undeployedList = new ArrayList<String>();
- StringTokenizer jarTokenizer = new StringTokenizer(jarFilenameList, ",");
- while (jarTokenizer.hasMoreTokens()) {
- String jarFilename = jarTokenizer.nextToken().trim();
+ for (String jarFilename : jarFilenameList) {
try {
undeployedList.add(jarFilename);
undeployedList.add(ClassPathLoader.getLatest().getJarDeployer().undeploy(jarFilename));
http://git-wip-us.apache.org/repos/asf/geode/blob/a6433273/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserAutoCompletionTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserAutoCompletionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserAutoCompletionTest.java
index a2946d4..4069c06 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserAutoCompletionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserAutoCompletionTest.java
@@ -53,7 +53,7 @@ public class GfshParserAutoCompletionTest {
public void testCompletionDeploy() throws Exception {
buffer = "deploy";
candidate = parser.complete(buffer);
- assertThat(candidate.size()).isEqualTo(3);
+ assertThat(candidate.size()).isEqualTo(5);
assertThat(candidate.getFirstCandidate()).isEqualTo(buffer + " --dir");
}
@@ -61,7 +61,7 @@ public class GfshParserAutoCompletionTest {
public void testCompletionDeployWithSpace() throws Exception {
buffer = "deploy ";
candidate = parser.complete(buffer);
- assertThat(candidate.size()).isEqualTo(3);
+ assertThat(candidate.size()).isEqualTo(5);
assertThat(candidate.getFirstCandidate()).isEqualTo(buffer + "--dir");
}
@@ -244,7 +244,7 @@ public class GfshParserAutoCompletionTest {
public void testCompletWithRegionTypeWithSpace() throws Exception {
buffer = "create region --name=test --type=REPLICATE ";
candidate = parser.complete(buffer);
- assertThat(candidate.size()).isEqualTo(37);
+ assertThat(candidate.size()).isEqualTo(38);
assertThat(candidate.getFirstCandidate()).isEqualTo(buffer + "--async-event-queue-id");
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a6433273/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandsDUnitTest.java
index 3a88faa..846a8d9 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandsDUnitTest.java
@@ -120,7 +120,7 @@ public class DeployCommandsDUnitTest implements Serializable {
}
@Test
- public void deployMultipleJarsToOneGroup() throws Exception {
+ public void deployJarsInDirToOneGroup() throws Exception {
// Deploy of multiple JARs to a single group
gfshConnector.executeAndVerifyCommand(
"deploy --group=" + GROUP1 + " --dir=" + subdirWithJars3and4.getCanonicalPath());
@@ -153,6 +153,40 @@ public class DeployCommandsDUnitTest implements Serializable {
}
@Test
+ public void deployMultipleJarsToOneGroup() throws Exception {
+ // Deploy of multiple JARs to a single group
+ gfshConnector.executeAndVerifyCommand("deploy --group=" + GROUP1 + " --jars="
+ + jar3.getAbsolutePath() + "," + jar4.getAbsolutePath());
+ String resultString = gfshConnector.getGfshOutput();
+
+ assertThat(resultString).describedAs(resultString).contains(server1.getName());
+ assertThat(resultString).doesNotContain(server2.getName());
+ assertThat(resultString).contains(jarName3);
+ assertThat(resultString).contains(jarName4);
+
+ server1.invoke(() -> {
+ assertThatCanLoad(jarName3, class3);
+ assertThatCanLoad(jarName4, class4);
+ });
+ server2.invoke(() -> {
+ assertThatCannotLoad(jarName3, class3);
+ assertThatCannotLoad(jarName4, class4);
+ });
+
+ // Undeploy of multiple jars by specifying group
+ gfshConnector.executeAndVerifyCommand("undeploy --jars=" + jarName3 + "," + jarName4);
+ server1.invoke(() -> {
+ assertThatCannotLoad(jarName3, class3);
+ assertThatCannotLoad(jarName4, class4);
+ });
+ server2.invoke(() -> {
+ assertThatCannotLoad(jarName3, class3);
+ assertThatCannotLoad(jarName4, class4);
+ });
+ }
+
+
+ @Test
public void deployJarToAllServers() throws Exception {
// Deploy a jar to all servers
gfshConnector.executeAndVerifyCommand("deploy --jar=" + jar1);
[5/5] geode git commit: GEODE-2818: add alias to any command's
options that involves "group", "member",
"jar" and replace CliString variables with GROUP, MEMBER, JAR, etc.
Posted by ji...@apache.org.
GEODE-2818: add alias to any command's options that involves "group", "member", "jar" and replace CliString variables with GROUP, MEMBER, JAR, etc.
* this closes #560
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/db8e1df3
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/db8e1df3
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/db8e1df3
Branch: refs/heads/develop
Commit: db8e1df392bcdbaabb44263e6c699756eda14850
Parents: a4d790c
Author: YehEmily <em...@gmail.com>
Authored: Mon Jun 5 13:03:39 2017 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Wed Jun 14 08:59:51 2017 -0700
----------------------------------------------------------------------
...erConfigurationServiceEndToEndDUnitTest.java | 8 +-
.../internal/cli/commands/ConfigCommands.java | 20 ++-
.../CreateAlterDestroyRegionCommands.java | 24 ++--
.../internal/cli/commands/DataCommands.java | 4 +-
.../internal/cli/commands/DeployCommands.java | 11 +-
.../cli/commands/DiskStoreCommands.java | 12 +-
.../cli/commands/DurableClientCommands.java | 22 +--
.../cli/commands/ExportLogsCommand.java | 4 +-
.../internal/cli/commands/FunctionCommands.java | 20 +--
.../internal/cli/commands/IndexCommands.java | 14 +-
.../cli/commands/LauncherLifecycleCommands.java | 4 +-
.../internal/cli/commands/MemberCommands.java | 4 +-
.../cli/commands/MiscellaneousCommands.java | 34 +++--
.../internal/cli/commands/QueueCommands.java | 2 +-
.../internal/cli/commands/RegionCommands.java | 6 +-
.../internal/cli/commands/WanCommands.java | 116 +++++++--------
.../internal/cli/i18n/CliStrings.java | 99 ++-----------
.../controllers/ConfigCommandsController.java | 24 ++--
.../web/controllers/DataCommandsController.java | 4 +-
.../controllers/DeployCommandsController.java | 26 ++--
.../DiskStoreCommandsController.java | 22 ++-
.../DurableClientCommandsController.java | 50 +++----
.../web/controllers/ExportLogController.java | 10 +-
.../controllers/FunctionCommandsController.java | 32 ++---
.../controllers/IndexCommandsController.java | 36 ++---
.../controllers/MemberCommandsController.java | 6 +-
.../MiscellaneousCommandsController.java | 36 +++--
.../controllers/QueueCommandsController.java | 6 +-
.../controllers/RegionCommandsController.java | 20 ++-
.../web/controllers/WanCommandsController.java | 143 +++++++------------
.../cli/commands/ConfigCommandsDUnitTest.java | 4 +-
...eateAlterDestroyRegionCommandsDUnitTest.java | 26 ++--
.../commands/DiskStoreCommandsDUnitTest.java | 16 +--
.../commands/GemfireDataCommandsDUnitTest.java | 60 ++++----
.../cli/commands/IndexCommandsDUnitTest.java | 16 +--
.../ListAndDescribeRegionDUnitTest.java | 8 +-
.../cli/commands/MemberCommandsDUnitTest.java | 2 +-
.../MiscellaneousCommandsDUnitTest.java | 17 ++-
.../cli/commands/QueueCommandsDUnitTest.java | 6 +-
.../cli/commands/ShowMetricsDUnitTest.java | 6 +-
.../cli/commands/ShowStackTraceDUnitTest.java | 8 +-
.../cli/shell/GfshMultilineCommandTest.java | 7 +-
.../ClusterConfigDistributionDUnitTest.java | 2 +-
.../WanCommandsControllerJUnitTest.java | 14 +-
.../LuceneClusterConfigurationDUnitTest.java | 4 +-
...mandCreateDestroyGatewaySenderDUnitTest.java | 56 ++++----
...anCommandCreateGatewayReceiverDUnitTest.java | 57 ++++----
...WanCommandGatewayReceiverStartDUnitTest.java | 39 +++--
.../WanCommandGatewayReceiverStopDUnitTest.java | 39 +++--
.../WanCommandGatewaySenderStartDUnitTest.java | 40 +++---
.../WanCommandGatewaySenderStopDUnitTest.java | 34 ++---
.../wan/wancommand/WanCommandListDUnitTest.java | 32 ++---
.../WanCommandPauseResumeDUnitTest.java | 68 ++++-----
.../wancommand/WanCommandStatusDUnitTest.java | 56 ++++----
.../ClusterConfigurationDUnitTest.java | 10 +-
...nfigurationIndexWithFromClauseDUnitTest.java | 4 +-
56 files changed, 630 insertions(+), 820 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-assembly/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceEndToEndDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceEndToEndDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceEndToEndDUnitTest.java
index 791f2ce..415ac3e 100644
--- a/geode-assembly/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceEndToEndDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceEndToEndDUnitTest.java
@@ -230,7 +230,7 @@ public class ClusterConfigurationServiceEndToEndDUnitTest extends CliCommandTest
FileUtils.writeByteArrayToFile(jarFile, jarBytes);
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.DEPLOY);
- csb.addOption(CliStrings.DEPLOY__JAR, queueCommandsJarName);
+ csb.addOption(CliStrings.JAR, queueCommandsJarName);
executeAndVerifyCommand(csb.getCommandString());
csb = new CommandStringBuilder(CliStrings.CREATE_ASYNC_EVENT_QUEUE);
@@ -279,7 +279,7 @@ public class ClusterConfigurationServiceEndToEndDUnitTest extends CliCommandTest
private void destroyDiskStore(final String diskStoreName, final String group) {
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.DESTROY_DISK_STORE);
csb.addOption(CliStrings.DESTROY_DISK_STORE__NAME, diskStoreName);
- csb.addOptionWithValueCheck(CliStrings.DESTROY_DISK_STORE__GROUP, group);
+ csb.addOptionWithValueCheck(CliStrings.GROUP, group);
executeAndVerifyCommand(csb.toString());
}
@@ -306,7 +306,7 @@ public class ClusterConfigurationServiceEndToEndDUnitTest extends CliCommandTest
}
if (!isBlank(group)) {
- csb.addOption(CliStrings.DESTROY_INDEX__GROUP, group);
+ csb.addOption(CliStrings.GROUP, group);
}
executeAndVerifyCommand(csb.getCommandString());
}
@@ -315,7 +315,7 @@ public class ClusterConfigurationServiceEndToEndDUnitTest extends CliCommandTest
File newDeployableJarFile = new File(jarName);
this.classBuilder.writeJarFromName("ShareConfigClass", newDeployableJarFile);
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.DEPLOY);
- csb.addOption(CliStrings.DEPLOY__JAR, jarName);
+ csb.addOption(CliStrings.JAR, jarName);
executeAndVerifyCommand(csb.getCommandString());
jarFileNames.add(jarName);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConfigCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConfigCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConfigCommands.java
index 48a8d7a..19c72c3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConfigCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConfigCommands.java
@@ -79,14 +79,11 @@ public class ConfigCommands implements GfshCommand {
@CliCommand(value = {CliStrings.DESCRIBE_CONFIG}, help = CliStrings.DESCRIBE_CONFIG__HELP)
@CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_CONFIG})
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ)
- public Result describeConfig(@CliOption(key = CliStrings.DESCRIBE_CONFIG__MEMBER,
- optionContext = ConverterHint.ALL_MEMBER_IDNAME,
- help = CliStrings.DESCRIBE_CONFIG__MEMBER__HELP, mandatory = true)
+ public Result describeConfig(
+ @CliOption(key = CliStrings.MEMBER, optionContext = ConverterHint.ALL_MEMBER_IDNAME,
+ help = CliStrings.DESCRIBE_CONFIG__MEMBER__HELP, mandatory = true)
- String memberNameOrId,
- @CliOption(key = CliStrings.DESCRIBE_CONFIG__HIDE__DEFAULTS,
- help = CliStrings.DESCRIBE_CONFIG__HIDE__DEFAULTS__HELP, unspecifiedDefaultValue = "true",
- specifiedDefaultValue = "true") boolean hideDefaults) {
+ String memberNameOrId, @CliOption(key = CliStrings.DESCRIBE_CONFIG__HIDE__DEFAULTS, help = CliStrings.DESCRIBE_CONFIG__HIDE__DEFAULTS__HELP, unspecifiedDefaultValue = "true", specifiedDefaultValue = "true") boolean hideDefaults) {
Result result = null;
try {
@@ -198,10 +195,11 @@ public class ConfigCommands implements GfshCommand {
relatedTopic = {CliStrings.TOPIC_GEODE_CONFIG})
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ)
public Result exportConfig(
- @CliOption(key = {CliStrings.EXPORT_CONFIG__MEMBER},
+ @CliOption(key = {CliStrings.MEMBER, CliStrings.MEMBERS},
optionContext = ConverterHint.ALL_MEMBER_IDNAME,
help = CliStrings.EXPORT_CONFIG__MEMBER__HELP) String[] member,
- @CliOption(key = {CliStrings.EXPORT_CONFIG__GROUP}, optionContext = ConverterHint.MEMBERGROUP,
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
+ optionContext = ConverterHint.MEMBERGROUP,
help = CliStrings.EXPORT_CONFIG__GROUP__HELP) String[] group,
@CliOption(key = {CliStrings.EXPORT_CONFIG__DIR},
help = CliStrings.EXPORT_CONFIG__DIR__HELP) String dir) {
@@ -251,10 +249,10 @@ public class ConfigCommands implements GfshCommand {
interceptor = "org.apache.geode.management.internal.cli.commands.ConfigCommands$AlterRuntimeInterceptor")
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.MANAGE)
public Result alterRuntimeConfig(
- @CliOption(key = {CliStrings.ALTER_RUNTIME_CONFIG__MEMBER},
+ @CliOption(key = {CliStrings.MEMBER, CliStrings.MEMBERS},
optionContext = ConverterHint.ALL_MEMBER_IDNAME,
help = CliStrings.ALTER_RUNTIME_CONFIG__MEMBER__HELP) String[] memberNameOrId,
- @CliOption(key = {CliStrings.ALTER_RUNTIME_CONFIG__GROUP},
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
optionContext = ConverterHint.MEMBERGROUP,
help = CliStrings.ALTER_RUNTIME_CONFIG__MEMBER__HELP) String[] group,
@CliOption(key = {CliStrings.ALTER_RUNTIME_CONFIG__ARCHIVE__DISK__SPACE__LIMIT},
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java
index b2f1d56..842802b 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java
@@ -115,7 +115,8 @@ public class CreateAlterDestroyRegionCommands implements GfshCommand {
@CliOption(key = CliStrings.CREATE_REGION__USEATTRIBUTESFROM,
optionContext = ConverterHint.REGION_PATH,
help = CliStrings.CREATE_REGION__USEATTRIBUTESFROM__HELP) String useAttributesFrom,
- @CliOption(key = CliStrings.CREATE_REGION__GROUP, optionContext = ConverterHint.MEMBERGROUP,
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
+ optionContext = ConverterHint.MEMBERGROUP,
help = CliStrings.CREATE_REGION__GROUP__HELP) String[] groups,
@CliOption(key = CliStrings.CREATE_REGION__SKIPIFEXISTS, unspecifiedDefaultValue = "true",
specifiedDefaultValue = "true",
@@ -379,7 +380,8 @@ public class CreateAlterDestroyRegionCommands implements GfshCommand {
public Result alterRegion(
@CliOption(key = CliStrings.ALTER_REGION__REGION, mandatory = true,
help = CliStrings.ALTER_REGION__REGION__HELP) String regionPath,
- @CliOption(key = CliStrings.ALTER_REGION__GROUP, optionContext = ConverterHint.MEMBERGROUP,
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
+ optionContext = ConverterHint.MEMBERGROUP,
help = CliStrings.ALTER_REGION__GROUP__HELP) String[] groups,
@CliOption(key = CliStrings.ALTER_REGION__ENTRYEXPIRATIONIDLETIME,
specifiedDefaultValue = "-1",
@@ -991,7 +993,7 @@ public class CreateAlterDestroyRegionCommands implements GfshCommand {
if (regionMembersList.size() == 0) {
return ResultBuilder.createUserErrorResult(
CliStrings.format(CliStrings.DESTROY_REGION__MSG__COULDNOT_FIND_REGIONPATH_0_IN_GEODE,
- new Object[] {regionPath, "jmx-manager-update-rate milliseconds"}));
+ regionPath, "jmx-manager-update-rate milliseconds"));
}
CliFunctionResult destroyRegionResult;
@@ -999,8 +1001,8 @@ public class CreateAlterDestroyRegionCommands implements GfshCommand {
ResultCollector<?, ?> resultCollector =
CliUtil.executeFunction(RegionDestroyFunction.INSTANCE, regionPath, regionMembersList);
List<CliFunctionResult> resultsList = (List<CliFunctionResult>) resultCollector.getResult();
- String message = CliStrings.format(CliStrings.DESTROY_REGION__MSG__REGION_0_1_DESTROYED,
- new Object[] {regionPath, ""});
+ String message =
+ CliStrings.format(CliStrings.DESTROY_REGION__MSG__REGION_0_1_DESTROYED, regionPath, "");
// Only if there is an error is this set to false
boolean isRegionDestroyed = true;
@@ -1013,12 +1015,12 @@ public class CreateAlterDestroyRegionCommands implements GfshCommand {
LogWrapper.getInstance().info(t.getMessage(), t);
message = CliStrings.format(
CliStrings.DESTROY_REGION__MSG__ERROR_OCCURRED_WHILE_DESTROYING_0_REASON_1,
- new Object[] {regionPath, t.getMessage()});
+ regionPath, t.getMessage());
isRegionDestroyed = false;
} else {
message = CliStrings.format(
CliStrings.DESTROY_REGION__MSG__UNKNOWN_RESULT_WHILE_DESTROYING_REGION_0_REASON_1,
- new Object[] {regionPath, destroyRegionResult.getMessage()});
+ regionPath, destroyRegionResult.getMessage());
isRegionDestroyed = false;
}
}
@@ -1029,12 +1031,12 @@ public class CreateAlterDestroyRegionCommands implements GfshCommand {
}
} catch (IllegalStateException e) {
result = ResultBuilder.createUserErrorResult(CliStrings.format(
- CliStrings.DESTROY_REGION__MSG__ERROR_WHILE_DESTROYING_REGION_0_REASON_1,
- new Object[] {regionPath, e.getMessage()}));
+ CliStrings.DESTROY_REGION__MSG__ERROR_WHILE_DESTROYING_REGION_0_REASON_1, regionPath,
+ e.getMessage()));
} catch (Exception e) {
result = ResultBuilder.createGemFireErrorResult(CliStrings.format(
- CliStrings.DESTROY_REGION__MSG__ERROR_WHILE_DESTROYING_REGION_0_REASON_1,
- new Object[] {regionPath, e.getMessage()}));
+ CliStrings.DESTROY_REGION__MSG__ERROR_WHILE_DESTROYING_REGION_0_REASON_1, regionPath,
+ e.getMessage()));
}
if (xmlEntity.get() != null) {
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java
index 9dee89d..b2789e3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java
@@ -742,7 +742,7 @@ public class DataCommands implements GfshCommand {
@CliOption(key = CliStrings.EXPORT_DATA__FILE,
unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE, mandatory = true,
help = CliStrings.EXPORT_DATA__FILE__HELP) String filePath,
- @CliOption(key = CliStrings.EXPORT_DATA__MEMBER,
+ @CliOption(key = CliStrings.MEMBER,
unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
optionContext = ConverterHint.MEMBERIDNAME, mandatory = true,
help = CliStrings.EXPORT_DATA__MEMBER__HELP) String memberNameOrId) {
@@ -798,7 +798,7 @@ public class DataCommands implements GfshCommand {
@CliOption(key = CliStrings.IMPORT_DATA__FILE, mandatory = true,
unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.IMPORT_DATA__FILE__HELP) String filePath,
- @CliOption(key = CliStrings.IMPORT_DATA__MEMBER, mandatory = true,
+ @CliOption(key = CliStrings.MEMBER, mandatory = true,
unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
optionContext = ConverterHint.MEMBERIDNAME,
help = CliStrings.IMPORT_DATA__MEMBER__HELP) String memberNameOrId,
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommands.java
index 99216bf..43a748e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommands.java
@@ -75,9 +75,9 @@ public class DeployCommands implements GfshCommand {
interceptor = "org.apache.geode.management.internal.cli.commands.DeployCommands$Interceptor",
relatedTopic = {CliStrings.TOPIC_GEODE_CONFIG})
public Result deploy(
- @CliOption(key = {CliStrings.DEPLOY__GROUP}, help = CliStrings.DEPLOY__GROUP__HELP,
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS}, help = CliStrings.DEPLOY__GROUP__HELP,
optionContext = ConverterHint.MEMBERGROUP) String[] groups,
- @CliOption(key = {CliStrings.DEPLOY__JAR}, help = CliStrings.DEPLOY__JAR__HELP) String jar,
+ @CliOption(key = {CliStrings.JAR}, help = CliStrings.DEPLOY__JAR__HELP) String jar,
@CliOption(key = {CliStrings.DEPLOY__DIR}, help = CliStrings.DEPLOY__DIR__HELP) String dir) {
try {
@@ -154,9 +154,10 @@ public class DeployCommands implements GfshCommand {
@CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_CONFIG})
@ResourceOperation(resource = Resource.DATA, operation = Operation.MANAGE)
public Result undeploy(
- @CliOption(key = {CliStrings.UNDEPLOY__GROUP}, help = CliStrings.UNDEPLOY__GROUP__HELP,
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
+ help = CliStrings.UNDEPLOY__GROUP__HELP,
optionContext = ConverterHint.MEMBERGROUP) String[] groups,
- @CliOption(key = {CliStrings.UNDEPLOY__JAR}, help = CliStrings.UNDEPLOY__JAR__HELP,
+ @CliOption(key = {CliStrings.JAR}, help = CliStrings.UNDEPLOY__JAR__HELP,
unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE) String jars) {
try {
@@ -222,7 +223,7 @@ public class DeployCommands implements GfshCommand {
@CliCommand(value = {CliStrings.LIST_DEPLOYED}, help = CliStrings.LIST_DEPLOYED__HELP)
@CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_CONFIG})
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ)
- public Result listDeployed(@CliOption(key = {CliStrings.LIST_DEPLOYED__GROUP},
+ public Result listDeployed(@CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
help = CliStrings.LIST_DEPLOYED__GROUP__HELP) String[] group) {
try {
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommands.java
index ef2c3dd..e14c3a6 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommands.java
@@ -304,7 +304,7 @@ public class DiskStoreCommands implements GfshCommand {
help = CliStrings.CREATE_DISK_STORE__WRITE_BUFFER_SIZE__HELP) int writeBufferSize,
@CliOption(key = CliStrings.CREATE_DISK_STORE__DIRECTORY_AND_SIZE, mandatory = true,
help = CliStrings.CREATE_DISK_STORE__DIRECTORY_AND_SIZE__HELP) String[] directoriesAndSizes,
- @CliOption(key = CliStrings.CREATE_DISK_STORE__GROUP,
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
help = CliStrings.CREATE_DISK_STORE__GROUP__HELP,
optionContext = ConverterHint.MEMBERGROUP) String[] groups,
@CliOption(key = CliStrings.CREATE_DISK_STORE__DISK_USAGE_WARNING_PCT,
@@ -405,7 +405,7 @@ public class DiskStoreCommands implements GfshCommand {
@CliOption(key = CliStrings.COMPACT_DISK_STORE__NAME, mandatory = true,
optionContext = ConverterHint.DISKSTORE,
help = CliStrings.COMPACT_DISK_STORE__NAME__HELP) String diskStoreName,
- @CliOption(key = CliStrings.COMPACT_DISK_STORE__GROUP,
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.COMPACT_DISK_STORE__GROUP__HELP) String[] groups) {
Result result = null;
@@ -645,7 +645,7 @@ public class DiskStoreCommands implements GfshCommand {
fieldsMessage += CliUtil.arrayToString(diskDirs);
String errorString = CliStrings.format(
CliStrings.COMPACT_OFFLINE_DISK_STORE__MSG__ERROR_WHILE_COMPACTING_DISKSTORE_0_WITH_1_REASON_2,
- new Object[] {diskStoreName, fieldsMessage});
+ diskStoreName, fieldsMessage);
result = ResultBuilder.createUserErrorResult(errorString);
if (logWrapper.fineEnabled()) {
logWrapper.fine(e.getMessage(), e);
@@ -787,7 +787,7 @@ public class DiskStoreCommands implements GfshCommand {
fieldsMessage += CliUtil.arrayToString(diskDirs);
String errorString = CliStrings.format(
CliStrings.UPGRADE_OFFLINE_DISK_STORE__MSG__ERROR_WHILE_COMPACTING_DISKSTORE_0_WITH_1_REASON_2,
- new Object[] {diskStoreName, fieldsMessage});
+ diskStoreName, fieldsMessage);
result = ResultBuilder.createUserErrorResult(errorString);
if (logWrapper.fineEnabled()) {
logWrapper.fine(e.getMessage(), e);
@@ -846,7 +846,7 @@ public class DiskStoreCommands implements GfshCommand {
@CliMetaData(shellOnly = false, relatedTopic = {CliStrings.TOPIC_GEODE_DISKSTORE})
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ)
public Result describeDiskStore(
- @CliOption(key = CliStrings.DESCRIBE_DISK_STORE__MEMBER, mandatory = true,
+ @CliOption(key = CliStrings.MEMBER, mandatory = true,
optionContext = ConverterHint.MEMBERIDNAME,
help = CliStrings.DESCRIBE_DISK_STORE__MEMBER__HELP) final String memberName,
@CliOption(key = CliStrings.DESCRIBE_DISK_STORE__NAME, mandatory = true,
@@ -1395,7 +1395,7 @@ public class DiskStoreCommands implements GfshCommand {
public Result destroyDiskStore(
@CliOption(key = CliStrings.DESTROY_DISK_STORE__NAME, mandatory = true,
help = CliStrings.DESTROY_DISK_STORE__NAME__HELP) String name,
- @CliOption(key = CliStrings.DESTROY_DISK_STORE__GROUP,
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
help = CliStrings.DESTROY_DISK_STORE__GROUP__HELP,
optionContext = ConverterHint.MEMBERGROUP) String[] groups) {
try {
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DurableClientCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DurableClientCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DurableClientCommands.java
index ef744d1..87ad1be 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DurableClientCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DurableClientCommands.java
@@ -69,11 +69,11 @@ public class DurableClientCommands implements GfshCommand {
@CliOption(key = CliStrings.LIST_DURABLE_CQS__DURABLECLIENTID, mandatory = true,
help = CliStrings.LIST_DURABLE_CQS__DURABLECLIENTID__HELP) final String durableClientId,
- @CliOption(key = CliStrings.LIST_DURABLE_CQS__MEMBER,
+ @CliOption(key = {CliStrings.MEMBER, CliStrings.MEMBERS},
help = CliStrings.LIST_DURABLE_CQS__MEMBER__HELP,
optionContext = ConverterHint.MEMBERIDNAME) final String[] memberNameOrId,
- @CliOption(key = CliStrings.LIST_DURABLE_CQS__GROUP,
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
help = CliStrings.LIST_DURABLE_CQS__GROUP__HELP,
optionContext = ConverterHint.MEMBERGROUP) final String[] group) {
Result result = null;
@@ -119,9 +119,9 @@ public class DurableClientCommands implements GfshCommand {
for (String cqName : cqNames) {
if (isFirst) {
isFirst = false;
- table.accumulate(CliStrings.LIST_DURABLE_CQS__MEMBER, member);
+ table.accumulate(CliStrings.MEMBER, member);
} else {
- table.accumulate(CliStrings.LIST_DURABLE_CQS__MEMBER, "");
+ table.accumulate(CliStrings.MEMBER, "");
}
table.accumulate(CliStrings.LIST_DURABLE_CQS__NAME, cqName);
}
@@ -149,10 +149,10 @@ public class DurableClientCommands implements GfshCommand {
help = CliStrings.COUNT_DURABLE_CQ_EVENTS__DURABLE__CLIENT__ID__HELP) final String durableClientId,
@CliOption(key = CliStrings.COUNT_DURABLE_CQ_EVENTS__DURABLE__CQ__NAME, mandatory = false,
help = CliStrings.COUNT_DURABLE_CQ_EVENTS__DURABLE__CQ__NAME__HELP) final String cqName,
- @CliOption(key = CliStrings.COUNT_DURABLE_CQ_EVENTS__MEMBER, mandatory = false,
+ @CliOption(key = {CliStrings.MEMBER, CliStrings.MEMBERS}, mandatory = false,
help = CliStrings.COUNT_DURABLE_CQ_EVENTS__MEMBER__HELP,
optionContext = ConverterHint.MEMBERIDNAME) final String[] memberNameOrId,
- @CliOption(key = CliStrings.COUNT_DURABLE_CQ_EVENTS__GROUP, mandatory = false,
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS}, mandatory = false,
help = CliStrings.COUNT_DURABLE_CQ_EVENTS__GROUP__HELP,
optionContext = ConverterHint.MEMBERGROUP) final String[] group) {
@@ -196,10 +196,10 @@ public class DurableClientCommands implements GfshCommand {
public Result closeDurableClient(
@CliOption(key = CliStrings.CLOSE_DURABLE_CLIENTS__CLIENT__ID, mandatory = true,
help = CliStrings.CLOSE_DURABLE_CLIENTS__CLIENT__ID__HELP) final String durableClientId,
- @CliOption(key = CliStrings.CLOSE_DURABLE_CLIENTS__MEMBER, mandatory = false,
+ @CliOption(key = {CliStrings.MEMBER, CliStrings.MEMBERS}, mandatory = false,
help = CliStrings.CLOSE_DURABLE_CLIENTS__MEMBER__HELP,
optionContext = ConverterHint.MEMBERIDNAME) final String[] memberNameOrId,
- @CliOption(key = CliStrings.CLOSE_DURABLE_CLIENTS__GROUP, mandatory = false,
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS}, mandatory = false,
help = CliStrings.COUNT_DURABLE_CQ_EVENTS__GROUP__HELP,
optionContext = ConverterHint.MEMBERGROUP) final String[] group) {
@@ -237,11 +237,11 @@ public class DurableClientCommands implements GfshCommand {
@CliOption(key = CliStrings.CLOSE_DURABLE_CQS__NAME, mandatory = true,
help = CliStrings.CLOSE_DURABLE_CQS__NAME__HELP) final String cqName,
- @CliOption(key = CliStrings.CLOSE_DURABLE_CQS__MEMBER, mandatory = false,
+ @CliOption(key = {CliStrings.MEMBER, CliStrings.MEMBERS}, mandatory = false,
help = CliStrings.CLOSE_DURABLE_CQS__MEMBER__HELP,
optionContext = ConverterHint.MEMBERIDNAME) final String[] memberNameOrId,
- @CliOption(key = CliStrings.CLOSE_DURABLE_CQS__GROUP, mandatory = false,
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS}, mandatory = false,
help = CliStrings.CLOSE_DURABLE_CQS__GROUP__HELP,
optionContext = ConverterHint.MEMBERGROUP) final String[] group) {
Result result = null;
@@ -343,7 +343,7 @@ public class DurableClientCommands implements GfshCommand {
for (String member : members) {
long queueSize = memberQueueSizeTable.get(member);
- table.accumulate(CliStrings.COUNT_DURABLE_CQ_EVENTS__MEMBER, member);
+ table.accumulate(CliStrings.MEMBER, member);
table.accumulate(queueSizeColumnName, queueSize);
}
result = ResultBuilder.buildResult(table);
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java
index 3d68788..2075776 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java
@@ -68,11 +68,11 @@ public class ExportLogsCommand implements GfshCommand {
public Result exportLogs(
@CliOption(key = CliStrings.EXPORT_LOGS__DIR, help = CliStrings.EXPORT_LOGS__DIR__HELP,
mandatory = false) String dirName,
- @CliOption(key = CliStrings.EXPORT_LOGS__GROUP,
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
optionContext = ConverterHint.MEMBERGROUP,
help = CliStrings.EXPORT_LOGS__GROUP__HELP) String[] groups,
- @CliOption(key = CliStrings.EXPORT_LOGS__MEMBER,
+ @CliOption(key = {CliStrings.MEMBER, CliStrings.MEMBERS},
unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
optionContext = ConverterHint.ALL_MEMBER_IDNAME,
help = CliStrings.EXPORT_LOGS__MEMBER__HELP) String[] memberIds,
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/FunctionCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/FunctionCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/FunctionCommands.java
index b0193af..c04820e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/FunctionCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/FunctionCommands.java
@@ -76,11 +76,11 @@ public class FunctionCommands implements GfshCommand {
// TODO: Add optioncontext for functionID
@CliOption(key = CliStrings.EXECUTE_FUNCTION__ID, mandatory = true,
help = CliStrings.EXECUTE_FUNCTION__ID__HELP) String functionId,
- @CliOption(key = CliStrings.EXECUTE_FUNCTION__ONGROUPS,
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
optionContext = ConverterHint.MEMBERGROUP,
help = CliStrings.EXECUTE_FUNCTION__ONGROUPS__HELP) String[] onGroups,
- @CliOption(key = CliStrings.EXECUTE_FUNCTION__ONMEMBER,
+ @CliOption(key = CliStrings.MEMBER,
unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
optionContext = ConverterHint.MEMBERIDNAME,
help = CliStrings.EXECUTE_FUNCTION__ONMEMBER__HELP) String onMember,
@@ -300,7 +300,7 @@ public class FunctionCommands implements GfshCommand {
}
} else if (onMember != null && onMember.length() > 0) {
DistributedMember member = CliUtil.getDistributedMemberByNameOrId(onMember); // fix for bug
- // 45658
+ // 45658
if (member != null) {
executeAndGetResults(functionId, filterString, resultCollector, arguments, cache, member,
resultTable, onRegion);
@@ -414,11 +414,11 @@ public class FunctionCommands implements GfshCommand {
public Result destroyFunction(
@CliOption(key = CliStrings.DESTROY_FUNCTION__ID, mandatory = true,
help = CliStrings.DESTROY_FUNCTION__HELP) String functionId,
- @CliOption(key = CliStrings.DESTROY_FUNCTION__ONGROUPS,
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
optionContext = ConverterHint.MEMBERGROUP,
help = CliStrings.DESTROY_FUNCTION__ONGROUPS__HELP) String[] groups,
- @CliOption(key = CliStrings.DESTROY_FUNCTION__ONMEMBER,
+ @CliOption(key = CliStrings.MEMBER,
unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
optionContext = ConverterHint.MEMBERIDNAME,
help = CliStrings.DESTROY_FUNCTION__ONMEMBER__HELP) String memberId) {
@@ -465,8 +465,8 @@ public class FunctionCommands implements GfshCommand {
public Result preExecution(GfshParseResult parseResult) {
Map<String, String> paramValueMap = parseResult.getParamValueStrings();
Set<Entry<String, String>> setEnvMap = paramValueMap.entrySet();
- String onGroup = paramValueMap.get(CliStrings.DESTROY_FUNCTION__ONGROUPS);
- String onMember = paramValueMap.get(CliStrings.DESTROY_FUNCTION__ONMEMBER);
+ String onGroup = paramValueMap.get(CliStrings.GROUP);
+ String onMember = paramValueMap.get(CliStrings.MEMBER);
if ((onGroup == null && onMember == null)) {
Response response = readYesNo("Do you really want to destroy "
@@ -533,9 +533,11 @@ public class FunctionCommands implements GfshCommand {
public Result listFunction(
@CliOption(key = CliStrings.LIST_FUNCTION__MATCHES,
help = CliStrings.LIST_FUNCTION__MATCHES__HELP) String matches,
- @CliOption(key = CliStrings.LIST_FUNCTION__GROUP, optionContext = ConverterHint.MEMBERGROUP,
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
+ optionContext = ConverterHint.MEMBERGROUP,
help = CliStrings.LIST_FUNCTION__GROUP__HELP) String[] groups,
- @CliOption(key = CliStrings.LIST_FUNCTION__MEMBER, optionContext = ConverterHint.MEMBERIDNAME,
+ @CliOption(key = {CliStrings.MEMBER, CliStrings.MEMBERS},
+ optionContext = ConverterHint.MEMBERIDNAME,
help = CliStrings.LIST_FUNCTION__MEMBER__HELP) String[] members) {
TabularResultData tabularData = ResultBuilder.createTabularResultData();
boolean accumulatedData = false;
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/IndexCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/IndexCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/IndexCommands.java
index c61de37..4d8d5fe 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/IndexCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/IndexCommands.java
@@ -174,7 +174,7 @@ public class IndexCommands implements GfshCommand {
optionContext = ConverterHint.REGION_PATH,
help = CliStrings.CREATE_INDEX__REGION__HELP) String regionPath,
- @CliOption(key = CliStrings.CREATE_INDEX__MEMBER, mandatory = false,
+ @CliOption(key = {CliStrings.MEMBER, CliStrings.MEMBERS}, mandatory = false,
optionContext = ConverterHint.MEMBERIDNAME,
help = CliStrings.CREATE_INDEX__MEMBER__HELP) final String[] memberNameOrID,
@@ -182,7 +182,7 @@ public class IndexCommands implements GfshCommand {
unspecifiedDefaultValue = "range", optionContext = ConverterHint.INDEX_TYPE,
help = CliStrings.CREATE_INDEX__TYPE__HELP) final String indexType,
- @CliOption(key = CliStrings.CREATE_INDEX__GROUP, mandatory = false,
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS}, mandatory = false,
optionContext = ConverterHint.MEMBERGROUP,
help = CliStrings.CREATE_INDEX__GROUP__HELP) final String[] group) {
@@ -324,11 +324,11 @@ public class IndexCommands implements GfshCommand {
optionContext = ConverterHint.REGION_PATH,
help = CliStrings.DESTROY_INDEX__REGION__HELP) final String regionPath,
- @CliOption(key = CliStrings.DESTROY_INDEX__MEMBER, mandatory = false,
+ @CliOption(key = {CliStrings.MEMBER, CliStrings.MEMBERS}, mandatory = false,
optionContext = ConverterHint.MEMBERIDNAME,
help = CliStrings.DESTROY_INDEX__MEMBER__HELP) final String[] memberNameOrID,
- @CliOption(key = CliStrings.DESTROY_INDEX__GROUP, mandatory = false,
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS}, mandatory = false,
optionContext = ConverterHint.MEMBERGROUP,
help = CliStrings.DESTROY_INDEX__GROUP__HELP) final String[] group) {
@@ -412,7 +412,7 @@ public class IndexCommands implements GfshCommand {
int num = 0;
for (String memberId : successfulMembers) {
infoResult.addLine(CliStrings.format(
- CliStrings.format(CliStrings.DESTROY_INDEX__NUMBER__AND__MEMBER, ++num, memberId)));;
+ CliStrings.format(CliStrings.DESTROY_INDEX__NUMBER__AND__MEMBER, ++num, memberId)));
}
result = ResultBuilder.buildResult(infoResult);
@@ -524,11 +524,11 @@ public class IndexCommands implements GfshCommand {
// TODO : Add optionContext for indexName
public Result createDefinedIndexes(
- @CliOption(key = CliStrings.CREATE_DEFINED_INDEXES__MEMBER, mandatory = false,
+ @CliOption(key = {CliStrings.MEMBER, CliStrings.MEMBERS}, mandatory = false,
optionContext = ConverterHint.MEMBERIDNAME,
help = CliStrings.CREATE_DEFINED_INDEXES__MEMBER__HELP) final String[] memberNameOrID,
- @CliOption(key = CliStrings.CREATE_DEFINED_INDEXES__GROUP, mandatory = false,
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS}, mandatory = false,
optionContext = ConverterHint.MEMBERGROUP,
help = CliStrings.CREATE_DEFINED_INDEXES__GROUP__HELP) final String[] group) {
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java
index bc506cf..88832ba 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java
@@ -167,7 +167,7 @@ public class LauncherLifecycleCommands implements GfshCommand {
@CliOption(key = CliStrings.START_LOCATOR__FORCE, unspecifiedDefaultValue = "false",
specifiedDefaultValue = "true",
help = CliStrings.START_LOCATOR__FORCE__HELP) final Boolean force,
- @CliOption(key = CliStrings.START_LOCATOR__GROUP, optionContext = ConverterHint.MEMBERGROUP,
+ @CliOption(key = CliStrings.GROUP, optionContext = ConverterHint.MEMBERGROUP,
help = CliStrings.START_LOCATOR__GROUP__HELP) final String group,
@CliOption(key = CliStrings.START_LOCATOR__HOSTNAME_FOR_CLIENTS,
help = CliStrings.START_LOCATOR__HOSTNAME_FOR_CLIENTS__HELP) final String hostnameForClients,
@@ -873,7 +873,7 @@ public class LauncherLifecycleCommands implements GfshCommand {
@CliOption(key = CliStrings.START_SERVER__FORCE, unspecifiedDefaultValue = "false",
specifiedDefaultValue = "true",
help = CliStrings.START_SERVER__FORCE__HELP) final Boolean force,
- @CliOption(key = CliStrings.START_SERVER__GROUP, optionContext = ConverterHint.MEMBERGROUP,
+ @CliOption(key = CliStrings.GROUP, optionContext = ConverterHint.MEMBERGROUP,
help = CliStrings.START_SERVER__GROUP__HELP) final String group,
@CliOption(key = CliStrings.START_SERVER__HOSTNAME__FOR__CLIENTS,
help = CliStrings.START_SERVER__HOSTNAME__FOR__CLIENTS__HELP) final String hostNameForClients,
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/MemberCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/MemberCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/MemberCommands.java
index 74264c3..12820f2 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/MemberCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/MemberCommands.java
@@ -58,8 +58,8 @@ public class MemberCommands implements GfshCommand {
@CliCommand(value = {CliStrings.LIST_MEMBER}, help = CliStrings.LIST_MEMBER__HELP)
@CliMetaData(shellOnly = false, relatedTopic = CliStrings.TOPIC_GEODE_SERVER)
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ)
- public Result listMember(@CliOption(key = {CliStrings.LIST_MEMBER__GROUP},
- unspecifiedDefaultValue = "", optionContext = ConverterHint.MEMBERGROUP,
+ public Result listMember(@CliOption(key = {CliStrings.GROUP}, unspecifiedDefaultValue = "",
+ optionContext = ConverterHint.MEMBERGROUP,
help = CliStrings.LIST_MEMBER__GROUP__HELP) String group) {
Result result = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommands.java
index 2c3d766..637fa0e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommands.java
@@ -289,10 +289,10 @@ public class MiscellaneousCommands implements GfshCommand {
@CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_DEBUG_UTIL})
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.MANAGE)
public Result gc(
- @CliOption(key = CliStrings.GC__GROUP,
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.GC__GROUP__HELP) String[] groups,
- @CliOption(key = CliStrings.GC__MEMBER, optionContext = ConverterHint.ALL_MEMBER_IDNAME,
+ @CliOption(key = CliStrings.MEMBER, optionContext = ConverterHint.ALL_MEMBER_IDNAME,
unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.GC__MEMBER__HELP) String memberId) {
InternalCache cache = getCache();
@@ -351,9 +351,9 @@ public class MiscellaneousCommands implements GfshCommand {
return ResultBuilder.createUserErrorResult((String) object);
} else {
Map<String, String> resultMap = (Map<String, String>) object;
- toTabularResultData(resultTable, (String) resultMap.get("MemberId"),
- (String) resultMap.get("HeapSizeBeforeGC"),
- (String) resultMap.get("HeapSizeAfterGC"), (String) resultMap.get("TimeSpentInGC"));
+ toTabularResultData(resultTable, resultMap.get("MemberId"),
+ resultMap.get("HeapSizeBeforeGC"), resultMap.get("HeapSizeAfterGC"),
+ resultMap.get("TimeSpentInGC"));
}
} else {
LogWrapper.getInstance().fine("ResultMap was null ");
@@ -380,11 +380,11 @@ public class MiscellaneousCommands implements GfshCommand {
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ)
// TODO : Verify the auto-completion for multiple values.
public Result netstat(
- @CliOption(key = CliStrings.NETSTAT__MEMBER, mandatory = false,
+ @CliOption(key = {CliStrings.MEMBER, CliStrings.MEMBERS}, mandatory = false,
unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
optionContext = ConverterHint.ALL_MEMBER_IDNAME,
help = CliStrings.NETSTAT__MEMBER__HELP) String[] members,
- @CliOption(key = CliStrings.NETSTAT__GROUP, mandatory = false,
+ @CliOption(key = CliStrings.GROUP, mandatory = false,
unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
optionContext = ConverterHint.MEMBERGROUP,
help = CliStrings.NETSTAT__GROUP__HELP) String group,
@@ -593,7 +593,7 @@ public class MiscellaneousCommands implements GfshCommand {
@CliMetaData(shellOnly = false, relatedTopic = {CliStrings.TOPIC_GEODE_DEBUG_UTIL})
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ)
public Result showLog(
- @CliOption(key = CliStrings.SHOW_LOG_MEMBER, optionContext = ConverterHint.ALL_MEMBER_IDNAME,
+ @CliOption(key = CliStrings.MEMBER, optionContext = ConverterHint.ALL_MEMBER_IDNAME,
unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.SHOW_LOG_MEMBER_HELP, mandatory = true) String memberNameOrId,
@CliOption(key = CliStrings.SHOW_LOG_LINE_NUM, unspecifiedDefaultValue = "0",
@@ -657,13 +657,12 @@ public class MiscellaneousCommands implements GfshCommand {
@CliCommand(value = CliStrings.EXPORT_STACKTRACE, help = CliStrings.EXPORT_STACKTRACE__HELP)
@CliMetaData(shellOnly = false, relatedTopic = {CliStrings.TOPIC_GEODE_DEBUG_UTIL})
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ)
- public Result exportStackTrace(@CliOption(key = CliStrings.EXPORT_STACKTRACE__MEMBER,
+ public Result exportStackTrace(@CliOption(key = {CliStrings.MEMBER, CliStrings.MEMBERS},
optionContext = ConverterHint.ALL_MEMBER_IDNAME,
help = CliStrings.EXPORT_STACKTRACE__HELP) String[] memberNameOrId,
- @CliOption(key = CliStrings.EXPORT_STACKTRACE__GROUP,
- optionContext = ConverterHint.ALL_MEMBER_IDNAME,
- help = CliStrings.EXPORT_STACKTRACE__GROUP) String[] group,
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
+ optionContext = ConverterHint.ALL_MEMBER_IDNAME, help = CliStrings.GROUP) String[] group,
@CliOption(key = CliStrings.EXPORT_STACKTRACE__FILE,
help = CliStrings.EXPORT_STACKTRACE__FILE__HELP) String fileName,
@@ -786,8 +785,7 @@ public class MiscellaneousCommands implements GfshCommand {
@CliMetaData(shellOnly = false, relatedTopic = {CliStrings.TOPIC_GEODE_STATISTICS})
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ)
public Result showMetrics(
- @CliOption(key = {CliStrings.SHOW_METRICS__MEMBER},
- optionContext = ConverterHint.ALL_MEMBER_IDNAME,
+ @CliOption(key = {CliStrings.MEMBER}, optionContext = ConverterHint.ALL_MEMBER_IDNAME,
help = CliStrings.SHOW_METRICS__MEMBER__HELP) String memberNameOrId,
@CliOption(key = {CliStrings.SHOW_METRICS__REGION}, optionContext = ConverterHint.REGION_PATH,
help = CliStrings.SHOW_METRICS__REGION__HELP) String regionName,
@@ -1828,9 +1826,9 @@ public class MiscellaneousCommands implements GfshCommand {
interceptor = "org.apache.geode.management.internal.cli.commands.MiscellaneousCommands$ChangeLogLevelInterceptor")
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.WRITE)
public Result changeLogLevel(
- @CliOption(key = CliStrings.CHANGE_LOGLEVEL__MEMBER,
+ @CliOption(key = {CliStrings.MEMBER, CliStrings.MEMBERS},
help = CliStrings.CHANGE_LOGLEVEL__MEMBER__HELP) String[] memberIds,
- @CliOption(key = CliStrings.CHANGE_LOGLEVEL__GROUPS, unspecifiedDefaultValue = "",
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS}, unspecifiedDefaultValue = "",
help = CliStrings.CHANGE_LOGLEVEL__GROUPS__HELP) String[] grps,
@CliOption(key = CliStrings.CHANGE_LOGLEVEL__LOGLEVEL,
optionContext = ConverterHint.LOG_LEVEL, mandatory = true, unspecifiedDefaultValue = "",
@@ -1858,8 +1856,8 @@ public class MiscellaneousCommands implements GfshCommand {
Iterator<DistributedMember> it = ds.iterator();
while (it.hasNext()) {
DistributedMember mem = it.next();
- if (mem.getName() == null ? false
- : mem.getName().equals(member) || mem.getId().equals(member)) {
+ if (mem.getName() != null
+ && (mem.getName().equals(member) || mem.getId().equals(member))) {
dsMembers.add(mem);
break;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/QueueCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/QueueCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/QueueCommands.java
index 0f407e7..25b95cd 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/QueueCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/QueueCommands.java
@@ -58,7 +58,7 @@ public class QueueCommands implements GfshCommand {
public Result createAsyncEventQueue(
@CliOption(key = CliStrings.CREATE_ASYNC_EVENT_QUEUE__ID, mandatory = true,
help = CliStrings.CREATE_ASYNC_EVENT_QUEUE__ID__HELP) String id,
- @CliOption(key = CliStrings.CREATE_ASYNC_EVENT_QUEUE__GROUP,
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
optionContext = ConverterHint.MEMBERGROUP,
help = CliStrings.CREATE_ASYNC_EVENT_QUEUE__GROUP__HELP) String[] groups,
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RegionCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RegionCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RegionCommands.java
index 260230b..68dbbf0 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RegionCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RegionCommands.java
@@ -70,9 +70,11 @@ public class RegionCommands implements GfshCommand {
@CliMetaData(shellOnly = false, relatedTopic = CliStrings.TOPIC_GEODE_REGION)
@ResourceOperation(resource = Resource.DATA, operation = Operation.READ)
public Result listRegion(
- @CliOption(key = {CliStrings.LIST_REGION__GROUP}, optionContext = ConverterHint.MEMBERGROUP,
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
+ optionContext = ConverterHint.MEMBERGROUP,
help = CliStrings.LIST_REGION__GROUP__HELP) String[] group,
- @CliOption(key = {CliStrings.LIST_REGION__MEMBER}, optionContext = ConverterHint.MEMBERIDNAME,
+ @CliOption(key = {CliStrings.MEMBER, CliStrings.MEMBERS},
+ optionContext = ConverterHint.MEMBERIDNAME,
help = CliStrings.LIST_REGION__MEMBER__HELP) String[] memberNameOrId) {
Result result = null;
try {
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/WanCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/WanCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/WanCommands.java
index ad3d22c..a6745fd 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/WanCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/WanCommands.java
@@ -68,11 +68,11 @@ public class WanCommands implements GfshCommand {
@CliCommand(value = CliStrings.CREATE_GATEWAYSENDER, help = CliStrings.CREATE_GATEWAYSENDER__HELP)
@CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_WAN)
@ResourceOperation(resource = Resource.DATA, operation = Operation.MANAGE)
- public Result createGatewaySender(@CliOption(key = CliStrings.CREATE_GATEWAYSENDER__GROUP,
+ public Result createGatewaySender(@CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
optionContext = ConverterHint.MEMBERGROUP,
help = CliStrings.CREATE_GATEWAYSENDER__GROUP__HELP) String[] onGroups,
- @CliOption(key = CliStrings.CREATE_GATEWAYSENDER__MEMBER,
+ @CliOption(key = {CliStrings.MEMBER, CliStrings.MEMBERS},
optionContext = ConverterHint.MEMBERIDNAME,
unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.CREATE_GATEWAYSENDER__MEMBER__HELP) String[] onMember,
@@ -187,11 +187,11 @@ public class WanCommands implements GfshCommand {
mandatory = true, optionContext = ConverterHint.GATEWAY_SENDER_ID,
help = CliStrings.START_GATEWAYSENDER__ID__HELP) String senderId,
- @CliOption(key = CliStrings.START_GATEWAYSENDER__GROUP,
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
optionContext = ConverterHint.MEMBERGROUP,
help = CliStrings.START_GATEWAYSENDER__GROUP__HELP) String[] onGroup,
- @CliOption(key = CliStrings.START_GATEWAYSENDER__MEMBER,
+ @CliOption(key = {CliStrings.MEMBER, CliStrings.MEMBERS},
optionContext = ConverterHint.MEMBERIDNAME,
help = CliStrings.START_GATEWAYSENDER__MEMBER__HELP) String[] onMember) {
@@ -245,20 +245,19 @@ public class WanCommands implements GfshCommand {
statusList.add(CliStrings.GATEWAY_ERROR);
statusList.add(
CliStrings.format(CliStrings.GATEWAY_SENDER_0_IS_ALREADY_STARTED_ON_MEMBER_1,
- new Object[] {id, member.getId()}));
+ id, member.getId()));
} else {
bean.start();
statusList.add(member.getId());
statusList.add(CliStrings.GATEWAY_OK);
statusList.add(CliStrings.format(CliStrings.GATEWAY_SENDER_0_IS_STARTED_ON_MEMBER_1,
- new Object[] {id, member.getId()}));
+ id, member.getId()));
}
} else {
statusList.add(member.getId());
statusList.add(CliStrings.GATEWAY_ERROR);
- statusList
- .add(CliStrings.format(CliStrings.GATEWAY_SENDER_0_IS_NOT_AVAILABLE_ON_MEMBER_1,
- new Object[] {id, member.getId()}));
+ statusList.add(CliStrings.format(
+ CliStrings.GATEWAY_SENDER_0_IS_NOT_AVAILABLE_ON_MEMBER_1, id, member.getId()));
}
return statusList;
}
@@ -271,9 +270,8 @@ public class WanCommands implements GfshCommand {
try {
futures = execService.invokeAll(callables);
} catch (InterruptedException ite) {
- accumulateStartResult(resultData, null, CliStrings.GATEWAY_ERROR,
- CliStrings.format(CliStrings.GATEWAY_SENDER_0_COULD_NOT_BE_INVOKED_DUE_TO_1,
- new Object[] {id, ite.getMessage()}));
+ accumulateStartResult(resultData, null, CliStrings.GATEWAY_ERROR, CliStrings.format(
+ CliStrings.GATEWAY_SENDER_0_COULD_NOT_BE_INVOKED_DUE_TO_1, id, ite.getMessage()));
}
for (Future<List> future : futures) {
@@ -286,12 +284,12 @@ public class WanCommands implements GfshCommand {
} catch (InterruptedException ite) {
accumulateStartResult(resultData, member.getId(), CliStrings.GATEWAY_ERROR,
CliStrings.format(CliStrings.GATEWAY_SENDER_0_COULD_NOT_BE_STARTED_ON_MEMBER_DUE_TO_1,
- new Object[] {id, ite.getMessage()}));
+ id, ite.getMessage()));
continue;
} catch (ExecutionException ee) {
accumulateStartResult(resultData, member.getId(), CliStrings.GATEWAY_ERROR,
CliStrings.format(CliStrings.GATEWAY_SENDER_0_COULD_NOT_BE_STARTED_ON_MEMBER_DUE_TO_1,
- new Object[] {id, ee.getMessage()}));
+ id, ee.getMessage()));
continue;
}
}
@@ -312,11 +310,11 @@ public class WanCommands implements GfshCommand {
mandatory = true, optionContext = ConverterHint.GATEWAY_SENDER_ID,
help = CliStrings.PAUSE_GATEWAYSENDER__ID__HELP) String senderId,
- @CliOption(key = CliStrings.PAUSE_GATEWAYSENDER__GROUP,
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
optionContext = ConverterHint.MEMBERGROUP,
help = CliStrings.PAUSE_GATEWAYSENDER__GROUP__HELP) String[] onGroup,
- @CliOption(key = CliStrings.PAUSE_GATEWAYSENDER__MEMBER,
+ @CliOption(key = {CliStrings.MEMBER, CliStrings.MEMBERS},
optionContext = ConverterHint.MEMBERIDNAME,
help = CliStrings.PAUSE_GATEWAYSENDER__MEMBER__HELP) String[] onMember) {
@@ -352,22 +350,22 @@ public class WanCommands implements GfshCommand {
if (bean.isPaused()) {
accumulateStartResult(resultData, member.getId(), CliStrings.GATEWAY_ERROR,
CliStrings.format(CliStrings.GATEWAY_SENDER_0_IS_ALREADY_PAUSED_ON_MEMBER_1,
- new Object[] {senderId, member.getId()}));
+ senderId, member.getId()));
} else {
bean.pause();
accumulateStartResult(resultData, member.getId(), CliStrings.GATEWAY_OK,
- CliStrings.format(CliStrings.GATEWAY_SENDER_0_IS_PAUSED_ON_MEMBER_1,
- new Object[] {senderId, member.getId()}));
+ CliStrings.format(CliStrings.GATEWAY_SENDER_0_IS_PAUSED_ON_MEMBER_1, senderId,
+ member.getId()));
}
} else {
accumulateStartResult(resultData, member.getId(), CliStrings.GATEWAY_ERROR,
- CliStrings.format(CliStrings.GATEWAY_SENDER_0_IS_NOT_RUNNING_ON_MEMBER_1,
- new Object[] {senderId, member.getId()}));
+ CliStrings.format(CliStrings.GATEWAY_SENDER_0_IS_NOT_RUNNING_ON_MEMBER_1, senderId,
+ member.getId()));
}
} else {
accumulateStartResult(resultData, member.getId(), CliStrings.GATEWAY_ERROR,
- CliStrings.format(CliStrings.GATEWAY_SENDER_0_IS_NOT_AVAILABLE_ON_MEMBER_1,
- new Object[] {senderId, member.getId()}));
+ CliStrings.format(CliStrings.GATEWAY_SENDER_0_IS_NOT_AVAILABLE_ON_MEMBER_1, senderId,
+ member.getId()));
}
}
result = ResultBuilder.buildResult(resultData);
@@ -385,10 +383,10 @@ public class WanCommands implements GfshCommand {
mandatory = true, optionContext = ConverterHint.GATEWAY_SENDER_ID,
help = CliStrings.RESUME_GATEWAYSENDER__ID__HELP) String senderId,
- @CliOption(key = CliStrings.RESUME_GATEWAYSENDER__GROUP,
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
optionContext = ConverterHint.MEMBERGROUP,
help = CliStrings.RESUME_GATEWAYSENDER__GROUP__HELP) String[] onGroup,
- @CliOption(key = CliStrings.RESUME_GATEWAYSENDER__MEMBER,
+ @CliOption(key = {CliStrings.MEMBER, CliStrings.MEMBERS},
optionContext = ConverterHint.MEMBERIDNAME,
help = CliStrings.RESUME_GATEWAYSENDER__MEMBER__HELP) String[] onMember) {
@@ -424,22 +422,22 @@ public class WanCommands implements GfshCommand {
if (bean.isPaused()) {
bean.resume();
accumulateStartResult(resultData, member.getId(), CliStrings.GATEWAY_OK,
- CliStrings.format(CliStrings.GATEWAY_SENDER_0_IS_RESUMED_ON_MEMBER_1,
- new Object[] {senderId, member.getId()}));
+ CliStrings.format(CliStrings.GATEWAY_SENDER_0_IS_RESUMED_ON_MEMBER_1, senderId,
+ member.getId()));
} else {
accumulateStartResult(resultData, member.getId(), CliStrings.GATEWAY_ERROR,
- CliStrings.format(CliStrings.GATEWAY_SENDER_0_IS_NOT_PAUSED_ON_MEMBER_1,
- new Object[] {senderId, member.getId()}));
+ CliStrings.format(CliStrings.GATEWAY_SENDER_0_IS_NOT_PAUSED_ON_MEMBER_1, senderId,
+ member.getId()));
}
} else {
accumulateStartResult(resultData, member.getId(), CliStrings.GATEWAY_ERROR,
- CliStrings.format(CliStrings.GATEWAY_SENDER_0_IS_NOT_RUNNING_ON_MEMBER_1,
- new Object[] {senderId, member.getId()}));
+ CliStrings.format(CliStrings.GATEWAY_SENDER_0_IS_NOT_RUNNING_ON_MEMBER_1, senderId,
+ member.getId()));
}
} else {
accumulateStartResult(resultData, member.getId(), CliStrings.GATEWAY_ERROR,
- CliStrings.format(CliStrings.GATEWAY_SENDER_0_IS_NOT_AVAILABLE_ON_MEMBER_1,
- new Object[] {senderId, member.getId()}));
+ CliStrings.format(CliStrings.GATEWAY_SENDER_0_IS_NOT_AVAILABLE_ON_MEMBER_1, senderId,
+ member.getId()));
}
}
result = ResultBuilder.buildResult(resultData);
@@ -457,11 +455,11 @@ public class WanCommands implements GfshCommand {
mandatory = true, optionContext = ConverterHint.GATEWAY_SENDER_ID,
help = CliStrings.STOP_GATEWAYSENDER__ID__HELP) String senderId,
- @CliOption(key = CliStrings.STOP_GATEWAYSENDER__GROUP,
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
optionContext = ConverterHint.MEMBERGROUP,
help = CliStrings.STOP_GATEWAYSENDER__GROUP__HELP) String[] onGroup,
- @CliOption(key = CliStrings.STOP_GATEWAYSENDER__MEMBER,
+ @CliOption(key = {CliStrings.MEMBER, CliStrings.MEMBERS},
optionContext = ConverterHint.MEMBERIDNAME,
help = CliStrings.STOP_GATEWAYSENDER__MEMBER__HELP) String[] onMember) {
@@ -495,18 +493,18 @@ public class WanCommands implements GfshCommand {
if (bean.isRunning()) {
bean.stop();
accumulateStartResult(resultData, member.getId(), CliStrings.GATEWAY_OK,
- CliStrings.format(CliStrings.GATEWAY_SENDER_0_IS_STOPPED_ON_MEMBER_1,
- new Object[] {senderId, member.getId()}));
+ CliStrings.format(CliStrings.GATEWAY_SENDER_0_IS_STOPPED_ON_MEMBER_1, senderId,
+ member.getId()));
} else {
accumulateStartResult(resultData, member.getId(), CliStrings.GATEWAY_ERROR,
- CliStrings.format(CliStrings.GATEWAY_SENDER_0_IS_NOT_RUNNING_ON_MEMBER_1,
- new Object[] {senderId, member.getId()}));
+ CliStrings.format(CliStrings.GATEWAY_SENDER_0_IS_NOT_RUNNING_ON_MEMBER_1, senderId,
+ member.getId()));
}
} else {
accumulateStartResult(resultData, member.getId(), CliStrings.GATEWAY_ERROR,
- CliStrings.format(CliStrings.GATEWAY_SENDER_0_IS_NOT_AVAILABLE_ON_MEMBER_1,
- new Object[] {senderId, member.getId()}));
+ CliStrings.format(CliStrings.GATEWAY_SENDER_0_IS_NOT_AVAILABLE_ON_MEMBER_1, senderId,
+ member.getId()));
}
}
result = ResultBuilder.buildResult(resultData);
@@ -521,11 +519,11 @@ public class WanCommands implements GfshCommand {
help = CliStrings.CREATE_GATEWAYRECEIVER__HELP)
@CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_WAN)
@ResourceOperation(resource = Resource.DATA, operation = Operation.MANAGE)
- public Result createGatewayReceiver(@CliOption(key = CliStrings.CREATE_GATEWAYRECEIVER__GROUP,
+ public Result createGatewayReceiver(@CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
optionContext = ConverterHint.MEMBERGROUP,
help = CliStrings.CREATE_GATEWAYRECEIVER__GROUP__HELP) String[] onGroups,
- @CliOption(key = CliStrings.CREATE_GATEWAYRECEIVER__MEMBER,
+ @CliOption(key = {CliStrings.MEMBER, CliStrings.MEMBERS},
optionContext = ConverterHint.MEMBERIDNAME,
unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.CREATE_GATEWAYRECEIVER__MEMBER__HELP) String[] onMember,
@@ -636,12 +634,12 @@ public class WanCommands implements GfshCommand {
gatewaySenderExists = true;
bean.rebalance();
accumulateStartResult(resultData, member.getId(), CliStrings.GATEWAY_OK,
- CliStrings.format(CliStrings.GATEWAY_SENDER_0_IS_REBALANCED_ON_MEMBER_1,
- new Object[] {senderId, member.getId()}));
+ CliStrings.format(CliStrings.GATEWAY_SENDER_0_IS_REBALANCED_ON_MEMBER_1, senderId,
+ member.getId()));
} else {
accumulateStartResult(resultData, member.getId(), CliStrings.GATEWAY_ERROR,
CliStrings.format(CliStrings.GATEWAY_SENDER_0_IS_NOT_AVAILABLE_ON_MEMBER_1,
- new Object[] {senderId, member.getId()}));
+ senderId, member.getId()));
}
}
if (gatewaySenderExists) {
@@ -663,11 +661,11 @@ public class WanCommands implements GfshCommand {
help = CliStrings.START_GATEWAYRECEIVER__HELP)
@CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_WAN)
@ResourceOperation(resource = Resource.DATA, operation = Operation.MANAGE)
- public Result startGatewayReceiver(@CliOption(key = CliStrings.START_GATEWAYRECEIVER__GROUP,
+ public Result startGatewayReceiver(@CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
optionContext = ConverterHint.MEMBERGROUP,
help = CliStrings.START_GATEWAYRECEIVER__GROUP__HELP) String[] onGroup,
- @CliOption(key = CliStrings.START_GATEWAYRECEIVER__MEMBER,
+ @CliOption(key = {CliStrings.MEMBER, CliStrings.MEMBERS},
optionContext = ConverterHint.MEMBERIDNAME,
help = CliStrings.START_GATEWAYRECEIVER__MEMBER__HELP) String[] onMember) {
Result result = null;
@@ -730,11 +728,11 @@ public class WanCommands implements GfshCommand {
@ResourceOperation(resource = Resource.DATA, operation = Operation.MANAGE)
public Result stopGatewayReceiver(
- @CliOption(key = CliStrings.STOP_GATEWAYRECEIVER__GROUP,
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
optionContext = ConverterHint.MEMBERGROUP,
help = CliStrings.STOP_GATEWAYRECEIVER__GROUP__HELP) String[] onGroup,
- @CliOption(key = CliStrings.STOP_GATEWAYRECEIVER__MEMBER,
+ @CliOption(key = {CliStrings.MEMBER, CliStrings.MEMBERS},
optionContext = ConverterHint.MEMBERIDNAME,
help = CliStrings.STOP_GATEWAYRECEIVER__MEMBER__HELP) String[] onMember) {
@@ -797,9 +795,11 @@ public class WanCommands implements GfshCommand {
@CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_WAN)
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ)
public Result listGateway(
- @CliOption(key = CliStrings.LIST_GATEWAY__MEMBER, optionContext = ConverterHint.MEMBERIDNAME,
+ @CliOption(key = {CliStrings.MEMBER, CliStrings.MEMBERS},
+ optionContext = ConverterHint.MEMBERIDNAME,
help = CliStrings.LIST_GATEWAY__MEMBER__HELP) String[] onMember,
- @CliOption(key = CliStrings.LIST_GATEWAY__GROUP, optionContext = ConverterHint.MEMBERGROUP,
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
+ optionContext = ConverterHint.MEMBERGROUP,
help = CliStrings.LIST_GATEWAY__GROUP__HELP) String[] onGroup) {
Result result = null;
@@ -878,11 +878,11 @@ public class WanCommands implements GfshCommand {
mandatory = true, optionContext = ConverterHint.GATEWAY_SENDER_ID,
help = CliStrings.STATUS_GATEWAYSENDER__ID__HELP) String senderId,
- @CliOption(key = CliStrings.STATUS_GATEWAYSENDER__GROUP,
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
optionContext = ConverterHint.MEMBERGROUP,
help = CliStrings.STATUS_GATEWAYSENDER__GROUP__HELP) String[] onGroup,
- @CliOption(key = CliStrings.STATUS_GATEWAYSENDER__MEMBER,
+ @CliOption(key = {CliStrings.MEMBER, CliStrings.MEMBERS},
optionContext = ConverterHint.MEMBERIDNAME,
help = CliStrings.STATUS_GATEWAYSENDER__MEMBER__HELP) String[] onMember) {
@@ -936,11 +936,11 @@ public class WanCommands implements GfshCommand {
help = CliStrings.STATUS_GATEWAYRECEIVER__HELP)
@CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_WAN)
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ)
- public Result statusGatewayReceiver(@CliOption(key = CliStrings.STATUS_GATEWAYRECEIVER__GROUP,
+ public Result statusGatewayReceiver(@CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
optionContext = ConverterHint.MEMBERGROUP,
help = CliStrings.STATUS_GATEWAYRECEIVER__GROUP__HELP) String[] onGroup,
- @CliOption(key = CliStrings.STATUS_GATEWAYRECEIVER__MEMBER,
+ @CliOption(key = {CliStrings.MEMBER, CliStrings.MEMBERS},
optionContext = ConverterHint.MEMBERIDNAME,
help = CliStrings.STATUS_GATEWAYRECEIVER__MEMBER__HELP) String[] onMember) {
@@ -991,10 +991,10 @@ public class WanCommands implements GfshCommand {
@CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_WAN)
@ResourceOperation(resource = Resource.DATA, operation = Operation.MANAGE)
public Result destroyGatewaySender(
- @CliOption(key = CliStrings.DESTROY_GATEWAYSENDER__GROUP,
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
optionContext = ConverterHint.MEMBERGROUP,
help = CliStrings.DESTROY_GATEWAYSENDER__GROUP__HELP) String[] onGroups,
- @CliOption(key = CliStrings.DESTROY_GATEWAYSENDER__MEMBER,
+ @CliOption(key = {CliStrings.MEMBER, CliStrings.MEMBERS},
optionContext = ConverterHint.MEMBERIDNAME,
unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.DESTROY_GATEWAYSENDER__MEMBER__HELP) String[] onMember,
[2/5] geode git commit: GEODE-2818: add alias to any command's
options that involves "group", "member",
"jar" and replace CliString variables with GROUP, MEMBER, JAR, etc.
Posted by ji...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
index 63cf594..bdccabe 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
@@ -51,14 +51,14 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
public void testCreateGatewayReceiverWithDefault() {
VM puneLocator = Host.getLocator();
- int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort());
+ int punePort = puneLocator.invoke(() -> getLocatorPort());
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCache(punePort));
vm4.invoke(() -> createCache(punePort));
@@ -104,14 +104,14 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
public void testCreateGatewayReceiver() {
VM puneLocator = Host.getLocator();
- int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort());
+ int punePort = puneLocator.invoke(() -> getLocatorPort());
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCache(punePort));
vm4.invoke(() -> createCache(punePort));
@@ -157,14 +157,14 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
public void testCreateGatewayReceiverWithGatewayTransportFilter() {
VM puneLocator = Host.getLocator();
- int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort());
+ int punePort = puneLocator.invoke(() -> getLocatorPort());
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCache(punePort));
vm4.invoke(() -> createCache(punePort));
@@ -215,14 +215,14 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
public void testCreateGatewayReceiverWithMultipleGatewayTransportFilters() {
VM puneLocator = Host.getLocator();
- int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort());
+ int punePort = puneLocator.invoke(() -> getLocatorPort());
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCache(punePort));
vm4.invoke(() -> createCache(punePort));
@@ -273,14 +273,14 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
public void testCreateGatewayReceiver_Error() {
VM puneLocator = Host.getLocator();
- int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort());
+ int punePort = puneLocator.invoke(() -> getLocatorPort());
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCache(punePort));
vm4.invoke(() -> createCache(punePort));
@@ -319,20 +319,20 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
public void testCreateGatewayReceiver_onMember() {
VM puneLocator = Host.getLocator();
- int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort());
+ int punePort = puneLocator.invoke(() -> getLocatorPort());
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCache(punePort));
vm4.invoke(() -> createCache(punePort));
vm5.invoke(() -> createCache(punePort));
- final DistributedMember vm3Member = (DistributedMember) vm3.invoke(() -> getMember());
+ final DistributedMember vm3Member = vm3.invoke(() -> getMember());
String command =
CliStrings.CREATE_GATEWAYRECEIVER + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MANUALSTART
@@ -341,7 +341,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
+ CliStrings.CREATE_GATEWAYRECEIVER__ENDPORT + "=11000" + " --"
+ CliStrings.CREATE_GATEWAYRECEIVER__MAXTIMEBETWEENPINGS + "=100000" + " --"
+ CliStrings.CREATE_GATEWAYRECEIVER__SOCKETBUFFERSIZE + "=512000" + " --"
- + CliStrings.CREATE_GATEWAYRECEIVER__MEMBER + "=" + vm3Member.getId();
+ + CliStrings.MEMBER + "=" + vm3Member.getId();
CommandResult cmdResult = executeCommand(command);
if (cmdResult != null) {
String strCmdResult = commandResultToString(cmdResult);
@@ -372,21 +372,21 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
public void testCreateGatewayReceiver_onMultipleMembers() {
VM puneLocator = Host.getLocator();
- int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort());
+ int punePort = puneLocator.invoke(() -> getLocatorPort());
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCache(punePort));
vm4.invoke(() -> createCache(punePort));
vm5.invoke(() -> createCache(punePort));
- final DistributedMember vm3Member = (DistributedMember) vm3.invoke(() -> getMember());
- final DistributedMember vm4Member = (DistributedMember) vm4.invoke(() -> getMember());
+ final DistributedMember vm3Member = vm3.invoke(() -> getMember());
+ final DistributedMember vm4Member = vm4.invoke(() -> getMember());
String command =
CliStrings.CREATE_GATEWAYRECEIVER + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MANUALSTART
@@ -395,8 +395,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
+ CliStrings.CREATE_GATEWAYRECEIVER__ENDPORT + "=11000" + " --"
+ CliStrings.CREATE_GATEWAYRECEIVER__MAXTIMEBETWEENPINGS + "=100000" + " --"
+ CliStrings.CREATE_GATEWAYRECEIVER__SOCKETBUFFERSIZE + "=512000" + " --"
- + CliStrings.CREATE_GATEWAYRECEIVER__MEMBER + "=" + vm3Member.getId() + ","
- + vm4Member.getId();
+ + CliStrings.MEMBER + "=" + vm3Member.getId() + "," + vm4Member.getId();
CommandResult cmdResult = executeCommand(command);
if (cmdResult != null) {
String strCmdResult = commandResultToString(cmdResult);
@@ -428,14 +427,14 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
public void testCreateGatewayReceiver_onGroup() {
VM puneLocator = Host.getLocator();
- int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort());
+ int punePort = puneLocator.invoke(() -> getLocatorPort());
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCacheWithGroups(punePort, "receiverGroup1"));
vm4.invoke(() -> createCacheWithGroups(punePort, "receiverGroup1"));
@@ -448,7 +447,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
+ CliStrings.CREATE_GATEWAYRECEIVER__ENDPORT + "=11000" + " --"
+ CliStrings.CREATE_GATEWAYRECEIVER__MAXTIMEBETWEENPINGS + "=100000" + " --"
+ CliStrings.CREATE_GATEWAYRECEIVER__SOCKETBUFFERSIZE + "=512000" + " --"
- + CliStrings.CREATE_GATEWAYRECEIVER__GROUP + "=receiverGroup1";
+ + CliStrings.GROUP + "=receiverGroup1";
CommandResult cmdResult = executeCommand(command);
if (cmdResult != null) {
String strCmdResult = commandResultToString(cmdResult);
@@ -483,14 +482,14 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
public void testCreateGatewayReceiver_onGroup_Scenario2() {
VM puneLocator = Host.getLocator();
- int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort());
+ int punePort = puneLocator.invoke(() -> getLocatorPort());
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCacheWithGroups(punePort, "receiverGroup1"));
vm4.invoke(() -> createCacheWithGroups(punePort, "receiverGroup1"));
@@ -503,7 +502,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
+ CliStrings.CREATE_GATEWAYRECEIVER__ENDPORT + "=11000" + " --"
+ CliStrings.CREATE_GATEWAYRECEIVER__MAXTIMEBETWEENPINGS + "=100000" + " --"
+ CliStrings.CREATE_GATEWAYRECEIVER__SOCKETBUFFERSIZE + "=512000" + " --"
- + CliStrings.CREATE_GATEWAYRECEIVER__GROUP + "=receiverGroup1";
+ + CliStrings.GROUP + "=receiverGroup1";
CommandResult cmdResult = executeCommand(command);
if (cmdResult != null) {
String strCmdResult = commandResultToString(cmdResult);
@@ -535,14 +534,14 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
public void testCreateGatewayReceiver_onMultipleGroups() {
VM puneLocator = Host.getLocator();
- int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort());
+ int punePort = puneLocator.invoke(() -> getLocatorPort());
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCacheWithGroups(punePort, "receiverGroup1"));
vm4.invoke(() -> createCacheWithGroups(punePort, "receiverGroup1"));
@@ -555,7 +554,7 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase
+ CliStrings.CREATE_GATEWAYRECEIVER__ENDPORT + "=11000" + " --"
+ CliStrings.CREATE_GATEWAYRECEIVER__MAXTIMEBETWEENPINGS + "=100000" + " --"
+ CliStrings.CREATE_GATEWAYRECEIVER__SOCKETBUFFERSIZE + "=512000" + " --"
- + CliStrings.CREATE_GATEWAYRECEIVER__GROUP + "=receiverGroup1,receiverGroup2";
+ + CliStrings.GROUP + "=receiverGroup1,receiverGroup2";
CommandResult cmdResult = executeCommand(command);
if (cmdResult != null) {
String strCmdResult = commandResultToString(cmdResult);
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
index 40c0f1b..9f97dd7 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
@@ -48,22 +48,21 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase
public void testStartGatewayReceiver_ErrorConditions() {
VM puneLocator = Host.getLocator();
- int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort());
+ int punePort = puneLocator.invoke(() -> getLocatorPort());
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createReceiver(punePort));
- final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> getMember());
+ final DistributedMember vm1Member = vm3.invoke(() -> getMember());
- String command =
- CliStrings.START_GATEWAYRECEIVER + " --" + CliStrings.START_GATEWAYRECEIVER__MEMBER + "="
- + vm1Member.getId() + " --" + CliStrings.START_GATEWAYRECEIVER__GROUP + "=RG1";
+ String command = CliStrings.START_GATEWAYRECEIVER + " --" + CliStrings.MEMBER + "="
+ + vm1Member.getId() + " --" + CliStrings.GROUP + "=RG1";
CommandResult cmdResult = executeCommand(command);
if (cmdResult != null) {
@@ -82,14 +81,14 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase
public void testStartGatewayReceiver() {
VM puneLocator = Host.getLocator();
- int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort());
+ int punePort = puneLocator.invoke(() -> getLocatorPort());
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createReceiver(punePort));
vm4.invoke(() -> createReceiver(punePort));
@@ -126,14 +125,14 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase
public void testStartGatewayReceiver_onMember() {
VM puneLocator = Host.getLocator();
- int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort());
+ int punePort = puneLocator.invoke(() -> getLocatorPort());
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createReceiver(punePort));
vm4.invoke(() -> createReceiver(punePort));
@@ -143,10 +142,10 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase
vm4.invoke(() -> verifyReceiverState(false));
vm5.invoke(() -> verifyReceiverState(false));
- final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> getMember());
+ final DistributedMember vm1Member = vm3.invoke(() -> getMember());
pause(10000);
- String command = CliStrings.START_GATEWAYRECEIVER + " --"
- + CliStrings.START_GATEWAYRECEIVER__MEMBER + "=" + vm1Member.getId();
+ String command =
+ CliStrings.START_GATEWAYRECEIVER + " --" + CliStrings.MEMBER + "=" + vm1Member.getId();
CommandResult cmdResult = executeCommand(command);
if (cmdResult != null) {
@@ -171,14 +170,14 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase
public void testStartGatewayReceiver_Group() {
VM puneLocator = Host.getLocator();
- int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort());
+ int punePort = puneLocator.invoke(() -> getLocatorPort());
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createReceiverWithGroup(punePort, "RG1"));
vm4.invoke(() -> createReceiverWithGroup(punePort, "RG1"));
@@ -189,8 +188,7 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase
vm5.invoke(() -> verifyReceiverState(false));
pause(10000);
- String command =
- CliStrings.START_GATEWAYRECEIVER + " --" + CliStrings.START_GATEWAYRECEIVER__GROUP + "=RG1";
+ String command = CliStrings.START_GATEWAYRECEIVER + " --" + CliStrings.GROUP + "=RG1";
CommandResult cmdResult = executeCommand(command);
if (cmdResult != null) {
String strCmdResult = commandResultToString(cmdResult);
@@ -220,14 +218,14 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase
public void testStartGatewayReceiver_MultipleGroup() {
VM puneLocator = Host.getLocator();
- int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort());
+ int punePort = puneLocator.invoke(() -> getLocatorPort());
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createReceiverWithGroup(punePort, "RG1"));
vm4.invoke(() -> createReceiverWithGroup(punePort, "RG1"));
@@ -242,8 +240,7 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase
vm7.invoke(() -> verifyReceiverState(false));
pause(10000);
- String command = CliStrings.START_GATEWAYRECEIVER + " --"
- + CliStrings.START_GATEWAYRECEIVER__GROUP + "=RG1,RG2";
+ String command = CliStrings.START_GATEWAYRECEIVER + " --" + CliStrings.GROUP + "=RG1,RG2";
CommandResult cmdResult = executeCommand(command);
if (cmdResult != null) {
String strCmdResult = commandResultToString(cmdResult);
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
index 5d211b0..2cfc5db 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
@@ -48,22 +48,21 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase {
public void testStopGatewayReceiver_ErrorConditions() {
VM puneLocator = Host.getLocator();
- int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort());
+ int punePort = puneLocator.invoke(() -> getLocatorPort());
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createReceiver(punePort));
- final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> getMember());
+ final DistributedMember vm1Member = vm3.invoke(() -> getMember());
- String command =
- CliStrings.STOP_GATEWAYRECEIVER + " --" + CliStrings.STOP_GATEWAYRECEIVER__MEMBER + "="
- + vm1Member.getId() + " --" + CliStrings.STOP_GATEWAYRECEIVER__GROUP + "=RG1";
+ String command = CliStrings.STOP_GATEWAYRECEIVER + " --" + CliStrings.MEMBER + "="
+ + vm1Member.getId() + " --" + CliStrings.GROUP + "=RG1";
CommandResult cmdResult = executeCommand(command);
if (cmdResult != null) {
@@ -82,14 +81,14 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase {
public void testStopGatewayReceiver() {
VM puneLocator = Host.getLocator();
- int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort());
+ int punePort = puneLocator.invoke(() -> getLocatorPort());
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createAndStartReceiver(punePort));
vm4.invoke(() -> createAndStartReceiver(punePort));
@@ -127,14 +126,14 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase {
public void testStopGatewayReceiver_onMember() {
VM puneLocator = Host.getLocator();
- int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort());
+ int punePort = puneLocator.invoke(() -> getLocatorPort());
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createAndStartReceiver(punePort));
vm4.invoke(() -> createAndStartReceiver(punePort));
@@ -144,10 +143,10 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase {
vm4.invoke(() -> verifyReceiverState(true));
vm5.invoke(() -> verifyReceiverState(true));
- final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> getMember());
+ final DistributedMember vm1Member = vm3.invoke(() -> getMember());
pause(10000);
- String command = CliStrings.STOP_GATEWAYRECEIVER + " --"
- + CliStrings.STOP_GATEWAYRECEIVER__MEMBER + "=" + vm1Member.getId();
+ String command =
+ CliStrings.STOP_GATEWAYRECEIVER + " --" + CliStrings.MEMBER + "=" + vm1Member.getId();
CommandResult cmdResult = executeCommand(command);
if (cmdResult != null) {
@@ -172,14 +171,14 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase {
public void testStopGatewayReceiver_Group() {
VM puneLocator = Host.getLocator();
- int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort());
+ int punePort = puneLocator.invoke(() -> getLocatorPort());
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createAndStartReceiverWithGroup(punePort, "RG1"));
vm4.invoke(() -> createAndStartReceiverWithGroup(punePort, "RG1"));
@@ -190,8 +189,7 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase {
vm5.invoke(() -> verifyReceiverState(true));
pause(10000);
- String command =
- CliStrings.STOP_GATEWAYRECEIVER + " --" + CliStrings.STOP_GATEWAYRECEIVER__GROUP + "=RG1";
+ String command = CliStrings.STOP_GATEWAYRECEIVER + " --" + CliStrings.GROUP + "=RG1";
CommandResult cmdResult = executeCommand(command);
if (cmdResult != null) {
String strCmdResult = commandResultToString(cmdResult);
@@ -221,14 +219,14 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase {
public void testStopGatewayReceiver_MultipleGroup() {
VM puneLocator = Host.getLocator();
- int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort());
+ int punePort = puneLocator.invoke(() -> getLocatorPort());
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createAndStartReceiverWithGroup(punePort, "RG1"));
vm4.invoke(() -> createAndStartReceiverWithGroup(punePort, "RG1"));
@@ -243,8 +241,7 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase {
vm7.invoke(() -> verifyReceiverState(true));
pause(10000);
- String command = CliStrings.STOP_GATEWAYRECEIVER + " --"
- + CliStrings.STOP_GATEWAYRECEIVER__GROUP + "=RG1,RG2";
+ String command = CliStrings.STOP_GATEWAYRECEIVER + " --" + CliStrings.GROUP + "=RG1,RG2";
CommandResult cmdResult = executeCommand(command);
if (cmdResult != null) {
String strCmdResult = commandResultToString(cmdResult);
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java
index db1de4b..a77c499 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java
@@ -44,7 +44,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
@Test
public void testStartGatewaySender_ErrorConditions() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -52,16 +52,16 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCache(punePort));
vm3.invoke(() -> createSender("ln", 2, false, 100, 400, false, false, null, true));
- final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> getMember());
+ final DistributedMember vm1Member = vm3.invoke(() -> getMember());
String command = CliStrings.START_GATEWAYSENDER + " --" + CliStrings.START_GATEWAYSENDER__ID
- + "=ln --" + CliStrings.START_GATEWAYSENDER__MEMBER + "=" + vm1Member.getId() + " --"
- + CliStrings.START_GATEWAYSENDER__GROUP + "=SenserGroup1";
+ + "=ln --" + CliStrings.MEMBER + "=" + vm1Member.getId() + " --" + CliStrings.GROUP
+ + "=SenserGroup1";
CommandResult cmdResult = executeCommandWithIgnoredExceptions(command);
if (cmdResult != null) {
String strCmdResult = commandResultToString(cmdResult);
@@ -86,7 +86,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
@Test
public void testStartGatewaySender() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -94,7 +94,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCache(punePort));
vm3.invoke(() -> createSender("ln", 2, false, 100, 400, false, false, null, true));
@@ -136,7 +136,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
@Test
public void testStartGatewaySender_onMember() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -144,17 +144,17 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCache(punePort));
vm3.invoke(() -> createSender("ln", 2, false, 100, 400, false, false, null, true));
vm3.invoke(() -> verifySenderState("ln", false, false));
- final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> getMember());
+ final DistributedMember vm1Member = vm3.invoke(() -> getMember());
pause(10000);
String command = CliStrings.START_GATEWAYSENDER + " --" + CliStrings.START_GATEWAYSENDER__ID
- + "=ln --" + CliStrings.START_GATEWAYSENDER__MEMBER + "=" + vm1Member.getId();
+ + "=ln --" + CliStrings.MEMBER + "=" + vm1Member.getId();
CommandResult cmdResult = executeCommandWithIgnoredExceptions(command);
if (cmdResult != null) {
String strCmdResult = commandResultToString(cmdResult);
@@ -174,7 +174,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
@Test
public void testStartGatewaySender_Group() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -182,7 +182,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCacheWithGroups(punePort, "SenderGroup1"));
vm3.invoke(() -> createSender("ln", 2, false, 100, 400, false, false, null, true));
@@ -197,7 +197,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
pause(10000);
String command = CliStrings.START_GATEWAYSENDER + " --" + CliStrings.START_GATEWAYSENDER__ID
- + "=ln --" + CliStrings.START_GATEWAYSENDER__GROUP + "=SenderGroup1";
+ + "=ln --" + CliStrings.GROUP + "=SenderGroup1";
CommandResult cmdResult = executeCommandWithIgnoredExceptions(command);
if (cmdResult != null) {
String strCmdResult = commandResultToString(cmdResult);
@@ -225,7 +225,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
@Test
public void testStartGatewaySender_MultipleGroup() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -233,7 +233,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCacheWithGroups(punePort, "SenderGroup1"));
vm3.invoke(() -> createSender("ln", 2, false, 100, 400, false, false, null, true));
@@ -254,7 +254,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
pause(10000);
String command = CliStrings.START_GATEWAYSENDER + " --" + CliStrings.START_GATEWAYSENDER__ID
- + "=ln --" + CliStrings.START_GATEWAYSENDER__GROUP + "=SenderGroup1,SenderGroup2";
+ + "=ln --" + CliStrings.GROUP + "=SenderGroup1,SenderGroup2";
CommandResult cmdResult = executeCommandWithIgnoredExceptions(command);
if (cmdResult != null) {
String strCmdResult = commandResultToString(cmdResult);
@@ -282,7 +282,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
@Test
public void testStartGatewaySender_Group_MissingSenderFromGroup() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -290,7 +290,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCacheWithGroups(punePort, "SenderGroup1"));
vm3.invoke(() -> createSender("ln", 2, false, 100, 400, false, false, null, true));
@@ -303,7 +303,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
pause(10000);
String command = CliStrings.START_GATEWAYSENDER + " --" + CliStrings.START_GATEWAYSENDER__ID
- + "=ln --" + CliStrings.START_GATEWAYSENDER__GROUP + "=SenderGroup1";
+ + "=ln --" + CliStrings.GROUP + "=SenderGroup1";
CommandResult cmdResult = executeCommandWithIgnoredExceptions(command);
if (cmdResult != null) {
String strCmdResult = commandResultToString(cmdResult);
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java
index a9d9cb4..1a4fa07 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java
@@ -47,7 +47,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase {
@Test
public void testStopGatewaySender_ErrorConditions() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -55,16 +55,16 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase {
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCache(punePort));
vm3.invoke(() -> createSender("ln", 2, false, 100, 400, false, false, null, true));
- final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> getMember());
+ final DistributedMember vm1Member = vm3.invoke(() -> getMember());
String command = CliStrings.STOP_GATEWAYSENDER + " --" + CliStrings.STOP_GATEWAYSENDER__ID
- + "=ln --" + CliStrings.STOP_GATEWAYSENDER__MEMBER + "=" + vm1Member.getId() + " --"
- + CliStrings.STOP_GATEWAYSENDER__GROUP + "=SenderGroup1";
+ + "=ln --" + CliStrings.MEMBER + "=" + vm1Member.getId() + " --" + CliStrings.GROUP
+ + "=SenderGroup1";
CommandResult cmdResult = executeCommandWithIgnoredExceptions(command);
if (cmdResult != null) {
String strCmdResult = commandResultToString(cmdResult);
@@ -79,7 +79,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase {
@Test
public void testStopGatewaySender() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -87,7 +87,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase {
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCache(punePort));
vm3.invoke(() -> createSender("ln", 2, false, 100, 400, false, false, null, true));
@@ -133,7 +133,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase {
@Test
public void testStopGatewaySender_onMember() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -141,7 +141,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase {
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCache(punePort));
vm3.invoke(() -> createSender("ln", 2, false, 100, 400, false, false, null, true));
@@ -150,10 +150,10 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase {
vm3.invoke(() -> verifySenderState("ln", true, false));
- final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> getMember());
+ final DistributedMember vm1Member = vm3.invoke(() -> getMember());
pause(10000);
String command = CliStrings.STOP_GATEWAYSENDER + " --" + CliStrings.STOP_GATEWAYSENDER__ID
- + "=ln --" + CliStrings.STOP_GATEWAYSENDER__MEMBER + "=" + vm1Member.getId();
+ + "=ln --" + CliStrings.MEMBER + "=" + vm1Member.getId();
CommandResult cmdResult = executeCommandWithIgnoredExceptions(command);
if (cmdResult != null) {
String strCmdResult = commandResultToString(cmdResult);
@@ -173,7 +173,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase {
@Test
public void testStopGatewaySender_Group() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -181,7 +181,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase {
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCacheWithGroups(punePort, "SenderGroup1"));
vm3.invoke(() -> createSender("ln", 2, false, 100, 400, false, false, null, true));
@@ -200,7 +200,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase {
pause(10000);
String command = CliStrings.STOP_GATEWAYSENDER + " --" + CliStrings.STOP_GATEWAYSENDER__ID
- + "=ln --" + CliStrings.STOP_GATEWAYSENDER__GROUP + "=SenderGroup1";
+ + "=ln --" + CliStrings.GROUP + "=SenderGroup1";
CommandResult cmdResult = executeCommandWithIgnoredExceptions(command);
if (cmdResult != null) {
String strCmdResult = commandResultToString(cmdResult);
@@ -228,7 +228,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase {
@Test
public void testStopGatewaySender_MultipleGroup() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -236,7 +236,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase {
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCacheWithGroups(punePort, "SenderGroup1"));
vm3.invoke(() -> createSender("ln", 2, false, 100, 400, false, false, null, true));
@@ -263,7 +263,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase {
pause(10000);
String command = CliStrings.STOP_GATEWAYSENDER + " --" + CliStrings.STOP_GATEWAYSENDER__ID
- + "=ln --" + CliStrings.STOP_GATEWAYSENDER__GROUP + "=SenderGroup1,SenderGroup2";
+ + "=ln --" + CliStrings.GROUP + "=SenderGroup1,SenderGroup2";
CommandResult cmdResult = executeCommandWithIgnoredExceptions(command);
if (cmdResult != null) {
String strCmdResult = commandResultToString(cmdResult);
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandListDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
index 8294d66..409c457 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
@@ -40,7 +40,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
@Test
public void testListGatewayWithNoSenderReceiver() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -48,7 +48,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCache(punePort));
vm4.invoke(() -> createCache(punePort));
@@ -69,7 +69,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
@Test
public void testListGatewaySender() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -77,7 +77,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm6.invoke(() -> createAndStartReceiver(nyPort));
vm7.invoke(() -> createAndStartReceiver(nyPort));
@@ -120,7 +120,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
@Test
public void testListGatewayReceiver() {
- Integer lnPort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer lnPort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -128,7 +128,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
props.setProperty(LOCATORS, "localhost[" + lnPort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, lnPort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, lnPort));
vm3.invoke(() -> createAndStartReceiver(lnPort));
vm4.invoke(() -> createAndStartReceiver(lnPort));
@@ -167,7 +167,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
@Test
public void testListGatewaySenderGatewayReceiver() throws GfJsonException {
- Integer lnPort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer lnPort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -175,7 +175,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
props.setProperty(LOCATORS, "localhost[" + lnPort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, lnPort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, lnPort));
vm6.invoke(() -> createAndStartReceiver(nyPort));
@@ -227,7 +227,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
@Test
public void testListGatewaySenderGatewayReceiver_group() {
- Integer lnPort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer lnPort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -235,7 +235,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
props.setProperty(LOCATORS, "localhost[" + lnPort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, lnPort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, lnPort));
vm6.invoke(() -> createAndStartReceiver(nyPort));
@@ -256,8 +256,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
vm7.invoke(() -> createSender("ln_Parallel", 1, true, 100, 400, false, false, null, false));
pause(10000);
- String command =
- CliStrings.LIST_GATEWAY + " --" + CliStrings.LIST_GATEWAY__GROUP + "=Serial_Sender";
+ String command = CliStrings.LIST_GATEWAY + " --" + CliStrings.GROUP + "=Serial_Sender";
CommandResult cmdResult = executeCommand(command);
if (cmdResult != null) {
String strCmdResult = commandResultToString(cmdResult);
@@ -277,7 +276,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
fail("testListGatewaySenderGatewayReceiver_group failed as did not get CommandResult");
}
- command = CliStrings.LIST_GATEWAY + " --" + CliStrings.LIST_GATEWAY__GROUP + "=Parallel_Sender";
+ command = CliStrings.LIST_GATEWAY + " --" + CliStrings.GROUP + "=Parallel_Sender";
cmdResult = executeCommand(command);
if (cmdResult != null) {
TabularResultData tableSenderResultData = ((CompositeResultData) cmdResult.getResultData())
@@ -300,7 +299,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
fail("testListGatewaySenderGatewayReceiver_group failed as did not get CommandResult");
}
- command = CliStrings.LIST_GATEWAY + " --" + CliStrings.LIST_GATEWAY__GROUP + "=Receiver_Group";
+ command = CliStrings.LIST_GATEWAY + " --" + CliStrings.GROUP + "=Receiver_Group";
cmdResult = executeCommand(command);
if (cmdResult != null) {
String strCmdResult = commandResultToString(cmdResult);
@@ -324,8 +323,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
fail("testListGatewaySenderGatewayReceiver_group failed as did not get CommandResult");
}
- command = CliStrings.LIST_GATEWAY + " --" + CliStrings.LIST_GATEWAY__GROUP
- + "=Serial_Sender,Parallel_Sender";
+ command = CliStrings.LIST_GATEWAY + " --" + CliStrings.GROUP + "=Serial_Sender,Parallel_Sender";
cmdResult = executeCommand(command);
if (cmdResult != null) {
String strCmdResult = commandResultToString(cmdResult);
@@ -348,7 +346,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
fail("testListGatewaySenderGatewayReceiver_group failed as did not get CommandResult");
}
- command = CliStrings.LIST_GATEWAY + " --" + CliStrings.LIST_GATEWAY__GROUP
+ command = CliStrings.LIST_GATEWAY + " --" + CliStrings.GROUP
+ "=Serial_Sender,Parallel_Sender,Receiver_Group";
cmdResult = executeCommand(command);
if (cmdResult != null) {
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
index 4b29d35..bae0553 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
@@ -39,7 +39,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
@Test
public void testPauseGatewaySender_ErrorConditions() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -47,16 +47,16 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCache(punePort));
vm3.invoke(() -> createSender("ln", 2, false, 100, 400, false, false, null, true));
- final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> getMember());
+ final DistributedMember vm1Member = vm3.invoke(() -> getMember());
String command = CliStrings.PAUSE_GATEWAYSENDER + " --" + CliStrings.PAUSE_GATEWAYSENDER__ID
- + "=ln --" + CliStrings.PAUSE_GATEWAYSENDER__MEMBER + "=" + vm1Member.getId() + " --"
- + CliStrings.PAUSE_GATEWAYSENDER__GROUP + "=SenderGroup1";
+ + "=ln --" + CliStrings.MEMBER + "=" + vm1Member.getId() + " --" + CliStrings.GROUP
+ + "=SenderGroup1";
CommandResult cmdResult = executeCommand(command);
if (cmdResult != null) {
String strCmdResult = commandResultToString(cmdResult);
@@ -74,7 +74,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
@Test
public void testPauseGatewaySender_onMember() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -82,7 +82,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCache(punePort));
vm3.invoke(() -> createSender("ln", 2, false, 100, 400, false, false, null, true));
@@ -91,10 +91,10 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
vm3.invoke(() -> verifySenderState("ln", true, false));
- final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> getMember());
+ final DistributedMember vm1Member = vm3.invoke(() -> getMember());
pause(10000);
String command = CliStrings.PAUSE_GATEWAYSENDER + " --" + CliStrings.PAUSE_GATEWAYSENDER__ID
- + "=ln --" + CliStrings.PAUSE_GATEWAYSENDER__MEMBER + "=" + vm1Member.getId();
+ + "=ln --" + CliStrings.MEMBER + "=" + vm1Member.getId();
CommandResult cmdResult = executeCommand(command);
if (cmdResult != null) {
String strCmdResult = commandResultToString(cmdResult);
@@ -111,7 +111,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
@Test
public void testPauseGatewaySender() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -119,7 +119,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCache(punePort));
vm3.invoke(() -> createSender("ln", 2, false, 100, 400, false, false, null, true));
@@ -165,7 +165,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
@Test
public void testPauseGatewaySender_Group() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -173,7 +173,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCacheWithGroups(punePort, "SenderGroup1"));
vm3.invoke(() -> createSender("ln", 2, false, 100, 400, false, false, null, true));
@@ -192,7 +192,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
pause(10000);
String command = CliStrings.PAUSE_GATEWAYSENDER + " --" + CliStrings.PAUSE_GATEWAYSENDER__ID
- + "=ln --" + CliStrings.PAUSE_GATEWAYSENDER__GROUP + "=SenderGroup1";
+ + "=ln --" + CliStrings.GROUP + "=SenderGroup1";
CommandResult cmdResult = executeCommand(command);
if (cmdResult != null) {
String strCmdResult = commandResultToString(cmdResult);
@@ -220,7 +220,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
@Test
public void testPauseGatewaySender_MultipleGroup() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -228,7 +228,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCacheWithGroups(punePort, "SenderGroup1"));
vm3.invoke(() -> createSender("ln", 2, false, 100, 400, false, false, null, true));
@@ -255,7 +255,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
pause(10000);
String command = CliStrings.PAUSE_GATEWAYSENDER + " --" + CliStrings.PAUSE_GATEWAYSENDER__ID
- + "=ln --" + CliStrings.PAUSE_GATEWAYSENDER__GROUP + "=SenderGroup1,SenderGroup2";
+ + "=ln --" + CliStrings.GROUP + "=SenderGroup1,SenderGroup2";
CommandResult cmdResult = executeCommand(command);
if (cmdResult != null) {
String strCmdResult = commandResultToString(cmdResult);
@@ -280,7 +280,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
@Test
public void testResumeGatewaySender_ErrorConditions() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -288,16 +288,16 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCache(punePort));
vm3.invoke(() -> createSender("ln", 2, false, 100, 400, false, false, null, true));
- final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> getMember());
+ final DistributedMember vm1Member = vm3.invoke(() -> getMember());
String command = CliStrings.RESUME_GATEWAYSENDER + " --" + CliStrings.RESUME_GATEWAYSENDER__ID
- + "=ln --" + CliStrings.RESUME_GATEWAYSENDER__MEMBER + "=" + vm1Member.getId() + " --"
- + CliStrings.RESUME_GATEWAYSENDER__GROUP + "=SenderGroup1";
+ + "=ln --" + CliStrings.MEMBER + "=" + vm1Member.getId() + " --" + CliStrings.GROUP
+ + "=SenderGroup1";
CommandResult cmdResult = executeCommand(command);
if (cmdResult != null) {
String strCmdResult = commandResultToString(cmdResult);
@@ -313,7 +313,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
@Test
public void testResumeGatewaySender() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -321,7 +321,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCache(punePort));
vm3.invoke(() -> createSender("ln", 2, false, 100, 400, false, false, null, true));
@@ -375,7 +375,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
@Test
public void testResumeGatewaySender_onMember() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -383,7 +383,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCache(punePort));
vm3.invoke(() -> createSender("ln", 2, false, 100, 400, false, false, null, true));
@@ -396,10 +396,10 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
vm3.invoke(() -> verifySenderState("ln", true, true));
- final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> getMember());
+ final DistributedMember vm1Member = vm3.invoke(() -> getMember());
pause(10000);
String command = CliStrings.RESUME_GATEWAYSENDER + " --" + CliStrings.RESUME_GATEWAYSENDER__ID
- + "=ln --" + CliStrings.RESUME_GATEWAYSENDER__MEMBER + "=" + vm1Member.getId();
+ + "=ln --" + CliStrings.MEMBER + "=" + vm1Member.getId();
CommandResult cmdResult = executeCommand(command);
if (cmdResult != null) {
String strCmdResult = commandResultToString(cmdResult);
@@ -419,7 +419,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
@Test
public void testResumeGatewaySender_Group() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -427,7 +427,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCacheWithGroups(punePort, "SenderGroup1"));
vm3.invoke(() -> createSender("ln", 2, false, 100, 400, false, false, null, true));
@@ -454,7 +454,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
pause(10000);
String command = CliStrings.RESUME_GATEWAYSENDER + " --" + CliStrings.RESUME_GATEWAYSENDER__ID
- + "=ln --" + CliStrings.RESUME_GATEWAYSENDER__GROUP + "=SenderGroup1";
+ + "=ln --" + CliStrings.GROUP + "=SenderGroup1";
CommandResult cmdResult = executeCommand(command);
if (cmdResult != null) {
String strCmdResult = commandResultToString(cmdResult);
@@ -482,7 +482,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
@Test
public void testResumeGatewaySender_MultipleGroup() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -490,7 +490,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCacheWithGroups(punePort, "SenderGroup1"));
vm3.invoke(() -> createSender("ln", 2, false, 100, 400, false, false, null, true));
@@ -529,7 +529,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
pause(10000);
String command = CliStrings.RESUME_GATEWAYSENDER + " --" + CliStrings.RESUME_GATEWAYSENDER__ID
- + "=ln --" + CliStrings.RESUME_GATEWAYSENDER__GROUP + "=SenderGroup1,SenderGroup2";
+ + "=ln --" + CliStrings.GROUP + "=SenderGroup1,SenderGroup2";
CommandResult cmdResult = executeCommand(command);
if (cmdResult != null) {
String strCmdResult = commandResultToString(cmdResult);
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
index 5b127d0..d067bad 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
@@ -42,14 +42,14 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase {
@Test
public void testGatewaySenderStatus() {
- Integer lnPort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer lnPort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "localhost[" + lnPort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, lnPort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, lnPort));
vm6.invoke(() -> createAndStartReceiver(nyPort));
@@ -128,14 +128,14 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase {
@Test
public void testGatewaySenderStatus_OnMember() {
- Integer lnPort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer lnPort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "localhost[" + lnPort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, lnPort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, lnPort));
vm6.invoke(() -> createAndStartReceiver(nyPort));
@@ -149,11 +149,11 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase {
vm5.invoke(() -> createCache(lnPort));
- final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> getMember());
+ final DistributedMember vm1Member = vm3.invoke(() -> getMember());
pause(10000);
String command = CliStrings.STATUS_GATEWAYSENDER + " --" + CliStrings.STATUS_GATEWAYSENDER__ID
- + "=ln_Serial --" + CliStrings.STATUS_GATEWAYSENDER__MEMBER + "=" + vm1Member.getId();
+ + "=ln_Serial --" + CliStrings.MEMBER + "=" + vm1Member.getId();
CommandResult cmdResult = executeCommand(command);
if (cmdResult != null) {
@@ -180,7 +180,7 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase {
pause(10000);
command = CliStrings.STATUS_GATEWAYSENDER + " --" + CliStrings.STATUS_GATEWAYSENDER__ID
- + "=ln_Serial --" + CliStrings.STATUS_GATEWAYSENDER__MEMBER + "=" + vm1Member.getId();
+ + "=ln_Serial --" + CliStrings.MEMBER + "=" + vm1Member.getId();
cmdResult = executeCommand(command);
if (cmdResult != null) {
@@ -203,10 +203,10 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase {
fail("testListGatewaySender failed as did not get CommandResult");
}
- final DistributedMember vm5Member = (DistributedMember) vm5.invoke(() -> getMember());
+ final DistributedMember vm5Member = vm5.invoke(() -> getMember());
command = CliStrings.STATUS_GATEWAYSENDER + " --" + CliStrings.STATUS_GATEWAYSENDER__ID
- + "=ln_Serial --" + CliStrings.STATUS_GATEWAYSENDER__MEMBER + "=" + vm5Member.getId();
+ + "=ln_Serial --" + CliStrings.MEMBER + "=" + vm5Member.getId();
cmdResult = executeCommand(command);
if (cmdResult != null) {
// ErrorResultData errorResultData =
@@ -224,14 +224,14 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase {
@Test
public void testGatewaySenderStatus_OnGroups() {
- Integer lnPort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer lnPort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "localhost[" + lnPort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, lnPort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, lnPort));
vm7.invoke(() -> createAndStartReceiver(nyPort));
@@ -249,11 +249,11 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase {
vm6.invoke(() -> createCacheWithGroups(lnPort, "Serial_Sender"));
- final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> getMember());
+ final DistributedMember vm1Member = vm3.invoke(() -> getMember());
pause(10000);
String command = CliStrings.STATUS_GATEWAYSENDER + " --" + CliStrings.STATUS_GATEWAYSENDER__ID
- + "=ln_Serial --" + CliStrings.STATUS_GATEWAYSENDER__GROUP + "=Serial_Sender";
+ + "=ln_Serial --" + CliStrings.GROUP + "=Serial_Sender";
CommandResult cmdResult = executeCommand(command);
if (cmdResult != null) {
@@ -286,7 +286,7 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase {
pause(10000);
command = CliStrings.STATUS_GATEWAYSENDER + " --" + CliStrings.STATUS_GATEWAYSENDER__ID
- + "=ln_Serial --" + CliStrings.STATUS_GATEWAYSENDER__GROUP + "=Serial_Sender";
+ + "=ln_Serial --" + CliStrings.GROUP + "=Serial_Sender";
cmdResult = executeCommand(command);
if (cmdResult != null) {
@@ -314,14 +314,14 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase {
@Test
public void testGatewayReceiverStatus() {
- Integer lnPort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer lnPort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "localhost[" + lnPort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, lnPort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, lnPort));
vm6.invoke(() -> createAndStartReceiver(nyPort));
@@ -394,14 +394,14 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase {
@Test
public void testGatewayReceiverStatus_OnMember() {
- Integer lnPort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer lnPort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "localhost[" + lnPort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, lnPort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, lnPort));
vm6.invoke(() -> createAndStartReceiver(nyPort));
@@ -409,11 +409,11 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase {
vm4.invoke(() -> createAndStartReceiver(lnPort));
vm5.invoke(() -> createAndStartReceiver(lnPort));
- final DistributedMember vm3Member = (DistributedMember) vm3.invoke(() -> getMember());
+ final DistributedMember vm3Member = vm3.invoke(() -> getMember());
pause(10000);
- String command = CliStrings.STATUS_GATEWAYRECEIVER + " --"
- + CliStrings.STATUS_GATEWAYRECEIVER__MEMBER + "=" + vm3Member.getId();
+ String command =
+ CliStrings.STATUS_GATEWAYRECEIVER + " --" + CliStrings.MEMBER + "=" + vm3Member.getId();
CommandResult cmdResult = executeCommand(command);
@@ -441,8 +441,8 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase {
pause(10000);
- command = CliStrings.STATUS_GATEWAYRECEIVER + " --" + CliStrings.STATUS_GATEWAYRECEIVER__MEMBER
- + "=" + vm3Member.getId();
+ command =
+ CliStrings.STATUS_GATEWAYRECEIVER + " --" + CliStrings.MEMBER + "=" + vm3Member.getId();
cmdResult = executeCommand(command);
if (cmdResult != null) {
@@ -469,14 +469,14 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase {
@Test
public void testGatewayReceiverStatus_OnGroups() {
- Integer lnPort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer lnPort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "localhost[" + lnPort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, lnPort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, lnPort));
vm7.invoke(() -> createAndStartReceiver(nyPort));
@@ -486,8 +486,7 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase {
vm6.invoke(() -> createAndStartReceiverWithGroup(lnPort, "RG2"));
pause(10000);
- String command = CliStrings.STATUS_GATEWAYRECEIVER + " --"
- + CliStrings.STATUS_GATEWAYRECEIVER__GROUP + "=RG1";
+ String command = CliStrings.STATUS_GATEWAYRECEIVER + " --" + CliStrings.GROUP + "=RG1";
CommandResult cmdResult = executeCommand(command);
if (cmdResult != null) {
@@ -513,8 +512,7 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase {
vm5.invoke(() -> stopReceiver());
pause(10000);
- command = CliStrings.STATUS_GATEWAYRECEIVER + " --" + CliStrings.STATUS_GATEWAYRECEIVER__GROUP
- + "=RG1";
+ command = CliStrings.STATUS_GATEWAYRECEIVER + " --" + CliStrings.GROUP + "=RG1";
cmdResult = executeCommand(command);
if (cmdResult != null) {
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationDUnitTest.java
index b6b6712..9eb423f 100644
--- a/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationDUnitTest.java
@@ -166,8 +166,8 @@ public class ClusterConfigurationDUnitTest extends CliCommandTestBase {
// MockCacheExtension verification
@SuppressWarnings("unchecked")
// should only be one cache extension
- final MockCacheExtension mockCacheExtension = (MockCacheExtension) ((Extensible<Cache>) cache)
- .getExtensionPoint().getExtensions().iterator().next();
+ final MockCacheExtension mockCacheExtension =
+ (MockCacheExtension) cache.getExtensionPoint().getExtensions().iterator().next();
assertNotNull(mockCacheExtension);
assertEquals(1, mockCacheExtension.beforeCreateCounter.get());
assertEquals(1, mockCacheExtension.onCreateCounter.get());
@@ -231,7 +231,7 @@ public class ClusterConfigurationDUnitTest extends CliCommandTestBase {
// MockCacheExtension verification
@SuppressWarnings("unchecked")
- final Extensible<Cache> extensibleCache = (Extensible<Cache>) cache;
+ final Extensible<Cache> extensibleCache = cache;
// Should not be any cache extensions
assertTrue(!extensibleCache.getExtensionPoint().getExtensions().iterator().hasNext());
@@ -344,7 +344,7 @@ public class ClusterConfigurationDUnitTest extends CliCommandTestBase {
+ "locator-" + locator1Port + ".log";
VM locatorAndMgr = getHost(0).getVM(3);
- Object[] result = (Object[]) locatorAndMgr.invoke(() -> {
+ Object[] result = locatorAndMgr.invoke(() -> {
int httpPort;
int jmxPort;
String jmxHost;
@@ -433,7 +433,7 @@ public class ClusterConfigurationDUnitTest extends CliCommandTestBase {
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.CREATE_REGION);
csb.addOption(CliStrings.CREATE_REGION__REGION, regionName);
csb.addOption(CliStrings.CREATE_REGION__REGIONSHORTCUT, regionShortCut.name());
- csb.addOptionWithValueCheck(CliStrings.CREATE_REGION__GROUP, group);
+ csb.addOptionWithValueCheck(CliStrings.GROUP, group);
executeAndVerifyCommand(csb.toString());
}
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationIndexWithFromClauseDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationIndexWithFromClauseDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationIndexWithFromClauseDUnitTest.java
index 5a15506..7e82d23 100644
--- a/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationIndexWithFromClauseDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationIndexWithFromClauseDUnitTest.java
@@ -77,7 +77,7 @@ public class ClusterConfigurationIndexWithFromClauseDUnitTest {
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.LIST_MEMBER);
gfshShellConnectionRule.executeAndVerifyCommand(csb.toString());
lsRule.stopMember(1);
- lsRule.startServerVM(1, lsRule.getMember(0).getPort());;
+ lsRule.startServerVM(1, lsRule.getMember(0).getPort());
verifyIndexRecreated(INDEX_NAME);
}
@@ -114,7 +114,7 @@ public class ClusterConfigurationIndexWithFromClauseDUnitTest {
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.CREATE_REGION);
csb.addOption(CliStrings.CREATE_REGION__REGION, regionName);
csb.addOption(CliStrings.CREATE_REGION__REGIONSHORTCUT, regionShortCut.name());
- csb.addOptionWithValueCheck(CliStrings.CREATE_REGION__GROUP, group);
+ csb.addOptionWithValueCheck(CliStrings.GROUP, group);
gfshShellConnectionRule.executeAndVerifyCommand(csb.toString());
}
}
[3/5] geode git commit: GEODE-2818: add alias to any command's
options that involves "group", "member",
"jar" and replace CliString variables with GROUP, MEMBER, JAR, etc.
Posted by ji...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/WanCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/WanCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/WanCommandsController.java
index 4fd4b96..6a01c3e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/WanCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/WanCommandsController.java
@@ -46,19 +46,16 @@ public class WanCommandsController extends AbstractCommandsController {
@RequestMapping(method = RequestMethod.GET, value = "/gateways")
@ResponseBody
public String listGateways(
- @RequestParam(value = CliStrings.LIST_GATEWAY__GROUP, required = false) final String[] groups,
- @RequestParam(value = CliStrings.LIST_GATEWAY__MEMBER,
- required = false) final String[] members) {
+ @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups,
+ @RequestParam(value = CliStrings.MEMBER, required = false) final String[] members) {
CommandStringBuilder command = new CommandStringBuilder(CliStrings.LIST_GATEWAY);
if (hasValue(groups)) {
- command.addOption(CliStrings.LIST_GATEWAY__GROUP,
- StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(members)) {
- command.addOption(CliStrings.LIST_GATEWAY__MEMBER,
- StringUtils.join(members, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.MEMBER, StringUtils.join(members, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
@@ -67,12 +64,10 @@ public class WanCommandsController extends AbstractCommandsController {
@RequestMapping(method = RequestMethod.POST, value = "/gateways/receivers")
@ResponseBody
public String createGatewayReceiver(
- @RequestParam(value = CliStrings.CREATE_GATEWAYRECEIVER__GROUP,
- required = false) final String[] groups,
+ @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups,
@RequestParam(value = CliStrings.CREATE_GATEWAYRECEIVER__MANUALSTART,
required = false) final Boolean manualStart,
- @RequestParam(value = CliStrings.CREATE_GATEWAYRECEIVER__MEMBER,
- required = false) final String[] members,
+ @RequestParam(value = CliStrings.MEMBER, required = false) final String[] members,
@RequestParam(value = CliStrings.CREATE_GATEWAYRECEIVER__STARTPORT,
required = false) final Integer startPort,
@RequestParam(value = CliStrings.CREATE_GATEWAYRECEIVER__ENDPORT,
@@ -88,8 +83,7 @@ public class WanCommandsController extends AbstractCommandsController {
CommandStringBuilder command = new CommandStringBuilder(CliStrings.CREATE_GATEWAYRECEIVER);
if (hasValue(groups)) {
- command.addOption(CliStrings.CREATE_GATEWAYRECEIVER__GROUP,
- StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(manualStart)) {
@@ -98,8 +92,7 @@ public class WanCommandsController extends AbstractCommandsController {
}
if (hasValue(members)) {
- command.addOption(CliStrings.CREATE_GATEWAYRECEIVER__MEMBER,
- StringUtils.join(members, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.MEMBER, StringUtils.join(members, StringUtils.COMMA_DELIMITER));
}
if (hasValue(startPort)) {
@@ -137,10 +130,8 @@ public class WanCommandsController extends AbstractCommandsController {
public String createGatewaySender(
@RequestParam(CliStrings.CREATE_GATEWAYSENDER__ID) final String gatewaySenderId,
@RequestParam(CliStrings.CREATE_GATEWAYSENDER__REMOTEDISTRIBUTEDSYSTEMID) final Integer remoteDistributedSystemId,
- @RequestParam(value = CliStrings.CREATE_GATEWAYSENDER__GROUP,
- required = false) final String[] groups,
- @RequestParam(value = CliStrings.CREATE_GATEWAYSENDER__MEMBER,
- required = false) final String[] members,
+ @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups,
+ @RequestParam(value = CliStrings.MEMBER, required = false) final String[] members,
@RequestParam(value = CliStrings.CREATE_GATEWAYSENDER__PARALLEL,
required = false) final Boolean parallel,
@RequestParam(value = CliStrings.CREATE_GATEWAYSENDER__MANUALSTART,
@@ -180,13 +171,11 @@ public class WanCommandsController extends AbstractCommandsController {
String.valueOf(remoteDistributedSystemId));
if (hasValue(groups)) {
- command.addOption(CliStrings.CREATE_GATEWAYSENDER__GROUP,
- StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(members)) {
- command.addOption(CliStrings.CREATE_GATEWAYSENDER__MEMBER,
- StringUtils.join(members, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.MEMBER, StringUtils.join(members, StringUtils.COMMA_DELIMITER));
}
if (hasValue(parallel)) {
@@ -271,21 +260,17 @@ public class WanCommandsController extends AbstractCommandsController {
@RequestMapping(method = RequestMethod.DELETE, value = "/gateways/senders/{id}")
@ResponseBody
public String destroyGatewaySender(@PathVariable("id") final String gatewaySenderId,
- @RequestParam(value = CliStrings.DESTROY_GATEWAYSENDER__GROUP,
- required = false) final String[] groups,
- @RequestParam(value = CliStrings.DESTROY_GATEWAYSENDER__MEMBER,
- required = false) final String[] members) {
+ @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups,
+ @RequestParam(value = CliStrings.MEMBER, required = false) final String[] members) {
CommandStringBuilder command = new CommandStringBuilder(CliStrings.DESTROY_GATEWAYSENDER);
command.addOption(CliStrings.CREATE_GATEWAYSENDER__ID, gatewaySenderId);
if (hasValue(groups)) {
- command.addOption(CliStrings.CREATE_GATEWAYSENDER__GROUP,
- StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(members)) {
- command.addOption(CliStrings.CREATE_GATEWAYSENDER__MEMBER,
- StringUtils.join(members, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.MEMBER, StringUtils.join(members, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
}
@@ -307,22 +292,18 @@ public class WanCommandsController extends AbstractCommandsController {
params = "op=pause")
@ResponseBody
public String pauseGatewaySender(@PathVariable("id") final String gatewaySenderId,
- @RequestParam(value = CliStrings.PAUSE_GATEWAYSENDER__GROUP,
- required = false) final String[] groups,
- @RequestParam(value = CliStrings.PAUSE_GATEWAYSENDER__MEMBER,
- required = false) final String[] members) {
+ @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups,
+ @RequestParam(value = CliStrings.MEMBER, required = false) final String[] members) {
CommandStringBuilder command = new CommandStringBuilder(CliStrings.PAUSE_GATEWAYSENDER);
command.addOption(CliStrings.PAUSE_GATEWAYSENDER__ID, decode(gatewaySenderId));
if (hasValue(groups)) {
- command.addOption(CliStrings.PAUSE_GATEWAYSENDER__GROUP,
- StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(members)) {
- command.addOption(CliStrings.PAUSE_GATEWAYSENDER__MEMBER,
- StringUtils.join(members, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.MEMBER, StringUtils.join(members, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
@@ -333,22 +314,18 @@ public class WanCommandsController extends AbstractCommandsController {
params = "op=resume")
@ResponseBody
public String resumeGatewaySender(@PathVariable("id") final String gatewaySenderId,
- @RequestParam(value = CliStrings.RESUME_GATEWAYSENDER__GROUP,
- required = false) final String[] groups,
- @RequestParam(value = CliStrings.RESUME_GATEWAYSENDER__MEMBER,
- required = false) final String[] members) {
+ @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups,
+ @RequestParam(value = CliStrings.MEMBER, required = false) final String[] members) {
CommandStringBuilder command = new CommandStringBuilder(CliStrings.RESUME_GATEWAYSENDER);
command.addOption(CliStrings.RESUME_GATEWAYSENDER__ID, decode(gatewaySenderId));
if (hasValue(groups)) {
- command.addOption(CliStrings.RESUME_GATEWAYSENDER__GROUP,
- StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(members)) {
- command.addOption(CliStrings.RESUME_GATEWAYSENDER__MEMBER,
- StringUtils.join(members, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.MEMBER, StringUtils.join(members, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
@@ -358,20 +335,16 @@ public class WanCommandsController extends AbstractCommandsController {
@RequestMapping(method = RequestMethod.POST, value = "/gateways/receivers", params = "op=start")
@ResponseBody
public String startGatewayReceiver(
- @RequestParam(value = CliStrings.START_GATEWAYRECEIVER__GROUP,
- required = false) final String[] groups,
- @RequestParam(value = CliStrings.START_GATEWAYRECEIVER__MEMBER,
- required = false) final String[] members) {
+ @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups,
+ @RequestParam(value = CliStrings.MEMBER, required = false) final String[] members) {
CommandStringBuilder command = new CommandStringBuilder(CliStrings.START_GATEWAYRECEIVER);
if (hasValue(groups)) {
- command.addOption(CliStrings.START_GATEWAYRECEIVER__GROUP,
- StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(members)) {
- command.addOption(CliStrings.START_GATEWAYRECEIVER__MEMBER,
- StringUtils.join(members, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.MEMBER, StringUtils.join(members, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
@@ -382,22 +355,18 @@ public class WanCommandsController extends AbstractCommandsController {
@ResponseBody
public String startGatewaySender(
@RequestParam(CliStrings.START_GATEWAYSENDER__ID) final String gatewaySenderId,
- @RequestParam(value = CliStrings.START_GATEWAYSENDER__GROUP,
- required = false) final String[] groups,
- @RequestParam(value = CliStrings.START_GATEWAYSENDER__MEMBER,
- required = false) final String[] members) {
+ @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups,
+ @RequestParam(value = CliStrings.MEMBER, required = false) final String[] members) {
CommandStringBuilder command = new CommandStringBuilder(CliStrings.START_GATEWAYSENDER);
command.addOption(CliStrings.START_GATEWAYSENDER__ID, gatewaySenderId);
if (hasValue(groups)) {
- command.addOption(CliStrings.START_GATEWAYSENDER__GROUP,
- StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(members)) {
- command.addOption(CliStrings.START_GATEWAYSENDER__MEMBER,
- StringUtils.join(members, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.MEMBER, StringUtils.join(members, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
@@ -406,20 +375,16 @@ public class WanCommandsController extends AbstractCommandsController {
@RequestMapping(method = RequestMethod.GET, value = "/gateways/receivers")
@ResponseBody
public String statusGatewayReceivers(
- @RequestParam(value = CliStrings.STATUS_GATEWAYRECEIVER__GROUP,
- required = false) final String[] groups,
- @RequestParam(value = CliStrings.STATUS_GATEWAYRECEIVER__MEMBER,
- required = false) final String[] members) {
+ @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups,
+ @RequestParam(value = CliStrings.MEMBER, required = false) final String[] members) {
CommandStringBuilder command = new CommandStringBuilder(CliStrings.STATUS_GATEWAYRECEIVER);
if (hasValue(groups)) {
- command.addOption(CliStrings.STATUS_GATEWAYRECEIVER__GROUP,
- StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(members)) {
- command.addOption(CliStrings.STATUS_GATEWAYRECEIVER__MEMBER,
- StringUtils.join(members, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.MEMBER, StringUtils.join(members, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
@@ -428,22 +393,18 @@ public class WanCommandsController extends AbstractCommandsController {
@RequestMapping(method = RequestMethod.GET, value = "/gateways/senders/{id}")
@ResponseBody
public String statusGatewaySenders(@PathVariable("id") final String gatewaySenderId,
- @RequestParam(value = CliStrings.STATUS_GATEWAYSENDER__GROUP,
- required = false) final String[] groups,
- @RequestParam(value = CliStrings.STATUS_GATEWAYSENDER__MEMBER,
- required = false) final String[] members) {
+ @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups,
+ @RequestParam(value = CliStrings.MEMBER, required = false) final String[] members) {
CommandStringBuilder command = new CommandStringBuilder(CliStrings.STATUS_GATEWAYSENDER);
command.addOption(CliStrings.STATUS_GATEWAYSENDER__ID, decode(gatewaySenderId));
if (hasValue(groups)) {
- command.addOption(CliStrings.STATUS_GATEWAYSENDER__GROUP,
- StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(members)) {
- command.addOption(CliStrings.STATUS_GATEWAYSENDER__MEMBER,
- StringUtils.join(members, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.MEMBER, StringUtils.join(members, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
@@ -452,20 +413,16 @@ public class WanCommandsController extends AbstractCommandsController {
@RequestMapping(method = RequestMethod.POST, value = "/gateways/receivers", params = "op=stop")
@ResponseBody
public String stopGatewayReceiver(
- @RequestParam(value = CliStrings.STOP_GATEWAYRECEIVER__GROUP,
- required = false) final String[] groups,
- @RequestParam(value = CliStrings.STOP_GATEWAYRECEIVER__MEMBER,
- required = false) final String[] members) {
+ @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups,
+ @RequestParam(value = CliStrings.MEMBER, required = false) final String[] members) {
CommandStringBuilder command = new CommandStringBuilder(CliStrings.STOP_GATEWAYRECEIVER);
if (hasValue(groups)) {
- command.addOption(CliStrings.STOP_GATEWAYRECEIVER__GROUP,
- StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(members)) {
- command.addOption(CliStrings.STOP_GATEWAYRECEIVER__MEMBER,
- StringUtils.join(members, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.MEMBER, StringUtils.join(members, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
@@ -474,22 +431,18 @@ public class WanCommandsController extends AbstractCommandsController {
@RequestMapping(method = RequestMethod.POST, value = "/gateways/senders/{id}", params = "op=stop")
@ResponseBody
public String stopGatewaySender(@PathVariable("id") final String gatewaySenderId,
- @RequestParam(value = CliStrings.STOP_GATEWAYRECEIVER__GROUP,
- required = false) final String[] groups,
- @RequestParam(value = CliStrings.STOP_GATEWAYRECEIVER__MEMBER,
- required = false) final String[] members) {
+ @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups,
+ @RequestParam(value = CliStrings.MEMBER, required = false) final String[] members) {
CommandStringBuilder command = new CommandStringBuilder(CliStrings.STOP_GATEWAYSENDER);
command.addOption(CliStrings.STOP_GATEWAYSENDER__ID, decode(gatewaySenderId));
if (hasValue(groups)) {
- command.addOption(CliStrings.STOP_GATEWAYSENDER__GROUP,
- StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(members)) {
- command.addOption(CliStrings.STOP_GATEWAYSENDER__MEMBER,
- StringUtils.join(members, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.MEMBER, StringUtils.join(members, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigCommandsDUnitTest.java
index a110025..eeec317 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigCommandsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigCommandsDUnitTest.java
@@ -302,7 +302,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase {
final DistributionConfig config = cache.getSystem().getConfig();
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.ALTER_RUNTIME_CONFIG);
- csb.addOption(CliStrings.ALTER_RUNTIME_CONFIG__MEMBER, controller);
+ csb.addOption(CliStrings.MEMBER, controller);
csb.addOption(CliStrings.ALTER_RUNTIME_CONFIG__LOG__LEVEL, "info");
csb.addOption(CliStrings.ALTER_RUNTIME_CONFIG__LOG__FILE__SIZE__LIMIT, "50");
csb.addOption(CliStrings.ALTER_RUNTIME_CONFIG__ARCHIVE__DISK__SPACE__LIMIT, "32");
@@ -527,7 +527,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase {
// Test altering the runtime config
CommandStringBuilder commandStringBuilder =
new CommandStringBuilder(CliStrings.ALTER_RUNTIME_CONFIG);
- commandStringBuilder.addOption(CliStrings.ALTER_RUNTIME_CONFIG__GROUP, groupName);
+ commandStringBuilder.addOption(CliStrings.GROUP, groupName);
commandStringBuilder.addOption(CliStrings.ALTER_RUNTIME_CONFIG__LOG__LEVEL, "fine");
CommandResult cmdResult = executeCommand(commandStringBuilder.toString());
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
index d024022..e913746 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
@@ -390,8 +390,8 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
return () -> {
try {
MBeanServer mbeanServer = MBeanJMXAdapter.mbeanServer;
- String queryExp = MessageFormat.format(ManagementConstants.OBJECTNAME__REGION_MXBEAN,
- new Object[] {regionPath, "*"});
+ String queryExp =
+ MessageFormat.format(ManagementConstants.OBJECTNAME__REGION_MXBEAN, regionPath, "*");
ObjectName queryExpON = new ObjectName(queryExp);
return mbeanServer.queryNames(null, queryExpON).size() == mbeanCount;
} catch (MalformedObjectNameException mone) {
@@ -517,7 +517,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
private void regionAlterGroupTest() {
CommandStringBuilder commandStringBuilder = new CommandStringBuilder(CliStrings.ALTER_REGION);
commandStringBuilder.addOption(CliStrings.ALTER_REGION__REGION, this.alterRegionName);
- commandStringBuilder.addOption(CliStrings.ALTER_REGION__GROUP, "Group1");
+ commandStringBuilder.addOption(CliStrings.GROUP, "Group1");
commandStringBuilder.addOption(CliStrings.ALTER_REGION__EVICTIONMAX, "5764");
CommandResult cmdResult = executeCommand(commandStringBuilder.toString());
assertEquals(Result.Status.OK, cmdResult.getStatus());
@@ -541,7 +541,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
commandStringBuilder = new CommandStringBuilder(CliStrings.ALTER_REGION);
commandStringBuilder.addOption(CliStrings.ALTER_REGION__REGION, "/" + this.alterRegionName);
- commandStringBuilder.addOption(CliStrings.ALTER_REGION__GROUP, "Group2");
+ commandStringBuilder.addOption(CliStrings.GROUP, "Group2");
commandStringBuilder.addOption(CliStrings.ALTER_REGION__EVICTIONMAX, "6963");
cmdResult = executeCommand(commandStringBuilder.toString());
assertEquals(Result.Status.OK, cmdResult.getStatus());
@@ -630,7 +630,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
private void regionAlterNoChangeTest() {
CommandStringBuilder commandStringBuilder = new CommandStringBuilder(CliStrings.ALTER_REGION);
commandStringBuilder.addOption(CliStrings.ALTER_REGION__REGION, "/" + this.alterRegionName);
- commandStringBuilder.addOption(CliStrings.ALTER_REGION__GROUP, "Group1");
+ commandStringBuilder.addOption(CliStrings.GROUP, "Group1");
commandStringBuilder.addOption(CliStrings.ALTER_REGION__CLONINGENABLED, "true");
CommandResult cmdResult = executeCommand(commandStringBuilder.toString());
@@ -671,7 +671,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
private void regionAlterSetDefaultsTest() {
CommandStringBuilder commandStringBuilder = new CommandStringBuilder(CliStrings.ALTER_REGION);
commandStringBuilder.addOption(CliStrings.ALTER_REGION__REGION, "/" + this.alterRegionName);
- commandStringBuilder.addOption(CliStrings.ALTER_REGION__GROUP, "Group1");
+ commandStringBuilder.addOption(CliStrings.GROUP, "Group1");
commandStringBuilder.addOption(CliStrings.ALTER_REGION__EVICTIONMAX);
commandStringBuilder.addOption(CliStrings.ALTER_REGION__CLONINGENABLED);
commandStringBuilder.addOption(CliStrings.ALTER_REGION__ASYNCEVENTQUEUEID);
@@ -716,7 +716,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
// Start out by putting 3 entries into each of the plug-in sets
CommandStringBuilder commandStringBuilder = new CommandStringBuilder(CliStrings.ALTER_REGION);
commandStringBuilder.addOption(CliStrings.ALTER_REGION__REGION, "/" + this.alterRegionName);
- commandStringBuilder.addOption(CliStrings.ALTER_REGION__GROUP, "Group1");
+ commandStringBuilder.addOption(CliStrings.GROUP, "Group1");
commandStringBuilder.addOption(CliStrings.ALTER_REGION__ASYNCEVENTQUEUEID,
this.alterAsyncEventQueueId1);
commandStringBuilder.addOption(CliStrings.ALTER_REGION__ASYNCEVENTQUEUEID,
@@ -768,7 +768,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
// Now take 1 entry out of each of the sets
commandStringBuilder = new CommandStringBuilder(CliStrings.ALTER_REGION);
commandStringBuilder.addOption(CliStrings.ALTER_REGION__REGION, "/" + this.alterRegionName);
- commandStringBuilder.addOption(CliStrings.ALTER_REGION__GROUP, "Group1");
+ commandStringBuilder.addOption(CliStrings.GROUP, "Group1");
commandStringBuilder.addOption(CliStrings.ALTER_REGION__ASYNCEVENTQUEUEID,
this.alterAsyncEventQueueId1);
commandStringBuilder.addOption(CliStrings.ALTER_REGION__ASYNCEVENTQUEUEID,
@@ -811,7 +811,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
// Add 1 back to each of the sets
commandStringBuilder = new CommandStringBuilder(CliStrings.ALTER_REGION);
commandStringBuilder.addOption(CliStrings.ALTER_REGION__REGION, "/" + this.alterRegionName);
- commandStringBuilder.addOption(CliStrings.ALTER_REGION__GROUP, "Group1");
+ commandStringBuilder.addOption(CliStrings.GROUP, "Group1");
commandStringBuilder.addOption(CliStrings.ALTER_REGION__ASYNCEVENTQUEUEID,
this.alterAsyncEventQueueId1);
commandStringBuilder.addOption(CliStrings.ALTER_REGION__ASYNCEVENTQUEUEID,
@@ -934,7 +934,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
// Add 1 back to each of the sets
commandStringBuilder = new CommandStringBuilder(CliStrings.ALTER_REGION);
commandStringBuilder.addOption(CliStrings.ALTER_REGION__REGION, "/" + this.alterRegionName);
- commandStringBuilder.addOption(CliStrings.ALTER_REGION__GROUP, "Group1");
+ commandStringBuilder.addOption(CliStrings.GROUP, "Group1");
commandStringBuilder.addOption(CliStrings.ALTER_REGION__CACHELISTENER, "''");
cmdResult = executeCommand(commandStringBuilder.toString());
assertEquals(Result.Status.OK, cmdResult.getStatus());
@@ -1025,7 +1025,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
commandStringBuilder.addOption(CliStrings.CREATE_REGION__REGION, regionName);
commandStringBuilder.addOption(CliStrings.CREATE_REGION__REGIONSHORTCUT, "REPLICATE");
commandStringBuilder.addOption(CliStrings.CREATE_REGION__STATISTICSENABLED, "true");
- commandStringBuilder.addOption(CliStrings.CREATE_REGION__GROUP, groupName);
+ commandStringBuilder.addOption(CliStrings.GROUP, groupName);
CommandResult cmdResult = executeCommand(commandStringBuilder.toString());
assertEquals(Result.Status.OK, cmdResult.getStatus());
@@ -1068,7 +1068,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
// Test altering the region
commandStringBuilder = new CommandStringBuilder(CliStrings.ALTER_REGION);
commandStringBuilder.addOption(CliStrings.ALTER_REGION__REGION, regionName);
- commandStringBuilder.addOption(CliStrings.ALTER_REGION__GROUP, groupName);
+ commandStringBuilder.addOption(CliStrings.GROUP, groupName);
commandStringBuilder.addOption(CliStrings.ALTER_REGION__ENTRYEXPIRATIONTIMETOLIVE, "45635");
commandStringBuilder.addOption(CliStrings.ALTER_REGION__ENTRYEXPIRATIONTTLACTION, "DESTROY");
cmdResult = executeCommand(commandStringBuilder.toString());
@@ -1174,7 +1174,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
commandStringBuilder.addOption(CliStrings.CREATE_REGION__REGION, regionName);
commandStringBuilder.addOption(CliStrings.CREATE_REGION__REGIONSHORTCUT, "REPLICATE");
commandStringBuilder.addOption(CliStrings.CREATE_REGION__STATISTICSENABLED, "true");
- commandStringBuilder.addOption(CliStrings.CREATE_REGION__GROUP, groupName);
+ commandStringBuilder.addOption(CliStrings.GROUP, groupName);
CommandResult cmdResult = executeCommand(commandStringBuilder.toString());
assertEquals(Result.Status.OK, cmdResult.getStatus());
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
index 1aad49c..07cdb11 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
@@ -803,7 +803,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
CommandStringBuilder commandStringBuilder =
new CommandStringBuilder(CliStrings.CREATE_DISK_STORE);
commandStringBuilder.addOption(CliStrings.CREATE_DISK_STORE__NAME, diskStoreName);
- commandStringBuilder.addOption(CliStrings.CREATE_DISK_STORE__GROUP, groupName);
+ commandStringBuilder.addOption(CliStrings.GROUP, groupName);
commandStringBuilder.addOption(CliStrings.CREATE_DISK_STORE__DIRECTORY_AND_SIZE,
diskStoreDir.getAbsolutePath());
CommandResult cmdResult = executeCommand(commandStringBuilder.toString());
@@ -857,7 +857,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
// Test destroying the disk store
commandStringBuilder = new CommandStringBuilder(CliStrings.DESTROY_DISK_STORE);
commandStringBuilder.addOption(CliStrings.DESTROY_DISK_STORE__NAME, diskStoreName);
- commandStringBuilder.addOption(CliStrings.DESTROY_DISK_STORE__GROUP, groupName);
+ commandStringBuilder.addOption(CliStrings.GROUP, groupName);
cmdResult = executeCommand(commandStringBuilder.toString());
assertEquals(Result.Status.OK, cmdResult.getStatus());
@@ -1181,7 +1181,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
CommandStringBuilder commandStringBuilder =
new CommandStringBuilder(CliStrings.CREATE_DISK_STORE);
commandStringBuilder.addOption(CliStrings.CREATE_DISK_STORE__NAME, diskStore1Name);
- commandStringBuilder.addOption(CliStrings.CREATE_DISK_STORE__GROUP, "Group1");
+ commandStringBuilder.addOption(CliStrings.GROUP, "Group1");
commandStringBuilder.addOption(CliStrings.CREATE_DISK_STORE__ALLOW_FORCE_COMPACTION, "true");
commandStringBuilder.addOption(CliStrings.CREATE_DISK_STORE__AUTO_COMPACT, "false");
commandStringBuilder.addOption(CliStrings.CREATE_DISK_STORE__COMPACTION_THRESHOLD, "67");
@@ -1211,7 +1211,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
// Verify that all of the attributes of the disk store were set correctly.
commandStringBuilder = new CommandStringBuilder(CliStrings.DESCRIBE_DISK_STORE);
- commandStringBuilder.addOption(CliStrings.DESCRIBE_DISK_STORE__MEMBER, vm1Name);
+ commandStringBuilder.addOption(CliStrings.MEMBER, vm1Name);
commandStringBuilder.addOption(CliStrings.DESCRIBE_DISK_STORE__NAME, diskStore1Name);
cmdResult = executeCommand(commandStringBuilder.toString());
assertEquals(Result.Status.OK, cmdResult.getStatus());
@@ -1229,7 +1229,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
commandStringBuilder = new CommandStringBuilder(CliStrings.CREATE_DISK_STORE);
commandStringBuilder.addOption(CliStrings.CREATE_DISK_STORE__NAME, diskStore2Name);
- commandStringBuilder.addOption(CliStrings.CREATE_DISK_STORE__GROUP, "Group2");
+ commandStringBuilder.addOption(CliStrings.GROUP, "Group2");
commandStringBuilder.addOption(CliStrings.CREATE_DISK_STORE__DIRECTORY_AND_SIZE,
diskStore2Dir.getAbsolutePath());
cmdResult = executeCommand(commandStringBuilder.toString());
@@ -1327,7 +1327,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
CommandStringBuilder commandStringBuilder =
new CommandStringBuilder(CliStrings.DESTROY_DISK_STORE);
commandStringBuilder.addOption(CliStrings.DESTROY_DISK_STORE__NAME, diskStore1Name);
- commandStringBuilder.addOption(CliStrings.DESTROY_DISK_STORE__GROUP, "Group1");
+ commandStringBuilder.addOption(CliStrings.GROUP, "Group1");
cmdResult = executeCommand(commandStringBuilder.toString());
assertEquals(Result.Status.OK, cmdResult.getStatus());
String stringResult = commandResultToString(cmdResult);
@@ -1351,7 +1351,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
commandStringBuilder = new CommandStringBuilder(CliStrings.DESTROY_DISK_STORE);
commandStringBuilder.addOption(CliStrings.DESTROY_DISK_STORE__NAME, diskStore2Name);
- commandStringBuilder.addOption(CliStrings.DESTROY_DISK_STORE__GROUP, "Group2");
+ commandStringBuilder.addOption(CliStrings.GROUP, "Group2");
cmdResult = executeCommand(commandStringBuilder.toString());
assertEquals(Result.Status.OK, cmdResult.getStatus());
stringResult = commandResultToString(cmdResult);
@@ -1376,7 +1376,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
commandStringBuilder = new CommandStringBuilder(CliStrings.DESTROY_DISK_STORE);
commandStringBuilder.addOption(CliStrings.DESTROY_DISK_STORE__NAME, diskStore1Name);
- commandStringBuilder.addOption(CliStrings.DESTROY_DISK_STORE__GROUP, "Group2");
+ commandStringBuilder.addOption(CliStrings.GROUP, "Group2");
cmdResult = executeCommand(commandStringBuilder.toString());
assertEquals(Result.Status.OK, cmdResult.getStatus());
stringResult = commandResultToString(cmdResult);
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
index 14d4d3f..96aa526 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
@@ -434,34 +434,32 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
manager.invoke(new SerializableRunnable() {
@Override
public void run() {
- doQueryRegionsAssociatedMembers(queryTemplate1, 0, true,
- new String[] {DATA_REGION_NAME_VM1_PATH, DATA_REGION_NAME_VM2_PATH});
- doQueryRegionsAssociatedMembers(queryTemplate1, 2, true,
- new String[] {DATA_REGION_NAME_PATH, DATA_REGION_NAME_CHILD_1_PATH});
- doQueryRegionsAssociatedMembers(queryTemplate1, 1, false,
- new String[] {DATA_REGION_NAME_PATH, DATA_REGION_NAME_CHILD_1_PATH});
- doQueryRegionsAssociatedMembers(queryTemplate1, 1, true,
- new String[] {DATA_REGION_NAME_VM1_PATH, DATA_REGION_NAME_PATH});
- doQueryRegionsAssociatedMembers(queryTemplate1, 1, false,
- new String[] {DATA_REGION_NAME_VM1_PATH, DATA_REGION_NAME_PATH});
- doQueryRegionsAssociatedMembers(queryTemplate1, 1, true,
- new String[] {DATA_REGION_NAME_VM2_PATH, DATA_REGION_NAME_PATH});
- doQueryRegionsAssociatedMembers(queryTemplate1, 1, false,
- new String[] {DATA_REGION_NAME_VM2_PATH, DATA_REGION_NAME_PATH});
- doQueryRegionsAssociatedMembers(queryTemplate1, 0, true,
- new String[] {DATA_PAR_REGION_NAME_VM2_PATH, DATA_PAR_REGION_NAME_VM1_PATH});
- doQueryRegionsAssociatedMembers(queryTemplate1, 0, false,
- new String[] {DATA_PAR_REGION_NAME_VM2_PATH, DATA_PAR_REGION_NAME_VM1_PATH});
- doQueryRegionsAssociatedMembers(queryTemplate1, -1, true,
- new String[] {DATA_PAR_REGION_NAME_VM2_PATH, "/jfgkdfjgkd"}); // one wrong region
- doQueryRegionsAssociatedMembers(queryTemplate1, -1, false,
- new String[] {DATA_PAR_REGION_NAME_VM2_PATH, "/jfgkdfjgkd"}); // one wrong region
- doQueryRegionsAssociatedMembers(queryTemplate1, -1, true,
- new String[] {"/dhgfdhgf", "/dhgddhd"}); // both
+ doQueryRegionsAssociatedMembers(queryTemplate1, 0, true, DATA_REGION_NAME_VM1_PATH,
+ DATA_REGION_NAME_VM2_PATH);
+ doQueryRegionsAssociatedMembers(queryTemplate1, 2, true, DATA_REGION_NAME_PATH,
+ DATA_REGION_NAME_CHILD_1_PATH);
+ doQueryRegionsAssociatedMembers(queryTemplate1, 1, false, DATA_REGION_NAME_PATH,
+ DATA_REGION_NAME_CHILD_1_PATH);
+ doQueryRegionsAssociatedMembers(queryTemplate1, 1, true, DATA_REGION_NAME_VM1_PATH,
+ DATA_REGION_NAME_PATH);
+ doQueryRegionsAssociatedMembers(queryTemplate1, 1, false, DATA_REGION_NAME_VM1_PATH,
+ DATA_REGION_NAME_PATH);
+ doQueryRegionsAssociatedMembers(queryTemplate1, 1, true, DATA_REGION_NAME_VM2_PATH,
+ DATA_REGION_NAME_PATH);
+ doQueryRegionsAssociatedMembers(queryTemplate1, 1, false, DATA_REGION_NAME_VM2_PATH,
+ DATA_REGION_NAME_PATH);
+ doQueryRegionsAssociatedMembers(queryTemplate1, 0, true, DATA_PAR_REGION_NAME_VM2_PATH,
+ DATA_PAR_REGION_NAME_VM1_PATH);
+ doQueryRegionsAssociatedMembers(queryTemplate1, 0, false, DATA_PAR_REGION_NAME_VM2_PATH,
+ DATA_PAR_REGION_NAME_VM1_PATH);
+ doQueryRegionsAssociatedMembers(queryTemplate1, -1, true, DATA_PAR_REGION_NAME_VM2_PATH,
+ "/jfgkdfjgkd"); // one wrong region
+ doQueryRegionsAssociatedMembers(queryTemplate1, -1, false, DATA_PAR_REGION_NAME_VM2_PATH,
+ "/jfgkdfjgkd"); // one wrong region
+ doQueryRegionsAssociatedMembers(queryTemplate1, -1, true, "/dhgfdhgf", "/dhgddhd"); // both
// regions
// wrong
- doQueryRegionsAssociatedMembers(queryTemplate1, -1, false,
- new String[] {"/dhgfdhgf", "/dhgddhd"}); // both
+ doQueryRegionsAssociatedMembers(queryTemplate1, -1, false, "/dhgfdhgf", "/dhgddhd"); // both
// regions
// wrong
}
@@ -1755,7 +1753,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.EXPORT_DATA);
csb.addOption(CliStrings.EXPORT_DATA__REGION, regionName);
- csb.addOption(CliStrings.EXPORT_DATA__MEMBER, "Manager");
+ csb.addOption(CliStrings.MEMBER, "Manager");
csb.addOption(CliStrings.EXPORT_DATA__FILE, filePath);
String commandString = csb.toString();
@@ -1788,7 +1786,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
csb = new CommandStringBuilder(CliStrings.IMPORT_DATA);
csb.addOption(CliStrings.IMPORT_DATA__REGION, regionName);
csb.addOption(CliStrings.IMPORT_DATA__FILE, filePath);
- csb.addOption(CliStrings.IMPORT_DATA__MEMBER, "Manager");
+ csb.addOption(CliStrings.MEMBER, "Manager");
commandString = csb.toString();
cmdResult = executeCommand(commandString);
@@ -1834,7 +1832,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
csb = new CommandStringBuilder(CliStrings.IMPORT_DATA);
csb.addOption(CliStrings.IMPORT_DATA__REGION, regionName);
csb.addOption(CliStrings.IMPORT_DATA__FILE, filePath);
- csb.addOption(CliStrings.IMPORT_DATA__MEMBER, "Manager");
+ csb.addOption(CliStrings.MEMBER, "Manager");
csb.addOption(CliStrings.IMPORT_DATA__INVOKE_CALLBACKS, "true");
commandString = csb.toString();
cmdResult = executeCommand(commandString);
@@ -1852,7 +1850,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
csb = new CommandStringBuilder(CliStrings.EXPORT_DATA);
csb.addOption(CliStrings.EXPORT_DATA__REGION, "FDSERW");
csb.addOption(CliStrings.EXPORT_DATA__FILE, filePath);
- csb.addOption(CliStrings.EXPORT_DATA__MEMBER, "Manager");
+ csb.addOption(CliStrings.MEMBER, "Manager");
commandString = csb.getCommandString();
cmdResult = executeCommand(commandString);
@@ -1864,7 +1862,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
csb = new CommandStringBuilder(CliStrings.IMPORT_DATA);
csb.addOption(CliStrings.IMPORT_DATA__REGION, regionName);
csb.addOption(CliStrings.IMPORT_DATA__FILE, "#WEQW");
- csb.addOption(CliStrings.IMPORT_DATA__MEMBER, "Manager");
+ csb.addOption(CliStrings.MEMBER, "Manager");
commandString = csb.getCommandString();
cmdResult = executeCommand(commandString);
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsDUnitTest.java
index a0a599f..16f708d 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsDUnitTest.java
@@ -328,7 +328,7 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase {
csb.addOption(CliStrings.CREATE_INDEX__NAME, indexName);
csb.addOption(CliStrings.CREATE_INDEX__EXPRESSION, "key");
csb.addOption(CliStrings.CREATE_INDEX__REGION, "/StocksParReg");
- csb.addOption(CliStrings.CREATE_INDEX__MEMBER, VM1Name);
+ csb.addOption(CliStrings.MEMBER, VM1Name);
csb.addOption(CliStrings.CREATE_INDEX__TYPE, "key");
String commandString = csb.toString();
@@ -352,7 +352,7 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase {
csb = new CommandStringBuilder(CliStrings.DESTROY_INDEX);
csb.addOption(CliStrings.DESTROY_INDEX__NAME, indexName);
csb.addOption(CliStrings.DESTROY_INDEX__REGION, "/StocksParReg");
- csb.addOption(CliStrings.DESTROY_INDEX__MEMBER, VM1Name);
+ csb.addOption(CliStrings.MEMBER, VM1Name);
commandString = csb.toString();
commandResult = executeCommand(commandString);
resultAsString = commandResultToString(commandResult);
@@ -380,7 +380,7 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase {
csb.addOption(CliStrings.CREATE_INDEX__EXPRESSION, "key");
csb.addOption(CliStrings.CREATE_INDEX__REGION, "/StocksParReg");
csb.addOption(CliStrings.CREATE_INDEX__TYPE, "hash");
- csb.addOption(CliStrings.CREATE_INDEX__GROUP, group1);
+ csb.addOption(CliStrings.GROUP, group1);
String commandString = csb.toString();
CommandResult commandResult = executeCommand(commandString);
@@ -400,7 +400,7 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase {
csb = new CommandStringBuilder(CliStrings.DESTROY_INDEX);
csb.addOption(CliStrings.DESTROY_INDEX__NAME, indexName);
csb.addOption(CliStrings.DESTROY_INDEX__REGION, "/StocksParReg");
- csb.addOption(CliStrings.DESTROY_INDEX__GROUP, group1);
+ csb.addOption(CliStrings.GROUP, group1);
commandString = csb.toString();
commandResult = executeCommand(commandString);
resultAsString = commandResultToString(commandResult);
@@ -542,7 +542,7 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase {
csb = new CommandStringBuilder(CliStrings.DESTROY_INDEX);
csb.addOption(CliStrings.DESTROY_INDEX__NAME, indexName);
csb.addOption(CliStrings.DESTROY_INDEX__REGION, "Region");
- csb.addOption(CliStrings.DESTROY_INDEX__MEMBER, "wrongOne");
+ csb.addOption(CliStrings.MEMBER, "wrongOne");
commandString = csb.toString();
commandResult = executeCommand(commandString);
resultAsString = commandResultToString(commandResult);
@@ -583,7 +583,7 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase {
assertEquals(true, resultAsString.contains(VM1Name));
csb = new CommandStringBuilder(CliStrings.DESTROY_INDEX);
- csb.addOption(CliStrings.DESTROY_INDEX__GROUP, group1);
+ csb.addOption(CliStrings.GROUP, group1);
commandString = csb.toString();
commandResult = executeCommand(commandString);
resultAsString = commandResultToString(commandResult);
@@ -702,7 +702,7 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase {
CommandStringBuilder commandStringBuilder = new CommandStringBuilder(CliStrings.CREATE_INDEX);
commandStringBuilder.addOption(CliStrings.CREATE_INDEX__EXPRESSION, "key");
commandStringBuilder.addOption(CliStrings.CREATE_INDEX__NAME, indexName);
- commandStringBuilder.addOption(CliStrings.CREATE_INDEX__GROUP, groupName);
+ commandStringBuilder.addOption(CliStrings.GROUP, groupName);
commandStringBuilder.addOption(CliStrings.CREATE_INDEX__REGION, "\"/" + regionName + " p\"");
CommandResult cmdResult = executeCommand(commandStringBuilder.toString());
assertEquals(Result.Status.OK, cmdResult.getStatus());
@@ -748,7 +748,7 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase {
// Test destroying the index
commandStringBuilder = new CommandStringBuilder(CliStrings.DESTROY_INDEX);
commandStringBuilder.addOption(CliStrings.DESTROY_INDEX__NAME, indexName);
- commandStringBuilder.addOption(CliStrings.DESTROY_INDEX__GROUP, groupName);
+ commandStringBuilder.addOption(CliStrings.GROUP, groupName);
commandStringBuilder.addOption(CliStrings.DESTROY_INDEX__REGION, "/" + regionName);
cmdResult = executeCommand(commandStringBuilder.toString());
assertEquals(Result.Status.OK, cmdResult.getStatus());
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
index fb83f55..ab8c69b 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
@@ -211,7 +211,7 @@ public class ListAndDescribeRegionDUnitTest extends CliCommandTestBase {
csb = new CommandStringBuilder(CliStrings.LIST_REGION);
- csb.addOption(CliStrings.LIST_REGION__MEMBER, "Manager");
+ csb.addOption(CliStrings.MEMBER, "Manager");
commandString = csb.toString();
commandResult = executeCommand(commandString);
commandResultAsString = commandResultToString(commandResult);
@@ -222,7 +222,7 @@ public class ListAndDescribeRegionDUnitTest extends CliCommandTestBase {
assertTrue(commandResultAsString.contains(LOCALREGIONONMANAGER));
csb = new CommandStringBuilder(CliStrings.LIST_REGION);
- csb.addOption(CliStrings.LIST_REGION__MEMBER, "Server1");
+ csb.addOption(CliStrings.MEMBER, "Server1");
commandString = csb.toString();
commandResult = executeCommand(commandString);
commandResultAsString = commandResultToString(commandResult);
@@ -236,7 +236,7 @@ public class ListAndDescribeRegionDUnitTest extends CliCommandTestBase {
assertTrue(commandResultAsString.contains(SUBREGION1A));
csb = new CommandStringBuilder(CliStrings.LIST_REGION);
- csb.addOption(CliStrings.LIST_REGION__GROUP, "G1");
+ csb.addOption(CliStrings.GROUP, "G1");
commandString = csb.toString();
commandResult = executeCommand(commandString);
commandResultAsString = commandResultToString(commandResult);
@@ -247,7 +247,7 @@ public class ListAndDescribeRegionDUnitTest extends CliCommandTestBase {
assertTrue(commandResultAsString.contains(LOCALREGIONONMANAGER));
csb = new CommandStringBuilder(CliStrings.LIST_REGION);
- csb.addOption(CliStrings.LIST_REGION__GROUP, "G2");
+ csb.addOption(CliStrings.GROUP, "G2");
commandString = csb.toString();
commandResult = executeCommand(commandString);
commandResultAsString = commandResultToString(commandResult);
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MemberCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MemberCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MemberCommandsDUnitTest.java
index fb8341a..fe6bc40 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MemberCommandsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MemberCommandsDUnitTest.java
@@ -267,7 +267,7 @@ public class MemberCommandsDUnitTest extends JUnit4CacheTestCase {
setupSystem();
CommandProcessor commandProcessor = new CommandProcessor();
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.LIST_MEMBER);
- csb.addOption(CliStrings.LIST_MEMBER__GROUP, "G1");
+ csb.addOption(CliStrings.GROUP, "G1");
Result result = commandProcessor.createCommandStatement(csb.toString(), EMPTY_ENV).process();
getLogWriter().info("#SB" + getResultAsString(result));
assertEquals(true, result.getStatus().equals(Status.OK));
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
index 9c3aa34..f0c2c2f 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
@@ -83,7 +83,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
if (cmdResult.getType().equals(ResultData.TYPE_TABULAR)) {
TabularResultData table = (TabularResultData) cmdResult.getResultData();
List<String> memberNames = table.retrieveAllValues(CliStrings.GC__MSG__MEMBER_NAME);
- assertEquals(true, memberNames.size() == 1 ? true : false);
+ assertEquals(true, memberNames.size() == 1);
} else {
fail("testGCForGroup failed as CommandResult should be table type");
}
@@ -101,7 +101,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
public void testGCForMemberID() {
setUpJmxManagerOnVm0ThenConnect(null);
final VM vm1 = Host.getHost(0).getVM(1);
- final String vm1MemberId = (String) vm1.invoke(() -> getMemberId());
+ final String vm1MemberId = vm1.invoke(() -> getMemberId());
String command = "gc --member=" + vm1MemberId;
CommandResult cmdResult = executeCommand(command);
cmdResult.resetToFirstLine();
@@ -112,7 +112,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
if (cmdResult.getType().equals(ResultData.TYPE_TABULAR)) {
TabularResultData table = (TabularResultData) cmdResult.getResultData();
List<String> memberNames = table.retrieveAllValues(CliStrings.GC__MSG__MEMBER_NAME);
- assertEquals(true, memberNames.size() == 1 ? true : false);
+ assertEquals(true, memberNames.size() == 1);
} else {
fail("testGCForGroup failed as CommandResult should be table type");
}
@@ -128,7 +128,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
props.setProperty(LOG_FILE, "testShowLogDefault.log");
setUpJmxManagerOnVm0ThenConnect(props);
final VM vm1 = Host.getHost(0).getVM(0);
- final String vm1MemberId = (String) vm1.invoke(() -> getMemberId());
+ final String vm1MemberId = vm1.invoke(() -> getMemberId());
String command = "show log --member=" + vm1MemberId;
CommandResult cmdResult = executeCommand(command);
if (cmdResult != null) {
@@ -152,7 +152,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
try {
setUpJmxManagerOnVm0ThenConnect(props);
final VM vm1 = Host.getHost(0).getVM(0);
- final String vm1MemberId = (String) vm1.invoke(() -> getMemberId());
+ final String vm1MemberId = vm1.invoke(() -> getMemberId());
String command = "show log --member=" + vm1MemberId + " --lines=50";
CommandResult cmdResult = executeCommand(command);
if (cmdResult != null) {
@@ -428,9 +428,8 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
}
});
- String commandString =
- CliStrings.CHANGE_LOGLEVEL + " --" + CliStrings.CHANGE_LOGLEVEL__LOGLEVEL + "=finer" + " --"
- + CliStrings.CHANGE_LOGLEVEL__MEMBER + "=" + serverName1 + "," + serverName2;
+ String commandString = CliStrings.CHANGE_LOGLEVEL + " --" + CliStrings.CHANGE_LOGLEVEL__LOGLEVEL
+ + "=finer" + " --" + CliStrings.MEMBER + "=" + serverName1 + "," + serverName2;
CommandResult commandResult = executeCommand(commandString);
getLogWriter().info("testChangeLogLevel commandResult=" + commandResult);
@@ -490,7 +489,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
});
String commandString = CliStrings.CHANGE_LOGLEVEL + " --" + CliStrings.CHANGE_LOGLEVEL__LOGLEVEL
- + "=finer" + " --" + CliStrings.CHANGE_LOGLEVEL__GROUPS + "=" + grp1 + "," + grp2;
+ + "=finer" + " --" + CliStrings.GROUPS + "=" + grp1 + "," + grp2;
CommandResult commandResult = executeCommand(commandString);
getLogWriter().info("testChangeLogLevelForGrps commandResult=" + commandResult);
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueueCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueueCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueueCommandsDUnitTest.java
index a56febe..163e0b0 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueueCommandsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueueCommandsDUnitTest.java
@@ -159,7 +159,7 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase {
CommandStringBuilder commandStringBuilder =
new CommandStringBuilder(CliStrings.CREATE_DISK_STORE);
commandStringBuilder.addOption(CliStrings.CREATE_DISK_STORE__NAME, diskStoreName);
- commandStringBuilder.addOption(CliStrings.CREATE_DISK_STORE__GROUP, "Group1");
+ commandStringBuilder.addOption(CliStrings.GROUP, "Group1");
commandStringBuilder.addOption(CliStrings.CREATE_DISK_STORE__DIRECTORY_AND_SIZE,
diskStoreDir.getAbsolutePath());
cmdResult = executeCommand(commandStringBuilder.toString());
@@ -171,7 +171,7 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase {
commandStringBuilder = new CommandStringBuilder(CliStrings.CREATE_ASYNC_EVENT_QUEUE);
commandStringBuilder.addOption(CliStrings.CREATE_ASYNC_EVENT_QUEUE__ID, queue1Name);
- commandStringBuilder.addOption(CliStrings.CREATE_ASYNC_EVENT_QUEUE__GROUP, "Group1");
+ commandStringBuilder.addOption(CliStrings.GROUP, "Group1");
commandStringBuilder.addOption(CliStrings.CREATE_ASYNC_EVENT_QUEUE__BATCH_SIZE, "514");
commandStringBuilder.addOption(CliStrings.CREATE_ASYNC_EVENT_QUEUE__PERSISTENT, "true");
commandStringBuilder.addOption(CliStrings.CREATE_ASYNC_EVENT_QUEUE__DISK_STORE, diskStoreName);
@@ -364,7 +364,7 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase {
CommandStringBuilder commandStringBuilder =
new CommandStringBuilder(CliStrings.CREATE_ASYNC_EVENT_QUEUE);
commandStringBuilder.addOption(CliStrings.CREATE_ASYNC_EVENT_QUEUE__ID, queueName);
- commandStringBuilder.addOption(CliStrings.CREATE_ASYNC_EVENT_QUEUE__GROUP, groupName);
+ commandStringBuilder.addOption(CliStrings.GROUP, groupName);
commandStringBuilder.addOption(CliStrings.CREATE_ASYNC_EVENT_QUEUE__LISTENER,
"com.qcdunit.QueueCommandsDUnitTestListener");
cmdResult = executeCommand(commandStringBuilder.toString());
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsDUnitTest.java
index 9349396..5c94c3a 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsDUnitTest.java
@@ -244,9 +244,9 @@ public class ShowMetricsDUnitTest extends CliCommandTestBase {
wc = createMBeanWaitCriterion(5, "", distributedMember, cacheServerPort);
waitForCriterion(wc, 10000, 500, true);
- final String command = CliStrings.SHOW_METRICS + " --" + CliStrings.SHOW_METRICS__MEMBER
- + "=" + distributedMember.getId() + " --" + CliStrings.SHOW_METRICS__CACHESERVER__PORT
- + "=" + cacheServerPort + " --" + CliStrings.SHOW_METRICS__FILE + "=" + exportFileName;
+ final String command = CliStrings.SHOW_METRICS + " --" + CliStrings.MEMBER + "="
+ + distributedMember.getId() + " --" + CliStrings.SHOW_METRICS__CACHESERVER__PORT + "="
+ + cacheServerPort + " --" + CliStrings.SHOW_METRICS__FILE + "=" + exportFileName;
CommandProcessor commandProcessor = new CommandProcessor();
Result result =
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowStackTraceDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowStackTraceDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowStackTraceDUnitTest.java
index dda50f6..51653a4 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowStackTraceDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowStackTraceDUnitTest.java
@@ -106,7 +106,7 @@ public class ShowStackTraceDUnitTest extends CliCommandTestBase {
File mgrStacktraceFile = workDirectory.newFile("managerStacktrace.txt");
csb = new CommandStringBuilder(CliStrings.EXPORT_STACKTRACE);
csb.addOption(CliStrings.EXPORT_STACKTRACE__FILE, mgrStacktraceFile.getCanonicalPath());
- csb.addOption(CliStrings.EXPORT_STACKTRACE__MEMBER, "Manager");
+ csb.addOption(CliStrings.MEMBER, "Manager");
commandString = csb.toString();
getLogWriter().info("CommandString : " + commandString);
commandResult = executeCommand(commandString);
@@ -116,7 +116,7 @@ public class ShowStackTraceDUnitTest extends CliCommandTestBase {
File serverStacktraceFile = workDirectory.newFile("serverStacktrace.txt");
csb = new CommandStringBuilder(CliStrings.EXPORT_STACKTRACE);
csb.addOption(CliStrings.EXPORT_STACKTRACE__FILE, serverStacktraceFile.getCanonicalPath());
- csb.addOption(CliStrings.EXPORT_STACKTRACE__MEMBER, "Server");
+ csb.addOption(CliStrings.MEMBER, "Server");
commandString = csb.toString();
getLogWriter().info("CommandString : " + commandString);
commandResult = executeCommand(commandString);
@@ -126,7 +126,7 @@ public class ShowStackTraceDUnitTest extends CliCommandTestBase {
File groupStacktraceFile = workDirectory.newFile("groupstacktrace.txt");
csb = new CommandStringBuilder(CliStrings.EXPORT_STACKTRACE);
csb.addOption(CliStrings.EXPORT_STACKTRACE__FILE, groupStacktraceFile.getCanonicalPath());
- csb.addOption(CliStrings.EXPORT_STACKTRACE__GROUP, "G2");
+ csb.addOption(CliStrings.GROUP, "G2");
commandString = csb.toString();
getLogWriter().info("CommandString : " + commandString);
commandResult = executeCommand(commandString);
@@ -136,7 +136,7 @@ public class ShowStackTraceDUnitTest extends CliCommandTestBase {
File wrongStackTraceFile = workDirectory.newFile("wrongStackTrace.txt");
csb = new CommandStringBuilder(CliStrings.EXPORT_STACKTRACE);
csb.addOption(CliStrings.EXPORT_STACKTRACE__FILE, wrongStackTraceFile.getCanonicalPath());
- csb.addOption(CliStrings.EXPORT_STACKTRACE__MEMBER, "WrongMember");
+ csb.addOption(CliStrings.MEMBER, "WrongMember");
commandString = csb.toString();
getLogWriter().info("CommandString : " + commandString);
commandResult = executeCommand(commandString);
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshMultilineCommandTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshMultilineCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshMultilineCommandTest.java
index 7b11444..a2a5be4 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshMultilineCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshMultilineCommandTest.java
@@ -15,7 +15,7 @@
package org.apache.geode.management.internal.cli.shell;
import static org.apache.geode.management.internal.cli.i18n.CliStrings.LIST_MEMBER;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.LIST_MEMBER__GROUP;
+import static org.apache.geode.management.internal.cli.i18n.CliStrings.GROUP;
import static org.apache.geode.management.internal.cli.i18n.CliStrings.NO_MEMBERS_FOUND_MESSAGE;
import static org.assertj.core.api.Assertions.assertThat;
@@ -43,13 +43,12 @@ public class GfshMultilineCommandTest {
gfsh.connectAndVerify(server.getJmxPort(), GfshShellConnectionRule.PortType.jmxManger);
// Execute a command
CommandStringBuilder csb = new CommandStringBuilder(LIST_MEMBER);
- csb.addOption(LIST_MEMBER__GROUP, "nogroup");
+ csb.addOption(GROUP, "nogroup");
gfsh.executeAndVerifyCommand(csb.getCommandString());
assertThat(gfsh.getGfshOutput().trim()).isEqualTo(NO_MEMBERS_FOUND_MESSAGE);
// Now execute same command with a new Continuation on new line
- csb =
- new CommandStringBuilder(LIST_MEMBER).addNewLine().addOption(LIST_MEMBER__GROUP, "nogroup");
+ csb = new CommandStringBuilder(LIST_MEMBER).addNewLine().addOption(GROUP, "nogroup");
gfsh.executeAndVerifyCommand(csb.getCommandString());
assertThat(gfsh.getGfshOutput().trim()).isEqualTo(NO_MEMBERS_FOUND_MESSAGE);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDistributionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDistributionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDistributionDUnitTest.java
index 5dc77aa..52a1f9b 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDistributionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDistributionDUnitTest.java
@@ -95,7 +95,7 @@ public class ClusterConfigDistributionDUnitTest {
"com.qcdunit.QueueCommandsDUnitTestListener");
csb.addOptionWithValueCheck(CliStrings.CREATE_ASYNC_EVENT_QUEUE__DISK_STORE, null);
csb.addOptionWithValueCheck(CliStrings.CREATE_ASYNC_EVENT_QUEUE__BATCH_SIZE, "1000");
- csb.addOptionWithValueCheck(CliStrings.CREATE_ASYNC_EVENT_QUEUE__GROUP, null);
+ csb.addOptionWithValueCheck(CliStrings.GROUP, null);
csb.addOptionWithValueCheck(CliStrings.CREATE_ASYNC_EVENT_QUEUE__PERSISTENT, "false");
csb.addOptionWithValueCheck(CliStrings.CREATE_ASYNC_EVENT_QUEUE__MAXIMUM_QUEUE_MEMORY, "1000");
gfshConnector.executeAndVerifyCommand(csb.getCommandString());
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/test/java/org/apache/geode/management/internal/web/controllers/WanCommandsControllerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/web/controllers/WanCommandsControllerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/web/controllers/WanCommandsControllerJUnitTest.java
index 8ee3e0f..59d6ff4 100755
--- a/geode-core/src/test/java/org/apache/geode/management/internal/web/controllers/WanCommandsControllerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/web/controllers/WanCommandsControllerJUnitTest.java
@@ -53,10 +53,8 @@ public class WanCommandsControllerJUnitTest {
assertThat(this.wanCommandsController.testableCommand)
.contains("--" + START_GATEWAYSENDER__ID + "=" + null);
assertThat(this.wanCommandsController.testableCommand).contains(START_GATEWAYSENDER);
- assertThat(this.wanCommandsController.testableCommand)
- .doesNotContain(START_GATEWAYRECEIVER__GROUP);
- assertThat(this.wanCommandsController.testableCommand)
- .doesNotContain(START_GATEWAYRECEIVER__MEMBER);
+ assertThat(this.wanCommandsController.testableCommand).doesNotContain(GROUP);
+ assertThat(this.wanCommandsController.testableCommand).doesNotContain(MEMBER);
}
@Test
@@ -69,17 +67,17 @@ public class WanCommandsControllerJUnitTest {
assertThat(this.wanCommandsController.testableCommand).contains(START_GATEWAYSENDER);
assertThat(this.wanCommandsController.testableCommand)
.contains("--" + START_GATEWAYSENDER__ID + "=" + gatewaySenderId);
- assertThat(this.wanCommandsController.testableCommand.contains(START_GATEWAYRECEIVER__GROUP))
+ assertThat(this.wanCommandsController.testableCommand.contains(GROUP))
.isEqualTo(containsGroups);
- assertThat(this.wanCommandsController.testableCommand.contains(START_GATEWAYRECEIVER__MEMBER))
+ assertThat(this.wanCommandsController.testableCommand.contains(MEMBER))
.isEqualTo(containsMembers);
if (containsGroups) {
assertThat(this.wanCommandsController.testableCommand)
- .contains("--" + START_GATEWAYRECEIVER__GROUP + "=" + groups[0]);
+ .contains("--" + GROUP + "=" + groups[0]);
}
if (containsMembers) {
assertThat(this.wanCommandsController.testableCommand)
- .contains("--" + START_GATEWAYRECEIVER__MEMBER + "=" + members[0]);
+ .contains("--" + MEMBER + "=" + members[0]);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationDUnitTest.java
index 867dc2e..cac45eb 100755
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationDUnitTest.java
@@ -293,14 +293,14 @@ public class LuceneClusterConfigurationDUnitTest {
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.CREATE_REGION);
csb.addOption(CliStrings.CREATE_REGION__REGION, regionName);
csb.addOption(CliStrings.CREATE_REGION__REGIONSHORTCUT, regionShortCut.name());
- csb.addOptionWithValueCheck(CliStrings.CREATE_REGION__GROUP, group);
+ csb.addOptionWithValueCheck(CliStrings.GROUP, group);
gfshConnector.executeAndVerifyCommand(csb.toString());
}
private CommandResult alterRegionUsingGfsh(String group) throws Exception {
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.ALTER_REGION);
csb.addOption(CliStrings.ALTER_REGION__REGION, REGION_NAME);
- csb.addOption(CliStrings.ALTER_REGION__GROUP, group);
+ csb.addOption(CliStrings.GROUP, group);
csb.addOption(CliStrings.ALTER_REGION__EVICTIONMAX, "5764");
return gfshConnector.executeAndVerifyCommand(csb.toString());
}
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandCreateDestroyGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandCreateDestroyGatewaySenderDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandCreateDestroyGatewaySenderDUnitTest.java
index 8d1f5d8..cffc4c1 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandCreateDestroyGatewaySenderDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandCreateDestroyGatewaySenderDUnitTest.java
@@ -59,7 +59,7 @@ public class WanCommandCreateDestroyGatewaySenderDUnitTest extends WANCommandTes
@Test
public void testCreateDestroyGatewaySenderWithDefault() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -67,7 +67,7 @@ public class WanCommandCreateDestroyGatewaySenderDUnitTest extends WANCommandTes
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCache(punePort));
vm4.invoke(() -> createCache(punePort));
@@ -109,7 +109,7 @@ public class WanCommandCreateDestroyGatewaySenderDUnitTest extends WANCommandTes
@Test
public void testCreateDestroyGatewaySender() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -117,7 +117,7 @@ public class WanCommandCreateDestroyGatewaySenderDUnitTest extends WANCommandTes
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCache(punePort));
vm4.invoke(() -> createCache(punePort));
@@ -178,7 +178,7 @@ public class WanCommandCreateDestroyGatewaySenderDUnitTest extends WANCommandTes
@Test
public void testCreateGatewaySender_Error() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -186,7 +186,7 @@ public class WanCommandCreateDestroyGatewaySenderDUnitTest extends WANCommandTes
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCache(punePort));
vm4.invoke(() -> createCache(punePort));
@@ -231,7 +231,7 @@ public class WanCommandCreateDestroyGatewaySenderDUnitTest extends WANCommandTes
@Test
public void testCreateDestroyGatewaySenderWithGatewayEventFilters() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -239,7 +239,7 @@ public class WanCommandCreateDestroyGatewaySenderDUnitTest extends WANCommandTes
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCache(punePort));
vm4.invoke(() -> createCache(punePort));
@@ -308,7 +308,7 @@ public class WanCommandCreateDestroyGatewaySenderDUnitTest extends WANCommandTes
@Test
public void testCreateDestroyGatewaySenderWithGatewayTransportFilters() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -316,7 +316,7 @@ public class WanCommandCreateDestroyGatewaySenderDUnitTest extends WANCommandTes
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCache(punePort));
vm4.invoke(() -> createCache(punePort));
@@ -384,7 +384,7 @@ public class WanCommandCreateDestroyGatewaySenderDUnitTest extends WANCommandTes
@Test
public void testCreateDestroyGatewaySender_OnMember() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -392,17 +392,17 @@ public class WanCommandCreateDestroyGatewaySenderDUnitTest extends WANCommandTes
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCache(punePort));
vm4.invoke(() -> createCache(punePort));
vm5.invoke(() -> createCache(punePort));
- final DistributedMember vm3Member = (DistributedMember) vm3.invoke(() -> getMember());
+ final DistributedMember vm3Member = vm3.invoke(() -> getMember());
int socketReadTimeout = GatewaySender.MINIMUM_SOCKET_READ_TIMEOUT + 1000;
String command = CliStrings.CREATE_GATEWAYSENDER + " --" + CliStrings.CREATE_GATEWAYSENDER__ID
- + "=ln" + " --" + CliStrings.CREATE_GATEWAYSENDER__MEMBER + "=" + vm3Member.getId() + " --"
+ + "=ln" + " --" + CliStrings.MEMBER + "=" + vm3Member.getId() + " --"
+ CliStrings.CREATE_GATEWAYSENDER__REMOTEDISTRIBUTEDSYSTEMID + "=2" + " --"
+ CliStrings.CREATE_GATEWAYSENDER__PARALLEL + "=false" + " --"
+ CliStrings.CREATE_GATEWAYSENDER__MANUALSTART + "=true" + " --"
@@ -450,7 +450,7 @@ public class WanCommandCreateDestroyGatewaySenderDUnitTest extends WANCommandTes
@Test
public void testCreateDestroyGatewaySender_Group() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -458,7 +458,7 @@ public class WanCommandCreateDestroyGatewaySenderDUnitTest extends WANCommandTes
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCacheWithGroups(punePort, "SenderGroup1"));
vm4.invoke(() -> createCacheWithGroups(punePort, "SenderGroup1"));
@@ -466,7 +466,7 @@ public class WanCommandCreateDestroyGatewaySenderDUnitTest extends WANCommandTes
int socketReadTimeout = GatewaySender.MINIMUM_SOCKET_READ_TIMEOUT + 1000;
String command = CliStrings.CREATE_GATEWAYSENDER + " --" + CliStrings.CREATE_GATEWAYSENDER__ID
- + "=ln" + " --" + CliStrings.CREATE_GATEWAYSENDER__GROUP + "=SenderGroup1" + " --"
+ + "=ln" + " --" + CliStrings.GROUP + "=SenderGroup1" + " --"
+ CliStrings.CREATE_GATEWAYSENDER__REMOTEDISTRIBUTEDSYSTEMID + "=2" + " --"
+ CliStrings.CREATE_GATEWAYSENDER__PARALLEL + "=false" + " --"
+ CliStrings.CREATE_GATEWAYSENDER__MANUALSTART + "=false" + " --"
@@ -515,7 +515,7 @@ public class WanCommandCreateDestroyGatewaySenderDUnitTest extends WANCommandTes
@Test
public void testCreateDestroyGatewaySender_Group_Scenario2() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -523,7 +523,7 @@ public class WanCommandCreateDestroyGatewaySenderDUnitTest extends WANCommandTes
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCacheWithGroups(punePort, "SenderGroup1"));
vm4.invoke(() -> createCacheWithGroups(punePort, "SenderGroup1"));
@@ -531,7 +531,7 @@ public class WanCommandCreateDestroyGatewaySenderDUnitTest extends WANCommandTes
int socketReadTimeout = GatewaySender.MINIMUM_SOCKET_READ_TIMEOUT + 1000;
String command = CliStrings.CREATE_GATEWAYSENDER + " --" + CliStrings.CREATE_GATEWAYSENDER__ID
- + "=ln" + " --" + CliStrings.CREATE_GATEWAYSENDER__GROUP + "=SenderGroup1" + " --"
+ + "=ln" + " --" + CliStrings.GROUP + "=SenderGroup1" + " --"
+ CliStrings.CREATE_GATEWAYSENDER__REMOTEDISTRIBUTEDSYSTEMID + "=2" + " --"
+ CliStrings.CREATE_GATEWAYSENDER__PARALLEL + "=false" + " --"
+ CliStrings.CREATE_GATEWAYSENDER__MANUALSTART + "=false" + " --"
@@ -578,7 +578,7 @@ public class WanCommandCreateDestroyGatewaySenderDUnitTest extends WANCommandTes
@Test
public void testCreateDestroyParallelGatewaySender() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -586,7 +586,7 @@ public class WanCommandCreateDestroyGatewaySenderDUnitTest extends WANCommandTes
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCache(punePort));
vm4.invoke(() -> createCache(punePort));
@@ -649,7 +649,7 @@ public class WanCommandCreateDestroyGatewaySenderDUnitTest extends WANCommandTes
@Test
public void testCreateParallelGatewaySender_Error() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -657,7 +657,7 @@ public class WanCommandCreateDestroyGatewaySenderDUnitTest extends WANCommandTes
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCache(punePort));
vm4.invoke(() -> createCache(punePort));
@@ -708,7 +708,7 @@ public class WanCommandCreateDestroyGatewaySenderDUnitTest extends WANCommandTes
@Test
public void testDestroyGatewaySender_NotCreatedSender() {
- Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer punePort = vm1.invoke(() -> createFirstLocatorWithDSId(1));
Properties props = getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -716,7 +716,7 @@ public class WanCommandCreateDestroyGatewaySenderDUnitTest extends WANCommandTes
props.setProperty(LOCATORS, "localhost[" + punePort + "]");
setUpJmxManagerOnVm0ThenConnect(props);
- Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
+ Integer nyPort = vm2.invoke(() -> createFirstRemoteLocator(2, punePort));
vm3.invoke(() -> createCache(punePort));
vm4.invoke(() -> createCache(punePort));
@@ -763,11 +763,11 @@ public class WanCommandCreateDestroyGatewaySenderDUnitTest extends WANCommandTes
CliStrings.DESTROY_GATEWAYSENDER + " --" + CliStrings.DESTROY_GATEWAYSENDER__ID + "=" + id;
if (group != null) {
- command += " --" + CliStrings.DESTROY_GATEWAYSENDER__GROUP + "=" + group;
+ command += " --" + CliStrings.GROUP + "=" + group;
}
if (member != null) {
- command += " --" + CliStrings.CREATE_GATEWAYSENDER__MEMBER + "=" + member.getId();
+ command += " --" + CliStrings.MEMBER + "=" + member.getId();
}
final CommandResult cmdResult = executeCommandWithIgnoredExceptions(command);
[4/5] geode git commit: GEODE-2818: add alias to any command's
options that involves "group", "member",
"jar" and replace CliString variables with GROUP, MEMBER, JAR, etc.
Posted by ji...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java
index 2758429..0829495 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java
@@ -75,6 +75,13 @@ import java.text.MessageFormat;
*/
public class CliStrings {
+ public static final String GROUP = "group";
+ public static final String GROUPS = "groups";
+ public static final String MEMBER = "member";
+ public static final String MEMBERS = "members";
+ public static final String JAR = "jar";
+ public static final String JARS = "jars";
+
private static final String LOG_LEVEL_VALUES =
"Possible values for log-level include: ALL, TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF.";
@@ -301,7 +308,6 @@ public class CliStrings {
"Alter a region with the given path and configuration.";
public static final String ALTER_REGION__REGION = "name";
public static final String ALTER_REGION__REGION__HELP = "Name/Path of the region to be altered.";
- public static final String ALTER_REGION__GROUP = "group";
public static final String ALTER_REGION__GROUP__HELP =
"Group(s) of members on which the region will be altered.";
public static final String ALTER_REGION__ENTRYEXPIRATIONIDLETIME = "entry-idle-time-expiration";
@@ -384,10 +390,9 @@ public class CliStrings {
public static final String ALTER_RUNTIME_CONFIG = "alter runtime";
public static final String ALTER_RUNTIME_CONFIG__HELP =
"Alter a subset of member or members configuration properties while running.";
- public static final String ALTER_RUNTIME_CONFIG__MEMBER = "member";
public static final String ALTER_RUNTIME_CONFIG__MEMBER__HELP =
"Name/Id of the member in whose configuration will be altered.";
- public static final String ALTER_RUNTIME_CONFIG__GROUP = "group";
+
public static final String ALTER_RUNTIME_CONFIG__GROUP__HELP =
"Group of members whose configuration will be altered.";
public static final String ALTER_RUNTIME_CONFIG__ARCHIVE__FILE__SIZE__LIMIT =
@@ -481,7 +486,6 @@ public class CliStrings {
public static final String COMPACT_DISK_STORE__NAME = "name";
public static final String COMPACT_DISK_STORE__NAME__HELP =
"Name of the disk store to be compacted.";
- public static final String COMPACT_DISK_STORE__GROUP = "group";
public static final String COMPACT_DISK_STORE__GROUP__HELP =
"Group(s) of members that will perform disk compaction. If no group is specified the disk store will be compacted by all members.";
public static final String COMPACT_DISK_STORE__DISKSTORE_0_DOESNOT_EXIST =
@@ -657,7 +661,6 @@ public class CliStrings {
public static final String CREATE_ASYNC_EVENT_QUEUE__LISTENER_PARAM_AND_VALUE = "listener-param";
public static final String CREATE_ASYNC_EVENT_QUEUE__LISTENER_PARAM_AND_VALUE__HELP =
"Parameter name for the AsyncEventListener. Optionally, parameter names may be followed by # and a value for the parameter. Example: --listener-param=loadAll --listener-param=maxRead#1024";
- public static final String CREATE_ASYNC_EVENT_QUEUE__GROUP = "group";
public static final String CREATE_ASYNC_EVENT_QUEUE__GROUP__HELP =
"Group(s) of members on which queue will be created. If no group is specified the queue will be created on all members.";
public static final String CREATE_ASYNC_EVENT_QUEUE__ERROR_WHILE_CREATING_REASON_0 =
@@ -701,7 +704,6 @@ public class CliStrings {
public static final String CREATE_DISK_STORE__DIRECTORY_AND_SIZE = "dir";
public static final String CREATE_DISK_STORE__DIRECTORY_AND_SIZE__HELP =
"Directories where the disk store files will be written, the directories will be created if they don't exist. Optionally, directory names may be followed by # and the maximum number of megabytes that the disk store can use in the directory. Example: --dir=/data/ds1 --dir=/data/ds2#5000";
- public static final String CREATE_DISK_STORE__GROUP = "group";
public static final String CREATE_DISK_STORE__GROUP__HELP =
"Group(s) of members on which the disk store will be created. If no group is specified the disk store will be created on all members.";
public static final String CREATE_DISK_STORE__DISK_USAGE_WARNING_PCT =
@@ -727,13 +729,11 @@ public class CliStrings {
public static final String CREATE_INDEX__REGION = "region";
public static final String CREATE_INDEX__REGION__HELP =
"Name/Path of the region which corresponds to the \"from\" clause in a query.";
- public static final String CREATE_INDEX__MEMBER = "member";
public static final String CREATE_INDEX__MEMBER__HELP =
"Name/Id of the member in which the index will be created.";
public static final String CREATE_INDEX__TYPE = "type";
public static final String CREATE_INDEX__TYPE__HELP =
"Type of the index. Valid values are: range, key and hash.";
- public static final String CREATE_INDEX__GROUP = "group";
public static final String CREATE_INDEX__GROUP__HELP =
"Group of members in which the index will be created.";
public static final String CREATE_INDEX__INVALID__INDEX__TYPE__MESSAGE =
@@ -790,9 +790,7 @@ public class CliStrings {
"Indexes successfully created. Use list indexes to get details.";
public static final String CREATE_DEFINED_INDEXES__FAILURE__MSG =
"Failed to create some or all indexes \"{0}\" due to following reasons";
- public static final String CREATE_DEFINED_INDEXES__MEMBER = CREATE_INDEX__MEMBER;
public static final String CREATE_DEFINED_INDEXES__MEMBER__HELP = CREATE_INDEX__MEMBER__HELP;
- public static final String CREATE_DEFINED_INDEXES__GROUP = CREATE_INDEX__GROUP;
public static final String CREATE_DEFINED_INDEXES__GROUP__HELP = CREATE_INDEX__GROUP__HELP;
public static final String CREATE_DEFINED_INDEXES__MEMBER__MSG = CREATE_INDEX__MEMBER__MSG;
public static final String CREATE_DEFINED_INDEXES__NUMBER__AND__MEMBER =
@@ -815,7 +813,6 @@ public class CliStrings {
public static final String CREATE_REGION__REGIONSHORTCUT = "type";
public static final String CREATE_REGION__REGIONSHORTCUT__HELP =
"Type of region to create. The following types are pre-defined by the product (see RegionShortcut javadocs for more information): PARTITION, PARTITION_REDUNDANT, PARTITION_PERSISTENT, PARTITION_REDUNDANT_PERSISTENT, PARTITION_OVERFLOW, PARTITION_REDUNDANT_OVERFLOW, PARTITION_PERSISTENT_OVERFLOW, PARTITION_REDUNDANT_PERSISTENT_OVERFLOW, PARTITION_HEAP_LRU, PARTITION_REDUNDANT_HEAP_LRU, REPLICATE, REPLICATE_PERSISTENT, REPLICATE_OVERFLOW, REPLICATE_PERSISTENT_OVERFLOW, REPLICATE_HEAP_LRU, LOCAL, LOCAL_PERSISTENT, LOCAL_HEAP_LRU, LOCAL_OVERFLOW, LOCAL_PERSISTENT_OVERFLOW, PARTITION_PROXY, PARTITION_PROXY_REDUNDANT, and REPLICATE_PROXY.";
- public static final String CREATE_REGION__GROUP = "group";
public static final String CREATE_REGION__GROUP__HELP =
"Group(s) of members on which the region will be created.";
public static final String CREATE_REGION__USEATTRIBUTESFROM = "template-region";
@@ -1069,17 +1066,14 @@ public class CliStrings {
"Deploy JARs to a member or members. Only one of either --jar or --dir may be specified.";
public static final String DEPLOY__DIR = "dir";
public static final String DEPLOY__DIR__HELP = "Directory from which to deploy the JARs.";
- public static final String DEPLOY__GROUP = "group";
public static final String DEPLOY__GROUP__HELP =
"Group(s) to which the specified JARs will be deployed. If not specified, deploy will occur on all members.";
- public static final String DEPLOY__JAR = "jar";
public static final String DEPLOY__JAR__HELP = "Path of the JAR to deploy.";
/* describe config command */
public static final String DESCRIBE_CONFIG = "describe config";
public static final String DESCRIBE_CONFIG__HELP =
"Display configuration details of a member or members.";
- public static final String DESCRIBE_CONFIG__MEMBER = "member";
public static final String DESCRIBE_CONFIG__MEMBER__HELP =
"Name/Id of the member whose configuration will be described.";
public static final String DESCRIBE_CONFIG__HIDE__DEFAULTS = "hide-defaults";
@@ -1097,7 +1091,6 @@ public class CliStrings {
public static final String DESCRIBE_DISK_STORE = "describe disk-store";
public static final String DESCRIBE_DISK_STORE__HELP =
"Display information about a member's disk store.";
- public static final String DESCRIBE_DISK_STORE__MEMBER = "member";
public static final String DESCRIBE_DISK_STORE__MEMBER__HELP =
"Name/Id of the member with the disk store to be described.";
public static final String DESCRIBE_DISK_STORE__NAME = "name";
@@ -1182,7 +1175,6 @@ public class CliStrings {
public static final String DESTROY_DISK_STORE__NAME = "name";
public static final String DESTROY_DISK_STORE__NAME__HELP =
"Name of the disk store that will be destroyed.";
- public static final String DESTROY_DISK_STORE__GROUP = "group";
public static final String DESTROY_DISK_STORE__GROUP__HELP =
"Group(s) of members on which the disk store will be destroyed. If no group is specified the disk store will be destroyed on all members.";
public static final String DESTROY_DISK_STORE__ERROR_WHILE_DESTROYING_REASON_0 =
@@ -1194,10 +1186,8 @@ public class CliStrings {
"Destroy/Unregister a function. The default is for the function to be unregistered from all members.";
public static final String DESTROY_FUNCTION__ID = "id";
public static final String DESTROY_FUNCTION__ID__HELP = "ID of the function.";
- public static final String DESTROY_FUNCTION__ONGROUPS = "groups";
public static final String DESTROY_FUNCTION__ONGROUPS__HELP =
"Groups of members from which this function will be unregistered.";
- public static final String DESTROY_FUNCTION__ONMEMBER = "member";
public static final String DESTROY_FUNCTION__ONMEMBER__HELP =
"Name/Id of the member from which this function will be unregistered.";
public static final String DESTROY_FUNCTION__MSG__CANNOT_EXECUTE = "Cannot execute";
@@ -1209,13 +1199,11 @@ public class CliStrings {
public static final String DESTROY_INDEX__HELP = "Destroy/Remove the specified index.";
public static final String DESTROY_INDEX__NAME = "name";
public static final String DESTROY_INDEX__NAME__HELP = "Name of the index to remove.";
- public static final String DESTROY_INDEX__MEMBER = "member";
public static final String DESTROY_INDEX__MEMBER__HELP =
"Name/Id of the member from which the index will be removed.";
public static final String DESTROY_INDEX__REGION = "region";
public static final String DESTROY_INDEX__REGION__HELP =
"Name/Path of the region from which the index will be removed.";
- public static final String DESTROY_INDEX__GROUP = "group";
public static final String DESTROY_INDEX__GROUP__HELP =
"Group of members from which the index will be removed.";
public static final String DESTROY_INDEX__SUCCESS__MSG =
@@ -1290,10 +1278,8 @@ public class CliStrings {
"Execute the function with the specified ID. By default will execute on all members.";
public static final String EXECUTE_FUNCTION__ID = "id";
public static final String EXECUTE_FUNCTION__ID__HELP = "ID of the function to execute.";
- public static final String EXECUTE_FUNCTION__ONGROUPS = "groups";
public static final String EXECUTE_FUNCTION__ONGROUPS__HELP =
"Groups of members on which the function will be executed.";
- public static final String EXECUTE_FUNCTION__ONMEMBER = "member";
public static final String EXECUTE_FUNCTION__ONMEMBER__HELP =
"Name/Id of the member on which the function will be executed.";
public static final String EXECUTE_FUNCTION__ONREGION = "region";
@@ -1358,10 +1344,8 @@ public class CliStrings {
public static final String EXPORT_CONFIG = "export config";
public static final String EXPORT_CONFIG__HELP =
"Export configuration properties for a member or members.";
- public static final String EXPORT_CONFIG__GROUP = "group";
public static final String EXPORT_CONFIG__GROUP__HELP =
"Group(s) of members whose configuration will be exported.";
- public static final String EXPORT_CONFIG__MEMBER = "member";
public static final String EXPORT_CONFIG__MEMBER__HELP =
"Name/Id of the member(s) whose configuration will be exported.";
public static final String EXPORT_CONFIG__DIR = "dir";
@@ -1384,7 +1368,6 @@ public class CliStrings {
public static final String EXPORT_DATA__FILE = "file";
public static final String EXPORT_DATA__FILE__HELP =
"File to which the exported data will be written. The file must have an extension of \".gfd\".";
- public static final String EXPORT_DATA__MEMBER = "member";
public static final String EXPORT_DATA__MEMBER__HELP =
"Name/Id of a member which hosts the region. The data will be exported to the specified file on the host where the member is running.";
public static final String EXPORT_DATA__MEMBER__NOT__FOUND = "Member {0} not found";
@@ -1398,10 +1381,8 @@ public class CliStrings {
public static final String EXPORT_LOGS__DIR = "dir";
public static final String EXPORT_LOGS__DIR__HELP =
"Directory to which logs will be written. This refers to a local directory when exporting logs using an http connection, but refers to the filesystem of the manager when connected via JMX. If not specified, logs are written to the location specified by the user.dir system property.";
- public static final String EXPORT_LOGS__MEMBER = "member";
public static final String EXPORT_LOGS__MEMBER__HELP =
"Name/Id of the member whose log files will be exported.";
- public static final String EXPORT_LOGS__GROUP = "group";
public static final String EXPORT_LOGS__GROUP__HELP =
"Group of members whose log files will be exported.";
public static final String EXPORT_LOGS__MSG__CANNOT_EXECUTE = "Cannot execute";
@@ -1451,10 +1432,8 @@ public class CliStrings {
public static final String EXPORT_STACKTRACE = "export stack-traces";
public static final String EXPORT_STACKTRACE__HELP =
"Export the stack trace for a member or members.";
- public static final String EXPORT_STACKTRACE__MEMBER = "member";
public static final String EXPORT_STACKTRACE__MEMBER__HELP =
"Name/Id of the member whose stack trace will be exported.";
- public static final String EXPORT_STACKTRACE__GROUP = "group";
public static final String EXPORT_STACKTRACE__GROUP__HELP =
"Group of members whose stack trace will be exported.";
public static final String EXPORT_STACKTRACE_ALL_STACKS = "all-stacks";
@@ -1480,10 +1459,8 @@ public class CliStrings {
public static final String GC = "gc";
public static final String GC__HELP =
"Force GC (Garbage Collection) on a member or members. The default is for garbage collection to occur on all caching members.";
- public static final String GC__MEMBER = "member";
public static final String GC__MEMBER__HELP =
"Name/Id of the member on which garbage collection will be done.";
- public static final String GC__GROUP = "group";
public static final String GC__GROUP__HELP =
"Group(s) of members on which garbage collection will be done.";
public static final String GC__MSG__MEMBER_NOT_FOUND = "Member not found";
@@ -1571,7 +1548,6 @@ public class CliStrings {
public static final String IMPORT_DATA__FILE = "file";
public static final String IMPORT_DATA__FILE__HELP =
"File from which the imported data will be read. The file must have an extension of \".gfd\".";
- public static final String IMPORT_DATA__MEMBER = "member";
public static final String IMPORT_DATA__MEMBER__HELP =
"Name/Id of a member which hosts the region. The data will be imported from the specified file on the host where the member is running.";
public static final String IMPORT_DATA__MEMBER__NOT__FOUND = "Member {0} not found.";
@@ -1647,7 +1623,6 @@ public class CliStrings {
public static final String LIST_DEPLOYED = "list deployed";
public static final String LIST_DEPLOYED__HELP =
"Display a list of JARs that were deployed to members using the \"deploy\" command.";
- public static final String LIST_DEPLOYED__GROUP = "group";
public static final String LIST_DEPLOYED__GROUP__HELP =
"Group(s) of members for which deployed JARs will be displayed. If not specified, JARs for all members will be displayed.";
public static final String LIST_DEPLOYED__NO_JARS_FOUND_MESSAGE = "No JAR Files Found";
@@ -1659,10 +1634,8 @@ public class CliStrings {
public static final String LIST_FUNCTION__MATCHES = "matches";
public static final String LIST_FUNCTION__MATCHES__HELP =
"Pattern that the function ID must match in order to be included. Uses Java pattern matching rules, not UNIX. For example, to match any character any number of times use \".*\" instead of \"*\".";
- public static final String LIST_FUNCTION__GROUP = "group";
public static final String LIST_FUNCTION__GROUP__HELP =
"Group(s) of members for which functions will be displayed.";
- public static final String LIST_FUNCTION__MEMBER = "member";
public static final String LIST_FUNCTION__MEMBER__HELP =
"Name/Id of the member(s) for which functions will be displayed.";
public static final String LIST_FUNCTION__NO_FUNCTIONS_FOUND_ERROR_MESSAGE = "No Functions Found";
@@ -1670,10 +1643,8 @@ public class CliStrings {
public static final String LIST_GATEWAY = "list gateways";
public static final String LIST_GATEWAY__HELP =
"Display the Gateway Senders and Receivers for a member or members.";
- public static final String LIST_GATEWAY__GROUP = "group";
public static final String LIST_GATEWAY__GROUP__HELP =
"Group(s) of members for which Gateway Senders and Receivers will be displayed.";
- public static final String LIST_GATEWAY__MEMBER = "member";
public static final String LIST_GATEWAY__MEMBER__HELP =
"Member(s) for which Gateway Senders and Receivers will be displayed.";
/* list index */
@@ -1698,7 +1669,6 @@ public class CliStrings {
/* 'list member' command */
public static final String LIST_MEMBER = "list members";
public static final String LIST_MEMBER__HELP = "Display all or a subset of members.";
- public static final String LIST_MEMBER__GROUP = "group";
public static final String LIST_MEMBER__GROUP__HELP =
"Group name for which members will be displayed.";
public static final String LIST_MEMBER__MSG__NO_MEMBER_FOUND = NO_MEMBERS_FOUND_MESSAGE;
@@ -1706,10 +1676,8 @@ public class CliStrings {
/* 'list region' command */
public static final String LIST_REGION = "list regions";
public static final String LIST_REGION__HELP = "Display regions of a member or members.";
- public static final String LIST_REGION__GROUP = "group";
public static final String LIST_REGION__GROUP__HELP =
"Group of members for which regions will be displayed.";
- public static final String LIST_REGION__MEMBER = "member";
public static final String LIST_REGION__MEMBER__HELP =
"Name/Id of the member for which regions will be displayed.";
public static final String LIST_REGION__MSG__NOT_FOUND = "No Regions Found";
@@ -1755,10 +1723,8 @@ public class CliStrings {
public static final String NETSTAT = "netstat";
public static final String NETSTAT__HELP =
"Report network information and statistics via the \"netstat\" operating system command.";
- public static final String NETSTAT__MEMBER = "member";
public static final String NETSTAT__MEMBER__HELP =
"Name/Id of the member(s) on which to run the netstat command.";
- public static final String NETSTAT__GROUP = "group";
public static final String NETSTAT__GROUP__HELP =
"Group of members on which to run the netstat command.";
public static final String NETSTAT__FILE = "file";
@@ -1784,9 +1750,7 @@ public class CliStrings {
/* pause gateway-sender */
public static final String PAUSE_GATEWAYSENDER = "pause gateway-sender";
- public static final String PAUSE_GATEWAYSENDER__ID = "id";;
- public static final String PAUSE_GATEWAYSENDER__MEMBER = "member";
- public static final String PAUSE_GATEWAYSENDER__GROUP = "group";
+ public static final String PAUSE_GATEWAYSENDER__ID = "id";
public static final String PAUSE_GATEWAYSENDER__HELP =
"Pause the Gateway Sender on a member or members.";
public static final String PAUSE_GATEWAYSENDER__ID__HELP = "ID of the Gateway Sender.";
@@ -1938,9 +1902,7 @@ public class CliStrings {
/* resume gateway-sender */
public static final String RESUME_GATEWAYSENDER = "resume gateway-sender";
- public static final String RESUME_GATEWAYSENDER__ID = "id";;
- public static final String RESUME_GATEWAYSENDER__MEMBER = "member";
- public static final String RESUME_GATEWAYSENDER__GROUP = "group";
+ public static final String RESUME_GATEWAYSENDER__ID = "id";
public static final String RESUME_GATEWAYSENDER__HELP =
"Resume the Gateway Sender on a member or members.";
public static final String RESUME_GATEWAYSENDER__ID__HELP = "ID of the Gateway Sender.";
@@ -1977,7 +1939,7 @@ public class CliStrings {
"Set GFSH variables that can be used by commands. "
+ "For example: if variable \"CACHE_SERVERS_GROUP\" is set then to use it with \""
+ CliStrings.LIST_MEMBER + "\", use \"" + CliStrings.LIST_MEMBER + " --"
- + CliStrings.LIST_MEMBER__GROUP + "=${CACHE_SERVERS_GROUP}\". "
+ + CliStrings.GROUP + "=${CACHE_SERVERS_GROUP}\". "
+ "The \"echo\" command can be used to know the value of a variable.";
public static final String SET_VARIABLE__VAR = "name";
public static final String SET_VARIABLE__VAR__HELP =
@@ -2029,7 +1991,6 @@ public class CliStrings {
/* Show Log command */
public static final String SHOW_LOG = "show log";
public static final String SHOW_LOG_HELP = "Display the log for a member.";
- public static final String SHOW_LOG_MEMBER = "member";
public static final String SHOW_LOG_MEMBER_HELP =
"Name/Id of the member whose log file will be displayed.";
public static final String SHOW_LOG_LINE_NUM = "lines";
@@ -2047,7 +2008,6 @@ public class CliStrings {
public static final String SHOW_METRICS__REGION = "region";
public static final String SHOW_METRICS__REGION__HELP =
"Name/Path of the region whose metrics will be displayed/exported.";
- public static final String SHOW_METRICS__MEMBER = "member";
public static final String SHOW_METRICS__MEMBER__HELP =
"Name/Id of the member whose metrics will be displayed/exported.";
public static final String SHOW_METRICS__CATEGORY = "categories";
@@ -2112,10 +2072,8 @@ public class CliStrings {
public static final String CHANGE_LOGLEVEL = "change loglevel";
public static final String CHANGE_LOGLEVEL__HELP =
"This command changes log-level run time on specified servers.";
- public static final String CHANGE_LOGLEVEL__GROUPS = "groups";
public static final String CHANGE_LOGLEVEL__GROUPS__HELP =
"Groups of members to change the log-level";
- public static final String CHANGE_LOGLEVEL__MEMBER = "members";
public static final String CHANGE_LOGLEVEL__MEMBER__HELP =
"Name/Id of the member to change the log-level";
public static final String CHANGE_LOGLEVEL__LOGLEVEL = "loglevel";
@@ -2143,10 +2101,8 @@ public class CliStrings {
public static final String CREATE_GATEWAYRECEIVER = "create gateway-receiver";
public static final String CREATE_GATEWAYRECEIVER__HELP =
"Create the Gateway Receiver on a member or members.";
- public static final String CREATE_GATEWAYRECEIVER__GROUP = "group";
public static final String CREATE_GATEWAYRECEIVER__GROUP__HELP =
"Group(s) of members on which to create the Gateway Receiver.";
- public static final String CREATE_GATEWAYRECEIVER__MEMBER = "member";
public static final String CREATE_GATEWAYRECEIVER__MEMBER__HELP =
"Name/Id of the member on which to create the Gateway Receiver.";
public static final String CREATE_GATEWAYRECEIVER__STARTPORT = "start-port";
@@ -2178,8 +2134,6 @@ public class CliStrings {
/* start gateway-receiver */
public static final String START_GATEWAYRECEIVER = "start gateway-receiver";
- public static final String START_GATEWAYRECEIVER__MEMBER = "member";
- public static final String START_GATEWAYRECEIVER__GROUP = "group";
public static final String START_GATEWAYRECEIVER__HELP =
"Start the Gateway Receiver on a member or members.";
public static final String START_GATEWAYRECEIVER__GROUP__HELP =
@@ -2191,10 +2145,8 @@ public class CliStrings {
public static final String CREATE_GATEWAYSENDER = "create gateway-sender";
public static final String CREATE_GATEWAYSENDER__HELP =
"Create the Gateway Sender on a member or members.";
- public static final String CREATE_GATEWAYSENDER__GROUP = "group";
public static final String CREATE_GATEWAYSENDER__GROUP__HELP =
"Group(s) of members on which to create the Gateway Sender.";
- public static final String CREATE_GATEWAYSENDER__MEMBER = "member";
public static final String CREATE_GATEWAYSENDER__MEMBER__HELP =
"Name/Id of the member on which to create the Gateway Sender.";
public static final String CREATE_GATEWAYSENDER__ID = "id";
@@ -2266,10 +2218,8 @@ public class CliStrings {
"Start the Gateway Sender on a member or members.";
public static final String START_GATEWAYSENDER__ID = "id";
public static final String START_GATEWAYSENDER__ID__HELP = "ID of the Gateway Sender.";
- public static final String START_GATEWAYSENDER__GROUP = "group";
public static final String START_GATEWAYSENDER__GROUP__HELP =
"Group(s) of members on which to start the Gateway Sender.";
- public static final String START_GATEWAYSENDER__MEMBER = "member";
public static final String START_GATEWAYSENDER__MEMBER__HELP =
"Name/Id of the member on which to start the Gateway Sender.";
@@ -2278,10 +2228,8 @@ public class CliStrings {
public static final String DESTROY_GATEWAYSENDER = "destroy gateway-sender";
public static final String DESTROY_GATEWAYSENDER__HELP =
"Destroy the Gateway Sender on a member or members.";
- public static final String DESTROY_GATEWAYSENDER__GROUP = "group";
public static final String DESTROY_GATEWAYSENDER__GROUP__HELP =
"Group(s) of members on which to destroy the Gateway Sender.";
- public static final String DESTROY_GATEWAYSENDER__MEMBER = "member";
public static final String DESTROY_GATEWAYSENDER__MEMBER__HELP =
"Name/Id of the member on which to destroy the Gateway Sender.";
public static final String DESTROY_GATEWAYSENDER__ID = "id";
@@ -2363,7 +2311,6 @@ public class CliStrings {
public static final String START_LOCATOR__FORCE = "force";
public static final String START_LOCATOR__FORCE__HELP =
"Whether to allow the PID file from a previous Locator run to be overwritten.";
- public static final String START_LOCATOR__GROUP = "group";
public static final String START_LOCATOR__GROUP__HELP = "Group(s) the Locator will be a part of.";
public static final String START_LOCATOR__HOSTNAME_FOR_CLIENTS = "hostname-for-clients";
@@ -2461,7 +2408,6 @@ public class CliStrings {
public static final String START_MANAGER__BIND_ADDRESS = "bind-address";
public static final String START_MANAGER__BIND_ADDRESS__HELP =
"IP address the Manager listen on for JMX-RMI client connections. The default is to bind to all local addresses.";
- public static final String START_MANAGER__GROUP = "group";
public static final String START_MANAGER__GROUP__HELP =
"Group(s) this Manager will be a part of.";
public static final String START_MANAGER__MAXHEAP = "max-heap";
@@ -2508,7 +2454,6 @@ public class CliStrings {
public static final String START_SERVER__FORCE = "force";
public static final String START_SERVER__FORCE__HELP =
"Whether to allow the PID file from a previous Cache Server run to be overwritten.";
- public static final String START_SERVER__GROUP = "group";
public static final String START_SERVER__GROUP__HELP =
"Group(s) the Cache Server will be a part of.";
public static final String START_SERVER__INCLUDE_SYSTEM_CLASSPATH = "include-system-classpath";
@@ -2705,10 +2650,8 @@ public class CliStrings {
public static final String STATUS_GATEWAYRECEIVER = "status gateway-receiver";
public static final String STATUS_GATEWAYRECEIVER__HELP =
"Display the status of a Gateway Receiver.";
- public static final String STATUS_GATEWAYRECEIVER__GROUP = "group";
public static final String STATUS_GATEWAYRECEIVER__GROUP__HELP =
"Group(s) of Gateway Receivers for which to display status.";
- public static final String STATUS_GATEWAYRECEIVER__MEMBER = "member";
public static final String STATUS_GATEWAYRECEIVER__MEMBER__HELP =
"Name/Id of the Gateway Receiver for which to display status.";
@@ -2717,10 +2660,8 @@ public class CliStrings {
public static final String STATUS_GATEWAYSENDER__HELP = "Display the status of a Gateway Sender.";
public static final String STATUS_GATEWAYSENDER__ID = "id";
public static final String STATUS_GATEWAYSENDER__ID__HELP = "ID of the Gateway Sender.";
- public static final String STATUS_GATEWAYSENDER__GROUP = "group";
public static final String STATUS_GATEWAYSENDER__GROUP__HELP =
"Group(s) of Gateway Senders for which to display status.";
- public static final String STATUS_GATEWAYSENDER__MEMBER = "member";
public static final String STATUS_GATEWAYSENDER__MEMBER__HELP =
"Name/Id of the Gateway Sender for which to display status.";
@@ -2767,8 +2708,6 @@ public class CliStrings {
/* stop gateway-reciver */
public static final String STOP_GATEWAYRECEIVER = "stop gateway-receiver";
- public static final String STOP_GATEWAYRECEIVER__MEMBER = "member";
- public static final String STOP_GATEWAYRECEIVER__GROUP = "group";
public static final String STOP_GATEWAYRECEIVER__HELP =
"Stop the Gateway Receiver on a member or members.";
public static final String STOP_GATEWAYRECEIVER__GROUP__HELP =
@@ -2778,9 +2717,7 @@ public class CliStrings {
/* stop gateway-sender */
public static final String STOP_GATEWAYSENDER = "stop gateway-sender";
- public static final String STOP_GATEWAYSENDER__ID = "id";;
- public static final String STOP_GATEWAYSENDER__MEMBER = "member";
- public static final String STOP_GATEWAYSENDER__GROUP = "group";
+ public static final String STOP_GATEWAYSENDER__ID = "id";
public static final String STOP_GATEWAYSENDER__HELP =
"Stop the Gateway Sender on a member or members.";
public static final String STOP_GATEWAYSENDER__ID__HELP = "ID of the Gateway Sender.";
@@ -2840,10 +2777,8 @@ public class CliStrings {
/* undeploy command */
public static final String UNDEPLOY = "undeploy";
public static final String UNDEPLOY__HELP = "Undeploy JARs from a member or members.";
- public static final String UNDEPLOY__GROUP = "group";
public static final String UNDEPLOY__GROUP__HELP =
"Group(s) of members from which to undeploy JARs. If not specified, undeploy will occur on all members.";
- public static final String UNDEPLOY__JAR = "jar";
public static final String UNDEPLOY__JAR__HELP =
"JAR(s) to be undeployed. If not specified, all JARs will be undeployed.";
public static final String UNDEPLOY__NO_JARS_FOUND_MESSAGE = "No JAR Files Found";
@@ -3006,10 +2941,8 @@ public class CliStrings {
"The id used to identify the durable client";
public static final String LIST_DURABLE_CQS__HELP =
"List durable client cqs associated with the specified durable client id.";
- public static final String LIST_DURABLE_CQS__MEMBER = "member";
public static final String LIST_DURABLE_CQS__MEMBER__HELP =
"Name/Id of the member for which the durable client is registered and durable cqs will be displayed.";
- public static final String LIST_DURABLE_CQS__GROUP = "group";
public static final String LIST_DURABLE_CQS__GROUP__HELP =
"Group of members for which the durable client is registered and durable cqs will be displayed.";
public static final String LIST_DURABLE_CQS__NO__CQS__FOR__CLIENT =
@@ -3035,10 +2968,8 @@ public class CliStrings {
public static final String CLOSE_DURABLE_CQS__DURABLE__CLIENT__ID = DURABLE_CLIENT_ID;
public static final String CLOSE_DURABLE_CQS__DURABLE__CLIENT__ID__HELP =
"The id of the durable client";
- public static final String CLOSE_DURABLE_CQS__MEMBER = "member";
public static final String CLOSE_DURABLE_CQS__MEMBER__HELP =
"Name/Id of the member for which the durable client is registered and the cq to be closed.";
- public static final String CLOSE_DURABLE_CQS__GROUP = "group";
public static final String CLOSE_DURABLE_CQS__GROUP__HELP =
"Group of members for which the durable client is registered and the cq to be closed.";
public static final String CLOSE_DURABLE_CQS__FAILURE__HEADER =
@@ -3055,10 +2986,8 @@ public class CliStrings {
public static final String CLOSE_DURABLE_CLIENTS__CLIENT__ID = DURABLE_CLIENT_ID;
public static final String CLOSE_DURABLE_CLIENTS__CLIENT__ID__HELP =
"The id used to identify the durable client.";
- public static final String CLOSE_DURABLE_CLIENTS__MEMBER = "member";
public static final String CLOSE_DURABLE_CLIENTS__MEMBER__HELP =
"Name/Id of the member for which the durable client is to be closed.";
- public static final String CLOSE_DURABLE_CLIENTS__GROUP = "group";
public static final String CLOSE_DURABLE_CLIENTS__GROUP__HELP =
"Group of members for which the durable client is to be closed.";
public static final String CLOSE_DURABLE_CLIENTS__FAILURE__HEADER =
@@ -3075,10 +3004,8 @@ public class CliStrings {
public static final String COUNT_DURABLE_CQ_EVENTS__DURABLE__CQ__NAME = "durable-cq-name";
public static final String COUNT_DURABLE_CQ_EVENTS__DURABLE__CQ__NAME__HELP =
"The name that identifies the cq.";
- public static final String COUNT_DURABLE_CQ_EVENTS__MEMBER = "member";
public static final String COUNT_DURABLE_CQ_EVENTS__MEMBER__HELP =
"Name/Id of the member for which the subscription events are to be counted.";
- public static final String COUNT_DURABLE_CQ_EVENTS__GROUP = "group";
public static final String COUNT_DURABLE_CQ_EVENTS__GROUP__HELP =
"Group of members for which the subscription queue events are to be counted.";
public static final String COUNT_DURABLE_CQ_EVENTS__DURABLE_CLIENT_NOT_FOUND =
@@ -3230,6 +3157,8 @@ public class CliStrings {
public static final String START_SERVER__MSG__PASSWORD_MUST_BE_SPECIFIED =
"password must be specified.";
+
+
/**
* Creates a MessageFormat with the given pattern and uses it to format the given argument.
*
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ConfigCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ConfigCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ConfigCommandsController.java
index 25d0cc3..9f06ea3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ConfigCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ConfigCommandsController.java
@@ -53,10 +53,8 @@ public class ConfigCommandsController extends AbstractMultiPartCommandsControlle
@RequestMapping(method = RequestMethod.POST, value = "/config")
@ResponseBody
public String alterRuntime(
- @RequestParam(value = CliStrings.ALTER_RUNTIME_CONFIG__GROUP,
- required = false) final String group,
- @RequestParam(value = CliStrings.ALTER_RUNTIME_CONFIG__MEMBER,
- required = false) final String memberNameId,
+ @RequestParam(value = CliStrings.GROUP, required = false) final String group,
+ @RequestParam(value = CliStrings.MEMBER, required = false) final String memberNameId,
@RequestParam(value = CliStrings.ALTER_RUNTIME_CONFIG__ARCHIVE__DISK__SPACE__LIMIT,
required = false) final Integer archiveDiskSpaceLimit,
@RequestParam(value = CliStrings.ALTER_RUNTIME_CONFIG__ARCHIVE__FILE__SIZE__LIMIT,
@@ -86,11 +84,11 @@ public class ConfigCommandsController extends AbstractMultiPartCommandsControlle
CommandStringBuilder command = new CommandStringBuilder(CliStrings.ALTER_RUNTIME_CONFIG);
if (hasValue(memberNameId)) {
- command.addOption(CliStrings.ALTER_RUNTIME_CONFIG__MEMBER, memberNameId);
+ command.addOption(CliStrings.MEMBER, memberNameId);
}
if (hasValue(group)) {
- command.addOption(CliStrings.ALTER_RUNTIME_CONFIG__GROUP, group);
+ command.addOption(CliStrings.GROUP, group);
}
if (hasValue(archiveDiskSpaceLimit)) {
@@ -166,7 +164,7 @@ public class ConfigCommandsController extends AbstractMultiPartCommandsControlle
defaultValue = "true") final Boolean hideDefaults) {
CommandStringBuilder command = new CommandStringBuilder(CliStrings.DESCRIBE_CONFIG);
- command.addOption(CliStrings.DESCRIBE_CONFIG__MEMBER, decode(memberNameId));
+ command.addOption(CliStrings.MEMBER, decode(memberNameId));
command.addOption(CliStrings.DESCRIBE_CONFIG__HIDE__DEFAULTS, String.valueOf(hideDefaults));
return processCommand(command.toString());
@@ -174,22 +172,18 @@ public class ConfigCommandsController extends AbstractMultiPartCommandsControlle
@RequestMapping(method = RequestMethod.GET, value = "/config")
public Callable<ResponseEntity<String>> exportConfig(
- @RequestParam(value = CliStrings.EXPORT_CONFIG__GROUP,
- required = false) final String[] groups,
- @RequestParam(value = CliStrings.EXPORT_CONFIG__MEMBER,
- required = false) final String[] members,
+ @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups,
+ @RequestParam(value = CliStrings.MEMBER, required = false) final String[] members,
@RequestParam(value = CliStrings.EXPORT_CONFIG__DIR,
required = false) final String directory) {
final CommandStringBuilder command = new CommandStringBuilder(CliStrings.EXPORT_CONFIG);
if (hasValue(groups)) {
- command.addOption(CliStrings.EXPORT_CONFIG__GROUP,
- StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(members)) {
- command.addOption(CliStrings.EXPORT_CONFIG__MEMBER,
- StringUtils.join(members, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.MEMBER, StringUtils.join(members, StringUtils.COMMA_DELIMITER));
}
if (hasValue(directory)) {
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DataCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DataCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DataCommandsController.java
index ce2ed54..fb63184 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DataCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DataCommandsController.java
@@ -133,7 +133,7 @@ public class DataCommandsController extends AbstractCommandsController {
@RequestParam(CliStrings.EXPORT_DATA__FILE) final String file) {
final CommandStringBuilder command = new CommandStringBuilder(CliStrings.EXPORT_DATA);
- command.addOption(CliStrings.EXPORT_DATA__MEMBER, decode(memberNameId));
+ command.addOption(CliStrings.MEMBER, decode(memberNameId));
command.addOption(CliStrings.EXPORT_DATA__REGION, decode(regionNamePath));
command.addOption(CliStrings.EXPORT_DATA__FILE, decode(file));
@@ -147,7 +147,7 @@ public class DataCommandsController extends AbstractCommandsController {
@RequestParam(CliStrings.IMPORT_DATA__FILE) final String file) {
final CommandStringBuilder command = new CommandStringBuilder(CliStrings.IMPORT_DATA);
- command.addOption(CliStrings.IMPORT_DATA__MEMBER, decode(memberNameId));
+ command.addOption(CliStrings.MEMBER, decode(memberNameId));
command.addOption(CliStrings.IMPORT_DATA__REGION, decode(regionNamePath));
command.addOption(CliStrings.IMPORT_DATA__FILE, decode(file));
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DeployCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DeployCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DeployCommandsController.java
index 35f57ef..23c5083 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DeployCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DeployCommandsController.java
@@ -48,13 +48,12 @@ public class DeployCommandsController extends AbstractMultiPartCommandsControlle
@RequestMapping(method = RequestMethod.GET, value = "/deployed")
@ResponseBody
- public String listDeployed(@RequestParam(value = CliStrings.LIST_DEPLOYED__GROUP,
- required = false) final String[] groups) {
+ public String listDeployed(
+ @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups) {
final CommandStringBuilder command = new CommandStringBuilder(CliStrings.LIST_DEPLOYED);
if (hasValue(groups)) {
- command.addOption(CliStrings.LIST_DEPLOYED__GROUP,
- StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
@@ -66,19 +65,18 @@ public class DeployCommandsController extends AbstractMultiPartCommandsControlle
// @RequestPart(RESOURCES_REQUEST_PARAMETER) final Resource[] jarFileResources,
public String deploy(
@RequestParam(RESOURCES_REQUEST_PARAMETER) final MultipartFile[] jarFileResources,
- @RequestParam(value = CliStrings.DEPLOY__GROUP, required = false) final String[] groups,
- @RequestParam(value = CliStrings.DEPLOY__JAR, required = false) final String jarFileName,
+ @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups,
+ @RequestParam(value = CliStrings.JAR, required = false) final String jarFileName,
@RequestParam(value = CliStrings.DEPLOY__DIR, required = false) final String directory)
throws IOException {
final CommandStringBuilder command = new CommandStringBuilder(CliStrings.DEPLOY);
if (hasValue(groups)) {
- command.addOption(CliStrings.DEPLOY__GROUP,
- StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(jarFileName)) {
- command.addOption(CliStrings.DEPLOY__JAR, jarFileName);
+ command.addOption(CliStrings.JAR, jarFileName);
}
if (hasValue(directory)) {
@@ -93,18 +91,16 @@ public class DeployCommandsController extends AbstractMultiPartCommandsControlle
@RequestMapping(method = RequestMethod.DELETE, value = "/deployed")
@ResponseBody
public String undeploy(
- @RequestParam(value = CliStrings.UNDEPLOY__GROUP, required = false) final String[] groups,
- @RequestParam(value = CliStrings.UNDEPLOY__JAR,
- required = false) final String[] jarFileNames) {
+ @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups,
+ @RequestParam(value = CliStrings.JAR, required = false) final String[] jarFileNames) {
final CommandStringBuilder command = new CommandStringBuilder(CliStrings.UNDEPLOY);
if (hasValue(groups)) {
- command.addOption(CliStrings.UNDEPLOY__GROUP,
- StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(jarFileNames)) {
- command.addOption(CliStrings.UNDEPLOY__JAR,
+ command.addOption(CliStrings.JAR,
StringUtils.join(jarFileNames, StringUtils.COMMA_DELIMITER));
}
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DiskStoreCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DiskStoreCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DiskStoreCommandsController.java
index fa074c3..c613a8a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DiskStoreCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DiskStoreCommandsController.java
@@ -72,15 +72,13 @@ public class DiskStoreCommandsController extends AbstractCommandsController {
@RequestMapping(method = RequestMethod.POST, value = "/diskstores/{name}", params = "op=compact")
public Callable<ResponseEntity<String>> compactDiskStore(
@PathVariable("name") final String diskStoreNameId,
- @RequestParam(value = CliStrings.COMPACT_DISK_STORE__GROUP,
- required = false) final String[] groups) {
+ @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups) {
final CommandStringBuilder command = new CommandStringBuilder(CliStrings.COMPACT_DISK_STORE);
command.addOption(CliStrings.COMPACT_DISK_STORE__NAME, decode(diskStoreNameId));
if (hasValue(groups)) {
- command.addOption(CliStrings.COMPACT_DISK_STORE__GROUP,
- StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
return getProcessCommandCallable(command.toString());
@@ -110,8 +108,7 @@ public class DiskStoreCommandsController extends AbstractCommandsController {
defaultValue = "90") final Float diskUsageWarningPercentage,
@RequestParam(value = CliStrings.CREATE_DISK_STORE__DISK_USAGE_CRITICAL_PCT,
defaultValue = "99") final Integer diskUsageCriticalPercentage,
- @RequestParam(value = CliStrings.CREATE_DISK_STORE__GROUP,
- required = false) final String[] groups) {
+ @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups) {
CommandStringBuilder command = new CommandStringBuilder(CliStrings.CREATE_DISK_STORE);
command.addOption(CliStrings.CREATE_DISK_STORE__NAME, diskStoreNameId);
@@ -136,8 +133,7 @@ public class DiskStoreCommandsController extends AbstractCommandsController {
String.valueOf(diskUsageCriticalPercentage));
if (hasValue(groups)) {
- command.addOption(CliStrings.CREATE_DISK_STORE__GROUP,
- StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
@@ -146,9 +142,9 @@ public class DiskStoreCommandsController extends AbstractCommandsController {
@RequestMapping(method = RequestMethod.GET, value = "/diskstores/{name}")
@ResponseBody
public String describeDiskStore(@PathVariable("name") final String diskStoreNameId,
- @RequestParam(CliStrings.DESCRIBE_DISK_STORE__MEMBER) final String memberNameId) {
+ @RequestParam(CliStrings.MEMBER) final String memberNameId) {
CommandStringBuilder command = new CommandStringBuilder(CliStrings.DESCRIBE_DISK_STORE);
- command.addOption(CliStrings.DESCRIBE_DISK_STORE__MEMBER, memberNameId);
+ command.addOption(CliStrings.MEMBER, memberNameId);
command.addOption(CliStrings.DESCRIBE_DISK_STORE__NAME, decode(diskStoreNameId));
return processCommand(command.toString());
}
@@ -157,15 +153,13 @@ public class DiskStoreCommandsController extends AbstractCommandsController {
@RequestMapping(method = RequestMethod.DELETE, value = "/diskstores/{name}")
@ResponseBody
public String destroyDiskStore(@PathVariable("name") final String diskStoreNameId,
- @RequestParam(value = CliStrings.DESTROY_DISK_STORE__GROUP,
- required = false) final String[] groups) {
+ @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups) {
CommandStringBuilder command = new CommandStringBuilder(CliStrings.DESTROY_DISK_STORE);
command.addOption(CliStrings.DESTROY_DISK_STORE__NAME, decode(diskStoreNameId));
if (hasValue(groups)) {
- command.addOption(CliStrings.DESTROY_DISK_STORE__GROUP,
- StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DurableClientCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DurableClientCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DurableClientCommandsController.java
index 8f31f7a..4562cd5 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DurableClientCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DurableClientCommandsController.java
@@ -49,21 +49,18 @@ public class DurableClientCommandsController extends AbstractCommandsController
@ResponseBody
public String listDurableClientContinuousQueries(
@PathVariable(ConfigurationProperties.DURABLE_CLIENT_ID) final String durableClientId,
- @RequestParam(value = CliStrings.LIST_DURABLE_CQS__MEMBER,
- required = false) final String memberNameId,
- @RequestParam(value = CliStrings.LIST_DURABLE_CQS__GROUP,
- required = false) final String[] groups) {
+ @RequestParam(value = CliStrings.MEMBER, required = false) final String memberNameId,
+ @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups) {
final CommandStringBuilder command = new CommandStringBuilder(CliStrings.LIST_DURABLE_CQS);
command.addOption(CliStrings.LIST_DURABLE_CQS__DURABLECLIENTID, decode(durableClientId));
if (hasValue(memberNameId)) {
- command.addOption(CliStrings.LIST_DURABLE_CQS__MEMBER, memberNameId);
+ command.addOption(CliStrings.MEMBER, memberNameId);
}
if (hasValue(groups)) {
- command.addOption(CliStrings.LIST_DURABLE_CQS__GROUP,
- StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
@@ -74,10 +71,8 @@ public class DurableClientCommandsController extends AbstractCommandsController
@ResponseBody
public String countDurableClientContinuousQueryEvents(
@PathVariable(ConfigurationProperties.DURABLE_CLIENT_ID) final String durableClientId,
- @RequestParam(value = CliStrings.COUNT_DURABLE_CQ_EVENTS__MEMBER,
- required = false) final String memberNameId,
- @RequestParam(value = CliStrings.COUNT_DURABLE_CQ_EVENTS__GROUP,
- required = false) final String[] groups) {
+ @RequestParam(value = CliStrings.MEMBER, required = false) final String memberNameId,
+ @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups) {
return internalCountDurableClientContinuousQueryEvents(decode(durableClientId), null,
memberNameId, groups);
}
@@ -88,10 +83,8 @@ public class DurableClientCommandsController extends AbstractCommandsController
public String countDurableClientContinuousQueryEvents(
@PathVariable(ConfigurationProperties.DURABLE_CLIENT_ID) final String durableClientId,
@PathVariable("durable-cq-name") final String durableCqName,
- @RequestParam(value = CliStrings.COUNT_DURABLE_CQ_EVENTS__MEMBER,
- required = false) final String memberNameId,
- @RequestParam(value = CliStrings.COUNT_DURABLE_CQ_EVENTS__GROUP,
- required = false) final String[] groups) {
+ @RequestParam(value = CliStrings.MEMBER, required = false) final String memberNameId,
+ @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups) {
return internalCountDurableClientContinuousQueryEvents(decode(durableClientId),
decode(durableCqName), memberNameId, groups);
}
@@ -108,12 +101,11 @@ public class DurableClientCommandsController extends AbstractCommandsController
}
if (hasValue(memberNameId)) {
- command.addOption(CliStrings.COUNT_DURABLE_CQ_EVENTS__MEMBER, memberNameId);
+ command.addOption(CliStrings.MEMBER, memberNameId);
}
if (hasValue(groups)) {
- command.addOption(CliStrings.COUNT_DURABLE_CQ_EVENTS__GROUP,
- StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
@@ -124,21 +116,18 @@ public class DurableClientCommandsController extends AbstractCommandsController
@ResponseBody
public String closeDurableClient(
@PathVariable(ConfigurationProperties.DURABLE_CLIENT_ID) final String durableClientId,
- @RequestParam(value = CliStrings.CLOSE_DURABLE_CLIENTS__MEMBER,
- required = false) final String memberNameId,
- @RequestParam(value = CliStrings.CLOSE_DURABLE_CLIENTS__GROUP,
- required = false) final String[] groups) {
+ @RequestParam(value = CliStrings.MEMBER, required = false) final String memberNameId,
+ @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups) {
final CommandStringBuilder command = new CommandStringBuilder(CliStrings.CLOSE_DURABLE_CLIENTS);
command.addOption(CliStrings.CLOSE_DURABLE_CLIENTS__CLIENT__ID, decode(durableClientId));
if (hasValue(memberNameId)) {
- command.addOption(CliStrings.CLOSE_DURABLE_CLIENTS__MEMBER, memberNameId);
+ command.addOption(CliStrings.MEMBER, memberNameId);
}
if (hasValue(groups)) {
- command.addOption(CliStrings.CLOSE_DURABLE_CLIENTS__GROUP,
- StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
@@ -150,22 +139,19 @@ public class DurableClientCommandsController extends AbstractCommandsController
public String closeDurableContinuousQuery(
@PathVariable(ConfigurationProperties.DURABLE_CLIENT_ID) final String durableClientId,
@PathVariable("durable-cq-name") final String durableCqName,
- @RequestParam(value = CliStrings.CLOSE_DURABLE_CQS__MEMBER,
- required = false) final String memberNameId,
- @RequestParam(value = CliStrings.CLOSE_DURABLE_CQS__GROUP,
- required = false) final String[] groups) {
+ @RequestParam(value = CliStrings.MEMBER, required = false) final String memberNameId,
+ @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups) {
final CommandStringBuilder command = new CommandStringBuilder(CliStrings.CLOSE_DURABLE_CQS);
command.addOption(CliStrings.CLOSE_DURABLE_CQS__DURABLE__CLIENT__ID, decode(durableClientId));
command.addOption(CliStrings.CLOSE_DURABLE_CQS__NAME, decode(durableCqName));
if (hasValue(memberNameId)) {
- command.addOption(CliStrings.CLOSE_DURABLE_CQS__MEMBER, memberNameId);
+ command.addOption(CliStrings.MEMBER, memberNameId);
}
if (hasValue(groups)) {
- command.addOption(CliStrings.CLOSE_DURABLE_CQS__GROUP,
- StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ExportLogController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ExportLogController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ExportLogController.java
index ddfd936..87afc24 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ExportLogController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ExportLogController.java
@@ -42,9 +42,8 @@ public class ExportLogController extends AbstractCommandsController {
@RequestMapping(method = RequestMethod.GET, value = "/logs")
public ResponseEntity<InputStreamResource> exportLogs(
@RequestParam(value = CliStrings.EXPORT_LOGS__DIR, required = false) final String directory,
- @RequestParam(value = CliStrings.EXPORT_LOGS__GROUP, required = false) final String[] groups,
- @RequestParam(value = CliStrings.EXPORT_LOGS__MEMBER,
- required = false) final String memberNameId,
+ @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups,
+ @RequestParam(value = CliStrings.MEMBER, required = false) final String memberNameId,
@RequestParam(value = CliStrings.EXPORT_LOGS__LOGLEVEL,
required = false) final String logLevel,
@RequestParam(value = CliStrings.EXPORT_LOGS__UPTO_LOGLEVEL,
@@ -65,12 +64,11 @@ public class ExportLogController extends AbstractCommandsController {
command.addOption(CliStrings.EXPORT_LOGS__DIR, decode(directory));
if (hasValue(groups)) {
- command.addOption(CliStrings.EXPORT_LOGS__GROUP,
- StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(memberNameId)) {
- command.addOption(CliStrings.EXPORT_LOGS__MEMBER, memberNameId);
+ command.addOption(CliStrings.MEMBER, memberNameId);
}
if (hasValue(logLevel)) {
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/FunctionCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/FunctionCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/FunctionCommandsController.java
index 508c335..855947e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/FunctionCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/FunctionCommandsController.java
@@ -50,22 +50,18 @@ public class FunctionCommandsController extends AbstractCommandsController {
@RequestMapping(method = RequestMethod.GET, value = "/functions")
@ResponseBody
public String listFunctions(
- @RequestParam(value = CliStrings.LIST_FUNCTION__GROUP,
- required = false) final String[] groups,
- @RequestParam(value = CliStrings.LIST_FUNCTION__MEMBER,
- required = false) final String[] members,
+ @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups,
+ @RequestParam(value = CliStrings.MEMBER, required = false) final String[] members,
@RequestParam(value = CliStrings.LIST_FUNCTION__MATCHES,
required = false) final String matches) {
final CommandStringBuilder command = new CommandStringBuilder(CliStrings.LIST_FUNCTION);
if (hasValue(groups)) {
- command.addOption(CliStrings.LIST_FUNCTION__GROUP,
- StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(members)) {
- command.addOption(CliStrings.LIST_FUNCTION__MEMBER,
- StringUtils.join(members, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.MEMBER, StringUtils.join(members, StringUtils.COMMA_DELIMITER));
}
if (hasValue(matches)) {
@@ -78,10 +74,8 @@ public class FunctionCommandsController extends AbstractCommandsController {
@RequestMapping(method = RequestMethod.POST, value = "/functions/{id}")
public Callable<ResponseEntity<String>> executeFunction(
@PathVariable("id") final String functionId,
- @RequestParam(value = CliStrings.EXECUTE_FUNCTION__ONGROUPS,
- required = false) final String groupName,
- @RequestParam(value = CliStrings.EXECUTE_FUNCTION__ONMEMBER,
- required = false) final String memberNameId,
+ @RequestParam(value = CliStrings.GROUPS, required = false) final String groupName,
+ @RequestParam(value = CliStrings.MEMBER, required = false) final String memberNameId,
@RequestParam(value = CliStrings.EXECUTE_FUNCTION__ONREGION,
required = false) final String regionNamePath,
@RequestParam(value = CliStrings.EXECUTE_FUNCTION__ARGUMENTS,
@@ -95,11 +89,11 @@ public class FunctionCommandsController extends AbstractCommandsController {
command.addOption(CliStrings.EXECUTE_FUNCTION__ID, decode(functionId));
if (hasValue(groupName)) {
- command.addOption(CliStrings.EXECUTE_FUNCTION__ONGROUPS, groupName);
+ command.addOption(CliStrings.GROUPS, groupName);
}
if (hasValue(memberNameId)) {
- command.addOption(CliStrings.EXECUTE_FUNCTION__ONMEMBER, memberNameId);
+ command.addOption(CliStrings.MEMBER, memberNameId);
}
if (hasValue(regionNamePath)) {
@@ -124,20 +118,18 @@ public class FunctionCommandsController extends AbstractCommandsController {
@RequestMapping(method = RequestMethod.DELETE, value = "/functions/{id}")
@ResponseBody
public String destroyFunction(@PathVariable("id") final String functionId,
- @RequestParam(value = CliStrings.DESTROY_FUNCTION__ONGROUPS,
- required = false) final String groupName,
- @RequestParam(value = CliStrings.DESTROY_FUNCTION__ONMEMBER,
- required = false) final String memberNameId) {
+ @RequestParam(value = CliStrings.GROUPS, required = false) final String groupName,
+ @RequestParam(value = CliStrings.MEMBER, required = false) final String memberNameId) {
final CommandStringBuilder command = new CommandStringBuilder(CliStrings.DESTROY_FUNCTION);
command.addOption(CliStrings.DESTROY_FUNCTION__ID, decode(functionId));
if (hasValue(groupName)) {
- command.addOption(CliStrings.DESTROY_FUNCTION__ONGROUPS, groupName);
+ command.addOption(CliStrings.GROUPS, groupName);
}
if (hasValue(memberNameId)) {
- command.addOption(CliStrings.DESTROY_FUNCTION__ONMEMBER, memberNameId);
+ command.addOption(CliStrings.MEMBER, memberNameId);
}
return processCommand(command.toString());
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/IndexCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/IndexCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/IndexCommandsController.java
index fc260eb..296156f 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/IndexCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/IndexCommandsController.java
@@ -60,10 +60,8 @@ public class IndexCommandsController extends AbstractCommandsController {
public String createIndex(@RequestParam(CliStrings.CREATE_INDEX__NAME) final String name,
@RequestParam(CliStrings.CREATE_INDEX__EXPRESSION) final String expression,
@RequestParam(CliStrings.CREATE_INDEX__REGION) final String regionNamePath,
- @RequestParam(value = CliStrings.CREATE_INDEX__GROUP,
- required = false) final String groupName,
- @RequestParam(value = CliStrings.CREATE_INDEX__MEMBER,
- required = false) final String memberNameId,
+ @RequestParam(value = CliStrings.GROUP, required = false) final String groupName,
+ @RequestParam(value = CliStrings.MEMBER, required = false) final String memberNameId,
@RequestParam(value = CliStrings.CREATE_INDEX__TYPE,
defaultValue = DEFAULT_INDEX_TYPE) final String type) {
CommandStringBuilder command = new CommandStringBuilder(CliStrings.CREATE_INDEX);
@@ -74,11 +72,11 @@ public class IndexCommandsController extends AbstractCommandsController {
command.addOption(CliStrings.CREATE_INDEX__TYPE, type);
if (hasValue(groupName)) {
- command.addOption(CliStrings.CREATE_INDEX__GROUP, groupName);
+ command.addOption(CliStrings.GROUP, groupName);
}
if (hasValue(memberNameId)) {
- command.addOption(CliStrings.CREATE_INDEX__MEMBER, memberNameId);
+ command.addOption(CliStrings.MEMBER, memberNameId);
}
return processCommand(command.toString());
@@ -87,18 +85,16 @@ public class IndexCommandsController extends AbstractCommandsController {
@RequestMapping(method = RequestMethod.POST, value = "/indexes", params = "op=create-defined")
@ResponseBody
public String createDefinedIndexes(
- @RequestParam(value = CliStrings.CREATE_DEFINED_INDEXES__GROUP,
- required = false) final String groupName,
- @RequestParam(value = CliStrings.CREATE_DEFINED_INDEXES__MEMBER,
- required = false) final String memberNameId) {
+ @RequestParam(value = CliStrings.GROUP, required = false) final String groupName,
+ @RequestParam(value = CliStrings.MEMBER, required = false) final String memberNameId) {
CommandStringBuilder command = new CommandStringBuilder(CliStrings.CREATE_DEFINED_INDEXES);
if (hasValue(groupName)) {
- command.addOption(CliStrings.CREATE_DEFINED_INDEXES__GROUP, groupName);
+ command.addOption(CliStrings.GROUP, groupName);
}
if (hasValue(memberNameId)) {
- command.addOption(CliStrings.CREATE_DEFINED_INDEXES__MEMBER, memberNameId);
+ command.addOption(CliStrings.MEMBER, memberNameId);
}
return processCommand(command.toString());
@@ -130,10 +126,8 @@ public class IndexCommandsController extends AbstractCommandsController {
@RequestMapping(method = RequestMethod.DELETE, value = "/indexes")
@ResponseBody
public String destroyIndexes(
- @RequestParam(value = CliStrings.DESTROY_INDEX__GROUP,
- required = false) final String groupName,
- @RequestParam(value = CliStrings.DESTROY_INDEX__MEMBER,
- required = false) final String memberNameId,
+ @RequestParam(value = CliStrings.GROUP, required = false) final String groupName,
+ @RequestParam(value = CliStrings.MEMBER, required = false) final String memberNameId,
@RequestParam(value = CliStrings.DESTROY_INDEX__REGION,
required = false) final String regionNamePath) {
return internalDestroyIndex(null, groupName, memberNameId, regionNamePath);
@@ -142,10 +136,8 @@ public class IndexCommandsController extends AbstractCommandsController {
@RequestMapping(method = RequestMethod.DELETE, value = "/indexes/{name}")
@ResponseBody
public String destroyIndex(@PathVariable("name") final String indexName,
- @RequestParam(value = CliStrings.DESTROY_INDEX__GROUP,
- required = false) final String groupName,
- @RequestParam(value = CliStrings.DESTROY_INDEX__MEMBER,
- required = false) final String memberNameId,
+ @RequestParam(value = CliStrings.GROUP, required = false) final String groupName,
+ @RequestParam(value = CliStrings.MEMBER, required = false) final String memberNameId,
@RequestParam(value = CliStrings.DESTROY_INDEX__REGION,
required = false) final String regionNamePath) {
return internalDestroyIndex(decode(indexName), groupName, memberNameId, regionNamePath);
@@ -160,11 +152,11 @@ public class IndexCommandsController extends AbstractCommandsController {
}
if (hasValue(groupName)) {
- command.addOption(CliStrings.DESTROY_INDEX__GROUP, groupName);
+ command.addOption(CliStrings.GROUP, groupName);
}
if (hasValue(memberNameId)) {
- command.addOption(CliStrings.DESTROY_INDEX__MEMBER, memberNameId);
+ command.addOption(CliStrings.MEMBER, memberNameId);
}
if (hasValue(regionNamePath)) {
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/MemberCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/MemberCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/MemberCommandsController.java
index 56eea26..66e82ee 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/MemberCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/MemberCommandsController.java
@@ -50,8 +50,8 @@ public class MemberCommandsController extends AbstractCommandsController {
// public String listMembers(@RequestParam(value = "group", required = false) final String
// groupName,
// @RequestParam(value = "group", required = false) final String[] groupNames) {
- public String listMembers(@RequestParam(value = CliStrings.LIST_MEMBER__GROUP,
- required = false) final String groupName) {
+ public String listMembers(
+ @RequestParam(value = CliStrings.GROUP, required = false) final String groupName) {
CommandStringBuilder command = new CommandStringBuilder(CliStrings.LIST_MEMBER);
// logger.info(String.format("Request Body: %1$s", requestParameters));
@@ -62,7 +62,7 @@ public class MemberCommandsController extends AbstractCommandsController {
// final String groupName = requestParameters.getFirst("group");
if (hasValue(groupName)) {
- command.addOption(CliStrings.LIST_MEMBER__GROUP, groupName);
+ command.addOption(CliStrings.GROUP, groupName);
}
return processCommand(command.toString());
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/MiscellaneousCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/MiscellaneousCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/MiscellaneousCommandsController.java
index 9b13b5f..fd28fed 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/MiscellaneousCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/MiscellaneousCommandsController.java
@@ -48,10 +48,8 @@ public class MiscellaneousCommandsController extends AbstractCommandsController
@ResponseBody
public String exportStackTraces(
@RequestParam(value = CliStrings.EXPORT_STACKTRACE__FILE, required = false) final String file,
- @RequestParam(value = CliStrings.EXPORT_STACKTRACE__GROUP,
- required = false) final String groupName,
- @RequestParam(value = CliStrings.EXPORT_STACKTRACE__MEMBER,
- required = false) final String memberNameId,
+ @RequestParam(value = CliStrings.GROUP, required = false) final String groupName,
+ @RequestParam(value = CliStrings.MEMBER, required = false) final String memberNameId,
@RequestParam(value = CliStrings.EXPORT_STACKTRACE__FAIL__IF__FILE__PRESENT,
required = false) final boolean failIfFilePresent) {
CommandStringBuilder command = new CommandStringBuilder(CliStrings.EXPORT_STACKTRACE);
@@ -61,11 +59,11 @@ public class MiscellaneousCommandsController extends AbstractCommandsController
}
if (hasValue(groupName)) {
- command.addOption(CliStrings.EXPORT_STACKTRACE__GROUP, groupName);
+ command.addOption(CliStrings.GROUP, groupName);
}
if (hasValue(memberNameId)) {
- command.addOption(CliStrings.EXPORT_STACKTRACE__MEMBER, memberNameId);
+ command.addOption(CliStrings.MEMBER, memberNameId);
}
if (hasValue(failIfFilePresent)) {
@@ -80,12 +78,11 @@ public class MiscellaneousCommandsController extends AbstractCommandsController
@RequestMapping(method = RequestMethod.POST, value = "/gc")
@ResponseBody
public String gc(
- @RequestParam(value = CliStrings.GC__GROUP, required = false) final String[] groups) {
+ @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups) {
CommandStringBuilder command = new CommandStringBuilder(CliStrings.GC);
if (hasValue(groups)) {
- command.addOption(CliStrings.GC__GROUP,
- StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
@@ -96,7 +93,7 @@ public class MiscellaneousCommandsController extends AbstractCommandsController
@ResponseBody
public String gc(@PathVariable("member") final String memberNameId) {
CommandStringBuilder command = new CommandStringBuilder(CliStrings.GC);
- command.addOption(CliStrings.GC__MEMBER, decode(memberNameId));
+ command.addOption(CliStrings.MEMBER, decode(memberNameId));
return processCommand(command.toString());
}
@@ -104,15 +101,15 @@ public class MiscellaneousCommandsController extends AbstractCommandsController
@RequestMapping(method = RequestMethod.GET, value = "/netstat")
@ResponseBody
public String netstat(
- @RequestParam(value = CliStrings.NETSTAT__MEMBER, required = false) final String[] members,
- @RequestParam(value = CliStrings.NETSTAT__GROUP, required = false) final String group,
+ @RequestParam(value = CliStrings.MEMBER, required = false) final String[] members,
+ @RequestParam(value = CliStrings.GROUP, required = false) final String group,
@RequestParam(value = CliStrings.NETSTAT__FILE, required = false) final String file,
@RequestParam(value = CliStrings.NETSTAT__WITHLSOF,
defaultValue = "false") final Boolean withLsof) {
CommandStringBuilder command = new CommandStringBuilder(CliStrings.NETSTAT);
- addCommandOption(null, command, CliStrings.NETSTAT__MEMBER, members);
- addCommandOption(null, command, CliStrings.NETSTAT__GROUP, group);
+ addCommandOption(null, command, CliStrings.MEMBER, members);
+ addCommandOption(null, command, CliStrings.GROUP, group);
addCommandOption(null, command, CliStrings.NETSTAT__FILE, file);
addCommandOption(null, command, CliStrings.NETSTAT__WITHLSOF, withLsof);
@@ -136,7 +133,7 @@ public class MiscellaneousCommandsController extends AbstractCommandsController
@RequestParam(value = CliStrings.SHOW_LOG_LINE_NUM, defaultValue = "0") final Integer lines) {
CommandStringBuilder command = new CommandStringBuilder(CliStrings.SHOW_LOG);
- command.addOption(CliStrings.SHOW_LOG_MEMBER, decode(memberNameId));
+ command.addOption(CliStrings.MEMBER, decode(memberNameId));
command.addOption(CliStrings.SHOW_LOG_LINE_NUM, String.valueOf(lines));
return processCommand(command.toString());
@@ -146,8 +143,7 @@ public class MiscellaneousCommandsController extends AbstractCommandsController
@RequestMapping(method = RequestMethod.GET, value = "/metrics")
@ResponseBody
public String showMetrics(
- @RequestParam(value = CliStrings.SHOW_METRICS__MEMBER,
- required = false) final String memberNameId,
+ @RequestParam(value = CliStrings.MEMBER, required = false) final String memberNameId,
@RequestParam(value = CliStrings.SHOW_METRICS__REGION,
required = false) final String regionNamePath,
@RequestParam(value = CliStrings.SHOW_METRICS__FILE, required = false) final String file,
@@ -158,7 +154,7 @@ public class MiscellaneousCommandsController extends AbstractCommandsController
CommandStringBuilder command = new CommandStringBuilder(CliStrings.SHOW_METRICS);
if (hasValue(memberNameId)) {
- command.addOption(CliStrings.SHOW_METRICS__MEMBER, memberNameId);
+ command.addOption(CliStrings.MEMBER, memberNameId);
}
if (hasValue(regionNamePath)) {
@@ -234,11 +230,11 @@ public class MiscellaneousCommandsController extends AbstractCommandsController
command.addOption(CliStrings.CHANGE_LOGLEVEL__LOGLEVEL, decode(logLevel));
if (hasValue(groups)) {
- command.addOption(CliStrings.CHANGE_LOGLEVEL__GROUPS, decode(groups));
+ command.addOption(CliStrings.GROUP, decode(groups));
}
if (hasValue(members)) {
- command.addOption(CliStrings.CHANGE_LOGLEVEL__MEMBER, decode(members));
+ command.addOption(CliStrings.MEMBER, decode(members));
}
return processCommand(command.toString());
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/QueueCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/QueueCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/QueueCommandsController.java
index df49e49..02d9bcb 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/QueueCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/QueueCommandsController.java
@@ -50,8 +50,7 @@ public class QueueCommandsController extends AbstractCommandsController {
@RequestParam(CliStrings.CREATE_ASYNC_EVENT_QUEUE__LISTENER) final String listener,
@RequestParam(value = CliStrings.CREATE_ASYNC_EVENT_QUEUE__LISTENER_PARAM_AND_VALUE,
required = false) final String[] listenerParametersValues,
- @RequestParam(value = CliStrings.CREATE_ASYNC_EVENT_QUEUE__GROUP,
- required = false) final String[] groups,
+ @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups,
@RequestParam(value = CliStrings.CREATE_ASYNC_EVENT_QUEUE__PARALLEL,
defaultValue = "false") final Boolean parallel,
@RequestParam(value = CliStrings.CREATE_ASYNC_EVENT_QUEUE__ENABLEBATCHCONFLATION,
@@ -91,8 +90,7 @@ public class QueueCommandsController extends AbstractCommandsController {
}
if (hasValue(groups)) {
- command.addOption(CliStrings.CREATE_ASYNC_EVENT_QUEUE__GROUP,
- StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
command.addOption(CliStrings.CREATE_ASYNC_EVENT_QUEUE__PARALLEL,
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/RegionCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/RegionCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/RegionCommandsController.java
index baf24e5..21f85bf 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/RegionCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/RegionCommandsController.java
@@ -48,17 +48,16 @@ public class RegionCommandsController extends AbstractCommandsController {
@RequestMapping(method = RequestMethod.GET, value = "/regions")
@ResponseBody
public String listRegions(
- @RequestParam(value = CliStrings.LIST_REGION__GROUP, required = false) final String groupName,
- @RequestParam(value = CliStrings.LIST_REGION__MEMBER,
- required = false) final String memberNameId) {
+ @RequestParam(value = CliStrings.GROUP, required = false) final String groupName,
+ @RequestParam(value = CliStrings.MEMBER, required = false) final String memberNameId) {
final CommandStringBuilder command = new CommandStringBuilder(CliStrings.LIST_REGION);
if (hasValue(groupName)) {
- command.addOption(CliStrings.LIST_REGION__GROUP, groupName);
+ command.addOption(CliStrings.GROUP, groupName);
}
if (hasValue(memberNameId)) {
- command.addOption(CliStrings.LIST_REGION__MEMBER, memberNameId);
+ command.addOption(CliStrings.MEMBER, memberNameId);
}
return processCommand(command.toString());
@@ -76,7 +75,7 @@ public class RegionCommandsController extends AbstractCommandsController {
@ResponseBody
public String alterRegion(final WebRequest request,
@PathVariable("name") final String regionNamePath,
- @RequestParam(value = CliStrings.ALTER_REGION__GROUP, required = false) final String[] groups,
+ @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups,
@RequestParam(value = CliStrings.ALTER_REGION__ENTRYEXPIRATIONIDLETIME,
required = false) final Integer entryIdleTimeExpiration,
@RequestParam(value = CliStrings.ALTER_REGION__ENTRYEXPIRATIONIDLETIMEACTION,
@@ -114,8 +113,7 @@ public class RegionCommandsController extends AbstractCommandsController {
command.addOption(CliStrings.ALTER_REGION__REGION, decode(regionNamePath));
if (hasValue(groups)) {
- command.addOption(CliStrings.ALTER_REGION__GROUP,
- StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
addCommandOption(request, command, CliStrings.ALTER_REGION__ENTRYEXPIRATIONIDLETIME,
@@ -159,8 +157,7 @@ public class RegionCommandsController extends AbstractCommandsController {
required = false) final String regionType,
@RequestParam(value = CliStrings.CREATE_REGION__USEATTRIBUTESFROM,
required = false) final String regionTemplate,
- @RequestParam(value = CliStrings.CREATE_REGION__GROUP,
- required = false) final String[] groups,
+ @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups,
@RequestParam(value = CliStrings.CREATE_REGION__SKIPIFEXISTS,
defaultValue = "true") final Boolean skipIfExists,
@RequestParam(value = CliStrings.CREATE_REGION__KEYCONSTRAINT,
@@ -241,8 +238,7 @@ public class RegionCommandsController extends AbstractCommandsController {
}
if (hasValue(groups)) {
- command.addOption(CliStrings.CREATE_REGION__GROUP,
- StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
command.addOption(CliStrings.CREATE_REGION__SKIPIFEXISTS,