[#1440] Fix annotation processor bug: ensure that commands have uniqu…

…e subcommand instances Closes #1440
remkop · Jan 18, 2022 · ed222fe · ed222fe
1 parent 50a724d
commit ed222fe
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -19,6 +19,7 @@ Picocli follows [semantic versioning](http://semver.org/).
 
 
 ## <a name="4.6.3-fixes"></a> Fixed issues
+* [#1440] Bugfix: annotation processor incorrectly failed with `DuplicateOptionAnnotationsException` when multiple commands had a subcommand in common and an inherited (`scope = ScopeType.INHERIT`) option. Thanks to [nemetsSY](https://github.com/nemetsSY) for raising this.
 * [#1384][#1493] Bugfix: parser now correctly handles ArgGroups with optional positional parameters. Thanks to [Matthew Lewis](https://github.com/mattjlewis) for raising this and to [Kurt Kaiser](https://github.com/kurtkaiser) for the pull request.
 * [#1474] Bugfix: Avoid `UnsupportedCharsetException: cp65001` on Microsoft Windows console when code page is set to UTF-8. Thanks to [epuni](https://github.com/epuni) for raising this.
 * [#1466][#1467] Bugfix/Enhancement: Autocomplete now shows subcommand aliases in the completion candidates. Thanks to [Ruud Senden](https://github.com/rsenden) for the pull request.

diff --git a/...ion-processing-tests/src/test/java/picocli/annotation/processing/tests/Issue1440Test.java b/...ion-processing-tests/src/test/java/picocli/annotation/processing/tests/Issue1440Test.java
@@ -11,7 +11,7 @@
 import static com.google.testing.compile.Compiler.javac;
 
 public class Issue1440Test {
-    @Ignore("https://github.com/remkop/picocli/issues/1440")
+    //@Ignore("https://github.com/remkop/picocli/issues/1440")
     @Test
     public void testIssue1440() {
         Processor processor = new AnnotatedCommandSourceGeneratorProcessor();

diff --git a/...ation-processing-tests/src/test/resources/picocli/issue1440inheritedoptions/Command2.java b/...ation-processing-tests/src/test/resources/picocli/issue1440inheritedoptions/Command2.java
@@ -5,7 +5,7 @@
 import picocli.CommandLine.Model.CommandSpec;
 import picocli.CommandLine.Spec;
 
-@Command(name = "Command1", subcommands =  CommandLine.HelpCommand.class,
+@Command(name = "Command2", subcommands =  CommandLine.HelpCommand.class,
     description = "Command 1 description")
 class Command2 {
     @Spec

diff --git a/...gen/src/main/java/picocli/codegen/annotation/processing/AbstractCommandSpecProcessor.java b/...gen/src/main/java/picocli/codegen/annotation/processing/AbstractCommandSpecProcessor.java
@@ -229,11 +229,17 @@ private void buildCommands(RoundEnvironment roundEnv, Context context) {
     }
 
     private CommandSpec buildCommand(Element element, final Context context, final RoundEnvironment roundEnv) {
+        return buildCommand(true, element, context, roundEnv);
+    }
+    private CommandSpec buildCommand(boolean reuseExisting, Element element, final Context context, final RoundEnvironment roundEnv) {
         debugElement(element, "@Command");
 
-        CommandSpec result = context.commands.get(element);
-        if (result != null) {
-            return result;
+        CommandSpec result = null;
+        if (reuseExisting) { // #1440 subcommands should create separate instances
+            result = context.commands.get(element);
+            if (result != null) {
+                return result;
+            }
         }
         result = CommandSpec.wrapWithoutInspection(element);
         result.interpolateVariables(false);
@@ -387,7 +393,7 @@ private void registerSubcommands(List<AnnotationValue> typeMirrors,
             logger.fine("Processing subcommand: " + subcommandElement);
 
             if (isValidSubcommandHasNameAttribute(subcommandElement)) {
-                CommandSpec commandSpec = buildCommand(subcommandElement, context, roundEnv);
+                CommandSpec commandSpec = buildCommand(false, subcommandElement, context, roundEnv);
                 result.add(commandSpec);
             }
         }