This is an automated email from the ASF dual-hosted git repository.
jinmeiliao pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 13876f6 GEODE-3788: add availability indicator for alter aeq command
(#1107)
13876f6 is described below
commit 13876f6b5b7aa70d2e11e0d533c63fee433172ca
Author: jinmeiliao <[email protected]>
AuthorDate: Fri Dec 1 15:13:12 2017 -0800
GEODE-3788: add availability indicator for alter aeq command (#1107)
---
.../cli/commands/CommandAvailabilityIndicator.java | 2 +-
.../geode/management/internal/cli/help/Helper.java | 4 ++
.../commands/CommandAvailabilityIndicatorTest.java | 65 ++++++++++++++++++++++
3 files changed, 70 insertions(+), 1 deletion(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CommandAvailabilityIndicator.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CommandAvailabilityIndicator.java
index accfbe3..cfdeaa5 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CommandAvailabilityIndicator.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CommandAvailabilityIndicator.java
@@ -49,7 +49,7 @@ public class CommandAvailabilityIndicator implements
CommandMarker {
CliStrings.CREATE_GATEWAYRECEIVER, CliStrings.START_GATEWAYRECEIVER,
CliStrings.STOP_GATEWAYRECEIVER, CliStrings.LIST_GATEWAY,
CliStrings.STATUS_GATEWAYSENDER,
CliStrings.STATUS_GATEWAYRECEIVER, CliStrings.LOAD_BALANCE_GATEWAYSENDER,
- CliStrings.DESTROY_GATEWAYSENDER})
+ CliStrings.DESTROY_GATEWAYSENDER,
AlterAsyncEventQueueCommand.COMMAND_NAME})
public boolean clientCommandsAvailable() {
Gfsh gfsh = Gfsh.getCurrentInstance();
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/help/Helper.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/help/Helper.java
index 917f3e4..aaf743e 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/help/Helper.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/help/Helper.java
@@ -187,6 +187,10 @@ public class Helper {
}
}
+ public boolean hasAvailabilityIndicator(String command) {
+ return availabilityIndicators.get(command) != null;
+ }
+
HelpBlock getHelp() {
HelpBlock root = new HelpBlock();
commands.keySet().stream().sorted().map(commands::get).forEach(method -> {
diff --git
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CommandAvailabilityIndicatorTest.java
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CommandAvailabilityIndicatorTest.java
new file mode 100644
index 0000000..f94a94f
--- /dev/null
+++
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CommandAvailabilityIndicatorTest.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express
+ * or implied. See the License for the specific language governing permissions
and limitations under
+ * the License.
+ */
+
+package org.apache.geode.management.internal.cli.commands;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.springframework.shell.core.CommandMarker;
+import org.springframework.shell.core.annotation.CliCommand;
+
+import org.apache.geode.management.cli.CliMetaData;
+import org.apache.geode.management.internal.cli.CommandManager;
+import org.apache.geode.test.junit.categories.UnitTest;
+
+
+@Category(UnitTest.class)
+public class CommandAvailabilityIndicatorTest {
+
+ @Test
+ public void allOnlineCommandsHaveAvailabilityIndicator() throws Exception {
+ CommandManager manager = new CommandManager();
+ List<CommandMarker> commandMarkers = manager.getCommandMarkers();
+
+ for (CommandMarker commandMarker : commandMarkers) {
+ // ignore all the other commands beside GfshCommand
+ if (!GfshCommand.class.isAssignableFrom(commandMarker.getClass())) {
+ continue;
+ }
+
+ GfshCommand gfshCommand = (GfshCommand) commandMarker;
+ for (Method method : commandMarker.getClass().getMethods()) {
+ CliCommand cliCommand = method.getAnnotation(CliCommand.class);
+ CliMetaData cliMetaData = method.getAnnotation(CliMetaData.class);
+
+ // all the online commands have availability indicator defined in the
commandManager
+ if (cliMetaData != null && !cliMetaData.shellOnly()) {
+
assertThat(manager.getHelper().hasAvailabilityIndicator(cliCommand.value()[0]))
+ .describedAs(cliCommand.value()[0] + " has no availability
indicator defined. "
+ + "Please add the command in the
CommandAvailabilityIndicator")
+ .isTrue();
+ }
+ }
+ }
+ }
+
+
+
+}
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
