New API, within new metadata package.

Author: kimeta

sdk/src/org.graalvm.nativeimage/snapshot.sigtest

@@ -1004,10 +1004,10 @@ meth public abstract java.nio.file.Path getImagePath()
 CLSS public abstract interface static org.graalvm.nativeimage.hosted.Feature$AfterRegistrationAccess
  outer org.graalvm.nativeimage.hosted.Feature
 intf org.graalvm.nativeimage.hosted.Feature$FeatureAccess
-meth public abstract org.graalvm.nativeimage.hosted.RuntimeJNIAccess getRuntimeJNIAccess()
-meth public abstract org.graalvm.nativeimage.hosted.RuntimeReflection getRuntimeReflection()
-meth public abstract org.graalvm.nativeimage.hosted.RuntimeResourceAccess getRuntimeResourceAccess()
-meth public abstract org.graalvm.nativeimage.hosted.RuntimeForeignAccess getRuntimeForeignAccess()
+meth public abstract org.graalvm.nativeimage.metadata.JNIAccess getJNIAccess()
+meth public abstract org.graalvm.nativeimage.metadata.ReflectionAccess getReflectionAccess()
+meth public abstract org.graalvm.nativeimage.metadata.ResourceAccess getResourceAccess()
+meth public abstract org.graalvm.nativeimage.metadata.ForeignAccess getForeignAccess()
 
 CLSS public abstract interface static org.graalvm.nativeimage.hosted.Feature$BeforeAnalysisAccess
  outer org.graalvm.nativeimage.hosted.Feature
@@ -1097,34 +1097,23 @@ meth public !varargs static void initializeAtRunTime(java.lang.Class<?>[])
 meth public !varargs static void initializeAtRunTime(java.lang.String[])
 supr java.lang.Object
 
-CLSS public abstract interface org.graalvm.nativeimage.hosted.RuntimeForeignAccess
+CLSS public final org.graalvm.nativeimage.hosted.RuntimeForeignAccess
 meth public !varargs static void registerForDirectUpcall(java.lang.invoke.MethodHandle,java.lang.Object,java.lang.Object[])
 meth public !varargs static void registerForDowncall(java.lang.Object,java.lang.Object[])
 meth public !varargs static void registerForUpcall(java.lang.Object,java.lang.Object[])
-meth public !varargs abstract void registerForDirectUpcall(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.invoke.MethodHandle,java.lang.Object,java.lang.Object[])
-meth public !varargs abstract void registerForDowncall(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.Object,java.lang.Object[])
-meth public !varargs abstract void registerForUpcall(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.Object,java.lang.Object[])
+supr java.lang.Object
 
-CLSS public abstract interface org.graalvm.nativeimage.hosted.RuntimeJNIAccess
-meth public !varargs abstract void register(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.Class<?>[])
-meth public !varargs abstract void register(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.reflect.Executable[])
-meth public !varargs abstract void register(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.reflect.Field[])
+CLSS public final org.graalvm.nativeimage.hosted.RuntimeJNIAccess
 meth public !varargs static void register(java.lang.Class<?>[])
 meth public !varargs static void register(java.lang.reflect.Executable[])
 meth public !varargs static void register(java.lang.reflect.Field[])
+supr java.lang.Object
 
 CLSS public final org.graalvm.nativeimage.hosted.RuntimeProxyCreation
 meth public !varargs static void register(java.lang.Class<?>[])
 supr java.lang.Object
 
-CLSS public abstract interface org.graalvm.nativeimage.hosted.RuntimeReflection
-meth public !varargs abstract void register(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.Class<?>[])
-meth public abstract void registerClassLookup(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.String)
-meth public !varargs abstract void registerUnsafeAllocation(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.Class<?>[])
-meth public !varargs abstract void register(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.reflect.Executable[])
-meth public !varargs abstract void register(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.reflect.Field[])
-meth public !varargs abstract void registerForSerialization(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.Class<?>[])
-meth public !varargs abstract java.lang.Class<?> registerProxy(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.Class<?>[])
+CLSS public final org.graalvm.nativeimage.hosted.RuntimeReflection
 meth public !varargs static void register(boolean,boolean,java.lang.reflect.Field[])
  anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="21.1")
 meth public !varargs static void register(boolean,java.lang.reflect.Field[])
