Extract annottaion element fetching into a separate method

Author: dnestoro

common/junit-platform-native/src/main/java/org/graalvm/junit/platform/config/core/PluginConfigProvider.java

@@ -41,6 +41,9 @@
 
 package org.graalvm.junit.platform.config.core;
 
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+
 public abstract class PluginConfigProvider {
 
     protected ClassLoader applicationClassLoader;
@@ -55,4 +58,21 @@ public final void initialize(ClassLoader classLoader, NativeImageConfiguration n
         applicationClassLoader = classLoader;
         nativeImageConfigImpl = nic;
     }
+
+    @SuppressWarnings("unchecked")
+    protected final <T> T getAnnotationElementValue(Class<?> annotatedClass, String annotationName, String annotationElementName) {
+        try {
+            Class<Annotation> annotation = (Class<Annotation>) applicationClassLoader.loadClass(annotationName);
+            Method classProvider = annotation.getDeclaredMethod(annotationElementName);
+
+            Annotation classAnnotation = annotatedClass.getAnnotation(annotation);
+            if (classAnnotation != null) {
+                return (T) classProvider.invoke(classAnnotation);
+            }
+        } catch (ReflectiveOperationException e) {
+            // intentionally ignored
+        }
+
+        return null;
+    }
 }

common/junit-platform-native/src/main/java/org/graalvm/junit/platform/config/vintage/VintageConfigProvider.java

@@ -46,9 +46,6 @@
 import org.graalvm.nativeimage.hosted.RuntimeReflection;
 import org.graalvm.nativeimage.hosted.RuntimeSerialization;
 
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-
 public class VintageConfigProvider extends PluginConfigProvider {
 
     @Override
@@ -63,23 +60,14 @@ public void onLoad(NativeImageConfiguration config) {
 
     @Override
     public void onTestClassRegistered(Class<?> testClass, NativeImageConfiguration registry) {
-        registerAnnotationClassesForReflection("org.junit.runner.RunWith", "value", testClass);
-        registerAnnotationClassesForReflection("org.junit.runners.Parameterized.UseParametersRunnerFactory", "value", testClass);
+        registerAnnotationClassesForReflection(testClass, "org.junit.runner.RunWith", "value");
+        registerAnnotationClassesForReflection(testClass, "org.junit.runners.Parameterized.UseParametersRunnerFactory", "value");
     }
 
-    @SuppressWarnings("unchecked")
-    private void registerAnnotationClassesForReflection(String annotationClass, String classProviderMethod, Class<?> testClass) {
-        try {
-            Class<Annotation> annotation = (Class<Annotation>) applicationClassLoader.loadClass(annotationClass);
-            Method classProvider = annotation.getDeclaredMethod(classProviderMethod);
-
-            Annotation classAnnotation = testClass.getAnnotation(annotation);
-            if (classAnnotation != null) {
-                Class<?> annotationArgument = (Class<?>) classProvider.invoke(classAnnotation);
-                nativeImageConfigImpl.registerAllClassMembersForReflection(annotationArgument);
-            }
-        } catch (ReflectiveOperationException e) {
-             // intentionally ignored
+    private void registerAnnotationClassesForReflection(Class<?> testClass, String annotationName, String annotationElementName) {
+        Class<?> annotationArgument = getAnnotationElementValue(testClass, annotationName, annotationElementName);
+        if (annotationArgument != null) {
+            nativeImageConfigImpl.registerAllClassMembersForReflection(annotationArgument);
         }
     }
 }