From efe6a8313e4ef9c16dc542c8d5588237ddd31085 Mon Sep 17 00:00:00 2001 From: mihailo Date: Mon, 24 Feb 2025 18:22:47 +0100 Subject: [PATCH] Introduced public API for registration conditions. ConfigurationCondition is divided into RegistrationCondition(API) and TypeReachabilityCondition(implementation). Replaced all usages of ConfigurationCondition. --- .../org.graalvm.nativeimage/snapshot.sigtest | 4 + .../hosted/RegistrationCondition.java | 135 ++++++++++++++++++ .../hosted/RuntimeForeignAccess.java | 9 +- .../nativeimage/hosted/RuntimeJNIAccess.java | 9 +- .../hosted/RuntimeProxyCreation.java | 5 +- .../nativeimage/hosted/RuntimeReflection.java | 41 +++--- .../hosted/RuntimeResourceAccess.java | 9 +- .../hosted/RuntimeSerialization.java | 13 +- .../nativeimage/impl/ReflectionRegistry.java | 20 +-- .../impl/RuntimeForeignAccessSupport.java | 10 +- .../impl/RuntimeProxyCreationSupport.java | 6 +- .../impl/RuntimeReflectionSupport.java | 28 ++-- .../impl/RuntimeResourceSupport.java | 11 +- .../impl/RuntimeSerializationSupport.java | 5 +- ...on.java => TypeReachabilityCondition.java} | 66 +++------ .../config/ResourceConfigurationTest.java | 4 +- .../svm/configure/ResourcesRegistry.java | 4 +- .../UnresolvedConfigurationCondition.java | 4 +- .../config/ResourceConfiguration.java | 4 +- .../oracle/svm/core/ClassLoaderSupport.java | 6 +- .../core/configure/RuntimeConditionSet.java | 21 +-- .../svm/core/hub/ClassForNameSupport.java | 18 +-- .../svm/core/jdk/JavaNetHttpFeature.java | 4 +- .../com/oracle/svm/core/jdk/Resources.java | 4 +- .../jdk/localization/LocalizationSupport.java | 6 +- .../oracle/svm/core/jni/JNIRuntimeAccess.java | 4 +- .../reflect/proxy/DynamicProxySupport.java | 7 +- .../serialize/SerializationSupport.java | 6 +- .../ForeignFunctionsConfigurationParser.java | 8 +- .../foreign/ForeignFunctionsFeature.java | 8 +- ...onglyTypedRuntimeForeignAccessSupport.java | 24 ++-- .../svm/hosted/ClassLoaderSupportImpl.java | 8 +- .../ConditionalConfigurationRegistry.java | 23 +-- .../com/oracle/svm/hosted/FeatureImpl.java | 4 +- .../oracle/svm/hosted/ResourcesFeature.java | 39 ++--- .../config/ConfigurationParserUtils.java | 8 +- .../svm/hosted/config/JNIRegistryAdapter.java | 40 +++--- .../config/ReflectionRegistryAdapter.java | 48 +++---- .../svm/hosted/config/RegistryAdapter.java | 60 ++++---- .../hosted/image/PreserveOptionsSupport.java | 6 +- .../svm/hosted/jdk/JmxCommonFeature.java | 34 ++--- .../svm/hosted/jdk/JmxServerFeature.java | 14 +- .../jdk/localization/LocalizationFeature.java | 24 ++-- .../svm/hosted/jni/JNIAccessFeature.java | 22 +-- .../reflect/NativeImageConditionResolver.java | 16 ++- .../hosted/reflect/ReflectionDataBuilder.java | 83 ++++++----- .../svm/hosted/reflect/ReflectionFeature.java | 10 +- .../reflect/proxy/DynamicProxyFeature.java | 6 +- .../hosted/reflect/proxy/ProxyRegistry.java | 6 +- .../serialize/SerializationFeature.java | 56 ++++---- .../hosted/xml/XMLParsersRegistration.java | 34 ++--- .../hosted/webimage/JSEntryPointRegistry.java | 18 +-- .../svm/hosted/webimage/WebImageFeature.java | 6 +- .../WebImageRuntimeJNIAccessSupport.java | 16 +-- 54 files changed, 608 insertions(+), 476 deletions(-) create mode 100644 sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RegistrationCondition.java rename sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/{ConfigurationCondition.java => TypeReachabilityCondition.java} (62%) diff --git a/sdk/src/org.graalvm.nativeimage/snapshot.sigtest b/sdk/src/org.graalvm.nativeimage/snapshot.sigtest index 5c15c4d96208..a3ff9a39f1ec 100644 --- a/sdk/src/org.graalvm.nativeimage/snapshot.sigtest +++ b/sdk/src/org.graalvm.nativeimage/snapshot.sigtest @@ -1082,6 +1082,10 @@ CLSS public abstract interface org.graalvm.nativeimage.hosted.FieldValueTransfor meth public abstract java.lang.Object transform(java.lang.Object,java.lang.Object) meth public boolean isAvailable() +CLSS public abstract interface org.graalvm.nativeimage.hosted.RegistrationCondition +meth public static org.graalvm.nativeimage.hosted.RegistrationCondition always() +meth public static org.graalvm.nativeimage.hosted.RegistrationCondition typeReached(java.lang.Class) + CLSS public final org.graalvm.nativeimage.hosted.RuntimeClassInitialization meth public !varargs static void initializeAtBuildTime(java.lang.Class[]) meth public !varargs static void initializeAtBuildTime(java.lang.String[]) diff --git a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RegistrationCondition.java b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RegistrationCondition.java new file mode 100644 index 000000000000..c0781cc8d721 --- /dev/null +++ b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RegistrationCondition.java @@ -0,0 +1,135 @@ +/* + * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * The Universal Permissive License (UPL), Version 1.0 + * + * Subject to the condition set forth below, permission is hereby granted to any + * person obtaining a copy of this software, associated documentation and/or + * data (collectively the "Software"), free of charge and under any and all + * copyright rights in the Software, and any and all patent rights owned or + * freely licensable by each licensor hereunder covering either (i) the + * unmodified Software as contributed to or provided by such licensor, or (ii) + * the Larger Works (as defined below), to deal in both + * + * (a) the Software, and + * + * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if + * one is included with the Software each a "Larger Work" to which the Software + * is contributed by such licensors), + * + * without restriction, including without limitation the rights to copy, create + * derivative works of, display, perform, and distribute the Software and make, + * use, sell, offer for sale, import, export, have made, and have sold the + * Software and the Larger Work(s), and to sublicense the foregoing rights on + * either these or other terms. + * + * This license is subject to the following condition: + * + * The above copyright notice and either this complete permission notice or at a + * minimum a reference to the UPL must be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package org.graalvm.nativeimage.hosted; + +import org.graalvm.nativeimage.impl.TypeReachabilityCondition; + +/** + * A condition that must be satisfied to include elements for dynamic access (e.g., reflection, + * serialization, JNI access, resource access, and foreign access at runtime). + * {@link RegistrationCondition} is used in conjunction with: + * + * to programmatically register metadata. Conditions prevent unnecessary growth of the native binary + * size. + *

+ * There are currently two types of conditions: + *

+ *

+ * Conditions can be created via the {@link #always} and {@link #typeReached} factory methods. + * + * @since 25.0 + */ +public interface RegistrationCondition { + + /** + * Creates the condition that is always satisfied. Any metadata that is predicated with this + * condition will always be included. + * + * @return instance of the condition + * + * @since 25.0 + */ + static RegistrationCondition always() { + return TypeReachabilityCondition.JAVA_LANG_OBJECT_REACHED; + } + + /** + * Creates the {@code typeReached} condition that is satisfied when the type is reached at + * runtime. A type is reached at runtime, right before the class-initialization routine starts + * for that type, or any of the type's subtypes are reached. Metadata predicated with this + * condition is only included if the condition is satisfied. + *

+ * Example: + * + * 

{@code
+     * class SuperType {
+     *     static {
+     *         // ConditionType reached (subtype reached) => metadata is available
+     *     }
+     * }
+     * 
+     * class ConditionType extends SuperType {
+     *     static {
+     *         // ConditionType reached (before static initializer) => metadata is available
+     *     }
+     * 
+     *     static ConditionType singleton() {
+     *         // ConditionType reached (already initialized) => metadata is available
+     *     }
+     * }
+     * 
+     * public class App {
+     *     public static void main(String[] args) {
+     *         // ConditionType not reached => metadata is not available
+     *         Class clazz = ConditionType.class;
+     *         // ConditionType not reached (ConditionType.class doesn't start class initialization)
+     *         // => metadata is not available
+     *         ConditionType.singleton();
+     *         // ConditionType reached (already initialized) => metadata is available
+     *     }
+     * }
+     * }
+ *

+ * Type is also reached, if it is marked as {@code initialize-at-build-time} or any of its + * subtypes are marked as {@code initialize-at-build-time} and they exist on the classpath. + * Array types are never marked as reached and therefore cannot be used as the type in a + * condition. + * + * @param type the type that has to be reached for this condition to be satisfied, must not be + * {@code null} + * + * @return instance of the condition + * + * @since 25.0 + */ + static RegistrationCondition typeReached(Class type) { + return TypeReachabilityCondition.create(type, true); + } +} diff --git a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeForeignAccess.java b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeForeignAccess.java index 2b5aa887f6ce..887773256695 100644 --- a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeForeignAccess.java +++ b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeForeignAccess.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * The Universal Permissive License (UPL), Version 1.0 @@ -46,7 +46,6 @@ import org.graalvm.nativeimage.ImageSingletons; import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import org.graalvm.nativeimage.impl.ConfigurationCondition; import org.graalvm.nativeimage.impl.RuntimeForeignAccessSupport; @Platforms(Platform.HOSTED_ONLY.class) @@ -68,7 +67,7 @@ public final class RuntimeForeignAccess { * @since 23.1 */ public static void registerForDowncall(Object desc, Object... options) { - ImageSingletons.lookup(RuntimeForeignAccessSupport.class).registerForDowncall(ConfigurationCondition.alwaysTrue(), desc, options); + ImageSingletons.lookup(RuntimeForeignAccessSupport.class).registerForDowncall(RegistrationCondition.always(), desc, options); } /** @@ -86,7 +85,7 @@ public static void registerForDowncall(Object desc, Object... options) { * @since 24.1 */ public static void registerForUpcall(Object desc, Object... options) { - ImageSingletons.lookup(RuntimeForeignAccessSupport.class).registerForUpcall(ConfigurationCondition.alwaysTrue(), desc, options); + ImageSingletons.lookup(RuntimeForeignAccessSupport.class).registerForUpcall(RegistrationCondition.always(), desc, options); } /** @@ -114,7 +113,7 @@ public static void registerForUpcall(Object desc, Object... options) { * @since 24.2 */ public static void registerForDirectUpcall(MethodHandle target, Object desc, Object... options) { - ImageSingletons.lookup(RuntimeForeignAccessSupport.class).registerForDirectUpcall(ConfigurationCondition.alwaysTrue(), target, desc, options); + ImageSingletons.lookup(RuntimeForeignAccessSupport.class).registerForDirectUpcall(RegistrationCondition.always(), target, desc, options); } private RuntimeForeignAccess() { diff --git a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeJNIAccess.java b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeJNIAccess.java index e5c044517406..39043285e069 100644 --- a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeJNIAccess.java +++ b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeJNIAccess.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * The Universal Permissive License (UPL), Version 1.0 @@ -46,7 +46,6 @@ import org.graalvm.nativeimage.ImageSingletons; import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import org.graalvm.nativeimage.impl.ConfigurationCondition; import org.graalvm.nativeimage.impl.RuntimeJNIAccessSupport; /** @@ -66,7 +65,7 @@ public final class RuntimeJNIAccess { * @since 22.3 */ public static void register(Class... classes) { - ImageSingletons.lookup(RuntimeJNIAccessSupport.class).register(ConfigurationCondition.alwaysTrue(), classes); + ImageSingletons.lookup(RuntimeJNIAccessSupport.class).register(RegistrationCondition.always(), classes); } /** @@ -79,7 +78,7 @@ public static void register(Class... classes) { * @since 22.3 */ public static void register(Executable... methods) { - ImageSingletons.lookup(RuntimeJNIAccessSupport.class).register(ConfigurationCondition.alwaysTrue(), false, methods); + ImageSingletons.lookup(RuntimeJNIAccessSupport.class).register(RegistrationCondition.always(), false, methods); } /** @@ -92,7 +91,7 @@ public static void register(Executable... methods) { * @since 22.3 */ public static void register(Field... fields) { - ImageSingletons.lookup(RuntimeJNIAccessSupport.class).register(ConfigurationCondition.alwaysTrue(), false, fields); + ImageSingletons.lookup(RuntimeJNIAccessSupport.class).register(RegistrationCondition.always(), false, fields); } private RuntimeJNIAccess() { diff --git a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeProxyCreation.java b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeProxyCreation.java index a2f4f7bb781e..dfc9c678d8b3 100644 --- a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeProxyCreation.java +++ b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeProxyCreation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * The Universal Permissive License (UPL), Version 1.0 @@ -43,7 +43,6 @@ import org.graalvm.nativeimage.ImageSingletons; import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import org.graalvm.nativeimage.impl.ConfigurationCondition; import org.graalvm.nativeimage.impl.RuntimeProxyCreationSupport; /** @@ -62,7 +61,7 @@ public final class RuntimeProxyCreation { * @since 22.3 */ public static void register(Class... interfaces) { - ImageSingletons.lookup(RuntimeProxyCreationSupport.class).addProxyClass(ConfigurationCondition.alwaysTrue(), interfaces); + ImageSingletons.lookup(RuntimeProxyCreationSupport.class).addProxyClass(RegistrationCondition.always(), interfaces); } private RuntimeProxyCreation() { diff --git a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeReflection.java b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeReflection.java index a4b5adb949f3..641ce3af1287 100644 --- a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeReflection.java +++ b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeReflection.java @@ -48,7 +48,6 @@ import org.graalvm.nativeimage.ImageSingletons; import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import org.graalvm.nativeimage.impl.ConfigurationCondition; import org.graalvm.nativeimage.impl.RuntimeReflectionSupport; //Checkstyle: allow reflection @@ -69,7 +68,7 @@ public final class RuntimeReflection { * @since 19.0 */ public static void register(Class... classes) { - ImageSingletons.lookup(RuntimeReflectionSupport.class).register(ConfigurationCondition.alwaysTrue(), classes); + ImageSingletons.lookup(RuntimeReflectionSupport.class).register(RegistrationCondition.always(), classes); } /** @@ -80,7 +79,7 @@ public static void register(Class... classes) { * @since 23.0 */ public static void registerClassLookup(String className) { - ImageSingletons.lookup(RuntimeReflectionSupport.class).registerClassLookup(ConfigurationCondition.alwaysTrue(), className); + ImageSingletons.lookup(RuntimeReflectionSupport.class).registerClassLookup(RegistrationCondition.always(), className); } /** @@ -91,7 +90,7 @@ public static void registerClassLookup(String className) { * @since 19.0 */ public static void register(Executable... methods) { - ImageSingletons.lookup(RuntimeReflectionSupport.class).register(ConfigurationCondition.alwaysTrue(), false, methods); + ImageSingletons.lookup(RuntimeReflectionSupport.class).register(RegistrationCondition.always(), false, methods); } /** @@ -103,7 +102,7 @@ public static void register(Executable... methods) { * @since 21.3 */ public static void registerAsQueried(Executable... methods) { - ImageSingletons.lookup(RuntimeReflectionSupport.class).register(ConfigurationCondition.alwaysTrue(), true, methods); + ImageSingletons.lookup(RuntimeReflectionSupport.class).register(RegistrationCondition.always(), true, methods); } /** @@ -116,7 +115,7 @@ public static void registerAsQueried(Executable... methods) { * @since 23.0 */ public static void registerMethodLookup(Class declaringClass, String methodName, Class... parameterTypes) { - ImageSingletons.lookup(RuntimeReflectionSupport.class).registerMethodLookup(ConfigurationCondition.alwaysTrue(), declaringClass, methodName, parameterTypes); + ImageSingletons.lookup(RuntimeReflectionSupport.class).registerMethodLookup(RegistrationCondition.always(), declaringClass, methodName, parameterTypes); } /** @@ -130,7 +129,7 @@ public static void registerMethodLookup(Class declaringClass, String methodNa * @since 23.0 */ public static void registerConstructorLookup(Class declaringClass, Class... parameterTypes) { - ImageSingletons.lookup(RuntimeReflectionSupport.class).registerConstructorLookup(ConfigurationCondition.alwaysTrue(), declaringClass, parameterTypes); + ImageSingletons.lookup(RuntimeReflectionSupport.class).registerConstructorLookup(RegistrationCondition.always(), declaringClass, parameterTypes); } /** @@ -141,7 +140,7 @@ public static void registerConstructorLookup(Class declaringClass, Class.. * @since 19.0 */ public static void register(Field... fields) { - ImageSingletons.lookup(RuntimeReflectionSupport.class).register(ConfigurationCondition.alwaysTrue(), false, fields); + ImageSingletons.lookup(RuntimeReflectionSupport.class).register(RegistrationCondition.always(), false, fields); } /** @@ -153,7 +152,7 @@ public static void register(Field... fields) { * @since 19.0 */ public static void registerFieldLookup(Class declaringClass, String fieldName) { - ImageSingletons.lookup(RuntimeReflectionSupport.class).registerFieldLookup(ConfigurationCondition.alwaysTrue(), declaringClass, fieldName); + ImageSingletons.lookup(RuntimeReflectionSupport.class).registerFieldLookup(RegistrationCondition.always(), declaringClass, fieldName); } /** @@ -162,7 +161,7 @@ public static void registerFieldLookup(Class declaringClass, String fieldName * @since 23.0 */ public static void registerAllClasses(Class declaringClass) { - ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllClassesQuery(ConfigurationCondition.alwaysTrue(), declaringClass); + ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllClassesQuery(RegistrationCondition.always(), declaringClass); } /** @@ -171,7 +170,7 @@ public static void registerAllClasses(Class declaringClass) { * @since 23.0 */ public static void registerAllDeclaredClasses(Class declaringClass) { - ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllDeclaredClassesQuery(ConfigurationCondition.alwaysTrue(), declaringClass); + ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllDeclaredClassesQuery(RegistrationCondition.always(), declaringClass); } /** @@ -181,7 +180,7 @@ public static void registerAllDeclaredClasses(Class declaringClass) { * @since 23.0 */ public static void registerAllMethods(Class declaringClass) { - ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllMethodsQuery(ConfigurationCondition.alwaysTrue(), true, declaringClass); + ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllMethodsQuery(RegistrationCondition.always(), true, declaringClass); } /** @@ -191,7 +190,7 @@ public static void registerAllMethods(Class declaringClass) { * @since 23.0 */ public static void registerAllDeclaredMethods(Class declaringClass) { - ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllDeclaredMethodsQuery(ConfigurationCondition.alwaysTrue(), true, declaringClass); + ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllDeclaredMethodsQuery(RegistrationCondition.always(), true, declaringClass); } /** @@ -201,7 +200,7 @@ public static void registerAllDeclaredMethods(Class declaringClass) { * @since 23.0 */ public static void registerAllConstructors(Class declaringClass) { - ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllConstructorsQuery(ConfigurationCondition.alwaysTrue(), true, declaringClass); + ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllConstructorsQuery(RegistrationCondition.always(), true, declaringClass); } /** @@ -211,7 +210,7 @@ public static void registerAllConstructors(Class declaringClass) { * @since 23.0 */ public static void registerAllDeclaredConstructors(Class declaringClass) { - ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllDeclaredConstructorsQuery(ConfigurationCondition.alwaysTrue(), true, declaringClass); + ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllDeclaredConstructorsQuery(RegistrationCondition.always(), true, declaringClass); } /** @@ -221,7 +220,7 @@ public static void registerAllDeclaredConstructors(Class declaringClass) { * @since 23.0 */ public static void registerAllFields(Class declaringClass) { - ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllFields(ConfigurationCondition.alwaysTrue(), declaringClass); + ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllFields(RegistrationCondition.always(), declaringClass); } /** @@ -231,7 +230,7 @@ public static void registerAllFields(Class declaringClass) { * @since 23.0 */ public static void registerAllDeclaredFields(Class declaringClass) { - ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllDeclaredFields(ConfigurationCondition.alwaysTrue(), declaringClass); + ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllDeclaredFields(RegistrationCondition.always(), declaringClass); } /** @@ -240,7 +239,7 @@ public static void registerAllDeclaredFields(Class declaringClass) { * @since 23.0 */ public static void registerAllNestMembers(Class declaringClass) { - ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllNestMembersQuery(ConfigurationCondition.alwaysTrue(), declaringClass); + ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllNestMembersQuery(RegistrationCondition.always(), declaringClass); } /** @@ -249,7 +248,7 @@ public static void registerAllNestMembers(Class declaringClass) { * @since 23.0 */ public static void registerAllPermittedSubclasses(Class declaringClass) { - ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllPermittedSubclassesQuery(ConfigurationCondition.alwaysTrue(), declaringClass); + ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllPermittedSubclassesQuery(RegistrationCondition.always(), declaringClass); } /** @@ -258,7 +257,7 @@ public static void registerAllPermittedSubclasses(Class declaringClass) { * @since 23.0 */ public static void registerAllRecordComponents(Class declaringClass) { - ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllRecordComponentsQuery(ConfigurationCondition.alwaysTrue(), declaringClass); + ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllRecordComponentsQuery(RegistrationCondition.always(), declaringClass); } /** @@ -267,7 +266,7 @@ public static void registerAllRecordComponents(Class declaringClass) { * @since 23.0 */ public static void registerAllSigners(Class declaringClass) { - ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllSignersQuery(ConfigurationCondition.alwaysTrue(), declaringClass); + ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllSignersQuery(RegistrationCondition.always(), declaringClass); } /** diff --git a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeResourceAccess.java b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeResourceAccess.java index 6d7b6cd60398..bc7f30a5962d 100644 --- a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeResourceAccess.java +++ b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeResourceAccess.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * The Universal Permissive License (UPL), Version 1.0 @@ -47,7 +47,6 @@ import org.graalvm.nativeimage.ImageSingletons; import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import org.graalvm.nativeimage.impl.ConfigurationCondition; import org.graalvm.nativeimage.impl.RuntimeResourceSupport; /** @@ -84,7 +83,7 @@ public static void addResource(Module module, String resourcePath, byte[] resour Objects.requireNonNull(resourcePath); Objects.requireNonNull(resourceContent); ImageSingletons.lookup(RuntimeResourceSupport.class).injectResource(module, resourcePath, resourceContent, "Manually added via RuntimeResourceAccess"); - ImageSingletons.lookup(RuntimeResourceSupport.class).addCondition(ConfigurationCondition.alwaysTrue(), module, resourcePath); + ImageSingletons.lookup(RuntimeResourceSupport.class).addCondition(RegistrationCondition.always(), module, resourcePath); } /** @@ -96,7 +95,7 @@ public static void addResource(Module module, String resourcePath, byte[] resour */ public static void addResourceBundle(Module module, String baseBundleName, Locale[] locales) { Objects.requireNonNull(locales); - RuntimeResourceSupport.singleton().addResourceBundles(ConfigurationCondition.alwaysTrue(), + RuntimeResourceSupport.singleton().addResourceBundles(RegistrationCondition.always(), withModuleName(module, baseBundleName), Arrays.asList(locales)); } @@ -108,7 +107,7 @@ public static void addResourceBundle(Module module, String baseBundleName, Local * @since 22.3 */ public static void addResourceBundle(Module module, String bundleName) { - RuntimeResourceSupport.singleton().addResourceBundles(ConfigurationCondition.alwaysTrue(), + RuntimeResourceSupport.singleton().addResourceBundles(RegistrationCondition.always(), withModuleName(module, bundleName)); } diff --git a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeSerialization.java b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeSerialization.java index 8de8de2ea716..4c5700dde8cf 100644 --- a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeSerialization.java +++ b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeSerialization.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * The Universal Permissive License (UPL), Version 1.0 @@ -42,7 +42,6 @@ import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import org.graalvm.nativeimage.impl.ConfigurationCondition; import org.graalvm.nativeimage.impl.RuntimeSerializationSupport; /** @@ -72,7 +71,7 @@ public final class RuntimeSerialization { * @since 21.3 */ public static void registerIncludingAssociatedClasses(Class clazz) { - RuntimeSerializationSupport.singleton().registerIncludingAssociatedClasses(ConfigurationCondition.alwaysTrue(), clazz); + RuntimeSerializationSupport.singleton().registerIncludingAssociatedClasses(RegistrationCondition.always(), clazz); } /** @@ -82,7 +81,7 @@ public static void registerIncludingAssociatedClasses(Class clazz) { */ public static void register(Class... classes) { for (Class clazz : classes) { - RuntimeSerializationSupport.singleton().register(ConfigurationCondition.alwaysTrue(), clazz); + RuntimeSerializationSupport.singleton().register(RegistrationCondition.always(), clazz); } } @@ -103,7 +102,7 @@ public static void register(Class... classes) { @Deprecated(since = "24.2") @SuppressWarnings("unused") public static void registerWithTargetConstructorClass(Class clazz, Class customTargetConstructorClazz) { - RuntimeSerializationSupport.singleton().register(ConfigurationCondition.alwaysTrue(), clazz); + RuntimeSerializationSupport.singleton().register(RegistrationCondition.always(), clazz); } /** @@ -114,7 +113,7 @@ public static void registerWithTargetConstructorClass(Class clazz, Class c * @since 22.3 */ public static void registerLambdaCapturingClass(Class lambdaCapturingClass) { - RuntimeSerializationSupport.singleton().registerLambdaCapturingClass(ConfigurationCondition.alwaysTrue(), lambdaCapturingClass); + RuntimeSerializationSupport.singleton().registerLambdaCapturingClass(RegistrationCondition.always(), lambdaCapturingClass); } /** @@ -125,7 +124,7 @@ public static void registerLambdaCapturingClass(Class lambdaCapturingClass) { * @since 22.3 */ public static void registerProxyClass(Class... implementedInterfaces) { - RuntimeSerializationSupport.singleton().registerProxyClass(ConfigurationCondition.alwaysTrue(), implementedInterfaces); + RuntimeSerializationSupport.singleton().registerProxyClass(RegistrationCondition.always(), implementedInterfaces); } private RuntimeSerialization() { diff --git a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/ReflectionRegistry.java b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/ReflectionRegistry.java index 9d0534347cfb..4c57afb52bde 100644 --- a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/ReflectionRegistry.java +++ b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/ReflectionRegistry.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * The Universal Permissive License (UPL), Version 1.0 @@ -44,22 +44,24 @@ import java.lang.reflect.Field; import java.util.Arrays; +import org.graalvm.nativeimage.hosted.RegistrationCondition; + public interface ReflectionRegistry { - default void register(ConfigurationCondition condition, Class... classes) { + default void register(RegistrationCondition condition, Class... classes) { Arrays.stream(classes).forEach(clazz -> register(condition, false, clazz)); } - void register(ConfigurationCondition condition, boolean unsafeAllocated, Class clazz); + void register(RegistrationCondition condition, boolean unsafeAllocated, Class clazz); - void register(ConfigurationCondition condition, boolean queriedOnly, Executable... methods); + void register(RegistrationCondition condition, boolean queriedOnly, Executable... methods); - void register(ConfigurationCondition condition, boolean finalIsWritable, Field... fields); + void register(RegistrationCondition condition, boolean finalIsWritable, Field... fields); - void registerClassLookup(ConfigurationCondition condition, String typeName); + void registerClassLookup(RegistrationCondition condition, String typeName); - void registerFieldLookup(ConfigurationCondition condition, Class declaringClass, String fieldName); + void registerFieldLookup(RegistrationCondition condition, Class declaringClass, String fieldName); - void registerMethodLookup(ConfigurationCondition condition, Class declaringClass, String methodName, Class... parameterTypes); + void registerMethodLookup(RegistrationCondition condition, Class declaringClass, String methodName, Class... parameterTypes); - void registerConstructorLookup(ConfigurationCondition condition, Class declaringClass, Class... parameterTypes); + void registerConstructorLookup(RegistrationCondition condition, Class declaringClass, Class... parameterTypes); } diff --git a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/RuntimeForeignAccessSupport.java b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/RuntimeForeignAccessSupport.java index dd0537c496fc..e870ff0f42f5 100644 --- a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/RuntimeForeignAccessSupport.java +++ b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/RuntimeForeignAccessSupport.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * The Universal Permissive License (UPL), Version 1.0 @@ -42,10 +42,12 @@ import java.lang.invoke.MethodHandle; +import org.graalvm.nativeimage.hosted.RegistrationCondition; + public interface RuntimeForeignAccessSupport { - void registerForDowncall(ConfigurationCondition condition, Object desc, Object... options); + void registerForDowncall(RegistrationCondition condition, Object desc, Object... options); - void registerForUpcall(ConfigurationCondition condition, Object desc, Object... options); + void registerForUpcall(RegistrationCondition condition, Object desc, Object... options); - void registerForDirectUpcall(ConfigurationCondition condition, MethodHandle target, Object desc, Object... options); + void registerForDirectUpcall(RegistrationCondition condition, MethodHandle target, Object desc, Object... options); } diff --git a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/RuntimeProxyCreationSupport.java b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/RuntimeProxyCreationSupport.java index f7ca149c3c3f..2d3ab47cd541 100644 --- a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/RuntimeProxyCreationSupport.java +++ b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/RuntimeProxyCreationSupport.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * The Universal Permissive License (UPL), Version 1.0 @@ -40,6 +40,8 @@ */ package org.graalvm.nativeimage.impl; +import org.graalvm.nativeimage.hosted.RegistrationCondition; + public interface RuntimeProxyCreationSupport { - void addProxyClass(ConfigurationCondition condition, Class... interfaces); + void addProxyClass(RegistrationCondition condition, Class... interfaces); } diff --git a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/RuntimeReflectionSupport.java b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/RuntimeReflectionSupport.java index 5cfcd85b11b0..2e8a68bf7d30 100644 --- a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/RuntimeReflectionSupport.java +++ b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/RuntimeReflectionSupport.java @@ -40,32 +40,34 @@ */ package org.graalvm.nativeimage.impl; +import org.graalvm.nativeimage.hosted.RegistrationCondition; + public interface RuntimeReflectionSupport extends ReflectionRegistry { // needed as reflection-specific ImageSingletons key - void registerAllMethodsQuery(ConfigurationCondition condition, boolean queriedOnly, Class clazz); + void registerAllMethodsQuery(RegistrationCondition condition, boolean queriedOnly, Class clazz); - void registerAllDeclaredMethodsQuery(ConfigurationCondition condition, boolean queriedOnly, Class clazz); + void registerAllDeclaredMethodsQuery(RegistrationCondition condition, boolean queriedOnly, Class clazz); - void registerAllFields(ConfigurationCondition condition, Class clazz); + void registerAllConstructorsQuery(RegistrationCondition condition, boolean queriedOnly, Class clazz); - void registerAllDeclaredFields(ConfigurationCondition condition, Class clazz); + void registerAllDeclaredConstructorsQuery(RegistrationCondition condition, boolean queriedOnly, Class clazz); - void registerAllConstructorsQuery(ConfigurationCondition condition, boolean queriedOnly, Class clazz); + void registerAllClassesQuery(RegistrationCondition condition, Class clazz); - void registerAllDeclaredConstructorsQuery(ConfigurationCondition condition, boolean queriedOnly, Class clazz); + void registerAllDeclaredClassesQuery(RegistrationCondition condition, Class clazz); - void registerAllClassesQuery(ConfigurationCondition condition, Class clazz); + void registerAllFields(RegistrationCondition condition, Class clazz); - void registerAllDeclaredClassesQuery(ConfigurationCondition condition, Class clazz); + void registerAllDeclaredFields(RegistrationCondition condition, Class clazz); - void registerAllRecordComponentsQuery(ConfigurationCondition condition, Class clazz); + void registerAllRecordComponentsQuery(RegistrationCondition condition, Class clazz); - void registerAllPermittedSubclassesQuery(ConfigurationCondition condition, Class clazz); + void registerAllPermittedSubclassesQuery(RegistrationCondition condition, Class clazz); - void registerAllNestMembersQuery(ConfigurationCondition condition, Class clazz); + void registerAllNestMembersQuery(RegistrationCondition condition, Class clazz); - void registerAllSignersQuery(ConfigurationCondition condition, Class clazz); + void registerAllSignersQuery(RegistrationCondition condition, Class clazz); - void registerClassLookupException(ConfigurationCondition condition, String typeName, Throwable t); + void registerClassLookupException(RegistrationCondition condition, String typeName, Throwable t); } diff --git a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/RuntimeResourceSupport.java b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/RuntimeResourceSupport.java index f0c2273cbf95..24982e4faa7b 100644 --- a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/RuntimeResourceSupport.java +++ b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/RuntimeResourceSupport.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * The Universal Permissive License (UPL), Version 1.0 @@ -44,11 +44,12 @@ import java.util.Locale; import org.graalvm.nativeimage.ImageSingletons; +import org.graalvm.nativeimage.hosted.RegistrationCondition; public interface RuntimeResourceSupport { @SuppressWarnings("unchecked") - static RuntimeResourceSupport singleton() { + static RuntimeResourceSupport singleton() { return ImageSingletons.lookup(RuntimeResourceSupport.class); } @@ -63,15 +64,15 @@ static RuntimeResourceSupport singleton() { void addResourceBundles(C condition, String basename, Collection locales); /* Following functions are used only from features */ - void addCondition(ConfigurationCondition configurationCondition, Module module, String resourcePath); + void addCondition(RegistrationCondition condition, Module module, String resourcePath); void addResourceEntry(Module module, String resourcePath, Object origin); default void addResource(Module module, String resourcePath, Object origin) { - addResource(ConfigurationCondition.alwaysTrue(), module, resourcePath, origin); + addResource(RegistrationCondition.always(), module, resourcePath, origin); } - default void addResource(ConfigurationCondition condition, Module module, String resourcePath, Object origin) { + default void addResource(RegistrationCondition condition, Module module, String resourcePath, Object origin) { addResourceEntry(module, resourcePath, origin); addCondition(condition, module, resourcePath); } diff --git a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/RuntimeSerializationSupport.java b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/RuntimeSerializationSupport.java index 3237047e86d8..07b056d6bb7e 100644 --- a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/RuntimeSerializationSupport.java +++ b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/RuntimeSerializationSupport.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * The Universal Permissive License (UPL), Version 1.0 @@ -45,11 +45,12 @@ import java.util.stream.Collectors; import org.graalvm.nativeimage.ImageSingletons; +import org.graalvm.nativeimage.hosted.RegistrationCondition; public interface RuntimeSerializationSupport { @SuppressWarnings("unchecked") - static RuntimeSerializationSupport singleton() { + static RuntimeSerializationSupport singleton() { return ImageSingletons.lookup(RuntimeSerializationSupport.class); } diff --git a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/ConfigurationCondition.java b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/TypeReachabilityCondition.java similarity index 62% rename from sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/ConfigurationCondition.java rename to sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/TypeReachabilityCondition.java index d7c56dc0dd98..9711df2529da 100644 --- a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/ConfigurationCondition.java +++ b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/TypeReachabilityCondition.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * The Universal Permissive License (UPL), Version 1.0 @@ -42,44 +42,20 @@ import java.util.Objects; +import org.graalvm.nativeimage.hosted.RegistrationCondition; + /** - * A condition that describes if a reflectively-accessed element in Native Image is visible by the - * user at run time. - *

- * Currently, there is only two types of condition: - *

  • typeReached (the default) that signifies that the type must be both reachable by - * static analysis at build time, and reached at run time. A type is reached at run time, right - * before the class-initialization routine starts for that type, or any of the type's subtypes are - * reached.
    • - *
  • typeReachable (legacy) that signifies that the type must be reachable by static - * analysis at build time.
    • - *

    - * When {@link ConfigurationCondition#runtimeChecked} is true denotes that this is a + * Type that represents both {@code typeReached} and {@code typeReachable} condition. When + * {@link TypeReachabilityCondition#runtimeChecked} is true denotes that this is a * typeReached condition. */ -public final class ConfigurationCondition { +public class TypeReachabilityCondition implements RegistrationCondition { /* Cached to save space: it is used as a marker for all non-conditional elements */ - private static final ConfigurationCondition JAVA_LANG_OBJECT_REACHED = new ConfigurationCondition(Object.class, true); - - public static ConfigurationCondition alwaysTrue() { - return JAVA_LANG_OBJECT_REACHED; - } - + public static final TypeReachabilityCondition JAVA_LANG_OBJECT_REACHED = new TypeReachabilityCondition(Object.class, true); private final Class type; - private final boolean runtimeChecked; - - /** - * Creates the default type-reached condition that is satisfied when the type is reached at - * runtime. - * - * @param type that has to be reached for this condition to be satisfied - * @return instance of the condition - */ - public static ConfigurationCondition create(Class type) { - return create(type, true); - } + public final boolean runtimeChecked; /** * Creates either a type-reached condition ({@code runtimeChecked = true}) or a type-reachable @@ -89,31 +65,27 @@ public static ConfigurationCondition create(Class type) { * @param runtimeChecked makes this a type-reachable condition when false * @return instance of the condition */ - public static ConfigurationCondition create(Class type, boolean runtimeChecked) { + public static TypeReachabilityCondition create(Class type, boolean runtimeChecked) { Objects.requireNonNull(type); - if (JAVA_LANG_OBJECT_REACHED.getType().equals(type)) { - return JAVA_LANG_OBJECT_REACHED; + if (TypeReachabilityCondition.JAVA_LANG_OBJECT_REACHED.getKey().equals(type)) { + return TypeReachabilityCondition.JAVA_LANG_OBJECT_REACHED; } - return new ConfigurationCondition(type, runtimeChecked); + return new TypeReachabilityCondition(type, runtimeChecked); } public boolean isAlwaysTrue() { - return ConfigurationCondition.alwaysTrue().equals(this); + return RegistrationCondition.always().equals(this); } - private ConfigurationCondition(Class type, boolean runtimeChecked) { + public TypeReachabilityCondition(Class type, boolean runtimeChecked) { this.runtimeChecked = runtimeChecked; this.type = type; } - public Class getType() { + public Class getKey() { return type; } - public boolean isRuntimeChecked() { - return runtimeChecked; - } - @Override public boolean equals(Object o) { if (this == o) { @@ -122,7 +94,7 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - ConfigurationCondition that = (ConfigurationCondition) o; + TypeReachabilityCondition that = (TypeReachabilityCondition) o; return runtimeChecked == that.runtimeChecked && Objects.equals(type, that.type); } @@ -133,9 +105,13 @@ public int hashCode() { @Override public String toString() { - return "ConfigurationCondition(" + + return "TypeReachabilityCondition(" + "type=" + type + ", runtimeChecked=" + runtimeChecked + ')'; } + + public boolean isRuntimeChecked() { + return runtimeChecked; + } } diff --git a/substratevm/src/com.oracle.svm.configure.test/src/com/oracle/svm/configure/test/config/ResourceConfigurationTest.java b/substratevm/src/com.oracle.svm.configure.test/src/com/oracle/svm/configure/test/config/ResourceConfigurationTest.java index 1649fd56ed0e..d11674505b70 100644 --- a/substratevm/src/com.oracle.svm.configure.test/src/com/oracle/svm/configure/test/config/ResourceConfigurationTest.java +++ b/substratevm/src/com.oracle.svm.configure.test/src/com/oracle/svm/configure/test/config/ResourceConfigurationTest.java @@ -34,7 +34,7 @@ import java.util.List; import java.util.Locale; -import org.graalvm.nativeimage.impl.ConfigurationCondition; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import org.junit.Assert; import org.junit.Test; @@ -127,7 +127,7 @@ public void addResourceBundles(UnresolvedConfigurationCondition condition, Strin } @Override - public void addCondition(ConfigurationCondition configurationCondition, Module module, String resourcePath) { + public void addCondition(RegistrationCondition configurationCondition, Module module, String resourcePath) { } diff --git a/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/ResourcesRegistry.java b/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/ResourcesRegistry.java index 5fbdb3418524..308cfd899b06 100644 --- a/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/ResourcesRegistry.java +++ b/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/ResourcesRegistry.java @@ -28,13 +28,13 @@ import java.util.Locale; import org.graalvm.nativeimage.ImageSingletons; -import org.graalvm.nativeimage.impl.ConfigurationCondition; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import org.graalvm.nativeimage.impl.RuntimeResourceSupport; public interface ResourcesRegistry extends RuntimeResourceSupport { @SuppressWarnings("unchecked") - static ResourcesRegistry singleton() { + static ResourcesRegistry singleton() { return ImageSingletons.lookup(ResourcesRegistry.class); } diff --git a/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/UnresolvedConfigurationCondition.java b/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/UnresolvedConfigurationCondition.java index 641680a2b790..d678028b056f 100644 --- a/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/UnresolvedConfigurationCondition.java +++ b/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/UnresolvedConfigurationCondition.java @@ -26,10 +26,10 @@ import java.util.Objects; -import org.graalvm.nativeimage.impl.ConfigurationCondition; +import org.graalvm.nativeimage.hosted.RegistrationCondition; /** - * Represents a {@link ConfigurationCondition} during parsing before it is resolved in a context of + * Represents a {@link RegistrationCondition} during parsing before it is resolved in a context of * the classpath. */ public final class UnresolvedConfigurationCondition implements Comparable { diff --git a/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/ResourceConfiguration.java b/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/ResourceConfiguration.java index bbb7f609ea2f..a2c1c57726b2 100644 --- a/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/ResourceConfiguration.java +++ b/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/ResourceConfiguration.java @@ -40,7 +40,7 @@ import java.util.concurrent.ConcurrentMap; import java.util.regex.Pattern; -import org.graalvm.nativeimage.impl.ConfigurationCondition; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import com.oracle.svm.configure.ConditionalElement; import com.oracle.svm.configure.ConfigurationBase; @@ -82,7 +82,7 @@ public void addResourceEntry(Module module, String resourcePath, Object origin) } @Override - public void addCondition(ConfigurationCondition condition, Module module, String resourcePath) { + public void addCondition(RegistrationCondition condition, Module module, String resourcePath) { throw new UnsupportedOperationException("Unused function."); } diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/ClassLoaderSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/ClassLoaderSupport.java index 3f3a411b3a13..03a52d61b325 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/ClassLoaderSupport.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/ClassLoaderSupport.java @@ -34,7 +34,7 @@ import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import org.graalvm.nativeimage.impl.ConfigurationCondition; +import org.graalvm.nativeimage.hosted.RegistrationCondition; @Platforms(Platform.HOSTED_ONLY.class) public abstract class ClassLoaderSupport { @@ -52,7 +52,7 @@ public boolean isNativeImageClassLoader(ClassLoader classLoader) { protected abstract boolean isNativeImageClassLoaderImpl(ClassLoader classLoader); - public record ConditionWithOrigin(ConfigurationCondition condition, Object origin) { + public record ConditionWithOrigin(RegistrationCondition condition, Object origin) { } public interface ResourceCollector { @@ -60,7 +60,7 @@ public interface ResourceCollector { void addResourceEntry(Module module, String resourceName, Object origin); - void addResourceConditionally(Module module, String resourceName, ConfigurationCondition condition, Object origin); + void addResourceConditionally(Module module, String resourceName, RegistrationCondition condition, Object origin); void registerNegativeQuery(Module module, String resourceName); diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/RuntimeConditionSet.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/RuntimeConditionSet.java index d403da2152bc..498690fe8654 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/RuntimeConditionSet.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/RuntimeConditionSet.java @@ -33,7 +33,8 @@ import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import org.graalvm.nativeimage.impl.ConfigurationCondition; +import org.graalvm.nativeimage.hosted.RegistrationCondition; +import org.graalvm.nativeimage.impl.TypeReachabilityCondition; import com.oracle.svm.core.hub.DynamicHub; import com.oracle.svm.core.util.VMError; @@ -44,7 +45,7 @@ *

    * If any of the {@link #conditions} is satisfied then the whole set becomes also * {@link #satisfied}. {@link RuntimeConditionSet}s can be created at build time - * {@link #createHosted(ConfigurationCondition)} and stored to the image heap, or it can be encoded + * {@link #createHosted(RegistrationCondition)} and stored to the image heap, or it can be encoded * ({@link #getTypesForEncoding()} and later decoded at run time ({@link #createDecoded(Object[])}. * The current implementation does not cache {@link #conditions}, although this will be implemented * in the future (GR-49526) @@ -60,18 +61,18 @@ public static RuntimeConditionSet emptySet() { } @Platforms(Platform.HOSTED_ONLY.class) - public static RuntimeConditionSet createHosted(ConfigurationCondition condition) { + public static RuntimeConditionSet createHosted(RegistrationCondition condition) { var conditionSet = new RuntimeConditionSet(new Object[0]); conditionSet.addCondition(condition); return conditionSet; } @Platforms(Platform.HOSTED_ONLY.class) - public synchronized void addCondition(ConfigurationCondition cnd) { - VMError.guarantee(cnd.isRuntimeChecked(), "Only runtime conditions can be added to the ConditionalRuntimeValue."); + public synchronized void addCondition(RegistrationCondition cnd) { + VMError.guarantee(((TypeReachabilityCondition) cnd).isRuntimeChecked(), "Only runtime conditions can be added to the ConditionalRuntimeValue."); if (satisfied) { return; - } else if (cnd.isAlwaysTrue()) { + } else if (((TypeReachabilityCondition) cnd).isAlwaysTrue()) { conditions = null; satisfied = true; return; @@ -159,11 +160,11 @@ private void setConditions(Object[] conditions) { satisfied = false; } - private static Object createRuntimeCondition(ConfigurationCondition cnd) { - if (cnd.isAlwaysTrue() || !cnd.isRuntimeChecked()) { + private static Object createRuntimeCondition(RegistrationCondition cnd) { + if (((TypeReachabilityCondition) cnd).isAlwaysTrue() || !((TypeReachabilityCondition) cnd).isRuntimeChecked()) { throw VMError.shouldNotReachHere("We should never create run-time conditions from conditions that are always true at build time. Condition: " + cnd); } - return cnd.getType(); + return ((TypeReachabilityCondition) cnd).getKey(); } private static boolean isSatisfied(Object condition) { @@ -190,7 +191,7 @@ private UnmodifiableRuntimeConditionSet(Object[] conditions) { } @Override - public synchronized void addCondition(ConfigurationCondition cnd) { + public synchronized void addCondition(RegistrationCondition cnd) { throw new UnsupportedOperationException("Can't add conditions to an unmodifiable set of conditions."); } } diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/ClassForNameSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/ClassForNameSupport.java index 6425a7cd6c39..af649f77bf0a 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/ClassForNameSupport.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/ClassForNameSupport.java @@ -36,7 +36,7 @@ import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platform.HOSTED_ONLY; import org.graalvm.nativeimage.Platforms; -import org.graalvm.nativeimage.impl.ConfigurationCondition; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import com.oracle.svm.configure.ClassNameSupport; import com.oracle.svm.core.configure.ConditionalRuntimeValue; @@ -133,11 +133,11 @@ public static boolean respectClassLoader() { @Platforms(Platform.HOSTED_ONLY.class) public void registerClass(Class clazz, ClassLoader runtimeClassLoader) { - registerClass(ConfigurationCondition.alwaysTrue(), clazz, runtimeClassLoader); + registerClass(RegistrationCondition.always(), clazz, runtimeClassLoader); } @Platforms(Platform.HOSTED_ONLY.class) - public void registerClass(ConfigurationCondition condition, Class clazz, ClassLoader runtimeClassLoader) { + public void registerClass(RegistrationCondition condition, Class clazz, ClassLoader runtimeClassLoader) { assert !clazz.isPrimitive() : "primitive classes cannot be looked up by name"; if (PredefinedClassesSupport.isPredefined(clazz)) { return; // must be defined at runtime before it can be looked up @@ -201,7 +201,7 @@ private boolean isLibGraalClass(Class clazz) { } public static ConditionalRuntimeValue updateConditionalValue(ConditionalRuntimeValue existingConditionalValue, Object newValue, - ConfigurationCondition additionalCondition) { + RegistrationCondition additionalCondition) { if (existingConditionalValue == null) { return new ConditionalRuntimeValue<>(RuntimeConditionSet.createHosted(additionalCondition), newValue); } else { @@ -212,7 +212,7 @@ public static ConditionalRuntimeValue updateConditionalValue(Conditional } @Platforms(Platform.HOSTED_ONLY.class) - public void registerExceptionForClass(ConfigurationCondition condition, String className, Throwable t) { + public void registerExceptionForClass(RegistrationCondition condition, String className, Throwable t) { if (RuntimeClassLoading.isSupported()) { return; } @@ -227,7 +227,7 @@ public void registerExceptionForClass(ConfigurationCondition condition, String c } @Platforms(Platform.HOSTED_ONLY.class) - public void registerNegativeQuery(ConfigurationCondition condition, String className) { + public void registerNegativeQuery(RegistrationCondition condition, String className) { if (respectClassLoader()) { registerKnownClassName(condition, className); } else { @@ -240,7 +240,7 @@ public void registerNegativeQuery(ConfigurationCondition condition, String class } } - private void registerKnownClassName(ConfigurationCondition condition, String className) { + private void registerKnownClassName(RegistrationCondition condition, String className) { assert respectClassLoader(); synchronized (knownClassNames) { RuntimeConditionSet existingConditions = knownClassNames.get(className); @@ -253,7 +253,7 @@ private void registerKnownClassName(ConfigurationCondition condition, String cla } @Platforms(Platform.HOSTED_ONLY.class) - public void registerUnsafeAllocated(ConfigurationCondition condition, Class clazz) { + public void registerUnsafeAllocated(RegistrationCondition condition, Class clazz) { if (!clazz.isArray() && !clazz.isInterface() && !Modifier.isAbstract(clazz.getModifiers())) { /* Otherwise, UNSAFE.allocateInstance results in InstantiationException */ var conditionSet = unsafeInstantiatedClasses.putIfAbsent(clazz, RuntimeConditionSet.createHosted(condition)); @@ -263,7 +263,7 @@ public void registerUnsafeAllocated(ConfigurationCondition condition, Class c } } - private void updateCondition(ConfigurationCondition condition, String className, Object value) { + private void updateCondition(RegistrationCondition condition, String className, Object value) { synchronized (knownClasses) { var runtimeConditions = knownClasses.putIfAbsent(className, new ConditionalRuntimeValue<>(RuntimeConditionSet.createHosted(condition), value)); if (runtimeConditions != null) { diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaNetHttpFeature.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaNetHttpFeature.java index a36b46ba346c..44e5768c3d2c 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaNetHttpFeature.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaNetHttpFeature.java @@ -27,8 +27,8 @@ import java.util.Optional; import org.graalvm.nativeimage.ImageSingletons; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import org.graalvm.nativeimage.hosted.RuntimeReflection; -import org.graalvm.nativeimage.impl.ConfigurationCondition; import org.graalvm.nativeimage.impl.RuntimeClassInitializationSupport; import com.oracle.svm.configure.ResourcesRegistry; @@ -94,7 +94,7 @@ public void afterRegistration(AfterRegistrationAccess access) { @Override public void beforeAnalysis(BeforeAnalysisAccess access) { access.registerReachabilityHandler(a -> { - ResourcesRegistry.singleton().addResourceBundles(ConfigurationCondition.alwaysTrue(), "sun.net.httpserver.simpleserver.resources.simpleserver"); + ResourcesRegistry.singleton().addResourceBundles(RegistrationCondition.always(), "sun.net.httpserver.simpleserver.resources.simpleserver"); }, access.findClassByName("sun.net.httpserver.simpleserver.SimpleFileServerImpl")); } } diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Resources.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Resources.java index b911fcfa2ac0..bf51d4aa869c 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Resources.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Resources.java @@ -49,7 +49,7 @@ import org.graalvm.nativeimage.ImageSingletons; import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import org.graalvm.nativeimage.impl.ConfigurationCondition; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import com.oracle.svm.core.BuildPhaseProvider; import com.oracle.svm.core.ClassLoaderSupport.ConditionWithOrigin; @@ -314,7 +314,7 @@ public void registerNegativeQuery(Module module, String resourceName) { } @Platforms(Platform.HOSTED_ONLY.class) - public void registerIncludePattern(ConfigurationCondition condition, String module, String pattern) { + public void registerIncludePattern(RegistrationCondition condition, String module, String pattern) { assert MissingRegistrationUtils.throwMissingRegistrationErrors(); synchronized (requestedPatterns) { updateTimeStamp(); diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/LocalizationSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/LocalizationSupport.java index 36d8bb4e6e21..06288c42649f 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/LocalizationSupport.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/LocalizationSupport.java @@ -48,8 +48,8 @@ import org.graalvm.nativeimage.ImageSingletons; import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import org.graalvm.nativeimage.hosted.RuntimeReflection; -import org.graalvm.nativeimage.impl.ConfigurationCondition; import org.graalvm.nativeimage.impl.RuntimeReflectionSupport; import org.graalvm.nativeimage.impl.RuntimeResourceSupport; @@ -181,7 +181,7 @@ public void registerRequiredReflectionAndResourcesForBundle(String baseName, Col if (i > 0) { String name = baseName.substring(i + 1) + "Provider"; String providerName = baseName.substring(0, i) + ".spi." + name; - ImageSingletons.lookup(RuntimeReflectionSupport.class).registerClassLookup(ConfigurationCondition.alwaysTrue(), providerName); + ImageSingletons.lookup(RuntimeReflectionSupport.class).registerClassLookup(RegistrationCondition.always(), providerName); } } @@ -282,7 +282,7 @@ private static void registerNullaryConstructor(Class bundleClass) { } @Platforms(Platform.HOSTED_ONLY.class) - public void registerBundleLookup(ConfigurationCondition condition, String baseName) { + public void registerBundleLookup(RegistrationCondition condition, String baseName) { RuntimeConditionSet conditionSet = RuntimeConditionSet.emptySet(); var registered = registeredBundles.putIfAbsent(baseName, conditionSet); (registered == null ? conditionSet : registered).addCondition(condition); diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNIRuntimeAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNIRuntimeAccess.java index 4e4080b7667e..446006b68ca2 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNIRuntimeAccess.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNIRuntimeAccess.java @@ -30,8 +30,8 @@ import org.graalvm.nativeimage.ImageSingletons; import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import org.graalvm.nativeimage.hosted.RuntimeJNIAccess; -import org.graalvm.nativeimage.impl.ConfigurationCondition; import org.graalvm.nativeimage.impl.RuntimeJNIAccessSupport; /** @@ -56,6 +56,6 @@ public static void register(Field... fields) { } public static void register(boolean finalIsWritable, Field... fields) { - ImageSingletons.lookup(RuntimeJNIAccessSupport.class).register(ConfigurationCondition.alwaysTrue(), finalIsWritable, fields); + ImageSingletons.lookup(RuntimeJNIAccessSupport.class).register(RegistrationCondition.always(), finalIsWritable, fields); } } diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/proxy/DynamicProxySupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/proxy/DynamicProxySupport.java index e03f04449681..0536fff299ca 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/proxy/DynamicProxySupport.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/proxy/DynamicProxySupport.java @@ -33,9 +33,10 @@ import org.graalvm.collections.EconomicMap; import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import org.graalvm.nativeimage.hosted.RuntimeClassInitialization; import org.graalvm.nativeimage.hosted.RuntimeReflection; -import org.graalvm.nativeimage.impl.ConfigurationCondition; +import org.graalvm.nativeimage.impl.TypeReachabilityCondition; import com.oracle.svm.core.configure.ConditionalRuntimeValue; import com.oracle.svm.core.configure.RuntimeConditionSet; @@ -105,8 +106,8 @@ public DynamicProxySupport() { @Override @Platforms(Platform.HOSTED_ONLY.class) - public synchronized void addProxyClass(ConfigurationCondition condition, Class... interfaces) { - VMError.guarantee(condition.isRuntimeChecked(), "The condition used must be a runtime condition."); + public synchronized void addProxyClass(RegistrationCondition condition, Class... interfaces) { + VMError.guarantee(((TypeReachabilityCondition) condition).isRuntimeChecked(), "The condition used must be a runtime condition."); /* * Make a defensive copy of the interfaces array to protect against the caller modifying the * array. diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/serialize/SerializationSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/serialize/SerializationSupport.java index 866d3be261a0..c81a20de29fc 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/serialize/SerializationSupport.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/serialize/SerializationSupport.java @@ -38,7 +38,7 @@ import org.graalvm.collections.MapCursor; import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import org.graalvm.nativeimage.impl.ConfigurationCondition; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import com.oracle.svm.core.BuildPhaseProvider; import com.oracle.svm.core.SubstrateUtil; @@ -216,7 +216,7 @@ public int getTypeID() { private final EconomicMap lambdaCapturingClasses = EconomicMap.create(); @Platforms(Platform.HOSTED_ONLY.class) - public void registerSerializationTargetClass(ConfigurationCondition cnd, DynamicHub hub) { + public void registerSerializationTargetClass(RegistrationCondition cnd, DynamicHub hub) { synchronized (classes) { var previous = classes.putIfAbsent(BuildPhaseProvider.isHostedUniverseBuilt() ? hub.getTypeID() : new DynamicHubKey(hub), RuntimeConditionSet.createHosted(cnd)); if (previous != null) { @@ -239,7 +239,7 @@ public void replaceHubKeyWithTypeID() { } @Platforms(Platform.HOSTED_ONLY.class) - public void registerLambdaCapturingClass(ConfigurationCondition cnd, String lambdaCapturingClass) { + public void registerLambdaCapturingClass(RegistrationCondition cnd, String lambdaCapturingClass) { synchronized (lambdaCapturingClasses) { var previousConditions = lambdaCapturingClasses.putIfAbsent(lambdaCapturingClass, RuntimeConditionSet.createHosted(cnd)); if (previousConditions != null) { diff --git a/substratevm/src/com.oracle.svm.hosted.foreign/src/com/oracle/svm/hosted/foreign/ForeignFunctionsConfigurationParser.java b/substratevm/src/com.oracle.svm.hosted.foreign/src/com/oracle/svm/hosted/foreign/ForeignFunctionsConfigurationParser.java index 02485bfc7be6..d9b528c6d6f8 100644 --- a/substratevm/src/com.oracle.svm.hosted.foreign/src/com/oracle/svm/hosted/foreign/ForeignFunctionsConfigurationParser.java +++ b/substratevm/src/com.oracle.svm.hosted.foreign/src/com/oracle/svm/hosted/foreign/ForeignFunctionsConfigurationParser.java @@ -51,7 +51,7 @@ import org.graalvm.collections.Pair; import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import org.graalvm.nativeimage.impl.ConfigurationCondition; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import org.graalvm.nativeimage.impl.RuntimeForeignAccessSupport; import com.oracle.svm.configure.ConfigurationParser; @@ -125,10 +125,10 @@ private void parseAndRegisterForeignCall(Object call, boolean forUpcall) { try { if (forUpcall) { var options = parseUpcallOptions(optionsMap); - accessSupport.registerForUpcall(ConfigurationCondition.alwaysTrue(), descriptor, options.toArray()); + accessSupport.registerForUpcall(RegistrationCondition.always(), descriptor, options.toArray()); } else { var options = parseDowncallOptions(optionsMap, descriptor); - accessSupport.registerForDowncall(ConfigurationCondition.alwaysTrue(), descriptor, options.toArray()); + accessSupport.registerForDowncall(RegistrationCondition.always(), descriptor, options.toArray()); } } catch (IllegalArgumentException e) { handleRegistrationError(e, map); @@ -194,7 +194,7 @@ private void parseAndRegisterDirectUpcall(Object call) { var optionsMap = asMap(map.get("options", EconomicMap.emptyMap()), "options must be a map"); try { var options = parseUpcallOptions(optionsMap); - accessSupport.registerForDirectUpcall(ConfigurationCondition.alwaysTrue(), pair.getRight(), pair.getLeft(), options.toArray()); + accessSupport.registerForDirectUpcall(RegistrationCondition.always(), pair.getRight(), pair.getLeft(), options.toArray()); } catch (IllegalArgumentException e) { handleRegistrationError(e, map); } diff --git a/substratevm/src/com.oracle.svm.hosted.foreign/src/com/oracle/svm/hosted/foreign/ForeignFunctionsFeature.java b/substratevm/src/com.oracle.svm.hosted.foreign/src/com/oracle/svm/hosted/foreign/ForeignFunctionsFeature.java index 60ffcc027588..b533dad1d4cd 100644 --- a/substratevm/src/com.oracle.svm.hosted.foreign/src/com/oracle/svm/hosted/foreign/ForeignFunctionsFeature.java +++ b/substratevm/src/com.oracle.svm.hosted.foreign/src/com/oracle/svm/hosted/foreign/ForeignFunctionsFeature.java @@ -56,9 +56,9 @@ import org.graalvm.nativeimage.Platforms; import org.graalvm.nativeimage.c.function.CFunctionPointer; import org.graalvm.nativeimage.c.type.CIntPointer; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import org.graalvm.nativeimage.hosted.RuntimeClassInitialization; import org.graalvm.nativeimage.hosted.RuntimeReflection; -import org.graalvm.nativeimage.impl.ConfigurationCondition; import org.graalvm.nativeimage.impl.RuntimeForeignAccessSupport; import com.oracle.graal.pointsto.meta.AnalysisMetaAccess; @@ -190,7 +190,7 @@ private final class RuntimeForeignAccessSupportImpl extends ConditionalConfigura private final Lookup implLookup = ReflectionUtil.readStaticField(MethodHandles.Lookup.class, "IMPL_LOOKUP"); @Override - public void registerForDowncall(ConfigurationCondition condition, FunctionDescriptor desc, Linker.Option... options) { + public void registerForDowncall(RegistrationCondition condition, FunctionDescriptor desc, Linker.Option... options) { checkNotSealed(); try { LinkerOptions linkerOptions = LinkerOptions.forDowncall(desc, options); @@ -201,7 +201,7 @@ public void registerForDowncall(ConfigurationCondition condition, FunctionDescri } @Override - public void registerForUpcall(ConfigurationCondition condition, FunctionDescriptor desc, Linker.Option... options) { + public void registerForUpcall(RegistrationCondition condition, FunctionDescriptor desc, Linker.Option... options) { checkNotSealed(); try { LinkerOptions linkerOptions = LinkerOptions.forUpcall(desc, options); @@ -212,7 +212,7 @@ public void registerForUpcall(ConfigurationCondition condition, FunctionDescript } @Override - public void registerForDirectUpcall(ConfigurationCondition condition, MethodHandle target, FunctionDescriptor desc, Linker.Option... options) { + public void registerForDirectUpcall(RegistrationCondition condition, MethodHandle target, FunctionDescriptor desc, Linker.Option... options) { checkNotSealed(); DirectMethodHandleDesc directMethodHandleDesc = target.describeConstable() .filter(x -> x instanceof DirectMethodHandleDesc dmh && dmh.kind() == Kind.STATIC) diff --git a/substratevm/src/com.oracle.svm.hosted.foreign/src/com/oracle/svm/hosted/foreign/StronglyTypedRuntimeForeignAccessSupport.java b/substratevm/src/com.oracle.svm.hosted.foreign/src/com/oracle/svm/hosted/foreign/StronglyTypedRuntimeForeignAccessSupport.java index 137f37345631..92199354302d 100644 --- a/substratevm/src/com.oracle.svm.hosted.foreign/src/com/oracle/svm/hosted/foreign/StronglyTypedRuntimeForeignAccessSupport.java +++ b/substratevm/src/com.oracle.svm.hosted.foreign/src/com/oracle/svm/hosted/foreign/StronglyTypedRuntimeForeignAccessSupport.java @@ -28,7 +28,7 @@ import java.lang.foreign.Linker; import java.lang.invoke.MethodHandle; -import org.graalvm.nativeimage.impl.ConfigurationCondition; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import org.graalvm.nativeimage.impl.RuntimeForeignAccessSupport; /** @@ -55,51 +55,51 @@ private static Linker.Option[] castOptions(Object... optionsO) { @FunctionalInterface interface Recorder { - void apply(ConfigurationCondition condition, FunctionDescriptor desc, Linker.Option... options); + void apply(RegistrationCondition condition, FunctionDescriptor desc, Linker.Option... options); } @FunctionalInterface interface DirectUpcallRecorder { - void apply(ConfigurationCondition condition, MethodHandle target, FunctionDescriptor desc, Linker.Option... options); + void apply(RegistrationCondition condition, MethodHandle target, FunctionDescriptor desc, Linker.Option... options); } static StronglyTypedRuntimeForeignAccessSupport make(Recorder forDowncalls, Recorder forUpcalls, DirectUpcallRecorder forDirectUpcalls) { return new StronglyTypedRuntimeForeignAccessSupport() { @Override - public void registerForDowncall(ConfigurationCondition condition, FunctionDescriptor desc, Linker.Option... options) { + public void registerForDowncall(RegistrationCondition condition, FunctionDescriptor desc, Linker.Option... options) { forDowncalls.apply(condition, desc, options); } @Override - public void registerForUpcall(ConfigurationCondition condition, FunctionDescriptor desc, Linker.Option... options) { + public void registerForUpcall(RegistrationCondition condition, FunctionDescriptor desc, Linker.Option... options) { forUpcalls.apply(condition, desc, options); } @Override - public void registerForDirectUpcall(ConfigurationCondition condition, MethodHandle target, FunctionDescriptor fd, Linker.Option... options) { + public void registerForDirectUpcall(RegistrationCondition condition, MethodHandle target, FunctionDescriptor fd, Linker.Option... options) { forDirectUpcalls.apply(condition, target, fd, options); } }; } @Override - default void registerForDowncall(ConfigurationCondition condition, Object descO, Object... optionsO) { + default void registerForDowncall(RegistrationCondition condition, Object descO, Object... optionsO) { registerForDowncall(condition, castDesc(descO), castOptions(optionsO)); } - void registerForDowncall(ConfigurationCondition condition, FunctionDescriptor desc, Linker.Option... options); + void registerForDowncall(RegistrationCondition condition, FunctionDescriptor desc, Linker.Option... options); @Override - default void registerForUpcall(ConfigurationCondition condition, Object descO, Object... optionsO) { + default void registerForUpcall(RegistrationCondition condition, Object descO, Object... optionsO) { registerForUpcall(condition, castDesc(descO), castOptions(optionsO)); } - void registerForUpcall(ConfigurationCondition condition, FunctionDescriptor desc, Linker.Option... options); + void registerForUpcall(RegistrationCondition condition, FunctionDescriptor desc, Linker.Option... options); @Override - default void registerForDirectUpcall(ConfigurationCondition condition, MethodHandle target, Object desc, Object... options) { + default void registerForDirectUpcall(RegistrationCondition condition, MethodHandle target, Object desc, Object... options) { registerForDirectUpcall(condition, target, castDesc(desc), castOptions(options)); } - void registerForDirectUpcall(ConfigurationCondition condition, MethodHandle target, FunctionDescriptor desc, Linker.Option... options); + void registerForDirectUpcall(RegistrationCondition condition, MethodHandle target, FunctionDescriptor desc, Linker.Option... options); } diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ClassLoaderSupportImpl.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ClassLoaderSupportImpl.java index c8dff0897002..c3339155705e 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ClassLoaderSupportImpl.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ClassLoaderSupportImpl.java @@ -54,7 +54,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import org.graalvm.nativeimage.impl.ConfigurationCondition; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import com.oracle.svm.core.ClassLoaderSupport; import com.oracle.svm.core.util.ClasspathUtils; @@ -72,7 +72,7 @@ public class ClassLoaderSupportImpl extends ClassLoaderSupport { private final Map> packageToModules; - private record ConditionalResource(ConfigurationCondition condition, String resourceName, Object origin) { + private record ConditionalResource(RegistrationCondition condition, String resourceName, Object origin) { } public ClassLoaderSupportImpl(NativeImageClassLoaderSupport classLoaderSupport) { @@ -220,13 +220,13 @@ private static void scanJar(Path jarPath, ResourceCollector collector, boolean i } } - private static void includeResource(ResourceCollector collector, Module module, String name, ConfigurationCondition condition, Object origin) { + private static void includeResource(ResourceCollector collector, Module module, String name, RegistrationCondition condition, Object origin) { collector.addResourceConditionally(module, name, condition, origin); } private static List shouldIncludeEntry(Module module, ResourceCollector collector, String fileName, URI uri, boolean includeCurrent) { if (includeCurrent && !(fileName.endsWith(".class") || fileName.endsWith(".jar"))) { - return Collections.singletonList(new ConditionWithOrigin(ConfigurationCondition.alwaysTrue(), "Include all")); + return Collections.singletonList(new ConditionWithOrigin(RegistrationCondition.always(), "Include all")); } return collector.isIncluded(module, fileName, uri); diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ConditionalConfigurationRegistry.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ConditionalConfigurationRegistry.java index c09f626e5baf..de11325f25ed 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ConditionalConfigurationRegistry.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ConditionalConfigurationRegistry.java @@ -32,7 +32,8 @@ import java.util.function.Consumer; import org.graalvm.nativeimage.hosted.Feature; -import org.graalvm.nativeimage.impl.ConfigurationCondition; +import org.graalvm.nativeimage.hosted.RegistrationCondition; +import org.graalvm.nativeimage.impl.TypeReachabilityCondition; import com.oracle.svm.core.util.VMError; import com.oracle.svm.hosted.classinitialization.ClassInitializationSupport; @@ -42,32 +43,32 @@ public abstract class ConditionalConfigurationRegistry { private SVMHost hostVM; private final Map, Collection> pendingReachabilityHandlers = new ConcurrentHashMap<>(); - protected void registerConditionalConfiguration(ConfigurationCondition condition, Consumer consumer) { + protected void registerConditionalConfiguration(RegistrationCondition condition, Consumer consumer) { Objects.requireNonNull(condition, "Cannot use null value as condition for conditional configuration. Please ensure that you register a non-null condition."); Objects.requireNonNull(consumer, "Cannot use null value as runnable for conditional configuration. Please ensure that you register a non-null runnable."); - if (condition.isRuntimeChecked() && !condition.isAlwaysTrue()) { + if (((TypeReachabilityCondition) condition).isRuntimeChecked() && !((TypeReachabilityCondition) condition).isAlwaysTrue()) { /* * We do this before the type is reached as the handler runs during analysis when it is * too late to register types for reached tracking. If the type is never reached, there * is no damage as subtypes will also never be reached. */ - ClassInitializationSupport.singleton().addForTypeReachedTracking(condition.getType()); + ClassInitializationSupport.singleton().addForTypeReachedTracking(((TypeReachabilityCondition) condition).getKey()); } - if (ConfigurationCondition.alwaysTrue().equals(condition)) { + if (RegistrationCondition.always().equals(condition)) { /* analysis optimization to include new types as early as possible */ - consumer.accept(ConfigurationCondition.alwaysTrue()); + consumer.accept(RegistrationCondition.always()); } else { - ConfigurationCondition runtimeCondition; - if (condition.isRuntimeChecked()) { + RegistrationCondition runtimeCondition; + if (((TypeReachabilityCondition) condition).isRuntimeChecked()) { runtimeCondition = condition; } else { - runtimeCondition = ConfigurationCondition.alwaysTrue(); + runtimeCondition = RegistrationCondition.always(); } if (beforeAnalysisAccess == null) { - Collection handlers = pendingReachabilityHandlers.computeIfAbsent(condition.getType(), key -> new ConcurrentLinkedQueue<>()); + Collection handlers = pendingReachabilityHandlers.computeIfAbsent(((TypeReachabilityCondition) condition).getKey(), key -> new ConcurrentLinkedQueue<>()); handlers.add(() -> consumer.accept(runtimeCondition)); } else { - beforeAnalysisAccess.registerReachabilityHandler(access -> consumer.accept(runtimeCondition), condition.getType()); + beforeAnalysisAccess.registerReachabilityHandler(access -> consumer.accept(runtimeCondition), ((TypeReachabilityCondition) condition).getKey()); } } diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/FeatureImpl.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/FeatureImpl.java index 9d268b206d05..0c69b1211cc5 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/FeatureImpl.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/FeatureImpl.java @@ -50,8 +50,8 @@ import org.graalvm.nativeimage.hosted.Feature; import org.graalvm.nativeimage.hosted.Feature.DuringAnalysisAccess; import org.graalvm.nativeimage.hosted.FieldValueTransformer; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import org.graalvm.nativeimage.hosted.RuntimeReflection; -import org.graalvm.nativeimage.impl.ConfigurationCondition; import com.oracle.graal.pointsto.BigBang; import com.oracle.graal.pointsto.ObjectScanner; @@ -409,7 +409,7 @@ public void registerAsUnsafeAllocated(AnalysisType aType) { throw UserError.abort("Cannot register an abstract class as instantiated: " + aType.toJavaName(true)); } aType.registerAsUnsafeAllocated("From feature"); - classForNameSupport.registerUnsafeAllocated(ConfigurationCondition.alwaysTrue(), aType.getJavaClass()); + classForNameSupport.registerUnsafeAllocated(RegistrationCondition.always(), aType.getJavaClass()); } @Override diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ResourcesFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ResourcesFeature.java index 2f11afd2fc5e..11a9bbbd5c81 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ResourcesFeature.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ResourcesFeature.java @@ -56,9 +56,10 @@ import java.util.stream.Collectors; import org.graalvm.nativeimage.ImageSingletons; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import org.graalvm.nativeimage.hosted.RuntimeResourceAccess; -import org.graalvm.nativeimage.impl.ConfigurationCondition; import org.graalvm.nativeimage.impl.RuntimeResourceSupport; +import org.graalvm.nativeimage.impl.TypeReachabilityCondition; import com.oracle.svm.configure.ConfigurationFile; import com.oracle.svm.configure.ResourceConfigurationParser; @@ -161,10 +162,10 @@ public static class Options { private boolean sealed = false; - private record ConditionalPattern(ConfigurationCondition condition, String pattern, Object origin) { + private record ConditionalPattern(RegistrationCondition condition, String pattern, Object origin) { } - private record CompiledConditionalPattern(ConfigurationCondition condition, ResourcePattern compiledPattern, Object origin) { + private record CompiledConditionalPattern(RegistrationCondition condition, ResourcePattern compiledPattern, Object origin) { } private Set resourcePatternWorkSet = Collections.newSetFromMap(new ConcurrentHashMap<>()); @@ -174,7 +175,7 @@ private record CompiledConditionalPattern(ConfigurationCondition condition, Reso private int loadedConfigurations; private ImageClassLoader imageClassLoader; - private class ResourcesRegistryImpl extends ConditionalConfigurationRegistry implements ResourcesRegistry { + private class ResourcesRegistryImpl extends ConditionalConfigurationRegistry implements ResourcesRegistry { private final ClassInitializationSupport classInitializationSupport = ClassInitializationSupport.singleton(); private final Set alreadyAddedResources = new HashSet<>(); @@ -183,7 +184,7 @@ private class ResourcesRegistryImpl extends ConditionalConfigurationRegistry imp } @Override - public void addResources(ConfigurationCondition condition, String pattern, Object origin) { + public void addResources(RegistrationCondition condition, String pattern, Object origin) { try { resourcePatternWorkSet.add(new ConditionalPattern(condition, pattern, origin)); } catch (UnsupportedOperationException e) { @@ -192,17 +193,17 @@ public void addResources(ConfigurationCondition condition, String pattern, Objec } @Override - public void addGlob(ConfigurationCondition condition, String module, String glob, Object origin) { + public void addGlob(RegistrationCondition condition, String module, String glob, Object origin) { String canonicalGlob = NativeImageResourcePathRepresentation.toCanonicalForm(glob); String resolvedGlob = GlobUtils.transformToTriePath(canonicalGlob, module); globWorkSet.add(new ConditionalPattern(condition, resolvedGlob, origin)); } @Override - public void addCondition(ConfigurationCondition condition, Module module, String resourcePath) { + public void addCondition(RegistrationCondition condition, Module module, String resourcePath) { var conditionalResource = Resources.currentLayer().getResource(createStorageKey(module, resourcePath)); if (conditionalResource != null) { - classInitializationSupport.addForTypeReachedTracking(condition.getType()); + classInitializationSupport.addForTypeReachedTracking(((TypeReachabilityCondition) condition).getKey()); conditionalResource.getConditions().addCondition(condition); } } @@ -233,7 +234,7 @@ public void injectResource(Module module, String resourcePath, byte[] resourceCo } @Override - public void ignoreResources(ConfigurationCondition condition, String pattern) { + public void ignoreResources(RegistrationCondition condition, String pattern) { registerConditionalConfiguration(condition, (cnd) -> { UserError.guarantee(!sealed, "Resources ignored too late: %s", pattern); @@ -242,17 +243,17 @@ public void ignoreResources(ConfigurationCondition condition, String pattern) { } @Override - public void addResourceBundles(ConfigurationCondition condition, String name) { + public void addResourceBundles(RegistrationCondition condition, String name) { registerConditionalConfiguration(condition, (cnd) -> ImageSingletons.lookup(LocalizationFeature.class).prepareBundle(cnd, name)); } @Override - public void addClassBasedResourceBundle(ConfigurationCondition condition, String basename, String className) { + public void addClassBasedResourceBundle(RegistrationCondition condition, String basename, String className) { registerConditionalConfiguration(condition, (cnd) -> ImageSingletons.lookup(LocalizationFeature.class).prepareClassResourceBundle(basename, className)); } @Override - public void addResourceBundles(ConfigurationCondition condition, String basename, Collection locales) { + public void addResourceBundles(RegistrationCondition condition, String basename, Collection locales) { registerConditionalConfiguration(condition, (cnd) -> ImageSingletons.lookup(LocalizationFeature.class).prepareBundle(cnd, basename, locales)); } @@ -406,14 +407,14 @@ protected boolean collectEmbeddedResourcesInfo() { public void beforeAnalysis(BeforeAnalysisAccess a) { FeatureImpl.BeforeAnalysisAccessImpl access = (FeatureImpl.BeforeAnalysisAccessImpl) a; /* load and parse resource configuration files */ - ConfigurationConditionResolver conditionResolver = new NativeImageConditionResolver(access.getImageClassLoader(), + ConfigurationConditionResolver conditionResolver = new NativeImageConditionResolver(access.getImageClassLoader(), ClassInitializationSupport.singleton()); - ResourceConfigurationParser parser = ResourceConfigurationParser.create(true, conditionResolver, ResourcesRegistry.singleton(), + ResourceConfigurationParser parser = ResourceConfigurationParser.create(true, conditionResolver, ResourcesRegistry.singleton(), ConfigurationFiles.Options.getConfigurationParserOptions()); loadedConfigurations = ConfigurationParserUtils.parseAndRegisterConfigurationsFromCombinedFile(parser, imageClassLoader, "resource"); - ResourceConfigurationParser legacyParser = ResourceConfigurationParser.create(false, conditionResolver, ResourcesRegistry.singleton(), + ResourceConfigurationParser legacyParser = ResourceConfigurationParser.create(false, conditionResolver, ResourcesRegistry.singleton(), ConfigurationFiles.Options.getConfigurationParserOptions()); loadedConfigurations += ConfigurationParserUtils.parseAndRegisterConfigurations(legacyParser, imageClassLoader, "resource", ConfigurationFiles.Options.ResourceConfigurationFiles, ConfigurationFiles.Options.ResourceConfigurationResources, @@ -444,7 +445,7 @@ public void beforeAnalysis(BeforeAnalysisAccess a) { /* prepare regex patterns for resource registration */ resourcePatternWorkSet.addAll(Options.IncludeResources.getValue() .getValuesWithOrigins() - .map(e -> new ConditionalPattern(ConfigurationCondition.alwaysTrue(), e.value(), e.origin())) + .map(e -> new ConditionalPattern(RegistrationCondition.always(), e.value(), e.origin())) .toList()); Set includePatterns = resourcePatternWorkSet .stream() @@ -583,7 +584,7 @@ public void addResourceEntry(Module module, String resourceName, Object origin) } @Override - public void addResourceConditionally(Module module, String resourceName, ConfigurationCondition condition, Object origin) { + public void addResourceConditionally(Module module, String resourceName, RegistrationCondition condition, Object origin) { registerConditionalConfiguration(condition, cnd -> { addResourceEntry(module, resourceName, origin); ImageSingletons.lookup(RuntimeResourceSupport.class).addCondition(cnd, module, resourceName); @@ -601,7 +602,7 @@ public void registerNegativeQuery(Module module, String resourceName) { Resources.currentLayer().registerNegativeQuery(module, resourceName); } - public void registerIncludePattern(ConfigurationCondition condition, String module, String pattern) { + public void registerIncludePattern(RegistrationCondition condition, String module, String pattern) { registerConditionalConfiguration(condition, cnd -> Resources.currentLayer().registerIncludePattern(cnd, module, pattern)); } } @@ -655,7 +656,7 @@ public void afterAnalysis(AfterAnalysisAccess access) { /* prepare resources GlobTrie for runtime */ GlobTrieNode root = Resources.currentLayer().getResourcesTrieRoot(); - CompressedGlobTrie.removeNodes(root, (conditionWithOrigin) -> !access.isReachable(conditionWithOrigin.condition().getType())); + CompressedGlobTrie.removeNodes(root, (conditionWithOrigin) -> !access.isReachable(((TypeReachabilityCondition) conditionWithOrigin.condition()).getKey())); CompressedGlobTrie.finalize(root); } diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/ConfigurationParserUtils.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/ConfigurationParserUtils.java index 9903e8b88a97..fca015d09535 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/ConfigurationParserUtils.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/ConfigurationParserUtils.java @@ -43,7 +43,7 @@ import java.util.stream.Stream; import java.util.stream.StreamSupport; -import org.graalvm.nativeimage.impl.ConfigurationCondition; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import org.graalvm.nativeimage.impl.ReflectionRegistry; import org.graalvm.nativeimage.impl.RuntimeJNIAccessSupport; import org.graalvm.nativeimage.impl.RuntimeProxyCreationSupport; @@ -63,9 +63,9 @@ public final class ConfigurationParserUtils { - public static ReflectionConfigurationParser> create(ConfigurationFile configurationKind, boolean combinedFileSchema, - ConfigurationConditionResolver conditionResolver, ReflectionRegistry registry, RuntimeProxyCreationSupport proxyRegistry, - RuntimeSerializationSupport serializationSupport, RuntimeJNIAccessSupport jniSupport, ImageClassLoader imageClassLoader) { + public static ReflectionConfigurationParser> create(ConfigurationFile configurationKind, boolean combinedFileSchema, + ConfigurationConditionResolver conditionResolver, ReflectionRegistry registry, RuntimeProxyCreationSupport proxyRegistry, + RuntimeSerializationSupport serializationSupport, RuntimeJNIAccessSupport jniSupport, ImageClassLoader imageClassLoader) { var additionalParserOptions = configurationKind == ConfigurationFile.JNI ? EnumSet.of(JNI_PARSER) : null; return ReflectionConfigurationParser.create(combinedFileSchema, conditionResolver, RegistryAdapter.create(registry, proxyRegistry, serializationSupport, jniSupport, imageClassLoader), ConfigurationFiles.Options.getConfigurationParserOptions(additionalParserOptions, null)); diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/JNIRegistryAdapter.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/JNIRegistryAdapter.java index f6ceb6919532..a28caa92526a 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/JNIRegistryAdapter.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/JNIRegistryAdapter.java @@ -28,7 +28,7 @@ import java.lang.reflect.Field; import java.util.List; -import org.graalvm.nativeimage.impl.ConfigurationCondition; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import org.graalvm.nativeimage.impl.ReflectionRegistry; import com.oracle.svm.core.util.VMError; @@ -40,108 +40,108 @@ public JNIRegistryAdapter(ReflectionRegistry registry, ImageClassLoader classLoa } @Override - public void registerPublicClasses(ConfigurationCondition condition, Class type) { + public void registerPublicClasses(RegistrationCondition condition, Class type) { registry.register(condition, type.getClasses()); } @Override - public void registerDeclaredClasses(ConfigurationCondition condition, Class type) { + public void registerDeclaredClasses(RegistrationCondition condition, Class type) { registry.register(condition, type.getDeclaredClasses()); } @Override - public void registerRecordComponents(ConfigurationCondition condition, Class type) { + public void registerRecordComponents(RegistrationCondition condition, Class type) { VMError.shouldNotReachHere("Record components cannot be accessed through JNI registrations"); } @Override - public void registerPermittedSubclasses(ConfigurationCondition condition, Class type) { + public void registerPermittedSubclasses(RegistrationCondition condition, Class type) { VMError.shouldNotReachHere("Permitted subclasses cannot be accessed through JNI registrations"); } @Override - public void registerNestMembers(ConfigurationCondition condition, Class type) { + public void registerNestMembers(RegistrationCondition condition, Class type) { VMError.shouldNotReachHere("Nest members cannot be accessed through JNI registrations"); } @Override - public void registerSigners(ConfigurationCondition condition, Class type) { + public void registerSigners(RegistrationCondition condition, Class type) { VMError.shouldNotReachHere("Signers cannot be accessed through JNI registrations"); } @Override - public void registerPublicFields(ConfigurationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { + public void registerPublicFields(RegistrationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { ensureJniAccessible(jniAccessible); super.registerPublicFields(condition, queriedOnly, false, type); } @Override - public void registerDeclaredFields(ConfigurationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { + public void registerDeclaredFields(RegistrationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { ensureJniAccessible(jniAccessible); super.registerDeclaredFields(condition, queriedOnly, false, type); } @Override - public void registerPublicMethods(ConfigurationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { + public void registerPublicMethods(RegistrationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { ensureJniAccessible(jniAccessible); super.registerPublicMethods(condition, queriedOnly, false, type); } @Override - public void registerDeclaredMethods(ConfigurationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { + public void registerDeclaredMethods(RegistrationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { ensureJniAccessible(jniAccessible); super.registerDeclaredMethods(condition, queriedOnly, false, type); } @Override - public void registerPublicConstructors(ConfigurationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { + public void registerPublicConstructors(RegistrationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { ensureJniAccessible(jniAccessible); super.registerPublicConstructors(condition, queriedOnly, false, type); } @Override - public void registerDeclaredConstructors(ConfigurationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { + public void registerDeclaredConstructors(RegistrationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { ensureJniAccessible(jniAccessible); super.registerDeclaredConstructors(condition, queriedOnly, false, type); } @Override - protected void registerField(ConfigurationCondition condition, boolean allowWrite, boolean jniAccessible, Field field) { + protected void registerField(RegistrationCondition condition, boolean allowWrite, boolean jniAccessible, Field field) { ensureJniAccessible(jniAccessible); super.registerField(condition, allowWrite, true, field); } @Override - protected void registerFieldNegativeQuery(ConfigurationCondition condition, boolean jniAccessible, Class type, String fieldName) { + protected void registerFieldNegativeQuery(RegistrationCondition condition, boolean jniAccessible, Class type, String fieldName) { ensureJniAccessible(jniAccessible); super.registerFieldNegativeQuery(condition, true, type, fieldName); } @Override - protected void registerExecutable(ConfigurationCondition condition, boolean queriedOnly, boolean jniAccessible, Executable... executable) { + protected void registerExecutable(RegistrationCondition condition, boolean queriedOnly, boolean jniAccessible, Executable... executable) { ensureJniAccessible(jniAccessible); super.registerExecutable(condition, queriedOnly, true, executable); } @Override - protected void registerMethodNegativeQuery(ConfigurationCondition condition, boolean jniAccessible, Class type, String methodName, List> methodParameterTypes) { + protected void registerMethodNegativeQuery(RegistrationCondition condition, boolean jniAccessible, Class type, String methodName, List> methodParameterTypes) { ensureJniAccessible(jniAccessible); super.registerMethodNegativeQuery(condition, true, type, methodName, methodParameterTypes); } @Override - protected void registerConstructorNegativeQuery(ConfigurationCondition condition, boolean jniAccessible, Class type, List> constructorParameterTypes) { + protected void registerConstructorNegativeQuery(RegistrationCondition condition, boolean jniAccessible, Class type, List> constructorParameterTypes) { ensureJniAccessible(jniAccessible); super.registerConstructorNegativeQuery(condition, true, type, constructorParameterTypes); } @Override - public void registerAsSerializable(ConfigurationCondition condition, Class clazz) { + public void registerAsSerializable(RegistrationCondition condition, Class clazz) { VMError.shouldNotReachHere("serializable cannot be set on JNI registrations"); } @Override - public void registerAsJniAccessed(ConfigurationCondition condition, Class clazz) { + public void registerAsJniAccessed(RegistrationCondition condition, Class clazz) { VMError.shouldNotReachHere("jniAccessible cannot be set on JNI registrations"); } diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/ReflectionRegistryAdapter.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/ReflectionRegistryAdapter.java index e1f7cd84b98d..8756f08ea77c 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/ReflectionRegistryAdapter.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/ReflectionRegistryAdapter.java @@ -31,9 +31,9 @@ import java.lang.reflect.Proxy; import java.util.List; -import org.graalvm.nativeimage.impl.ConfigurationCondition; import org.graalvm.nativeimage.impl.RuntimeJNIAccessSupport; import org.graalvm.nativeimage.impl.RuntimeProxyCreationSupport; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import org.graalvm.nativeimage.impl.RuntimeReflectionSupport; import org.graalvm.nativeimage.impl.RuntimeSerializationSupport; @@ -47,10 +47,10 @@ public class ReflectionRegistryAdapter extends RegistryAdapter { private final RuntimeReflectionSupport reflectionSupport; private final RuntimeProxyCreationSupport proxyRegistry; - private final RuntimeSerializationSupport serializationSupport; + private final RuntimeSerializationSupport serializationSupport; private final RuntimeJNIAccessSupport jniSupport; - ReflectionRegistryAdapter(RuntimeReflectionSupport reflectionSupport, RuntimeProxyCreationSupport proxyRegistry, RuntimeSerializationSupport serializationSupport, + ReflectionRegistryAdapter(RuntimeReflectionSupport reflectionSupport, RuntimeProxyCreationSupport proxyRegistry, RuntimeSerializationSupport serializationSupport, RuntimeJNIAccessSupport jniSupport, ImageClassLoader classLoader) { super(reflectionSupport, classLoader); this.reflectionSupport = reflectionSupport; @@ -60,7 +60,7 @@ public class ReflectionRegistryAdapter extends RegistryAdapter { } @Override - public void registerType(ConfigurationCondition condition, Class type) { + public void registerType(RegistrationCondition condition, Class type) { super.registerType(condition, type); if (Proxy.isProxyClass(type)) { proxyRegistry.addProxyClass(condition, type.getInterfaces()); @@ -68,7 +68,7 @@ public void registerType(ConfigurationCondition condition, Class type) { } @Override - public TypeResult> resolveType(ConfigurationCondition condition, ConfigurationTypeDescriptor typeDescriptor, boolean allowPrimitives, boolean jniAccessible) { + public TypeResult> resolveType(RegistrationCondition condition, ConfigurationTypeDescriptor typeDescriptor, boolean allowPrimitives, boolean jniAccessible) { TypeResult> result = super.resolveType(condition, typeDescriptor, allowPrimitives, jniAccessible); if (!result.isPresent() && typeDescriptor instanceof NamedConfigurationTypeDescriptor namedDescriptor) { Throwable classLookupException = result.getException(); @@ -84,37 +84,37 @@ public TypeResult> resolveType(ConfigurationCondition condition, Config } @Override - public void registerPublicClasses(ConfigurationCondition condition, Class type) { + public void registerPublicClasses(RegistrationCondition condition, Class type) { reflectionSupport.registerAllClassesQuery(condition, type); } @Override - public void registerDeclaredClasses(ConfigurationCondition condition, Class type) { + public void registerDeclaredClasses(RegistrationCondition condition, Class type) { reflectionSupport.registerAllDeclaredClassesQuery(condition, type); } @Override - public void registerRecordComponents(ConfigurationCondition condition, Class type) { + public void registerRecordComponents(RegistrationCondition condition, Class type) { reflectionSupport.registerAllRecordComponentsQuery(condition, type); } @Override - public void registerPermittedSubclasses(ConfigurationCondition condition, Class type) { + public void registerPermittedSubclasses(RegistrationCondition condition, Class type) { reflectionSupport.registerAllPermittedSubclassesQuery(condition, type); } @Override - public void registerNestMembers(ConfigurationCondition condition, Class type) { + public void registerNestMembers(RegistrationCondition condition, Class type) { reflectionSupport.registerAllNestMembersQuery(condition, type); } @Override - public void registerSigners(ConfigurationCondition condition, Class type) { + public void registerSigners(RegistrationCondition condition, Class type) { reflectionSupport.registerAllSignersQuery(condition, type); } @Override - public void registerPublicFields(ConfigurationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { + public void registerPublicFields(RegistrationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { if (queriedOnly && reflectionSupport instanceof ReflectionDataBuilder reflectionDataBuilder) { reflectionDataBuilder.registerAllFieldsQuery(condition, true, type); } else if (!queriedOnly) { @@ -126,7 +126,7 @@ public void registerPublicFields(ConfigurationCondition condition, boolean queri } @Override - public void registerDeclaredFields(ConfigurationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { + public void registerDeclaredFields(RegistrationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { if (queriedOnly && reflectionSupport instanceof ReflectionDataBuilder reflectionDataBuilder) { reflectionDataBuilder.registerAllDeclaredFieldsQuery(condition, true, type); } else if (!queriedOnly) { @@ -138,7 +138,7 @@ public void registerDeclaredFields(ConfigurationCondition condition, boolean que } @Override - public void registerPublicMethods(ConfigurationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { + public void registerPublicMethods(RegistrationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { reflectionSupport.registerAllMethodsQuery(condition, queriedOnly, type); if (!queriedOnly && jniAccessible) { jniSupport.register(condition, false, type.getMethods()); @@ -146,7 +146,7 @@ public void registerPublicMethods(ConfigurationCondition condition, boolean quer } @Override - public void registerDeclaredMethods(ConfigurationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { + public void registerDeclaredMethods(RegistrationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { reflectionSupport.registerAllDeclaredMethodsQuery(condition, queriedOnly, type); if (!queriedOnly && jniAccessible) { jniSupport.register(condition, false, type.getDeclaredMethods()); @@ -154,7 +154,7 @@ public void registerDeclaredMethods(ConfigurationCondition condition, boolean qu } @Override - public void registerPublicConstructors(ConfigurationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { + public void registerPublicConstructors(RegistrationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { reflectionSupport.registerAllConstructorsQuery(condition, queriedOnly, type); if (!queriedOnly && jniAccessible) { jniSupport.register(condition, false, type.getConstructors()); @@ -162,7 +162,7 @@ public void registerPublicConstructors(ConfigurationCondition condition, boolean } @Override - public void registerDeclaredConstructors(ConfigurationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { + public void registerDeclaredConstructors(RegistrationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { reflectionSupport.registerAllDeclaredConstructorsQuery(condition, queriedOnly, type); if (!queriedOnly && jniAccessible) { jniSupport.register(condition, false, type.getDeclaredConstructors()); @@ -170,17 +170,17 @@ public void registerDeclaredConstructors(ConfigurationCondition condition, boole } @Override - public void registerAsSerializable(ConfigurationCondition condition, Class clazz) { + public void registerAsSerializable(RegistrationCondition condition, Class clazz) { serializationSupport.register(condition, clazz); } @Override - public void registerAsJniAccessed(ConfigurationCondition condition, Class clazz) { + public void registerAsJniAccessed(RegistrationCondition condition, Class clazz) { jniSupport.register(condition, clazz); } @Override - protected void registerField(ConfigurationCondition condition, boolean allowWrite, boolean jniAccessible, Field field) { + protected void registerField(RegistrationCondition condition, boolean allowWrite, boolean jniAccessible, Field field) { super.registerField(condition, allowWrite, jniAccessible, field); if (jniAccessible) { jniSupport.register(condition, allowWrite, field); @@ -188,7 +188,7 @@ protected void registerField(ConfigurationCondition condition, boolean allowWrit } @Override - protected void registerFieldNegativeQuery(ConfigurationCondition condition, boolean jniAccessible, Class type, String fieldName) { + protected void registerFieldNegativeQuery(RegistrationCondition condition, boolean jniAccessible, Class type, String fieldName) { super.registerFieldNegativeQuery(condition, jniAccessible, type, fieldName); if (jniAccessible) { jniSupport.registerFieldLookup(condition, type, fieldName); @@ -196,7 +196,7 @@ protected void registerFieldNegativeQuery(ConfigurationCondition condition, bool } @Override - protected void registerExecutable(ConfigurationCondition condition, boolean queriedOnly, boolean jniAccessible, Executable... executable) { + protected void registerExecutable(RegistrationCondition condition, boolean queriedOnly, boolean jniAccessible, Executable... executable) { super.registerExecutable(condition, queriedOnly, jniAccessible, executable); if (jniAccessible) { jniSupport.register(condition, queriedOnly, executable); @@ -204,7 +204,7 @@ protected void registerExecutable(ConfigurationCondition condition, boolean quer } @Override - protected void registerMethodNegativeQuery(ConfigurationCondition condition, boolean jniAccessible, Class type, String methodName, List> methodParameterTypes) { + protected void registerMethodNegativeQuery(RegistrationCondition condition, boolean jniAccessible, Class type, String methodName, List> methodParameterTypes) { super.registerMethodNegativeQuery(condition, jniAccessible, type, methodName, methodParameterTypes); if (jniAccessible) { jniSupport.registerMethodLookup(condition, type, methodName, getParameterTypes(methodParameterTypes)); @@ -212,7 +212,7 @@ protected void registerMethodNegativeQuery(ConfigurationCondition condition, boo } @Override - protected void registerConstructorNegativeQuery(ConfigurationCondition condition, boolean jniAccessible, Class type, List> constructorParameterTypes) { + protected void registerConstructorNegativeQuery(RegistrationCondition condition, boolean jniAccessible, Class type, List> constructorParameterTypes) { super.registerConstructorNegativeQuery(condition, jniAccessible, type, constructorParameterTypes); if (jniAccessible) { jniSupport.registerConstructorLookup(condition, type, getParameterTypes(constructorParameterTypes)); diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/RegistryAdapter.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/RegistryAdapter.java index 687150cb9cb1..e5cde2414dc2 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/RegistryAdapter.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/RegistryAdapter.java @@ -34,7 +34,7 @@ import java.util.List; import org.graalvm.nativeimage.ImageSingletons; -import org.graalvm.nativeimage.impl.ConfigurationCondition; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import org.graalvm.nativeimage.impl.ReflectionRegistry; import org.graalvm.nativeimage.impl.RuntimeJNIAccessSupport; import org.graalvm.nativeimage.impl.RuntimeProxyCreationSupport; @@ -52,11 +52,11 @@ import com.oracle.svm.util.ClassUtil; import com.oracle.svm.util.TypeResult; -public class RegistryAdapter implements ReflectionConfigurationParserDelegate> { +public class RegistryAdapter implements ReflectionConfigurationParserDelegate> { protected final ReflectionRegistry registry; private final ImageClassLoader classLoader; - public static RegistryAdapter create(ReflectionRegistry registry, RuntimeProxyCreationSupport proxyRegistry, RuntimeSerializationSupport serializationSupport, + public static RegistryAdapter create(ReflectionRegistry registry, RuntimeProxyCreationSupport proxyRegistry, RuntimeSerializationSupport serializationSupport, RuntimeJNIAccessSupport jniSupport, ImageClassLoader classLoader) { if (registry instanceof RuntimeReflectionSupport) { return new ReflectionRegistryAdapter((RuntimeReflectionSupport) registry, proxyRegistry, serializationSupport, jniSupport, classLoader); @@ -73,12 +73,12 @@ public static RegistryAdapter create(ReflectionRegistry registry, RuntimeProxyCr } @Override - public void registerType(ConfigurationCondition condition, Class type) { + public void registerType(RegistrationCondition condition, Class type) { registry.register(condition, type); } @Override - public TypeResult> resolveType(ConfigurationCondition condition, ConfigurationTypeDescriptor typeDescriptor, boolean allowPrimitives, boolean jniAccessible) { + public TypeResult> resolveType(RegistrationCondition condition, ConfigurationTypeDescriptor typeDescriptor, boolean allowPrimitives, boolean jniAccessible) { switch (typeDescriptor.getDescriptorType()) { case NAMED -> { String reflectionName = ClassNameSupport.typeNameToReflectionName(((NamedConfigurationTypeDescriptor) typeDescriptor).name()); @@ -139,66 +139,66 @@ private TypeResult> resolveProxyType(ProxyConfigurationTypeDescriptor t } @Override - public void registerPublicClasses(ConfigurationCondition condition, Class type) { + public void registerPublicClasses(RegistrationCondition condition, Class type) { } @Override - public void registerDeclaredClasses(ConfigurationCondition condition, Class type) { + public void registerDeclaredClasses(RegistrationCondition condition, Class type) { } @Override - public void registerRecordComponents(ConfigurationCondition condition, Class type) { + public void registerRecordComponents(RegistrationCondition condition, Class type) { } @Override - public void registerPermittedSubclasses(ConfigurationCondition condition, Class type) { + public void registerPermittedSubclasses(RegistrationCondition condition, Class type) { } @Override - public void registerNestMembers(ConfigurationCondition condition, Class type) { + public void registerNestMembers(RegistrationCondition condition, Class type) { } @Override - public void registerSigners(ConfigurationCondition condition, Class type) { + public void registerSigners(RegistrationCondition condition, Class type) { } @Override - public void registerPublicFields(ConfigurationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { + public void registerPublicFields(RegistrationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { if (!queriedOnly) { registry.register(condition, false, type.getFields()); } } @Override - public void registerDeclaredFields(ConfigurationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { + public void registerDeclaredFields(RegistrationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { if (!queriedOnly) { registry.register(condition, false, type.getDeclaredFields()); } } @Override - public void registerPublicMethods(ConfigurationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { + public void registerPublicMethods(RegistrationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { registry.register(condition, queriedOnly, type.getMethods()); } @Override - public void registerDeclaredMethods(ConfigurationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { + public void registerDeclaredMethods(RegistrationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { registry.register(condition, queriedOnly, type.getDeclaredMethods()); } @Override - public void registerPublicConstructors(ConfigurationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { + public void registerPublicConstructors(RegistrationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { registry.register(condition, queriedOnly, type.getConstructors()); } @Override - public void registerDeclaredConstructors(ConfigurationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { + public void registerDeclaredConstructors(RegistrationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { registry.register(condition, queriedOnly, type.getDeclaredConstructors()); } @Override @SuppressWarnings("unused") - public final void registerField(ConfigurationCondition condition, Class type, String fieldName, boolean allowWrite, boolean jniAccessible) throws NoSuchFieldException { + public final void registerField(RegistrationCondition condition, Class type, String fieldName, boolean allowWrite, boolean jniAccessible) throws NoSuchFieldException { try { registerField(condition, allowWrite, jniAccessible, type.getDeclaredField(fieldName)); } catch (NoSuchFieldException e) { @@ -211,17 +211,17 @@ public final void registerField(ConfigurationCondition condition, Class type, } @SuppressWarnings("unused") - protected void registerField(ConfigurationCondition condition, boolean allowWrite, boolean jniAccessible, Field field) { + protected void registerField(RegistrationCondition condition, boolean allowWrite, boolean jniAccessible, Field field) { registry.register(condition, allowWrite, field); } @SuppressWarnings("unused") - protected void registerFieldNegativeQuery(ConfigurationCondition condition, boolean jniAccessible, Class type, String fieldName) { + protected void registerFieldNegativeQuery(RegistrationCondition condition, boolean jniAccessible, Class type, String fieldName) { registry.registerFieldLookup(condition, type, fieldName); } @Override - public boolean registerAllMethodsWithName(ConfigurationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type, String methodName) { + public boolean registerAllMethodsWithName(RegistrationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type, String methodName) { boolean found = false; Executable[] methods = type.getDeclaredMethods(); for (Executable method : methods) { @@ -234,14 +234,14 @@ public boolean registerAllMethodsWithName(ConfigurationCondition condition, bool } @Override - public boolean registerAllConstructors(ConfigurationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { + public boolean registerAllConstructors(RegistrationCondition condition, boolean queriedOnly, boolean jniAccessible, Class type) { Executable[] methods = type.getDeclaredConstructors(); registerExecutable(condition, queriedOnly, jniAccessible, methods); return methods.length > 0; } @Override - public void registerUnsafeAllocated(ConfigurationCondition condition, Class clazz) { + public void registerUnsafeAllocated(RegistrationCondition condition, Class clazz) { if (!clazz.isArray() && !clazz.isInterface() && !Modifier.isAbstract(clazz.getModifiers())) { registry.register(condition, true, clazz); /* @@ -252,7 +252,7 @@ public void registerUnsafeAllocated(ConfigurationCondition condition, Class c } @Override - public final void registerMethod(ConfigurationCondition condition, boolean queriedOnly, Class type, String methodName, List> methodParameterTypes, boolean jniAccessible) + public final void registerMethod(RegistrationCondition condition, boolean queriedOnly, Class type, String methodName, List> methodParameterTypes, boolean jniAccessible) throws NoSuchMethodException { try { Class[] parameterTypesArray = getParameterTypes(methodParameterTypes); @@ -286,7 +286,7 @@ public final void registerMethod(ConfigurationCondition condition, boolean queri } @Override - public final void registerConstructor(ConfigurationCondition condition, boolean queriedOnly, Class type, List> methodParameterTypes, boolean jniAccessible) + public final void registerConstructor(RegistrationCondition condition, boolean queriedOnly, Class type, List> methodParameterTypes, boolean jniAccessible) throws NoSuchMethodException { Class[] parameterTypesArray = getParameterTypes(methodParameterTypes); try { @@ -305,26 +305,26 @@ static Class[] getParameterTypes(List> methodParameterTypes) { } @SuppressWarnings("unused") - protected void registerExecutable(ConfigurationCondition condition, boolean queriedOnly, boolean jniAccessible, Executable... executable) { + protected void registerExecutable(RegistrationCondition condition, boolean queriedOnly, boolean jniAccessible, Executable... executable) { registry.register(condition, queriedOnly, executable); } @SuppressWarnings("unused") - protected void registerMethodNegativeQuery(ConfigurationCondition condition, boolean jniAccessible, Class type, String methodName, List> methodParameterTypes) { + protected void registerMethodNegativeQuery(RegistrationCondition condition, boolean jniAccessible, Class type, String methodName, List> methodParameterTypes) { registry.registerMethodLookup(condition, type, methodName, getParameterTypes(methodParameterTypes)); } @SuppressWarnings("unused") - protected void registerConstructorNegativeQuery(ConfigurationCondition condition, boolean jniAccessible, Class type, List> constructorParameterTypes) { + protected void registerConstructorNegativeQuery(RegistrationCondition condition, boolean jniAccessible, Class type, List> constructorParameterTypes) { registry.registerConstructorLookup(condition, type, getParameterTypes(constructorParameterTypes)); } @Override - public void registerAsSerializable(ConfigurationCondition condition, Class clazz) { + public void registerAsSerializable(RegistrationCondition condition, Class clazz) { } @Override - public void registerAsJniAccessed(ConfigurationCondition condition, Class clazz) { + public void registerAsJniAccessed(RegistrationCondition condition, Class clazz) { } @Override diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/PreserveOptionsSupport.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/PreserveOptionsSupport.java index 442fc34e4d54..3bd3f70ab0a4 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/PreserveOptionsSupport.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/PreserveOptionsSupport.java @@ -40,7 +40,7 @@ import org.graalvm.collections.EconomicMap; import org.graalvm.nativeimage.ImageSingletons; -import org.graalvm.nativeimage.impl.ConfigurationCondition; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import org.graalvm.nativeimage.impl.RuntimeJNIAccessSupport; import org.graalvm.nativeimage.impl.RuntimeProxyCreationSupport; import org.graalvm.nativeimage.impl.RuntimeReflectionSupport; @@ -152,8 +152,8 @@ public static void registerPreservedClasses(NativeImageClassLoaderSupport classL final RuntimeReflectionSupport reflection = ImageSingletons.lookup(RuntimeReflectionSupport.class); final RuntimeProxyCreationSupport proxy = ImageSingletons.lookup(RuntimeProxyCreationSupport.class); - final RuntimeSerializationSupport serialization = RuntimeSerializationSupport.singleton(); - final ConfigurationCondition always = ConfigurationCondition.alwaysTrue(); + final RuntimeSerializationSupport serialization = RuntimeSerializationSupport.singleton(); + final RegistrationCondition always = RegistrationCondition.always(); /* * Sort descending by class hierarchy depth to avoid complexity related to field diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JmxCommonFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JmxCommonFeature.java index 53e199bf8281..ae0e5104bbcd 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JmxCommonFeature.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JmxCommonFeature.java @@ -29,6 +29,7 @@ import java.util.Arrays; import org.graalvm.nativeimage.ImageSingletons; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import org.graalvm.nativeimage.hosted.RuntimeReflection; import org.graalvm.nativeimage.hosted.RuntimeSerialization; @@ -38,7 +39,6 @@ import com.oracle.svm.core.jdk.proxy.DynamicProxyRegistry; import com.oracle.svm.core.jni.JNIRuntimeAccess; import com.oracle.svm.util.ReflectionUtil; -import org.graalvm.nativeimage.impl.ConfigurationCondition; @AutomaticallyRegisteredFeature public class JmxCommonFeature implements InternalFeature { @@ -158,27 +158,27 @@ public void beforeAnalysis(BeforeAnalysisAccess access) { */ private static void configureProxy(BeforeAnalysisAccess access) { DynamicProxyRegistry dynamicProxySupport = ImageSingletons.lookup(DynamicProxyRegistry.class); - dynamicProxySupport.addProxyClass(ConfigurationCondition.alwaysTrue(), access.findClassByName("com.sun.management.GarbageCollectorMXBean"), + dynamicProxySupport.addProxyClass(RegistrationCondition.always(), access.findClassByName("com.sun.management.GarbageCollectorMXBean"), access.findClassByName("javax.management.NotificationEmitter")); - dynamicProxySupport.addProxyClass(ConfigurationCondition.alwaysTrue(), access.findClassByName("com.sun.management.OperatingSystemMXBean")); - dynamicProxySupport.addProxyClass(ConfigurationCondition.alwaysTrue(), access.findClassByName("com.sun.management.ThreadMXBean")); - dynamicProxySupport.addProxyClass(ConfigurationCondition.alwaysTrue(), access.findClassByName("com.sun.management.UnixOperatingSystemMXBean")); - dynamicProxySupport.addProxyClass(ConfigurationCondition.alwaysTrue(), access.findClassByName("java.lang.management.BufferPoolMXBean")); - dynamicProxySupport.addProxyClass(ConfigurationCondition.alwaysTrue(), access.findClassByName("java.lang.management.ClassLoadingMXBean")); - dynamicProxySupport.addProxyClass(ConfigurationCondition.alwaysTrue(), access.findClassByName("java.lang.management.CompilationMXBean")); - dynamicProxySupport.addProxyClass(ConfigurationCondition.alwaysTrue(), access.findClassByName("java.lang.management.GarbageCollectorMXBean"), + dynamicProxySupport.addProxyClass(RegistrationCondition.always(), access.findClassByName("com.sun.management.OperatingSystemMXBean")); + dynamicProxySupport.addProxyClass(RegistrationCondition.always(), access.findClassByName("com.sun.management.ThreadMXBean")); + dynamicProxySupport.addProxyClass(RegistrationCondition.always(), access.findClassByName("com.sun.management.UnixOperatingSystemMXBean")); + dynamicProxySupport.addProxyClass(RegistrationCondition.always(), access.findClassByName("java.lang.management.BufferPoolMXBean")); + dynamicProxySupport.addProxyClass(RegistrationCondition.always(), access.findClassByName("java.lang.management.ClassLoadingMXBean")); + dynamicProxySupport.addProxyClass(RegistrationCondition.always(), access.findClassByName("java.lang.management.CompilationMXBean")); + dynamicProxySupport.addProxyClass(RegistrationCondition.always(), access.findClassByName("java.lang.management.GarbageCollectorMXBean"), access.findClassByName("javax.management.NotificationEmitter")); - dynamicProxySupport.addProxyClass(ConfigurationCondition.alwaysTrue(), access.findClassByName("java.lang.management.MemoryManagerMXBean"), + dynamicProxySupport.addProxyClass(RegistrationCondition.always(), access.findClassByName("java.lang.management.MemoryManagerMXBean"), access.findClassByName("javax.management.NotificationEmitter")); - dynamicProxySupport.addProxyClass(ConfigurationCondition.alwaysTrue(), access.findClassByName("java.lang.management.MemoryManagerMXBean")); - dynamicProxySupport.addProxyClass(ConfigurationCondition.alwaysTrue(), access.findClassByName("java.lang.management.MemoryPoolMXBean"), + dynamicProxySupport.addProxyClass(RegistrationCondition.always(), access.findClassByName("java.lang.management.MemoryManagerMXBean")); + dynamicProxySupport.addProxyClass(RegistrationCondition.always(), access.findClassByName("java.lang.management.MemoryPoolMXBean"), access.findClassByName("javax.management.NotificationEmitter")); - dynamicProxySupport.addProxyClass(ConfigurationCondition.alwaysTrue(), access.findClassByName("java.lang.management.MemoryMXBean"), + dynamicProxySupport.addProxyClass(RegistrationCondition.always(), access.findClassByName("java.lang.management.MemoryMXBean"), access.findClassByName("javax.management.NotificationEmitter")); - dynamicProxySupport.addProxyClass(ConfigurationCondition.alwaysTrue(), access.findClassByName("java.lang.management.OperatingSystemMXBean")); - dynamicProxySupport.addProxyClass(ConfigurationCondition.alwaysTrue(), access.findClassByName("java.lang.management.RuntimeMXBean")); - dynamicProxySupport.addProxyClass(ConfigurationCondition.alwaysTrue(), access.findClassByName("java.lang.management.ThreadMXBean")); - dynamicProxySupport.addProxyClass(ConfigurationCondition.alwaysTrue(), access.findClassByName("jdk.management.jfr.FlightRecorderMXBean"), + dynamicProxySupport.addProxyClass(RegistrationCondition.always(), access.findClassByName("java.lang.management.OperatingSystemMXBean")); + dynamicProxySupport.addProxyClass(RegistrationCondition.always(), access.findClassByName("java.lang.management.RuntimeMXBean")); + dynamicProxySupport.addProxyClass(RegistrationCondition.always(), access.findClassByName("java.lang.management.ThreadMXBean")); + dynamicProxySupport.addProxyClass(RegistrationCondition.always(), access.findClassByName("jdk.management.jfr.FlightRecorderMXBean"), access.findClassByName("javax.management.NotificationEmitter")); } diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JmxServerFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JmxServerFeature.java index 50367d43c976..b19d3d2c1082 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JmxServerFeature.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JmxServerFeature.java @@ -34,11 +34,11 @@ import javax.management.remote.JMXServiceURL; import org.graalvm.nativeimage.ImageSingletons; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import org.graalvm.nativeimage.hosted.RuntimeReflection; -import org.graalvm.nativeimage.impl.ConfigurationCondition; -import com.oracle.svm.core.VMInspectionOptions; import com.oracle.svm.configure.ResourcesRegistry; +import com.oracle.svm.core.VMInspectionOptions; import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature; import com.oracle.svm.core.feature.InternalFeature; import com.oracle.svm.core.jdk.NativeLibrarySupport; @@ -77,22 +77,22 @@ public void beforeAnalysis(BeforeAnalysisAccess access) { } private static void registerJMXAgentResources() { - ResourcesRegistry resourcesRegistry = ResourcesRegistry.singleton(); + ResourcesRegistry resourcesRegistry = ResourcesRegistry.singleton(); - resourcesRegistry.addResourceBundles(ConfigurationCondition.alwaysTrue(), + resourcesRegistry.addResourceBundles(RegistrationCondition.always(), "jdk.internal.agent.resources.agent"); - resourcesRegistry.addResourceBundles(ConfigurationCondition.alwaysTrue(), + resourcesRegistry.addResourceBundles(RegistrationCondition.always(), "sun.security.util.Resources"); // required for password auth } private static void configureProxy(BeforeAnalysisAccess access) { DynamicProxyRegistry dynamicProxySupport = ImageSingletons.lookup(DynamicProxyRegistry.class); - dynamicProxySupport.addProxyClass(ConfigurationCondition.alwaysTrue(), access.findClassByName("java.rmi.Remote"), + dynamicProxySupport.addProxyClass(RegistrationCondition.always(), access.findClassByName("java.rmi.Remote"), access.findClassByName("java.rmi.registry.Registry")); - dynamicProxySupport.addProxyClass(ConfigurationCondition.alwaysTrue(), access.findClassByName("javax.management.remote.rmi.RMIServer")); + dynamicProxySupport.addProxyClass(RegistrationCondition.always(), access.findClassByName("javax.management.remote.rmi.RMIServer")); } /** diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/localization/LocalizationFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/localization/LocalizationFeature.java index 2d670c874e49..168142b0f78b 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/localization/LocalizationFeature.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/localization/LocalizationFeature.java @@ -63,7 +63,7 @@ import org.graalvm.nativeimage.ImageSingletons; import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import org.graalvm.nativeimage.impl.ConfigurationCondition; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import org.graalvm.nativeimage.impl.RuntimeClassInitializationSupport; import com.oracle.graal.pointsto.ObjectScanner; @@ -504,7 +504,7 @@ protected void addResourceBundles() { * Locale data bundle class names do not contain underscores */ String baseName = e.getClassName().split("_")[0]; - prepareNegativeBundle(ConfigurationCondition.alwaysTrue(), baseName, locale, true); + prepareNegativeBundle(RegistrationCondition.always(), baseName, locale, true); continue; /* No bundle for this `locale`. */ } if (bundle instanceof ParallelListResourceBundle) { @@ -521,14 +521,14 @@ protected void addResourceBundles() { * No eager loading of bundle content, so we need to include the * `sun.text.resources.FormatData` bundle supplement as well. */ - prepareBundle(ConfigurationCondition.alwaysTrue(), "sun.text.resources.JavaTimeSupplementary"); + prepareBundle(RegistrationCondition.always(), "sun.text.resources.JavaTimeSupplementary"); } final String[] alwaysRegisteredResourceBundles = new String[]{ "sun.util.logging.resources.logging" }; for (String bundleName : alwaysRegisteredResourceBundles) { - prepareBundle(ConfigurationCondition.alwaysTrue(), bundleName); + prepareBundle(RegistrationCondition.always(), bundleName); } for (String bundleName : Options.IncludeResourceBundles.getValue().values()) { @@ -545,13 +545,13 @@ private void processRequestedBundle(String input) { if (locale != null) { /* Get rid of locale specific suffix. */ String baseName = input.substring(0, splitIndex); - prepareBundle(ConfigurationCondition.alwaysTrue(), baseName, Collections.singletonList(locale)); + prepareBundle(RegistrationCondition.always(), baseName, Collections.singletonList(locale)); return; } else { trace("Cannot parse wanted locale " + input.substring(splitIndex + 1) + ", default will be used instead."); } } - prepareBundle(ConfigurationCondition.alwaysTrue(), input, allLocales); + prepareBundle(RegistrationCondition.always(), input, allLocales); } @Platforms(Platform.HOSTED_ONLY.class) @@ -568,7 +568,7 @@ public void prepareClassResourceBundle(String basename, String className) { } @Platforms(Platform.HOSTED_ONLY.class) - public void prepareBundle(ConfigurationCondition condition, String baseName) { + public void prepareBundle(RegistrationCondition condition, String baseName) { prepareBundle(condition, baseName, allLocales); } @@ -580,7 +580,7 @@ public void prepareBundle(ConfigurationCondition condition, String baseName) { }; @Platforms(Platform.HOSTED_ONLY.class) - public void prepareBundle(ConfigurationCondition condition, String baseName, Collection wantedLocales) { + public void prepareBundle(RegistrationCondition condition, String baseName, Collection wantedLocales) { prepareBundleInternal(condition, baseName, wantedLocales); String alternativeBundleName = null; @@ -595,7 +595,7 @@ public void prepareBundle(ConfigurationCondition condition, String baseName, Col } } - private void prepareBundleInternal(ConfigurationCondition condition, String baseName, Collection wantedLocales) { + private void prepareBundleInternal(RegistrationCondition condition, String baseName, Collection wantedLocales) { boolean somethingFound = false; for (Locale locale : wantedLocales) { support.registerBundleLookup(condition, baseName); @@ -652,7 +652,7 @@ private void prepareBundleInternal(ConfigurationCondition condition, String base } @Platforms(Platform.HOSTED_ONLY.class) - protected void prepareNegativeBundle(ConfigurationCondition condition, String baseName, Locale locale, boolean jdkBundle) { + protected void prepareNegativeBundle(RegistrationCondition condition, String baseName, Locale locale, boolean jdkBundle) { support.registerBundleLookup(condition, baseName); support.registerRequiredReflectionAndResourcesForBundleAndLocale(baseName, locale, jdkBundle); } @@ -660,11 +660,11 @@ protected void prepareNegativeBundle(ConfigurationCondition condition, String ba @Platforms(Platform.HOSTED_ONLY.class) protected void prepareJDKBundle(ResourceBundle bundle, Locale locale) { String baseName = bundle.getBaseBundleName(); - prepareBundle(ConfigurationCondition.alwaysTrue(), baseName, bundle, locale, true); + prepareBundle(RegistrationCondition.always(), baseName, bundle, locale, true); } @Platforms(Platform.HOSTED_ONLY.class) - private void prepareBundle(ConfigurationCondition condition, String bundleName, ResourceBundle bundle, Locale locale, boolean jdkBundle) { + private void prepareBundle(RegistrationCondition condition, String bundleName, ResourceBundle bundle, Locale locale, boolean jdkBundle) { trace("Adding bundle " + bundleName + ", locale " + locale + " with condition " + condition); /* * Ensure that the bundle contents are loaded. We need to walk the whole bundle parent chain diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIAccessFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIAccessFeature.java index e63b7b408d10..660879f2f862 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIAccessFeature.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIAccessFeature.java @@ -49,7 +49,7 @@ import org.graalvm.nativeimage.ImageSingletons; import org.graalvm.nativeimage.c.function.CodePointer; import org.graalvm.nativeimage.hosted.Feature; -import org.graalvm.nativeimage.impl.ConfigurationCondition; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import org.graalvm.nativeimage.impl.RuntimeJNIAccessSupport; import org.graalvm.word.PointerBase; @@ -210,12 +210,12 @@ public void afterRegistration(AfterRegistrationAccess arg) { runtimeSupport = new JNIRuntimeAccessibilitySupportImpl(); ImageSingletons.add(RuntimeJNIAccessSupport.class, runtimeSupport); - ConfigurationConditionResolver conditionResolver = new NativeImageConditionResolver(access.getImageClassLoader(), + ConfigurationConditionResolver conditionResolver = new NativeImageConditionResolver(access.getImageClassLoader(), ClassInitializationSupport.singleton()); - ReflectionConfigurationParser> parser = ConfigurationParserUtils.create(ConfigurationFile.JNI, true, conditionResolver, runtimeSupport, null, null, null, + ReflectionConfigurationParser> parser = ConfigurationParserUtils.create(ConfigurationFile.JNI, true, conditionResolver, runtimeSupport, null, null, null, access.getImageClassLoader()); loadedConfigurations = ConfigurationParserUtils.parseAndRegisterConfigurationsFromCombinedFile(parser, access.getImageClassLoader(), "JNI"); - ReflectionConfigurationParser> legacyParser = ConfigurationParserUtils.create(ConfigurationFile.JNI, false, conditionResolver, runtimeSupport, null, null, + ReflectionConfigurationParser> legacyParser = ConfigurationParserUtils.create(ConfigurationFile.JNI, false, conditionResolver, runtimeSupport, null, null, null, access.getImageClassLoader()); loadedConfigurations += ConfigurationParserUtils.parseAndRegisterConfigurations(legacyParser, access.getImageClassLoader(), "JNI", @@ -226,7 +226,7 @@ private final class JNIRuntimeAccessibilitySupportImpl extends ConditionalConfig implements RuntimeJNIAccessSupport, LayeredImageSingleton { @Override - public void register(ConfigurationCondition condition, boolean unsafeAllocated, Class clazz) { + public void register(RegistrationCondition condition, boolean unsafeAllocated, Class clazz) { assert !unsafeAllocated : "unsafeAllocated can be only set via Unsafe.allocateInstance, not via JNI."; Objects.requireNonNull(clazz, () -> nullErrorMessage("class")); abortIfSealed(); @@ -234,7 +234,7 @@ public void register(ConfigurationCondition condition, boolean unsafeAllocated, } @Override - public void register(ConfigurationCondition condition, boolean queriedOnly, Executable... executables) { + public void register(RegistrationCondition condition, boolean queriedOnly, Executable... executables) { requireNonNull(executables, "executable"); abortIfSealed(); if (!queriedOnly) { @@ -243,7 +243,7 @@ public void register(ConfigurationCondition condition, boolean queriedOnly, Exec } @Override - public void register(ConfigurationCondition condition, boolean finalIsWritable, Field... fields) { + public void register(RegistrationCondition condition, boolean finalIsWritable, Field... fields) { requireNonNull(fields, "field"); abortIfSealed(); registerConditionalConfiguration(condition, (cnd) -> registerFields(finalIsWritable, fields)); @@ -257,7 +257,7 @@ private void registerFields(boolean finalIsWritable, Field[] fields) { } @Override - public void registerClassLookup(ConfigurationCondition condition, String reflectionName) { + public void registerClassLookup(RegistrationCondition condition, String reflectionName) { try { register(condition, false, Class.forName(reflectionName)); } catch (ClassNotFoundException e) { @@ -267,7 +267,7 @@ public void registerClassLookup(ConfigurationCondition condition, String reflect } @Override - public void registerFieldLookup(ConfigurationCondition condition, Class declaringClass, String fieldName) { + public void registerFieldLookup(RegistrationCondition condition, Class declaringClass, String fieldName) { try { register(condition, false, declaringClass.getDeclaredField(fieldName)); } catch (NoSuchFieldException e) { @@ -276,7 +276,7 @@ public void registerFieldLookup(ConfigurationCondition condition, Class decla } @Override - public void registerMethodLookup(ConfigurationCondition condition, Class declaringClass, String methodName, Class... parameterTypes) { + public void registerMethodLookup(RegistrationCondition condition, Class declaringClass, String methodName, Class... parameterTypes) { try { register(condition, false, declaringClass.getDeclaredMethod(methodName, parameterTypes)); } catch (NoSuchMethodException e) { @@ -285,7 +285,7 @@ public void registerMethodLookup(ConfigurationCondition condition, Class decl } @Override - public void registerConstructorLookup(ConfigurationCondition condition, Class declaringClass, Class... parameterTypes) { + public void registerConstructorLookup(RegistrationCondition condition, Class declaringClass, Class... parameterTypes) { try { register(condition, false, declaringClass.getDeclaredConstructor(parameterTypes)); } catch (NoSuchMethodException e) { diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/NativeImageConditionResolver.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/NativeImageConditionResolver.java index 14288fb74c68..1034d123c025 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/NativeImageConditionResolver.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/NativeImageConditionResolver.java @@ -24,7 +24,8 @@ */ package com.oracle.svm.hosted.reflect; -import org.graalvm.nativeimage.impl.ConfigurationCondition; +import org.graalvm.nativeimage.hosted.RegistrationCondition; +import org.graalvm.nativeimage.impl.TypeReachabilityCondition; import com.oracle.svm.configure.ClassNameSupport; import com.oracle.svm.configure.UnresolvedConfigurationCondition; @@ -33,7 +34,7 @@ import com.oracle.svm.hosted.classinitialization.ClassInitializationSupport; import com.oracle.svm.util.TypeResult; -public class NativeImageConditionResolver implements ConfigurationConditionResolver { +public class NativeImageConditionResolver implements ConfigurationConditionResolver { private final ImageClassLoader classLoader; @SuppressWarnings({"FieldCanBeLocal", "unused"}) private final ClassInitializationSupport classInitializationSupport; @@ -43,7 +44,7 @@ public NativeImageConditionResolver(ImageClassLoader classLoader, ClassInitializ } @Override - public TypeResult resolveCondition(UnresolvedConfigurationCondition unresolvedCondition) { + public TypeResult resolveCondition(UnresolvedConfigurationCondition unresolvedCondition) { String reflectionName = ClassNameSupport.typeNameToReflectionName(unresolvedCondition.getTypeName()); TypeResult> clazz = classLoader.findClass(reflectionName); return clazz.map(type -> { @@ -52,12 +53,15 @@ public TypeResult resolveCondition(UnresolvedConfigurati * reachability checks. */ var runtimeChecked = !classInitializationSupport.isAlwaysReached(type) && unresolvedCondition.isRuntimeChecked(); - return ConfigurationCondition.create(type, runtimeChecked); + /* + * GR-62516, this should be deleted + */ + return TypeReachabilityCondition.create(type, runtimeChecked); }); } @Override - public ConfigurationCondition alwaysTrue() { - return ConfigurationCondition.alwaysTrue(); + public RegistrationCondition alwaysTrue() { + return RegistrationCondition.always(); } } diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionDataBuilder.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionDataBuilder.java index 513e0a887e9d..47652dec87ac 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionDataBuilder.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionDataBuilder.java @@ -68,10 +68,11 @@ import java.util.stream.Collectors; import org.graalvm.nativeimage.ImageSingletons; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import org.graalvm.nativeimage.hosted.RuntimeProxyCreation; import org.graalvm.nativeimage.hosted.RuntimeReflection; -import org.graalvm.nativeimage.impl.ConfigurationCondition; import org.graalvm.nativeimage.impl.RuntimeReflectionSupport; +import org.graalvm.nativeimage.impl.TypeReachabilityCondition; import com.oracle.graal.pointsto.ObjectScanner.ScanReason; import com.oracle.graal.pointsto.constraints.UnsupportedFeatureException; @@ -149,7 +150,7 @@ public class ReflectionDataBuilder extends ConditionalConfigurationRegistry impl private Map> processedTypes = new ConcurrentHashMap<>(); private Map, Set> pendingRecordClasses; - record ConditionalTask(ConfigurationCondition condition, Consumer task) { + record ConditionalTask(RegistrationCondition condition, Consumer task) { } private final Set pendingConditionalTasks = ConcurrentHashMap.newKeySet(); @@ -178,7 +179,7 @@ public void beforeAnalysis(BeforeAnalysisAccessImpl beforeAnalysisAccess) { this.analysisAccess = beforeAnalysisAccess; } - private void runConditionalInAnalysisTask(ConfigurationCondition condition, Consumer task) { + private void runConditionalInAnalysisTask(RegistrationCondition condition, Consumer task) { if (sealed) { throw new UnsupportedFeatureException("Too late to add classes, methods, and fields for reflective access. Registration must happen in a Feature before the analysis has finished."); } @@ -200,13 +201,13 @@ private boolean isQueryFlagSet(Class clazz, int flag) { } @Override - public void register(ConfigurationCondition condition, boolean unsafeInstantiated, Class clazz) { + public void register(RegistrationCondition condition, boolean unsafeInstantiated, Class clazz) { Objects.requireNonNull(clazz, () -> nullErrorMessage("class")); runConditionalInAnalysisTask(condition, (cnd) -> registerClass(cnd, clazz, unsafeInstantiated, true)); } @Override - public void registerAllClassesQuery(ConfigurationCondition condition, Class clazz) { + public void registerAllClassesQuery(RegistrationCondition condition, Class clazz) { guaranteeNotRuntimeConditionForQueries(condition, true); runConditionalInAnalysisTask(condition, (cnd) -> { setQueryFlag(clazz, ALL_CLASSES_FLAG); @@ -228,14 +229,15 @@ public void registerAllClassesQuery(ConfigurationCondition condition, Class c * Runtime conditions can only be used with type, so they are not valid here. */ @SuppressWarnings("unused") - private static void guaranteeNotRuntimeConditionForQueries(ConfigurationCondition cnd, boolean queriedOnly) { + private static void guaranteeNotRuntimeConditionForQueries(RegistrationCondition cnd, boolean queriedOnly) { if (!TreatAllTypeReachableConditionsAsTypeReached.getValue()) { - VMError.guarantee(!queriedOnly || cnd.isAlwaysTrue() || !cnd.isRuntimeChecked(), "Bulk queries can only be set with 'name' which does not allow run-time conditions."); + VMError.guarantee(!queriedOnly || ((TypeReachabilityCondition) cnd).isAlwaysTrue() || !((TypeReachabilityCondition) cnd).isRuntimeChecked(), + "Bulk queries can only be set with 'name' which does not allow run-time conditions."); } } @Override - public void registerAllDeclaredClassesQuery(ConfigurationCondition condition, Class clazz) { + public void registerAllDeclaredClassesQuery(RegistrationCondition condition, Class clazz) { guaranteeNotRuntimeConditionForQueries(condition, true); runConditionalInAnalysisTask(condition, (cnd) -> { setQueryFlag(clazz, ALL_DECLARED_CLASSES_FLAG); @@ -250,7 +252,7 @@ public void registerAllDeclaredClassesQuery(ConfigurationCondition condition, Cl }); } - private void registerClass(ConfigurationCondition condition, Class clazz, boolean unsafeInstantiated, boolean allowForName) { + private void registerClass(RegistrationCondition condition, Class clazz, boolean unsafeInstantiated, boolean allowForName) { if (shouldExcludeClass(clazz)) { return; } @@ -286,12 +288,12 @@ private void registerClass(ConfigurationCondition condition, Class clazz, boo } @Override - public void registerClassLookupException(ConfigurationCondition condition, String typeName, Throwable t) { + public void registerClassLookupException(RegistrationCondition condition, String typeName, Throwable t) { runConditionalInAnalysisTask(condition, (cnd) -> classForNameSupport.registerExceptionForClass(cnd, typeName, t)); } @Override - public void registerClassLookup(ConfigurationCondition condition, String typeName) { + public void registerClassLookup(RegistrationCondition condition, String typeName) { runConditionalInAnalysisTask(condition, (cnd) -> { try { registerClass(cnd, Class.forName(typeName, false, ClassLoader.getSystemClassLoader()), false, true); @@ -304,7 +306,7 @@ public void registerClassLookup(ConfigurationCondition condition, String typeNam } @Override - public void registerAllRecordComponentsQuery(ConfigurationCondition condition, Class clazz) { + public void registerAllRecordComponentsQuery(RegistrationCondition condition, Class clazz) { guaranteeNotRuntimeConditionForQueries(condition, true); runConditionalInAnalysisTask(condition, (cnd) -> { setQueryFlag(clazz, ALL_RECORD_COMPONENTS_FLAG); @@ -313,7 +315,7 @@ public void registerAllRecordComponentsQuery(ConfigurationCondition condition, C } @Override - public void registerAllPermittedSubclassesQuery(ConfigurationCondition condition, Class clazz) { + public void registerAllPermittedSubclassesQuery(RegistrationCondition condition, Class clazz) { guaranteeNotRuntimeConditionForQueries(condition, true); runConditionalInAnalysisTask(condition, (cnd) -> { setQueryFlag(clazz, ALL_PERMITTED_SUBCLASSES_FLAG); @@ -326,7 +328,7 @@ public void registerAllPermittedSubclassesQuery(ConfigurationCondition condition } @Override - public void registerAllNestMembersQuery(ConfigurationCondition condition, Class clazz) { + public void registerAllNestMembersQuery(RegistrationCondition condition, Class clazz) { guaranteeNotRuntimeConditionForQueries(condition, true); runConditionalInAnalysisTask(condition, (cnd) -> { setQueryFlag(clazz, ALL_NEST_MEMBERS_FLAG); @@ -339,7 +341,7 @@ public void registerAllNestMembersQuery(ConfigurationCondition condition, Class< } @Override - public void registerAllSignersQuery(ConfigurationCondition condition, Class clazz) { + public void registerAllSignersQuery(RegistrationCondition condition, Class clazz) { guaranteeNotRuntimeConditionForQueries(condition, true); runConditionalInAnalysisTask(condition, (cnd) -> { setQueryFlag(clazz, ALL_SIGNERS_FLAG); @@ -353,13 +355,13 @@ public void registerAllSignersQuery(ConfigurationCondition condition, Class c } @Override - public void register(ConfigurationCondition condition, boolean queriedOnly, Executable... executables) { + public void register(RegistrationCondition condition, boolean queriedOnly, Executable... executables) { requireNonNull(executables, "executable"); runConditionalInAnalysisTask(condition, (cnd) -> registerMethods(cnd, queriedOnly, executables)); } @Override - public void registerAllMethodsQuery(ConfigurationCondition condition, boolean queriedOnly, Class clazz) { + public void registerAllMethodsQuery(RegistrationCondition condition, boolean queriedOnly, Class clazz) { guaranteeNotRuntimeConditionForQueries(condition, queriedOnly); runConditionalInAnalysisTask(condition, (cnd) -> { for (Class current = clazz; current != null; current = current.getSuperclass()) { @@ -374,7 +376,7 @@ public void registerAllMethodsQuery(ConfigurationCondition condition, boolean qu } @Override - public void registerAllDeclaredMethodsQuery(ConfigurationCondition condition, boolean queriedOnly, Class clazz) { + public void registerAllDeclaredMethodsQuery(RegistrationCondition condition, boolean queriedOnly, Class clazz) { guaranteeNotRuntimeConditionForQueries(condition, queriedOnly); runConditionalInAnalysisTask(condition, (cnd) -> { setQueryFlag(clazz, ALL_DECLARED_METHODS_FLAG); @@ -387,7 +389,7 @@ public void registerAllDeclaredMethodsQuery(ConfigurationCondition condition, bo } @Override - public void registerAllConstructorsQuery(ConfigurationCondition condition, boolean queriedOnly, Class clazz) { + public void registerAllConstructorsQuery(RegistrationCondition condition, boolean queriedOnly, Class clazz) { guaranteeNotRuntimeConditionForQueries(condition, queriedOnly); runConditionalInAnalysisTask(condition, (cnd) -> { for (Class current = clazz; current != null; current = current.getSuperclass()) { @@ -402,7 +404,7 @@ public void registerAllConstructorsQuery(ConfigurationCondition condition, boole } @Override - public void registerAllDeclaredConstructorsQuery(ConfigurationCondition condition, boolean queriedOnly, Class clazz) { + public void registerAllDeclaredConstructorsQuery(RegistrationCondition condition, boolean queriedOnly, Class clazz) { guaranteeNotRuntimeConditionForQueries(condition, queriedOnly); runConditionalInAnalysisTask(condition, (cnd) -> { setQueryFlag(clazz, ALL_DECLARED_CONSTRUCTORS_FLAG); @@ -414,13 +416,13 @@ public void registerAllDeclaredConstructorsQuery(ConfigurationCondition conditio }); } - private void registerMethods(ConfigurationCondition cnd, boolean queriedOnly, Executable[] reflectExecutables) { + private void registerMethods(RegistrationCondition cnd, boolean queriedOnly, Executable[] reflectExecutables) { for (Executable reflectExecutable : reflectExecutables) { registerMethod(cnd, queriedOnly, reflectExecutable); } } - private void registerMethod(ConfigurationCondition cnd, boolean queriedOnly, Executable reflectExecutable) { + private void registerMethod(RegistrationCondition cnd, boolean queriedOnly, Executable reflectExecutable) { if (SubstitutionReflectivityFilter.shouldExclude(reflectExecutable, metaAccess, universe)) { return; } @@ -496,7 +498,7 @@ private void registerMethod(ConfigurationCondition cnd, boolean queriedOnly, Exe } @Override - public void registerMethodLookup(ConfigurationCondition condition, Class declaringClass, String methodName, Class... parameterTypes) { + public void registerMethodLookup(RegistrationCondition condition, Class declaringClass, String methodName, Class... parameterTypes) { guaranteeNotRuntimeConditionForQueries(condition, true); runConditionalInAnalysisTask(condition, (cnd) -> { try { @@ -511,7 +513,7 @@ public void registerMethodLookup(ConfigurationCondition condition, Class decl } @Override - public void registerConstructorLookup(ConfigurationCondition condition, Class declaringClass, Class... parameterTypes) { + public void registerConstructorLookup(RegistrationCondition condition, Class declaringClass, Class... parameterTypes) { guaranteeNotRuntimeConditionForQueries(condition, true); runConditionalInAnalysisTask(condition, (cnd) -> { try { @@ -526,17 +528,17 @@ public void registerConstructorLookup(ConfigurationCondition condition, Class } @Override - public void register(ConfigurationCondition condition, boolean finalIsWritable, Field... fields) { + public void register(RegistrationCondition condition, boolean finalIsWritable, Field... fields) { requireNonNull(fields, "field"); runConditionalInAnalysisTask(condition, (cnd) -> registerFields(cnd, false, fields)); } @Override - public void registerAllFields(ConfigurationCondition condition, Class clazz) { + public void registerAllFields(RegistrationCondition condition, Class clazz) { registerAllFieldsQuery(condition, false, clazz); } - public void registerAllFieldsQuery(ConfigurationCondition condition, boolean queriedOnly, Class clazz) { + public void registerAllFieldsQuery(RegistrationCondition condition, boolean queriedOnly, Class clazz) { guaranteeNotRuntimeConditionForQueries(condition, queriedOnly); runConditionalInAnalysisTask(condition, (cnd) -> { for (Class current = clazz; current != null; current = current.getSuperclass()) { @@ -551,16 +553,16 @@ public void registerAllFieldsQuery(ConfigurationCondition condition, boolean que } @Override - public void registerAllDeclaredFields(ConfigurationCondition condition, Class clazz) { + public void registerAllDeclaredFields(RegistrationCondition condition, Class clazz) { registerAllDeclaredFieldsQuery(condition, false, clazz); } - private record AllDeclaredFieldsQuery(ConfigurationCondition condition, boolean queriedOnly, Class clazz) { + private record AllDeclaredFieldsQuery(RegistrationCondition condition, boolean queriedOnly, Class clazz) { } private Set existingAllDeclaredFieldsQuery = ConcurrentHashMap.newKeySet(); - public void registerAllDeclaredFieldsQuery(ConfigurationCondition condition, boolean queriedOnly, Class clazz) { + public void registerAllDeclaredFieldsQuery(RegistrationCondition condition, boolean queriedOnly, Class clazz) { final var query = new AllDeclaredFieldsQuery(condition, queriedOnly, clazz); if (!existingAllDeclaredFieldsQuery.contains(query)) { runConditionalInAnalysisTask(condition, (cnd) -> { @@ -575,13 +577,13 @@ public void registerAllDeclaredFieldsQuery(ConfigurationCondition condition, boo } } - private void registerFields(ConfigurationCondition cnd, boolean queriedOnly, Field[] reflectFields) { + private void registerFields(RegistrationCondition cnd, boolean queriedOnly, Field[] reflectFields) { for (Field reflectField : reflectFields) { registerField(cnd, queriedOnly, reflectField); } } - private void registerField(ConfigurationCondition cnd, boolean queriedOnly, Field reflectField) { + private void registerField(RegistrationCondition cnd, boolean queriedOnly, Field reflectField) { if (SubstitutionReflectivityFilter.shouldExclude(reflectField, metaAccess, universe)) { return; } @@ -633,7 +635,7 @@ private void registerField(ConfigurationCondition cnd, boolean queriedOnly, Fiel } @Override - public void registerFieldLookup(ConfigurationCondition condition, Class declaringClass, String fieldName) { + public void registerFieldLookup(RegistrationCondition condition, Class declaringClass, String fieldName) { runConditionalInAnalysisTask(condition, (cnd) -> { try { registerField(cnd, false, declaringClass.getDeclaredField(fieldName)); @@ -658,8 +660,11 @@ private void processAnnotationMethod(boolean queriedOnly, Method method) { Class annotationClass = method.getDeclaringClass(); Class proxyClass = Proxy.getProxyClass(annotationClass.getClassLoader(), annotationClass); try { - /* build-time condition as it is registered during analysis */ - var condition = ConfigurationCondition.create(proxyClass, false); + /* + * build-time condition as it is registered during analysis GR-62516, this should be + * deleted + */ + var condition = TypeReachabilityCondition.create(proxyClass, false); register(condition, queriedOnly, proxyClass.getDeclaredMethod(method.getName(), method.getParameterTypes())); } catch (NoSuchMethodException e) { /* @@ -669,7 +674,7 @@ private void processAnnotationMethod(boolean queriedOnly, Method method) { } @SuppressWarnings("deprecation") - private void processAnnotationField(ConfigurationCondition cnd, Field field) { + private void processAnnotationField(RegistrationCondition cnd, Field field) { Class annotationClass = field.getDeclaringClass(); Class proxyClass = Proxy.getProxyClass(annotationClass.getClassLoader(), annotationClass); try { @@ -959,7 +964,7 @@ private void registerTypesForGenericSignature(Type type, int dimension) { private void registerTypesForRecordComponent(RecordComponent recordComponent) { Method accessorOrNull = recordComponent.getAccessor(); if (accessorOrNull != null) { - register(ConfigurationCondition.alwaysTrue(), true, accessorOrNull); + register(RegistrationCondition.always(), true, accessorOrNull); } registerTypesForAnnotations(recordComponent); registerTypesForTypeAnnotations(recordComponent); @@ -1235,7 +1240,7 @@ public void registerHeapReflectionField(Field reflectField, ScanReason reason) { if (!SubstitutionReflectivityFilter.shouldExclude(reflectField, metaAccess, universe)) { registerTypesForField(analysisField, reflectField, false); if (analysisField.getDeclaringClass().isAnnotation()) { - processAnnotationField(ConfigurationCondition.alwaysTrue(), reflectField); + processAnnotationField(RegistrationCondition.always(), reflectField); } } } @@ -1362,7 +1367,7 @@ private static String nullErrorMessage(String kind) { public static class TestBackdoor { public static void registerField(ReflectionDataBuilder reflectionDataBuilder, boolean queriedOnly, Field field) { - reflectionDataBuilder.runConditionalInAnalysisTask(ConfigurationCondition.alwaysTrue(), (cnd) -> reflectionDataBuilder.registerField(cnd, queriedOnly, field)); + reflectionDataBuilder.runConditionalInAnalysisTask(RegistrationCondition.always(), (cnd) -> reflectionDataBuilder.registerField(cnd, queriedOnly, field)); } } } diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionFeature.java index 13f195ecffe1..497076938936 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionFeature.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionFeature.java @@ -40,9 +40,9 @@ import org.graalvm.nativeimage.ImageSingletons; import org.graalvm.nativeimage.c.function.CFunctionPointer; import org.graalvm.nativeimage.hosted.Feature; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import org.graalvm.nativeimage.hosted.RuntimeReflection; import org.graalvm.nativeimage.impl.AnnotationExtractor; -import org.graalvm.nativeimage.impl.ConfigurationCondition; import org.graalvm.nativeimage.impl.RuntimeJNIAccessSupport; import org.graalvm.nativeimage.impl.RuntimeProxyCreationSupport; import org.graalvm.nativeimage.impl.RuntimeReflectionSupport; @@ -293,12 +293,12 @@ public void duringSetup(DuringSetupAccess a) { var conditionResolver = new NativeImageConditionResolver(access.getImageClassLoader(), ClassInitializationSupport.singleton()); reflectionData.duringSetup(access.getMetaAccess(), aUniverse); RuntimeProxyCreationSupport proxyRegistry = ImageSingletons.lookup(RuntimeProxyCreationSupport.class); - RuntimeSerializationSupport serializationSupport = RuntimeSerializationSupport.singleton(); + RuntimeSerializationSupport serializationSupport = RuntimeSerializationSupport.singleton(); RuntimeJNIAccessSupport jniSupport = SubstrateOptions.JNI.getValue() ? ImageSingletons.lookup(RuntimeJNIAccessSupport.class) : null; - ReflectionConfigurationParser> parser = ConfigurationParserUtils.create(ConfigurationFile.REFLECTION, true, conditionResolver, reflectionData, proxyRegistry, + ReflectionConfigurationParser> parser = ConfigurationParserUtils.create(ConfigurationFile.REFLECTION, true, conditionResolver, reflectionData, proxyRegistry, serializationSupport, jniSupport, access.getImageClassLoader()); loadedConfigurations = ConfigurationParserUtils.parseAndRegisterConfigurationsFromCombinedFile(parser, access.getImageClassLoader(), "reflection"); - ReflectionConfigurationParser> legacyParser = ConfigurationParserUtils.create(ConfigurationFile.REFLECTION, false, conditionResolver, reflectionData, + ReflectionConfigurationParser> legacyParser = ConfigurationParserUtils.create(ConfigurationFile.REFLECTION, false, conditionResolver, reflectionData, proxyRegistry, serializationSupport, jniSupport, access.getImageClassLoader()); loadedConfigurations += ConfigurationParserUtils.parseAndRegisterConfigurations(legacyParser, access.getImageClassLoader(), "reflection", ConfigurationFiles.Options.ReflectionConfigurationFiles, ConfigurationFiles.Options.ReflectionConfigurationResources, @@ -309,7 +309,7 @@ public void duringSetup(DuringSetupAccess a) { /* Primitive classes cannot be accessed through Class.forName() */ for (Class primitiveClass : PRIMITIVE_CLASSES) { - ClassForNameSupport.currentLayer().registerNegativeQuery(ConfigurationCondition.alwaysTrue(), primitiveClass.getName()); + ClassForNameSupport.currentLayer().registerNegativeQuery(RegistrationCondition.always(), primitiveClass.getName()); } access.registerObjectReachableCallback(SubstrateAccessor.class, ReflectionFeature::onAccessorReachable); diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/proxy/DynamicProxyFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/proxy/DynamicProxyFeature.java index 4231340be5a4..71d3246c08ce 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/proxy/DynamicProxyFeature.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/proxy/DynamicProxyFeature.java @@ -25,7 +25,7 @@ package com.oracle.svm.hosted.reflect.proxy; import org.graalvm.nativeimage.ImageSingletons; -import org.graalvm.nativeimage.impl.ConfigurationCondition; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import org.graalvm.nativeimage.impl.RuntimeProxyCreationSupport; import com.oracle.svm.configure.ConfigurationFile; @@ -68,9 +68,9 @@ public void afterRegistration(AfterRegistrationAccess a) { public void duringSetup(DuringSetupAccess a) { DuringSetupAccessImpl access = (DuringSetupAccessImpl) a; ImageClassLoader imageClassLoader = access.getImageClassLoader(); - ConfigurationConditionResolver conditionResolver = new NativeImageConditionResolver(imageClassLoader, ClassInitializationSupport.singleton()); + ConfigurationConditionResolver conditionResolver = new NativeImageConditionResolver(imageClassLoader, ClassInitializationSupport.singleton()); - ProxyConfigurationParser parser = new ProxyConfigurationParser<>(conditionResolver, ConfigurationFiles.Options.getConfigurationParserOptions(), proxyRegistry); + ProxyConfigurationParser parser = new ProxyConfigurationParser<>(conditionResolver, ConfigurationFiles.Options.getConfigurationParserOptions(), proxyRegistry); loadedConfigurations = ConfigurationParserUtils.parseAndRegisterConfigurations(parser, imageClassLoader, "dynamic proxy", ConfigurationFiles.Options.DynamicProxyConfigurationFiles, ConfigurationFiles.Options.DynamicProxyConfigurationResources, ConfigurationFile.DYNAMIC_PROXY.getFileName()); diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/proxy/ProxyRegistry.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/proxy/ProxyRegistry.java index f2a2e1093e89..f0567cf5d6ff 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/proxy/ProxyRegistry.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/proxy/ProxyRegistry.java @@ -27,14 +27,14 @@ import java.util.List; import java.util.function.BiConsumer; -import org.graalvm.nativeimage.impl.ConfigurationCondition; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import com.oracle.svm.core.jdk.proxy.DynamicProxyRegistry; import com.oracle.svm.hosted.ConditionalConfigurationRegistry; import com.oracle.svm.hosted.ImageClassLoader; import com.oracle.svm.util.LogUtils; -public class ProxyRegistry extends ConditionalConfigurationRegistry implements BiConsumer> { +public class ProxyRegistry extends ConditionalConfigurationRegistry implements BiConsumer> { private final DynamicProxyRegistry dynamicProxySupport; private final ImageClassLoader imageClassLoader; @@ -44,7 +44,7 @@ public ProxyRegistry(DynamicProxyRegistry dynamicProxySupport, ImageClassLoader } @Override - public void accept(ConfigurationCondition condition, List proxies) { + public void accept(RegistrationCondition condition, List proxies) { Class[] interfaces = checkIfInterfacesAreValid(proxies); if (interfaces != null) { registerConditionalConfiguration(condition, (cnd) -> { diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/serialize/SerializationFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/serialize/SerializationFeature.java index 7d100e56cfd2..ee32eefeaecd 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/serialize/SerializationFeature.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/serialize/SerializationFeature.java @@ -53,8 +53,8 @@ import org.graalvm.nativeimage.ImageSingletons; import org.graalvm.nativeimage.hosted.Feature; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import org.graalvm.nativeimage.hosted.RuntimeReflection; -import org.graalvm.nativeimage.impl.ConfigurationCondition; import org.graalvm.nativeimage.impl.RuntimeReflectionSupport; import org.graalvm.nativeimage.impl.RuntimeSerializationSupport; @@ -130,17 +130,17 @@ public void afterRegistration(AfterRegistrationAccess a) { public void duringSetup(DuringSetupAccess a) { FeatureImpl.DuringSetupAccessImpl access = (FeatureImpl.DuringSetupAccessImpl) a; ImageClassLoader imageClassLoader = access.getImageClassLoader(); - ConfigurationConditionResolver conditionResolver = new NativeImageConditionResolver(imageClassLoader, ClassInitializationSupport.singleton()); + ConfigurationConditionResolver conditionResolver = new NativeImageConditionResolver(imageClassLoader, ClassInitializationSupport.singleton()); EnumSet parserOptions = ConfigurationFiles.Options.getConfigurationParserOptions(); - SerializationConfigurationParser parser = SerializationConfigurationParser.create(true, conditionResolver, serializationBuilder, parserOptions); + SerializationConfigurationParser parser = SerializationConfigurationParser.create(true, conditionResolver, serializationBuilder, parserOptions); loadedConfigurations = ConfigurationParserUtils.parseAndRegisterConfigurationsFromCombinedFile(parser, imageClassLoader, "serialization"); - SerializationConfigurationParser denyCollectorParser = SerializationConfigurationParser.create(false, conditionResolver, serializationDenyRegistry, parserOptions); + SerializationConfigurationParser denyCollectorParser = SerializationConfigurationParser.create(false, conditionResolver, serializationDenyRegistry, parserOptions); ConfigurationParserUtils.parseAndRegisterConfigurations(denyCollectorParser, imageClassLoader, "serialization", ConfigurationFiles.Options.SerializationDenyConfigurationFiles, ConfigurationFiles.Options.SerializationDenyConfigurationResources, ConfigurationFile.SERIALIZATION_DENY.getFileName()); - SerializationConfigurationParser legacyParser = SerializationConfigurationParser.create(false, conditionResolver, serializationBuilder, parserOptions); + SerializationConfigurationParser legacyParser = SerializationConfigurationParser.create(false, conditionResolver, serializationBuilder, parserOptions); loadedConfigurations += ConfigurationParserUtils.parseAndRegisterConfigurations(legacyParser, imageClassLoader, "serialization", ConfigurationFiles.Options.SerializationConfigurationFiles, ConfigurationFiles.Options.SerializationConfigurationResources, ConfigurationFile.SERIALIZATION.getFileName()); @@ -156,7 +156,7 @@ private static void registerLambdasFromConstantNodesInGraph(StructuredGraph grap if (lambdaClass != null && Serializable.class.isAssignableFrom(lambdaClass)) { RuntimeReflection.register(ReflectionUtil.lookupMethod(lambdaClass, "writeReplace")); SerializationBuilder.registerSerializationUIDElements(lambdaClass, false); - serializationBuilder.serializationSupport.registerSerializationTargetClass(ConfigurationCondition.alwaysTrue(), serializationBuilder.getHostVM().dynamicHub(lambdaClass)); + serializationBuilder.serializationSupport.registerSerializationTargetClass(RegistrationCondition.always(), serializationBuilder.getHostVM().dynamicHub(lambdaClass)); } } } @@ -214,7 +214,7 @@ public static Object getConstructorAccessor(Constructor constructor) { } } -final class SerializationDenyRegistry implements RuntimeSerializationSupport { +final class SerializationDenyRegistry implements RuntimeSerializationSupport { private final Map, Boolean> deniedClasses = new HashMap<>(); private final ConfigurationTypeResolver typeResolver; @@ -228,24 +228,24 @@ final class SerializationDenyRegistry implements RuntimeSerializationSupport clazz) { + public void registerIncludingAssociatedClasses(RegistrationCondition condition, Class clazz) { register(condition, clazz); } @Override - public void register(ConfigurationCondition condition, Class clazz) { + public void register(RegistrationCondition condition, Class clazz) { if (clazz != null) { deniedClasses.put(clazz, true); } } @Override - public void register(ConfigurationCondition condition, String className) { + public void register(RegistrationCondition condition, String className) { this.register(condition, typeResolver.resolveType(className)); } @Override - public void registerLambdaCapturingClass(ConfigurationCondition condition, String lambdaCapturingClassName) { + public void registerLambdaCapturingClass(RegistrationCondition condition, String lambdaCapturingClassName) { Class lambdaCapturingClass = typeResolver.resolveType(lambdaCapturingClassName); if (lambdaCapturingClass != null) { deniedClasses.put(lambdaCapturingClass, true); @@ -253,7 +253,7 @@ public void registerLambdaCapturingClass(ConfigurationCondition condition, Strin } @Override - public void registerProxyClass(ConfigurationCondition condition, List implementedInterfaces) { + public void registerProxyClass(RegistrationCondition condition, List implementedInterfaces) { } public boolean isAllowed(Class clazz) { @@ -266,7 +266,7 @@ public boolean isAllowed(Class clazz) { } } -final class SerializationBuilder extends ConditionalConfigurationRegistry implements RuntimeSerializationSupport { +final class SerializationBuilder extends ConditionalConfigurationRegistry implements RuntimeSerializationSupport { private static final Method getConstructorAccessorMethod = ReflectionUtil.lookupMethod(Constructor.class, "getConstructorAccessor"); private static final Method getExternalizableConstructorMethod = ReflectionUtil.lookupMethod(ObjectStreamClass.class, "getExternalizableConstructor", Class.class); @@ -309,11 +309,11 @@ private void abortIfSealed() { } @Override - public void registerIncludingAssociatedClasses(ConfigurationCondition condition, Class clazz) { + public void registerIncludingAssociatedClasses(RegistrationCondition condition, Class clazz) { registerIncludingAssociatedClasses(condition, clazz, new HashSet<>()); } - private void registerIncludingAssociatedClasses(ConfigurationCondition condition, Class clazz, Set> alreadyVisited) { + private void registerIncludingAssociatedClasses(RegistrationCondition condition, Class clazz, Set> alreadyVisited) { if (alreadyVisited.contains(clazz)) { return; } @@ -363,7 +363,7 @@ private void registerIncludingAssociatedClasses(ConfigurationCondition condition } @Override - public void registerLambdaCapturingClass(ConfigurationCondition condition, String lambdaCapturingClassName) { + public void registerLambdaCapturingClass(RegistrationCondition condition, String lambdaCapturingClassName) { abortIfSealed(); Class lambdaCapturingClass = typeResolver.resolveType(lambdaCapturingClassName); @@ -385,7 +385,7 @@ public void registerLambdaCapturingClass(ConfigurationCondition condition, Strin } @Override - public void registerProxyClass(ConfigurationCondition condition, List implementedInterfaces) { + public void registerProxyClass(RegistrationCondition condition, List implementedInterfaces) { registerConditionalConfiguration(condition, (cnd) -> { Class proxyClass = proxyRegistry.createProxyClassForSerialization(implementedInterfaces); register(cnd, proxyClass); @@ -393,7 +393,7 @@ public void registerProxyClass(ConfigurationCondition condition, List im } @Override - public void register(ConfigurationCondition condition, String targetClassName) { + public void register(RegistrationCondition condition, String targetClassName) { abortIfSealed(); Class serializationTargetClass = typeResolver.resolveType(targetClassName); /* With invalid streams we have to register the class for lookup */ @@ -405,7 +405,7 @@ public void register(ConfigurationCondition condition, String targetClassName) { } @Override - public void register(ConfigurationCondition condition, Class serializationTargetClass) { + public void register(RegistrationCondition condition, Class serializationTargetClass) { abortIfSealed(); registerConditionalConfiguration(condition, (cnd) -> { /* @@ -428,9 +428,9 @@ public void register(ConfigurationCondition condition, Class serializationTar Class superclass = serializationTargetClass.getSuperclass(); if (superclass != null) { - ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllDeclaredConstructorsQuery(ConfigurationCondition.alwaysTrue(), true, superclass); - ImageSingletons.lookup(RuntimeReflectionSupport.class).registerMethodLookup(ConfigurationCondition.alwaysTrue(), superclass, "writeReplace"); - ImageSingletons.lookup(RuntimeReflectionSupport.class).registerMethodLookup(ConfigurationCondition.alwaysTrue(), superclass, "readResolve"); + ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllDeclaredConstructorsQuery(RegistrationCondition.always(), true, superclass); + ImageSingletons.lookup(RuntimeReflectionSupport.class).registerMethodLookup(RegistrationCondition.always(), superclass, "writeReplace"); + ImageSingletons.lookup(RuntimeReflectionSupport.class).registerMethodLookup(RegistrationCondition.always(), superclass, "readResolve"); } registerForSerialization(cnd, serializationTargetClass); @@ -440,7 +440,7 @@ public void register(ConfigurationCondition condition, Class serializationTar }); } - private void addOrQueueConstructorAccessors(ConfigurationCondition cnd, Class serializationTargetClass, DynamicHub hub) { + private void addOrQueueConstructorAccessors(RegistrationCondition cnd, Class serializationTargetClass, DynamicHub hub) { if (pendingConstructorRegistrations != null) { // cannot yet create constructor accessor -> add to pending pendingConstructorRegistrations.add(() -> registerConstructorAccessors(cnd, serializationTargetClass, hub)); @@ -450,7 +450,7 @@ private void addOrQueueConstructorAccessors(ConfigurationCondition cnd, Class } } - private void registerConstructorAccessors(ConfigurationCondition cnd, Class serializationTargetClass, DynamicHub hub) { + private void registerConstructorAccessors(RegistrationCondition cnd, Class serializationTargetClass, DynamicHub hub) { serializationSupport.registerSerializationTargetClass(cnd, hub); registerConstructorAccessor(cnd, serializationTargetClass, null); for (Class superclass = serializationTargetClass; superclass != null; superclass = superclass.getSuperclass()) { @@ -458,7 +458,7 @@ private void registerConstructorAccessors(ConfigurationCondition cnd, Class s } } - private void registerConstructorAccessor(ConfigurationCondition cnd, Class serializationTargetClass, Class targetConstructorClass) { + private void registerConstructorAccessor(RegistrationCondition cnd, Class serializationTargetClass, Class targetConstructorClass) { Optional.ofNullable(addConstructorAccessor(serializationTargetClass, targetConstructorClass)) .map(ReflectionUtil::lookupConstructor) .ifPresent(methods -> ImageSingletons.lookup(RuntimeReflectionSupport.class).register(cnd, false, methods)); @@ -485,7 +485,7 @@ private static void registerQueriesForInheritableMethod(Class clazz, String m } } - private static void registerMethod(ConfigurationCondition cnd, Class clazz, String methodName, Class... args) { + private static void registerMethod(RegistrationCondition cnd, Class clazz, String methodName, Class... args) { Method method = ReflectionUtil.lookupMethod(true, clazz, methodName, args); if (method != null) { ImageSingletons.lookup(RuntimeReflectionSupport.class).register(cnd, false, method); @@ -494,7 +494,7 @@ private static void registerMethod(ConfigurationCondition cnd, Class clazz, S } } - private void registerForSerialization(ConfigurationCondition cnd, Class serializationTargetClass) { + private void registerForSerialization(RegistrationCondition cnd, Class serializationTargetClass) { if (Serializable.class.isAssignableFrom(serializationTargetClass)) { /* @@ -569,7 +569,7 @@ public void afterAnalysis() { sealed = true; } - private static void registerForDeserialization(ConfigurationCondition cnd, Class serializationTargetClass) { + private static void registerForDeserialization(RegistrationCondition cnd, Class serializationTargetClass) { ImageSingletons.lookup(RuntimeReflectionSupport.class).register(cnd, serializationTargetClass); if (serializationTargetClass.isRecord()) { diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/xml/XMLParsersRegistration.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/xml/XMLParsersRegistration.java index 5c6be568af4f..bdbbf0cc2bf9 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/xml/XMLParsersRegistration.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/xml/XMLParsersRegistration.java @@ -31,8 +31,8 @@ import org.graalvm.nativeimage.ImageSingletons; import org.graalvm.nativeimage.hosted.Feature; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import org.graalvm.nativeimage.hosted.RuntimeReflection; -import org.graalvm.nativeimage.impl.ConfigurationCondition; import org.graalvm.nativeimage.impl.RuntimeClassInitializationSupport; import com.oracle.svm.configure.ResourcesRegistry; @@ -130,22 +130,22 @@ void registerResources() { ClassInitializationSupport classInitializationSupport = (ClassInitializationSupport) ImageSingletons.lookup(RuntimeClassInitializationSupport.class); classInitializationSupport.setConfigurationSealed(false); - ResourcesRegistry.singleton().addResourceBundles(ConfigurationCondition.alwaysTrue(), "com.sun.org.apache.xml.internal.serializer.utils.SerializerMessages"); - ResourcesRegistry.singleton().addResourceBundles(ConfigurationCondition.alwaysTrue(), "com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMessages"); - ResourcesRegistry.singleton().addResourceBundles(ConfigurationCondition.alwaysTrue(), "com.sun.org.apache.xml.internal.serializer.Encodings"); - ResourcesRegistry.singleton().addResourceBundles(ConfigurationCondition.alwaysTrue(), "com.sun.org.apache.xml.internal.serializer.HTMLEntities"); - ResourcesRegistry.singleton().addResourceBundles(ConfigurationCondition.alwaysTrue(), "com.sun.org.apache.xml.internal.serializer.XMLEntities"); - ResourcesRegistry.singleton().addResourceBundles(ConfigurationCondition.alwaysTrue(), "com.sun.org.apache.xerces.internal.impl.xpath.regex.message"); - ResourcesRegistry.singleton().addResourceBundles(ConfigurationCondition.alwaysTrue(), "com.sun.org.apache.xerces.internal.impl.msg.DOMMessages"); - ResourcesRegistry.singleton().addResourceBundles(ConfigurationCondition.alwaysTrue(), "com.sun.org.apache.xerces.internal.impl.msg.DatatypeMessages"); - ResourcesRegistry.singleton().addResourceBundles(ConfigurationCondition.alwaysTrue(), "com.sun.org.apache.xerces.internal.impl.msg.JAXPValidationMessages"); - ResourcesRegistry.singleton().addResourceBundles(ConfigurationCondition.alwaysTrue(), "com.sun.org.apache.xerces.internal.impl.msg.SAXMessages"); - ResourcesRegistry.singleton().addResourceBundles(ConfigurationCondition.alwaysTrue(), "com.sun.org.apache.xerces.internal.impl.msg.XIncludeMessages"); - ResourcesRegistry.singleton().addResourceBundles(ConfigurationCondition.alwaysTrue(), "com.sun.org.apache.xerces.internal.impl.msg.XMLMessages"); - ResourcesRegistry.singleton().addResourceBundles(ConfigurationCondition.alwaysTrue(), "com.sun.org.apache.xerces.internal.impl.msg.XMLSchemaMessages"); - ResourcesRegistry.singleton().addResourceBundles(ConfigurationCondition.alwaysTrue(), "com.sun.org.apache.xerces.internal.impl.msg.XMLSerializerMessages"); - ResourcesRegistry.singleton().addResourceBundles(ConfigurationCondition.alwaysTrue(), "com.sun.org.apache.xerces.internal.impl.msg.XPointerMessages"); - ResourcesRegistry.singleton().addResourceBundles(ConfigurationCondition.alwaysTrue(), "com.sun.org.apache.xalan.internal.res.XSLTInfo"); + ResourcesRegistry.singleton().addResourceBundles(RegistrationCondition.always(), "com.sun.org.apache.xml.internal.serializer.utils.SerializerMessages"); + ResourcesRegistry.singleton().addResourceBundles(RegistrationCondition.always(), "com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMessages"); + ResourcesRegistry.singleton().addResourceBundles(RegistrationCondition.always(), "com.sun.org.apache.xml.internal.serializer.Encodings"); + ResourcesRegistry.singleton().addResourceBundles(RegistrationCondition.always(), "com.sun.org.apache.xml.internal.serializer.HTMLEntities"); + ResourcesRegistry.singleton().addResourceBundles(RegistrationCondition.always(), "com.sun.org.apache.xml.internal.serializer.XMLEntities"); + ResourcesRegistry.singleton().addResourceBundles(RegistrationCondition.always(), "com.sun.org.apache.xerces.internal.impl.xpath.regex.message"); + ResourcesRegistry.singleton().addResourceBundles(RegistrationCondition.always(), "com.sun.org.apache.xerces.internal.impl.msg.DOMMessages"); + ResourcesRegistry.singleton().addResourceBundles(RegistrationCondition.always(), "com.sun.org.apache.xerces.internal.impl.msg.DatatypeMessages"); + ResourcesRegistry.singleton().addResourceBundles(RegistrationCondition.always(), "com.sun.org.apache.xerces.internal.impl.msg.JAXPValidationMessages"); + ResourcesRegistry.singleton().addResourceBundles(RegistrationCondition.always(), "com.sun.org.apache.xerces.internal.impl.msg.SAXMessages"); + ResourcesRegistry.singleton().addResourceBundles(RegistrationCondition.always(), "com.sun.org.apache.xerces.internal.impl.msg.XIncludeMessages"); + ResourcesRegistry.singleton().addResourceBundles(RegistrationCondition.always(), "com.sun.org.apache.xerces.internal.impl.msg.XMLMessages"); + ResourcesRegistry.singleton().addResourceBundles(RegistrationCondition.always(), "com.sun.org.apache.xerces.internal.impl.msg.XMLSchemaMessages"); + ResourcesRegistry.singleton().addResourceBundles(RegistrationCondition.always(), "com.sun.org.apache.xerces.internal.impl.msg.XMLSerializerMessages"); + ResourcesRegistry.singleton().addResourceBundles(RegistrationCondition.always(), "com.sun.org.apache.xerces.internal.impl.msg.XPointerMessages"); + ResourcesRegistry.singleton().addResourceBundles(RegistrationCondition.always(), "com.sun.org.apache.xalan.internal.res.XSLTInfo"); classInitializationSupport.setConfigurationSealed(true); } diff --git a/web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/JSEntryPointRegistry.java b/web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/JSEntryPointRegistry.java index b66e60983333..a442a62a863e 100644 --- a/web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/JSEntryPointRegistry.java +++ b/web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/JSEntryPointRegistry.java @@ -30,7 +30,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import org.graalvm.nativeimage.impl.ConfigurationCondition; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import org.graalvm.nativeimage.impl.ReflectionRegistry; /** @@ -47,13 +47,13 @@ public class JSEntryPointRegistry implements ReflectionRegistry { public final Set entryPoints = Collections.newSetFromMap(new ConcurrentHashMap<>()); @Override - public void register(ConfigurationCondition condition, boolean unsafeAllocated, Class clazz) { + public void register(RegistrationCondition condition, boolean unsafeAllocated, Class clazz) { // Do nothing for types } @Override - public void register(ConfigurationCondition condition, boolean queriedOnly, Executable... methods) { - if (!ConfigurationCondition.alwaysTrue().equals(condition)) { + public void register(RegistrationCondition condition, boolean queriedOnly, Executable... methods) { + if (!RegistrationCondition.always().equals(condition)) { System.err.println("Conditional specification in entry points configuration is not supported and is ignored"); } @@ -65,27 +65,27 @@ public void register(ConfigurationCondition condition, boolean queriedOnly, Exec } @Override - public void register(ConfigurationCondition condition, boolean finalIsWritable, Field... fields) { + public void register(RegistrationCondition condition, boolean finalIsWritable, Field... fields) { System.err.println("The specification for fields in entry points configuration is not supported and is ignored."); } @Override - public void registerClassLookup(ConfigurationCondition condition, String typeName) { + public void registerClassLookup(RegistrationCondition condition, String typeName) { } @Override - public void registerFieldLookup(ConfigurationCondition condition, Class declaringClass, String fieldName) { + public void registerFieldLookup(RegistrationCondition condition, Class declaringClass, String fieldName) { } @Override - public void registerMethodLookup(ConfigurationCondition condition, Class declaringClass, String methodName, Class... parameterTypes) { + public void registerMethodLookup(RegistrationCondition condition, Class declaringClass, String methodName, Class... parameterTypes) { } @Override - public void registerConstructorLookup(ConfigurationCondition condition, Class declaringClass, Class... parameterTypes) { + public void registerConstructorLookup(RegistrationCondition condition, Class declaringClass, Class... parameterTypes) { } } diff --git a/web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/WebImageFeature.java b/web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/WebImageFeature.java index b13b31659381..ed3e3241b771 100644 --- a/web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/WebImageFeature.java +++ b/web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/WebImageFeature.java @@ -42,7 +42,7 @@ import org.graalvm.nativeimage.Platforms; import org.graalvm.nativeimage.hosted.Feature; import org.graalvm.nativeimage.hosted.RuntimeReflection; -import org.graalvm.nativeimage.impl.ConfigurationCondition; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import org.graalvm.nativeimage.impl.RuntimeClassInitializationSupport; import org.graalvm.nativeimage.impl.RuntimeJNIAccessSupport; import org.graalvm.nativeimage.impl.RuntimeSystemPropertiesSupport; @@ -226,9 +226,9 @@ public void duringSetup(DuringSetupAccess a) { String entryPointConfig = WebImageOptions.EntryPointsConfig.getValue(ImageSingletons.lookup(HostedOptionValues.class)); if (entryPointConfig != null) { - ConfigurationConditionResolver conditionResolver = new NativeImageConditionResolver(access.getImageClassLoader(), + ConfigurationConditionResolver conditionResolver = new NativeImageConditionResolver(access.getImageClassLoader(), ClassInitializationSupport.singleton()); - ReflectionConfigurationParser> parser = ConfigurationParserUtils.create(ConfigurationFile.REFLECTION, false, conditionResolver, entryPointsData, null, + ReflectionConfigurationParser> parser = ConfigurationParserUtils.create(ConfigurationFile.REFLECTION, false, conditionResolver, entryPointsData, null, null, null, access.getImageClassLoader()); try { parser.parseAndRegister(Path.of(entryPointConfig).toUri()); diff --git a/web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/WebImageRuntimeJNIAccessSupport.java b/web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/WebImageRuntimeJNIAccessSupport.java index 739abd9ad5cc..d66960650d1b 100644 --- a/web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/WebImageRuntimeJNIAccessSupport.java +++ b/web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/WebImageRuntimeJNIAccessSupport.java @@ -28,7 +28,7 @@ import java.lang.reflect.Executable; import java.lang.reflect.Field; -import org.graalvm.nativeimage.impl.ConfigurationCondition; +import org.graalvm.nativeimage.hosted.RegistrationCondition; import org.graalvm.nativeimage.impl.RuntimeJNIAccessSupport; /** @@ -40,37 +40,37 @@ */ public class WebImageRuntimeJNIAccessSupport implements RuntimeJNIAccessSupport { @Override - public void register(ConfigurationCondition condition, boolean unsafeAllocated, Class clazz) { + public void register(RegistrationCondition condition, boolean unsafeAllocated, Class clazz) { // Do nothing. } @Override - public void register(ConfigurationCondition condition, boolean queriedOnly, Executable... methods) { + public void register(RegistrationCondition condition, boolean queriedOnly, Executable... methods) { // Do nothing. } @Override - public void register(ConfigurationCondition condition, boolean finalIsWritable, Field... fields) { + public void register(RegistrationCondition condition, boolean finalIsWritable, Field... fields) { // Do nothing. } @Override - public void registerClassLookup(ConfigurationCondition condition, String typeName) { + public void registerClassLookup(RegistrationCondition condition, String typeName) { // Do nothing. } @Override - public void registerFieldLookup(ConfigurationCondition condition, Class declaringClass, String fieldName) { + public void registerFieldLookup(RegistrationCondition condition, Class declaringClass, String fieldName) { // Do nothing. } @Override - public void registerMethodLookup(ConfigurationCondition condition, Class declaringClass, String methodName, Class... parameterTypes) { + public void registerMethodLookup(RegistrationCondition condition, Class declaringClass, String methodName, Class... parameterTypes) { // Do nothing. } @Override - public void registerConstructorLookup(ConfigurationCondition condition, Class declaringClass, Class... parameterTypes) { + public void registerConstructorLookup(RegistrationCondition condition, Class declaringClass, Class... parameterTypes) { // Do nothing. } }