@@ -1150,16 +1139,40 @@ meth public static void registerAllRecordComponents(java.lang.Class<?>)
 meth public static void registerAllSigners(java.lang.Class<?>)
 meth public static void registerClassLookup(java.lang.String)
 meth public static void registerFieldLookup(java.lang.Class<?>,java.lang.String)
+supr java.lang.Object
 
-CLSS public abstract interface org.graalvm.nativeimage.hosted.RuntimeResourceAccess
-meth public abstract void register(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.Module,java.lang.String)
-meth public void register(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.String)
-meth public abstract void registerResourceBundle(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.Module,java.lang.String)
-meth public void registerResourceBundle(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.String)
+CLSS public final org.graalvm.nativeimage.hosted.RuntimeResourceAccess
 meth public static void addResource(java.lang.Module,java.lang.String)
 meth public static void addResource(java.lang.Module,java.lang.String,byte[])
 meth public static void addResourceBundle(java.lang.Module,java.lang.String)
 meth public static void addResourceBundle(java.lang.Module,java.lang.String,java.util.Locale[])
+supr java.lang.Object
+
+CLSS public abstract interface org.graalvm.nativeimage.metadata.ReflectionAccess
+meth public !varargs abstract void register(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.Class<?>[])
+meth public abstract void registerClassLookup(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.String)
+meth public !varargs abstract void registerUnsafeAllocation(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.Class<?>[])
+meth public !varargs abstract void register(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.reflect.Executable[])
+meth public !varargs abstract void register(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.reflect.Field[])
+meth public !varargs abstract void registerForSerialization(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.Class<?>[])
+meth public !varargs abstract java.lang.Class<?> registerProxy(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.Class<?>[])
+
+CLSS public abstract interface org.graalvm.nativeimage.metadata.ResourceAccess
+meth public abstract void register(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.Module,java.lang.String)
+meth public void register(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.String)
+meth public abstract void registerResourceBundle(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.Module,java.lang.String)
+meth public void registerResourceBundle(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.String)
+
+CLSS public abstract interface org.graalvm.nativeimage.metadata.JNIAccess
+meth public !varargs abstract void register(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.Class<?>[])
+meth public !varargs abstract void register(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.reflect.Executable[])
+meth public !varargs abstract void register(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.reflect.Field[])
+
+CLSS public abstract interface org.graalvm.nativeimage.metadata.ForeignAccess
+meth public !varargs abstract void registerForDirectUpcall(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.invoke.MethodHandle,java.lang.Object,java.lang.Object[])
+meth public !varargs abstract void registerForDowncall(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.Object,java.lang.Object[])
+meth public !varargs abstract void registerForUpcall(org.graalvm.nativeimage.hosted.RegistrationCondition,java.lang.Object,java.lang.Object[])
+
 
 CLSS public final org.graalvm.nativeimage.hosted.RuntimeSerialization
 meth public !varargs static void register(java.lang.Class<?>[])

sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/Feature.java

@@ -54,6 +54,10 @@
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
+import org.graalvm.nativeimage.metadata.ResourceAccess;
+import org.graalvm.nativeimage.metadata.ReflectionAccess;
+import org.graalvm.nativeimage.metadata.JNIAccess;
+import org.graalvm.nativeimage.metadata.ForeignAccess;
 
 /**
  * Features allow clients to intercept the native image generation and run custom initialization
@@ -177,26 +181,26 @@ interface AfterRegistrationAccess extends FeatureAccess {
          * reflection at runtime. All registrations should happen in
          * {@link Feature#afterRegistration}.
          */
-        RuntimeReflection getRuntimeReflection();
+        ReflectionAccess getReflectionAccess();
 
         /**
          * Returns the instance of {@link RuntimeResourceAccess} used to register resources for
          * runtime access. All registrations should happen in {@link Feature#afterRegistration}.
          */
-        RuntimeResourceAccess getRuntimeResourceAccess();
+        ResourceAccess getResourceAccess();
 
         /**
          * Returns the instance of {@link RuntimeJNIAccess} used to register elements for JNI access
          * at runtime. All registrations should happen in {@link Feature#afterRegistration}.
          */
