geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zho...@apache.org
Subject [37/51] [abbrv] 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.
Date Wed, 14 Jun 2017 22:07:24 GMT
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);


Mime
View raw message