GEODE-188:wrong name for the gateway substitution filter in 'create async-event-queue' command -replaced string "gateway-event-substitution-listener" with "gateway-event-substitution-filter" and "GatewayEventSubstitutionListener" with "GatewayEventSubstitutionFilter
Ran: QueueCommandsDUnitTest Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/e7e24267 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/e7e24267 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/e7e24267 Branch: refs/heads/feature/GEODE-137 Commit: e7e24267e8c3f840ed5e43ba09dc5f19cb0ef2ef Parents: 88ed3ed Author: kbachhav <kbachhav.pivotal.io> Authored: Thu Aug 6 14:12:30 2015 +0530 Committer: Qihong Chen <qc...@pivotal.io> Committed: Thu Aug 6 10:07:48 2015 -0700 ---------------------------------------------------------------------- .../management/internal/cli/commands/QueueCommands.java | 4 ++-- .../cli/functions/CreateAsyncEventQueueFunction.java | 8 ++++---- .../gemfire/management/internal/cli/i18n/CliStrings.java | 4 ++-- .../internal/web/controllers/QueueCommandsController.java | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e7e24267/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommands.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommands.java b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommands.java index 7b298d6..b59f38a 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommands.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommands.java @@ -110,8 +110,8 @@ public class QueueCommands implements CommandMarker { help = CliStrings.CREATE_ASYNC_EVENT_QUEUE__GATEWAYEVENTFILTER__HELP) @CliMetaData (valueSeparator = ",") String[] gatewayEventFilters, - @CliOption(key = CliStrings.CREATE_ASYNC_EVENT_QUEUE__SUBSTITUTION_LISTENER, - help = CliStrings.CREATE_ASYNC_EVENT_QUEUE__SUBSTITUTION_LISTENER__HELP) + @CliOption(key = CliStrings.CREATE_ASYNC_EVENT_QUEUE__SUBSTITUTION_FILTER, + help = CliStrings.CREATE_ASYNC_EVENT_QUEUE__SUBSTITUTION_FILTER__HELP) String gatewaySubstitutionListener, @CliOption(key = CliStrings.CREATE_ASYNC_EVENT_QUEUE__LISTENER, mandatory = true, http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e7e24267/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/CreateAsyncEventQueueFunction.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/CreateAsyncEventQueueFunction.java b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/CreateAsyncEventQueueFunction.java index 547b199..4ee9e5d 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/CreateAsyncEventQueueFunction.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/CreateAsyncEventQueueFunction.java @@ -67,7 +67,7 @@ public class CreateAsyncEventQueueFunction extends FunctionAdapter implements In final int dispatcherThreads =(Integer) args[9]; final String orderPolicy= (String) args[10]; final String[] gatewayEventFilters =(String[]) args[11]; - final String gatewaySubstitutionListener = (String) args[12]; + final String gatewaySubstitutionFilter = (String) args[12]; final String listenerClassName = (String) args[13]; final Properties listenerProperties = (Properties) args[14]; @@ -98,9 +98,9 @@ public class CreateAsyncEventQueueFunction extends FunctionAdapter implements In asyncEventQueueFactory.addGatewayEventFilter((GatewayEventFilter) newInstance(gatewayEventFilterKlass, CliStrings.CREATE_ASYNC_EVENT_QUEUE__GATEWAYEVENTFILTER)); } } - if (gatewaySubstitutionListener != null) { - Class<?> gatewayEventSubstitutionListenerKlass = forName(gatewaySubstitutionListener, CliStrings.CREATE_ASYNC_EVENT_QUEUE__SUBSTITUTION_LISTENER); - asyncEventQueueFactory.setGatewayEventSubstitutionListener((GatewayEventSubstitutionFilter<?,?>) newInstance(gatewayEventSubstitutionListenerKlass, CliStrings.CREATE_ASYNC_EVENT_QUEUE__SUBSTITUTION_LISTENER)); + if (gatewaySubstitutionFilter != null) { + Class<?> gatewayEventSubstitutionFilterKlass = forName(gatewaySubstitutionFilter, CliStrings.CREATE_ASYNC_EVENT_QUEUE__SUBSTITUTION_FILTER); + asyncEventQueueFactory.setGatewayEventSubstitutionListener((GatewayEventSubstitutionFilter<?,?>) newInstance(gatewayEventSubstitutionFilterKlass, CliStrings.CREATE_ASYNC_EVENT_QUEUE__SUBSTITUTION_FILTER)); } Object listenerInstance; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e7e24267/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java index c65212f..678fd93 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java @@ -428,8 +428,8 @@ public class CliStrings { public static final String CREATE_ASYNC_EVENT_QUEUE__ORDERPOLICY__HELP = "Policy for dispatching events when --dispatcher-threads is > 1. Possible values are 'THREAD', 'KEY', 'PARTITION'."; public static final String CREATE_ASYNC_EVENT_QUEUE__DISPATCHERTHREADS = "dispatcher-threads"; public static final String CREATE_ASYNC_EVENT_QUEUE__DISPATCHERTHREADS__HELP = "Number of threads to use for sending events."; - public static final String CREATE_ASYNC_EVENT_QUEUE__SUBSTITUTION_LISTENER = "gateway-event-substitution-listener"; - public static final String CREATE_ASYNC_EVENT_QUEUE__SUBSTITUTION_LISTENER__HELP = "Fully qualified class name of the GatewayEventSubstitutionListener for this queue."; + public static final String CREATE_ASYNC_EVENT_QUEUE__SUBSTITUTION_FILTER = "gateway-event-substitution-filter"; + public static final String CREATE_ASYNC_EVENT_QUEUE__SUBSTITUTION_FILTER__HELP = "Fully qualified class name of the GatewayEventSubstitutionFilter for this queue."; public static final String CREATE_ASYNC_EVENT_QUEUE__LISTENER = "listener"; public static final String CREATE_ASYNC_EVENT_QUEUE__LISTENER__HELP = "Fully qualified class name of the AsyncEventListener for this queue."; public static final String CREATE_ASYNC_EVENT_QUEUE__LISTENER_PARAM_AND_VALUE = "listener-param"; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e7e24267/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/QueueCommandsController.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/QueueCommandsController.java b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/QueueCommandsController.java index 00cbd1a..a317aca 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/QueueCommandsController.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/QueueCommandsController.java @@ -54,7 +54,7 @@ public class QueueCommandsController extends AbstractCommandsController { @RequestParam(value = CliStrings.CREATE_ASYNC_EVENT_QUEUE__DISPATCHERTHREADS, defaultValue = "1") final Integer dispatcherThreads, @RequestParam(value = CliStrings.CREATE_ASYNC_EVENT_QUEUE__ORDERPOLICY, defaultValue = "KEY") final String orderPolicy, @RequestParam(value = CliStrings.CREATE_ASYNC_EVENT_QUEUE__GATEWAYEVENTFILTER, required = false) final String[] gatewayEventFilters, - @RequestParam(value = CliStrings.CREATE_ASYNC_EVENT_QUEUE__SUBSTITUTION_LISTENER, required = false) final String gatewaySubstitutionListener) + @RequestParam(value = CliStrings.CREATE_ASYNC_EVENT_QUEUE__SUBSTITUTION_FILTER, required = false) final String gatewaySubstitutionFilter) { CommandStringBuilder command = new CommandStringBuilder(CliStrings.CREATE_ASYNC_EVENT_QUEUE); @@ -108,8 +108,8 @@ public class QueueCommandsController extends AbstractCommandsController { gatewayEventFilters, StringUtils.COMMA_DELIMITER)); } - if (hasValue(gatewaySubstitutionListener)) { - command.addOption(CliStrings.CREATE_ASYNC_EVENT_QUEUE__SUBSTITUTION_LISTENER, gatewaySubstitutionListener); + if (hasValue(gatewaySubstitutionFilter)) { + command.addOption(CliStrings.CREATE_ASYNC_EVENT_QUEUE__SUBSTITUTION_FILTER, gatewaySubstitutionFilter); } return processCommand(command.toString());