Remove usage of GuardedAnnotationAccess. Initialize enum used in an annotation at build time

Aleksandar Gradinac · Aleksandar Gradinac · commit a6bba3cd45ad · 2022-06-28T13:19:03.000+02:00
diff --git a/common/junit-platform-native/src/main/java/org/graalvm/junit/platform/config/jupiter/JupiterConfigProvider.java b/common/junit-platform-native/src/main/java/org/graalvm/junit/platform/config/jupiter/JupiterConfigProvider.java
@@ -79,7 +79,8 @@ public void onLoad(NativeImageConfiguration config) {
                 "org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor",
                 "org.junit.jupiter.engine.descriptor.TestTemplateTestDescriptor",
                 "org.junit.jupiter.engine.execution.ConditionEvaluator",
-                "org.junit.jupiter.engine.execution.ExecutableInvoker"
+                "org.junit.jupiter.engine.execution.ExecutableInvoker",
+                "org.junit.jupiter.params.provider.EnumSource$Mode",
         };
         for (String className : buildTimeInitializedClasses) {
             config.initializeAtBuildTime(className);
diff --git a/common/junit-platform-native/src/main/java/org/graalvm/junit/platform/config/util/AnnotationUtils.java b/common/junit-platform-native/src/main/java/org/graalvm/junit/platform/config/util/AnnotationUtils.java
@@ -42,7 +42,6 @@
 package org.graalvm.junit.platform.config.util;
 
 import org.graalvm.junit.platform.config.core.NativeImageConfiguration;
-import org.graalvm.util.GuardedAnnotationAccess;
 import org.junit.platform.commons.support.AnnotationSupport;
 
 import java.lang.annotation.Annotation;
@@ -96,7 +95,7 @@ private static void forEachMethod(Class<?> clazz, Consumer<Method> consumer) {
     }
 
     private static <A extends Annotation> List<A> getAnnotations(AnnotatedElement element, Class<A> annotation) {
-        if (GuardedAnnotationAccess.getAnnotation(annotation, Repeatable.class) != null) {
+        if (annotation.getAnnotation(Repeatable.class) != null) {
             return AnnotationSupport.findRepeatableAnnotations(element, annotation);
         } else {
             Optional<A> optionalAnnotation = AnnotationSupport.findAnnotation(element, annotation);