-        RuntimeJNIAccess getRuntimeJNIAccess();
+        JNIAccess getJNIAccess();
 
         /**
          * Returns the instance of {@link RuntimeForeignAccess} used to register elements for
          * foreign access at runtime. All registrations should happen in
          * {@link Feature#afterRegistration}.
          */
-        RuntimeForeignAccess getRuntimeForeignAccess();
+        ForeignAccess getForeignAccess();
     }
 
     /**

sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RegistrationCondition.java

@@ -41,19 +41,22 @@
 package org.graalvm.nativeimage.hosted;
 
 import org.graalvm.nativeimage.impl.TypeReachabilityCondition;
+import org.graalvm.nativeimage.metadata.ForeignAccess;
+import org.graalvm.nativeimage.metadata.JNIAccess;
+import org.graalvm.nativeimage.metadata.ReflectionAccess;
+import org.graalvm.nativeimage.metadata.ResourceAccess;
 
 /**
- * A condition that must be satisfied to include elements for dynamic access (e.g., reflection,
+ * A condition that must be satisfied to register elements for dynamic access (e.g., reflection,
  * serialization, JNI access, resource access, and foreign access at runtime).
- * {@link RegistrationCondition} is used in conjunction with:
+ * {@link RegistrationCondition} is used for programmatic metadata registration in conjunction with:
  * <ul>
- * <li>{@link RuntimeReflection}</li>
- * <li>{@link RuntimeResourceAccess}</li>
- * <li>{@link RuntimeJNIAccess}</li>
- * <li>{@link RuntimeForeignAccess}</li>
+ * <li>{@link ReflectionAccess}</li>
+ * <li>{@link ResourceAccess}</li>
+ * <li>{@link JNIAccess}</li>
+ * <li>{@link ForeignAccess}</li>
  * </ul>
- * to programmatically register metadata. Conditions prevent unnecessary growth of the native binary
- * size.
+ * Conditions prevent unnecessary growth of the native binary size.
  * <p>
  * There are currently two types of conditions:
  * <ul>

sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeForeignAccess.java

@@ -49,74 +49,7 @@
 import org.graalvm.nativeimage.impl.RuntimeForeignAccessSupport;
 
 @Platforms(Platform.HOSTED_ONLY.class)
-public interface RuntimeForeignAccess {
-
-    /**
-     * Registers the provided function descriptor and options pair at image build time for downcalls
-     * into foreign code, if the {@code condition} is satisfied. Required to get a downcall method
-     * handle using {@link java.lang.foreign.Linker#downcallHandle} for the same descriptor and
-     * options at runtime.
-     * <p>
-     * Even though this method is weakly typed for compatibility reasons, runtime checks will be
-     * performed to ensure that the arguments have the expected type. It will be deprecated in favor
-     * of strongly typed variant as soon as possible.
-     *
-     * @param condition represents the condition that needs to be satisfied in order to register
-     *            target resources.
-     * @param desc A {@link java.lang.foreign.FunctionDescriptor} to register for downcalls.
-     * @param options An array of {@link java.lang.foreign.Linker.Option} used for the downcalls.
-     *
-     * @since 23.1
-     */
-    void registerForDowncall(RegistrationCondition condition, Object desc, Object... options);
-
-    /**
-     * Registers the provided function descriptor and options pair at image build time for upcalls
-     * from foreign code, if the {@code condition} is satisfied. Required to get an upcall stub
-     * function pointer using {@link java.lang.foreign.Linker#upcallStub} for the same descriptor
-     * and options at runtime.
-     * <p>
-     * Even though this method is weakly typed for compatibility reasons, runtime checks will be
-     * performed to ensure that the arguments have the expected type. It will be deprecated in favor
-     * of strongly typed variant as soon as possible.
-     *
-     * @param condition represents the condition that needs to be satisfied in order to register
-     *            target resources.
-     * @param desc A {@link java.lang.foreign.FunctionDescriptor} to register for upcalls.
-     * @param options An array of {@link java.lang.foreign.Linker.Option} used for the upcalls.
-     *
-     * @since 24.1
-     */
-    void registerForUpcall(RegistrationCondition condition, Object desc, Object... options);
-
-    /**
-     * Registers a specific static method (denoted by a method handle) as a fast upcall target, if
-     * the {@code condition} is satisfied. This will create a specialized upcall stub that will
-     * invoke only the specified method, which is much faster than using
-     * {@link #registerForUpcall(Object, Object...)}).
-     * <p>
-     * The provided method handle must be a direct method handle. Those are most commonly created
-     * using {@link java.lang.invoke.MethodHandles.Lookup#findStatic(Class, String, MethodType)}.
-     * However, a strict requirement is that it must be possible to create a non-empty descriptor
-     * for the method handle using {@link MethodHandle#describeConstable()}. The denoted static
-     * method will also be registered for reflective access since run-time code will also create a
-     * method handle to denoted static method.
-     * </p>
-     * <p>
-     * Even though this method is weakly typed for compatibility reasons, runtime checks will be
-     * performed to ensure that the arguments have the expected type. It will be deprecated in favor
-     * of strongly typed variant as soon as possible.
-     * </p>
-     * 
-     * @param condition represents the condition that needs to be satisfied in order to register
-     *            target resources.
-     * @param target A direct method handle denoting a static method.
-     * @param desc A {@link java.lang.foreign.FunctionDescriptor} to register for upcalls.
-     * @param options An array of {@link java.lang.foreign.Linker.Option} used for the upcalls.
-     *
-     * @since 24.2
-     */
-    void registerForDirectUpcall(RegistrationCondition condition, MethodHandle target, Object desc, Object... options);
+public final class RuntimeForeignAccess {
 
     /**
      * Registers the provided function descriptor and options pair at image build time for downcalls
@@ -127,13 +60,15 @@ public interface RuntimeForeignAccess {
      * Even though this method is weakly typed for compatibility reasons, runtime checks will be
      * performed to ensure that the arguments have the expected type. It will be deprecated in favor
      * of strongly typed variant as soon as possible.
+     * <p>
+     * This API is deprecated; use {@link org.graalvm.nativeimage.metadata.ForeignAccess} instead.
      *
      * @param desc A {@link java.lang.foreign.FunctionDescriptor} to register for downcalls.
      * @param options An array of {@link java.lang.foreign.Linker.Option} used for the downcalls.
      *
      * @since 23.1
      */
-    static void registerForDowncall(Object desc, Object... options) {
+    public static void registerForDowncall(Object desc, Object... options) {
         ImageSingletons.lookup(RuntimeForeignAccessSupport.class).registerForDowncall(RegistrationCondition.always(), desc, options);
     }
 
@@ -145,13 +80,15 @@ static void registerForDowncall(Object desc, Object... options) {
      * Even though this method is weakly typed for compatibility reasons, runtime checks will be
      * performed to ensure that the arguments have the expected type. It will be deprecated in favor
      * of strongly typed variant as soon as possible.
+     * <p>
+     * This API is deprecated; use {@link org.graalvm.nativeimage.metadata.ForeignAccess} instead.
      *
      * @param desc A {@link java.lang.foreign.FunctionDescriptor} to register for upcalls.
      * @param options An array of {@link java.lang.foreign.Linker.Option} used for the upcalls.
      *
      * @since 24.1
      */
-    static void registerForUpcall(Object desc, Object... options) {
+    public static void registerForUpcall(Object desc, Object... options) {
         ImageSingletons.lookup(RuntimeForeignAccessSupport.class).registerForUpcall(RegistrationCondition.always(), desc, options);
     }
 
@@ -172,14 +109,19 @@ static void registerForUpcall(Object desc, Object... options) {
      * performed to ensure that the arguments have the expected type. It will be deprecated in favor
      * of strongly typed variant as soon as possible.
      * </p>
+     * <p>
+     * This API is deprecated; use {@link org.graalvm.nativeimage.metadata.ForeignAccess} instead.
      *
      * @param target A direct method handle denoting a static method.
      * @param desc A {@link java.lang.foreign.FunctionDescriptor} to register for upcalls.
      * @param options An array of {@link java.lang.foreign.Linker.Option} used for the upcalls.
      *
      * @since 24.2
      */
-    static void registerForDirectUpcall(MethodHandle target, Object desc, Object... options) {
+    public static void registerForDirectUpcall(MethodHandle target, Object desc, Object... options) {
         ImageSingletons.lookup(RuntimeForeignAccessSupport.class).registerForDirectUpcall(RegistrationCondition.always(), target, desc, options);
     }
+
+    private RuntimeForeignAccess() {
+    }
 }