You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by je...@apache.org on 2017/06/19 15:23:38 UTC
[05/24] 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.
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/feature/GEODE-3071
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,