[#1151] Fix reflect-config generator to include options from compiled…

… sources
remkop · Aug 25, 2020 · c6e19b4 · c6e19b4
1 parent 5f35c3b
commit c6e19b4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -24,6 +24,7 @@ Picocli follows [semantic versioning](http://semver.org/).
 
 
 ## <a name="4.5.1-fixes"></a> Fixed issues
+* [#1151] Bugfix: `ManPageGenerator` as subcommand with native-image throws exception. Thanks to [Sebastian Hoß](https:/sebhoss) for reporting this.
 * [#1152] Bugfix: Gradle build fail when using picocli 4.4.0 or 4.5.0: Gradle Module Metadata for picocli 4.4.0+ missing from Maven Central. Thanks to [Frank Pavageau](https:/fpavageau) for reporting this.
 * [#1150] Bugfix: Fix terminal width detection on macOS. Thanks to [David Phillips](https:/electrum) for the pull request.
 * [#1142] DOC: Update Kotlin GraalVM native image example - Update native image gradle plugin. Now supports jdk 11. Thanks to [OndrejMalek](https:/OndrejMalek) for the pull request.

diff --git a/...ion-processing-tests/src/test/java/picocli/annotation/processing/tests/Issue1151Test.java b/...ion-processing-tests/src/test/java/picocli/annotation/processing/tests/Issue1151Test.java
@@ -29,7 +29,6 @@ public void testIssue1151() {
  }
 
 
- @Ignore("Requires fix for https:/remkop/picocli/issues/1151")
  @Test
  public void testGenerateReflectConfigIssue1151() {
  NativeImageConfigGeneratorProcessor processor = new NativeImageConfigGeneratorProcessor();

diff --git a/...gen/src/main/java/picocli/codegen/annotation/processing/AbstractCommandSpecProcessor.java b/...gen/src/main/java/picocli/codegen/annotation/processing/AbstractCommandSpecProcessor.java
@@ -242,12 +242,18 @@ private CommandSpec buildCommand(Element element, final Context context, final R
  @Override
  public Void visitType(TypeElement e, CommandSpec commandSpec) {
  updateCommandSpecFromTypeElement(e, context, commandSpec, roundEnv);
+
+ List<? extends Element> enclosedElements = e.getEnclosedElements();
+ processEnclosedElements(context, roundEnv, enclosedElements);
  return null;
  }
 
  @Override
  public Void visitExecutable(ExecutableElement e, CommandSpec commandSpec) {
  updateCommandFromMethodElement(e, context, commandSpec, roundEnv);
+
+ List<? extends Element> enclosedElements = e.getEnclosedElements();
+ processEnclosedElements(context, roundEnv, enclosedElements);
  return null;
  }
  }, result);
@@ -382,9 +388,6 @@ private void registerSubcommands(List<AnnotationValue> typeMirrors,
  if (isValidSubcommandHasNameAttribute(subcommandElement)) {
  CommandSpec commandSpec = buildCommand(subcommandElement, context, roundEnv);
  result.add(commandSpec);
-
- List<? extends Element> enclosedElements = subcommandElement.getEnclosedElements();
- processEnclosedElements(context, roundEnv, enclosedElements);
  }
  }
  }

diff --git a/picocli-codegen/src/main/java/picocli/codegen/aot/graalvm/ReflectionConfigGenerator.java b/picocli-codegen/src/main/java/picocli/codegen/aot/graalvm/ReflectionConfigGenerator.java
@@ -187,6 +187,7 @@ static final class Visitor {
  List.class.getName(),
  Set.class.getName(),
  Map.class.getName(),
+ Class.class.getName(), Class[].class.getName(), Class[].class.getCanonicalName(), "java.lang.Class<?>", "java.lang.Class<?>[]",
  "java.lang.reflect.Executable", // addMethod("getParameters")
  "java.lang.reflect.Parameter", // addMethod("getName");
  "org.fusesource.jansi.AnsiConsole", // addField("out", false);