Spring/spring-shell
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow non public methods for @CliAvailabilityIndicator

Browse Source 
Fixes https://github.com/spring-projects/spring-shell/issues/122
This commit is contained in:
Eric Bottard
2017-05-02 11:31:33 +02:00
parent fdf892cfaf
commit 685051b230
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/springframework/shell/core/SimpleParser.java
View File

@@ -41,6 +41,7 @@ import org.springframework.shell.support.util.ExceptionUtils;
import org.springframework.shell.support.util.NaturalOrderComparator;
import org.springframework.shell.support.util.OsUtils;
import org.springframework.util.Assert;
import org.springframework.util.ReflectionUtils;
import org.springframework.util.StringUtils;
/**
@@ -1086,7 +1087,7 @@ public class SimpleParser implements Parser {
public final void add(final CommandMarker command) {
synchronized (mutex) {
commands.add(command);
for (final Method method : command.getClass().getMethods()) {
for (final Method method : ReflectionUtils.getAllDeclaredMethods(command.getClass())) {
CliAvailabilityIndicator availability = method.getAnnotation(CliAvailabilityIndicator.class);
if (availability != null) {
Assert.isTrue(
@@ -1100,6 +1101,7 @@ public class SimpleParser implements Parser {
for (String cmd : availability.value()) {
Assert.isTrue(!availabilityIndicators.containsKey(cmd),
"Cannot specify an availability indicator for '" + cmd + "' more than once");
ReflectionUtils.makeAccessible(method);
availabilityIndicators.put(cmd, new MethodTarget(method, command));
}
}