Merge pull request #27687 from zakkak/avoid-graalvm-internal-lookupme…

…thod Use own lookupMethod to avoid dependency on internal GraalVM API
quarkusio · Sep 5, 2022 · dc9e119 · dc9e119
2 parents 7f6a45b + 44b77de
commit dc9e119
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageFeatureStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageFeatureStep.java
@@ -15,7 +15,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.graalvm.home.Version;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.Feature;
 import org.graalvm.nativeimage.hosted.RuntimeClassInitialization;
@@ -50,6 +49,7 @@
 import io.quarkus.gizmo.MethodDescriptor;
 import io.quarkus.gizmo.ResultHandle;
 import io.quarkus.gizmo.TryBlock;
+import io.quarkus.runtime.ReflectionUtil;
 import io.quarkus.runtime.ResourceHelper;
 import io.quarkus.runtime.graal.ResourcesFeature;
 import io.quarkus.runtime.graal.WeakReflection;
@@ -82,7 +82,7 @@ public class NativeImageFeatureStep {
             String.class);
 
     private static final MethodDescriptor LOOKUP_METHOD = ofMethod(
-            "com.oracle.svm.util.ReflectionUtil",
+            ReflectionUtil.class,
             "lookupMethod", Method.class, Class.class, String.class, Class[].class);
     private static final MethodDescriptor FOR_NAME = ofMethod(
             Class.class, "forName", Class.class, String.class, boolean.class, ClassLoader.class);
@@ -282,8 +282,8 @@ public void write(String s, byte[] bytes) {
 
         /* Resource includes and excludes */
         if (!resourcePatterns.isEmpty()) {
-            // Needed to access LOOKUP_METHOD
-            exports.produce(new JPMSExportBuildItem("org.graalvm.nativeimage.base", "com.oracle.svm.util",
+            // Needed to access com.oracle.svm.core.configure.ResourcesRegistry.*
+            exports.produce(new JPMSExportBuildItem("org.graalvm.nativeimage.builder", "com.oracle.svm.core.configure",
                     GraalVM.Version.VERSION_22_1_0));
 
             ResultHandle resourcesRegistrySingleton = overallCatch.invokeStaticMethod(IMAGE_SINGLETONS_LOOKUP,
@@ -506,9 +506,6 @@ public void write(String s, byte[] bytes) {
 
             if (entry.getValue().serialization) {
                 if (registerSerializationMethod == null) {
-                    // Needed by createRegisterSerializationForClassMethod to access LOOKUP_METHOD
-                    exports.produce(new JPMSExportBuildItem("org.graalvm.nativeimage.base", "com.oracle.svm.util",
-                            GraalVM.Version.VERSION_22_1_0));
                     registerSerializationMethod = createRegisterSerializationForClassMethod(file);
                 }
 

diff --git a/core/runtime/src/main/java/io/quarkus/runtime/ReflectionUtil.java b/core/runtime/src/main/java/io/quarkus/runtime/ReflectionUtil.java
@@ -0,0 +1,13 @@
+package io.quarkus.runtime;
+
+import java.lang.reflect.Method;
+
+public class ReflectionUtil {
+
+    public static Method lookupMethod(Class<?> declaringClass, String methodName, Class<?>... parameterTypes)
+            throws NoSuchMethodException {
+        Method result = declaringClass.getDeclaredMethod(methodName, parameterTypes);
+        result.setAccessible(true);
+        return result;
+    }
+}