Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CommandLine cleanup #1568

Merged
merged 4 commits into from
Feb 9, 2022
Merged

CommandLine cleanup #1568

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a6a22c6
Renamed CommandReflection#initFromAnnotatedFields(…) as initFromAnnot…
rgoldberg Dec 20, 2021
1f0e7ac
CommandReflection#initSubcommands(…) hierarchy param is now Set<Class…
rgoldberg Dec 20, 2021
bb822ea
Simplified CommandUserObject constructor
rgoldberg Dec 20, 2021
105a3df
Merge branch 'master' into command-line-cleanup
remkop Feb 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 15 additions & 15 deletions src/main/java/picocli/CommandLine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11447,7 +11447,7 @@ static ArgGroupSpec extractArgGroupSpec(IAnnotatedElement member, IFactory facto
boolean hasArgAnnotation = false;
while (!hierarchy.isEmpty()) {
cls = hierarchy.pop();
hasArgAnnotation |= initFromAnnotatedFields(scope, cls, commandSpec, builder, factory, null);
hasArgAnnotation |= initFromAnnotatedMembers(scope, cls, commandSpec, builder, factory, null);
}
ArgGroupSpec result = builder.build();
if (annotationsAreMandatory) {validateArgGroupSpec(result, hasArgAnnotation, cls.getName()); }
Expand Down Expand Up @@ -11475,20 +11475,19 @@ static CommandSpec extractCommandSpec(Object command, IFactory factory, boolean
injectSpecIntoVersionProvider(result, cmd, factory);
result.setAddMethodSubcommands(false); // method commands don't have method subcommands
hasCommandAnnotation = true;
initSubcommands(cmd, null, result, factory, new Stack<Class<?>>()); // after adding options
initSubcommands(cmd, null, result, factory, Collections.<Class<?>>emptySet()); // after adding options
result.mixinStandardHelpOptions(cmd.mixinStandardHelpOptions()); // do this last
initFromMethodParameters(userObject, method, result, null, factory);
// set command name to method name, unless @Command#name is set
result.initName(((Method)command).getName());
} else {
Stack<Class<?>> hierarchy = new Stack<Class<?>>();
Class<?> cls = userObject.getType();
Stack<Class<?>> hierarchy = new Stack<Class<?>>();
while (cls != null) {
hierarchy.add(cls);
cls = cls.getSuperclass();
}
@SuppressWarnings("unchecked")
Stack<Class<?>> originalHierarchy = (Stack<Class<?>>) hierarchy.clone();
Set<Class<?>> fullHierarchySet = new HashSet<Class<?>>(hierarchy);
boolean mixinStandardHelpOptions = false;
while (!hierarchy.isEmpty()) {
cls = hierarchy.pop();
Expand All @@ -11499,9 +11498,9 @@ static CommandSpec extractCommandSpec(Object command, IFactory factory, boolean
hasCommandAnnotation = true;
mixinStandardHelpOptions |= cmd.mixinStandardHelpOptions();
}
initSubcommands(cmd, cls, result, factory, originalHierarchy); // after adding options
initSubcommands(cmd, cls, result, factory, fullHierarchySet); // after adding options
initMethodSubcommands(cls, result, factory); // regardless of @Command annotation. NOTE: after adding options
hasCommandAnnotation |= initFromAnnotatedFields(userObject, cls, result, null, factory, null);
hasCommandAnnotation |= initFromAnnotatedMembers(userObject, cls, result, null, factory, null);
}
result.mixinStandardHelpOptions(mixinStandardHelpOptions); //#377 Standard help options should be added last
}
Expand All @@ -11515,14 +11514,14 @@ static CommandSpec extractCommandSpec(Object command, IFactory factory, boolean

private static void injectSpecIntoVersionProvider(CommandSpec result, Command cmd, IFactory factory) {
if (result.versionProvider() == null) { return; }
CommandReflection.initFromAnnotatedFields(new ObjectScope(result.versionProvider()), cmd.versionProvider(), result, null, factory, new Predicate<TypedMember>() {
initFromAnnotatedMembers(new ObjectScope(result.versionProvider()), cmd.versionProvider(), result, null, factory, new Predicate<TypedMember>() {
public boolean test(TypedMember tm) {
return tm.isSpec() && !(tm.isArgGroup() || tm.isUnmatched() || tm.isMixin() || tm.isOption() || tm.isParameter() || tm.isParentCommand());
}
});
}

private static void initSubcommands(Command cmd, Class<?> cls, CommandSpec parent, IFactory factory, Stack<Class<?>> hierarchy) {
private static void initSubcommands(Command cmd, Class<?> cls, CommandSpec parent, IFactory factory, Set<Class<?>> hierarchy) {
if (cmd == null) { return; }
for (Class<?> sub : cmd.subcommands()) {
if (sub.equals(cls)) {
Expand Down Expand Up @@ -11565,7 +11564,7 @@ private static String subcommandName(Class<?> sub) {
}
return subCommand.name();
}
private static boolean initFromAnnotatedFields(IScope scope, Class<?> cls, CommandSpec receiver, ArgGroupSpec.Builder groupBuilder, IFactory factory, Predicate<TypedMember> predicate) {
private static boolean initFromAnnotatedMembers(IScope scope, Class<?> cls, CommandSpec receiver, ArgGroupSpec.Builder groupBuilder, IFactory factory, Predicate<TypedMember> predicate) {
boolean result = false;
for (Field field : cls.getDeclaredFields()) {
result |= initFromAnnotatedTypedMembers(TypedMember.createIfAnnotated(field, scope), predicate, receiver, groupBuilder, factory);
Expand Down Expand Up @@ -11880,13 +11879,14 @@ static class CommandUserObject implements IScope {

private CommandUserObject(Object objectOrClass, IFactory factory) {
this.factory = Assert.notNull(factory, "factory");
type = objectOrClass == null ? null : objectOrClass.getClass();
instance = objectOrClass;
if (objectOrClass instanceof Class) {
type = (Class<?>) objectOrClass;
instance = null;
} else if (objectOrClass instanceof Method) {
type = null; // don't mix in options/positional params from outer class @Command
type = (Class<?>) objectOrClass;
} else {
instance = objectOrClass;
type = objectOrClass == null || objectOrClass instanceof Method // don't mix in options/positional params from outer class @Command
? null
: objectOrClass.getClass();
}
}
@Override public String toString() {
Expand Down