AbstractCommandSpecProcessor#isSubcommand(ExecutableElement, RoundEnv…

…ironment): Simplified Improved performance
Vampire · Nov 30, 2021 · c12e041 · c12e041
1 parent ce6b3a0
commit c12e041
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/...gen/src/main/java/picocli/codegen/annotation/processing/AbstractCommandSpecProcessor.java b/...gen/src/main/java/picocli/codegen/annotation/processing/AbstractCommandSpecProcessor.java
@@ -300,10 +300,8 @@ private void updateCommandFromMethodElement(ExecutableElement method, Context co
 
     private boolean isSubcommand(ExecutableElement method, RoundEnvironment roundEnv) {
         Element typeElement = method.getEnclosingElement();
-        if (typeElement.getAnnotation(Command.class) != null && typeElement.getAnnotation(Command.class).addMethodSubcommands()) {
-            return true;
-        }
-        if (typeElement.getAnnotation(Command.class) == null) {
+        Command cmd = typeElement.getAnnotation(Command.class);
+        if (cmd == null) {
             Set<Element> elements = new HashSet<Element>(typeElement.getEnclosedElements());
 
             // The class is a Command if it has any fields or methods annotated with the below:
@@ -314,7 +312,7 @@ private boolean isSubcommand(ExecutableElement method, RoundEnvironment roundEnv
                     || roundEnv.getElementsAnnotatedWith(Unmatched.class).removeAll(elements)
                     || roundEnv.getElementsAnnotatedWith(Spec.class).removeAll(elements);
         }
-        return false;
+        return cmd.addMethodSubcommands();
     }
 
     private Stack<TypeElement> buildTypeHierarchy(TypeElement typeElement) {