Skip to content

Commit

Permalink
[#841] refactor ReflectionConfigGenerator to allow reuse by similar J…
Browse files Browse the repository at this point in the history 
…SON config generators
  • Loading branch information
@remkop
remkop committed Oct 20, 2019
1 parent b234f55 commit a26f473
Showing 1 changed file with 23 additions and 14 deletions.
37 changes: 23 additions & 14 deletions picocli-codegen/src/main/java/picocli/codegen/aot/graalvm/ReflectionConfigGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ public class ReflectionConfigGenerator {
"The generated JSON file can be passed to the -H:ReflectionConfigurationFiles=/path/to/reflect-config.json " +
"option of the `native-image` GraalVM utility.",
"See https://github.com/oracle/graal/blob/master/substratevm/REFLECTION.md"},
mixinStandardHelpOptions = true, version = "picocli-codegen gen-reflect-config " + CommandLine.VERSION)
mixinStandardHelpOptions = true,
version = "picocli-codegen ${COMMAND-NAME} " + CommandLine.VERSION)
private static class App implements Callable<Integer> {

@Parameters(arity = "1..*", description = "One or more classes to generate a GraalVM ReflectionConfiguration for.")
Expand Down Expand Up @@ -195,7 +196,7 @@ void visitCommandSpec(CommandSpec spec) throws Exception {
if (userObject instanceof Method) {
Method method = (Method) spec.userObject();
ReflectedClass cls = getOrCreateClass(method.getDeclaringClass());
cls.addMethod(method.getName(), method.getParameterTypes());
cls.addMethod(method);
} else if (userObject instanceof Element) {
visitElement((Element) userObject);
} else if (Proxy.isProxyClass(spec.userObject().getClass())) {
Expand Down Expand Up @@ -323,25 +324,21 @@ private void visitAnnotatedFields(Class<?> cls) {
Field[] declaredFields = cls.getDeclaredFields();
for (Field f : declaredFields) {
if (f.isAnnotationPresent(CommandLine.Spec.class)) {
reflectedClass.addField(f.getName(), isFinal(f));
reflectedClass.addField(f);
}
if (f.isAnnotationPresent(CommandLine.ParentCommand.class)) {
reflectedClass.addField(f.getName(), isFinal(f));
reflectedClass.addField(f);
}
if (f.isAnnotationPresent(Mixin.class)) {
reflectedClass.addField(f.getName(), isFinal(f));
reflectedClass.addField(f);
}
if (f.isAnnotationPresent(CommandLine.Unmatched.class)) {
reflectedClass.addField(f.getName(), isFinal(f));
reflectedClass.addField(f);
}
}
visitAnnotatedFields(cls.getSuperclass());
}

private boolean isFinal(Field f) {
return (f.getModifiers() & Modifier.FINAL) == Modifier.FINAL;
}

private void visitArgSpec(ArgSpec argSpec) throws Exception {
visitGetter(argSpec.getter());
visitSetter(argSpec.setter());
Expand Down Expand Up @@ -430,7 +427,7 @@ private void visitSetter(ISetter setter) throws Exception {
private void visitFieldBinding(Object fieldBinding) throws Exception {
Field field = (Field) accessibleField(fieldBinding.getClass(), REFLECTED_FIELD_BINDING_FIELD).get(fieldBinding);
getOrCreateClass(field.getDeclaringClass())
.addField(field.getName(), isFinal(field));
.addField(field);

IScope scope = (IScope) accessibleField(fieldBinding.getClass(), REFLECTED_BINDING_FIELD_SCOPE).get(fieldBinding);
Object scopeValue = scope.get();
Expand All @@ -442,22 +439,22 @@ private void visitFieldBinding(Object fieldBinding) throws Exception {
private void visitMethodBinding(Object methodBinding) throws Exception {
Method method = (Method) accessibleField(methodBinding.getClass(), REFLECTED_METHOD_BINDING_METHOD).get(methodBinding);
ReflectedClass cls = getOrCreateClass(method.getDeclaringClass());
cls.addMethod(method.getName(), method.getParameterTypes());
cls.addMethod(method);

IScope scope = (IScope) accessibleField(methodBinding.getClass(), REFLECTED_BINDING_FIELD_SCOPE).get(methodBinding);
Object scopeValue = scope.get();
if (scopeValue != null) {
ReflectedClass scopeClass = getOrCreateClass(scopeValue.getClass());
if (!scope.getClass().equals(method.getDeclaringClass())) {
scopeClass.addMethod(method.getName(), method.getParameterTypes());
scopeClass.addMethod(method);
}
}
}

private void visitProxyMethodBinding(Object methodBinding) throws Exception {
Method method = (Method) accessibleField(methodBinding.getClass(), REFLECTED_METHOD_BINDING_METHOD).get(methodBinding);
ReflectedClass cls = getOrCreateClass(method.getDeclaringClass());
cls.addMethod(method.getName(), method.getParameterTypes());
cls.addMethod(method);
}

private static Field accessibleField(Class<?> cls, String fieldName) throws NoSuchFieldException {
Expand Down Expand Up @@ -504,6 +501,14 @@ static class ReflectedClass {
this.name = name;
}

private boolean isFinal(Field f) {
return (f.getModifiers() & Modifier.FINAL) == Modifier.FINAL;
}

ReflectedClass addField(Field field) {
return addField(field.getName(), isFinal(field));
}

ReflectedClass addField(String fieldName, boolean isFinal) {
fields.add(new ReflectedField(fieldName, isFinal));
return this;
Expand All @@ -514,6 +519,10 @@ ReflectedClass addMethod0(String methodName, String... paramTypes) {
return this;
}

ReflectedClass addMethod(Method method) {
return addMethod(method.getName(), method.getParameterTypes());
}

ReflectedClass addMethod(String methodName, Class... paramClasses) {
String[] paramTypes = new String[paramClasses.length];
for (int i = 0; i < paramClasses.length; i++) {
Expand Down

0 comments on commit a26f473

Please sign in to comment.