Introduced public API for registration conditions.

ConfigurationCondition is divided into InclusionCondition(API) and TypeCondition(implementation).

Replaced all usages of ConfigurationCondition.

Author: mihailo

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

@@ -0,0 +1,81 @@
+/*
+ * 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.TypeCondition;
+
+/**
+ * Condition that must be satisfied for inclusion of elements for dynamic access (e.g., runtime
+ * reflection, serialization, JNI access, and resource access at runtime).
+ * {@link InclusionCondition} is used together with {@link Feature} for programmatic registration of
+ * metadata.
+ * <p>
+ * Currently, there is only one type of condition: {@link #typeReached} 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.
+ * </p>
+ *
+ * Conditions can be created via {@link #alwaysInclude} and {@link #typeReached} factory methods.
+ */
+public interface InclusionCondition {
+
+    /**
+     * Creates the type-reached condition that is always satisfied. Any element that is predicated
+     * with this condition will always be included.
+     * 
+     * @return instance of the condition
+     */
+    static InclusionCondition alwaysInclude() {
+        return TypeCondition.JAVA_LANG_OBJECT_REACHED;
+    }
+
+    /**
+     * 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
+     */
+    static InclusionCondition typeReached(Class<?> type) {
+        return TypeCondition.create(type, true);
+    }
+}

sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/TypeReachabilityCondition.java

@@ -42,6 +42,7 @@
 
 import java.util.Objects;
 
+<<<<<<<< HEAD:sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/TypeReachabilityCondition.java
 import org.graalvm.nativeimage.hosted.RegistrationCondition;
 
 /**
@@ -53,6 +54,19 @@ public class TypeReachabilityCondition implements RegistrationCondition {
 
     /* Cached to save space: it is used as a marker for all non-conditional elements */
     public static final TypeReachabilityCondition JAVA_LANG_OBJECT_REACHED = new TypeReachabilityCondition(Object.class, true);
+========
+import org.graalvm.nativeimage.hosted.InclusionCondition;
+
+/**
+ * Type that represents both type-reached and type-reachable condition. When
+ * {@link TypeCondition#runtimeChecked} is <code>true</code> denotes that this is a
+ * <code>typeReached</code> condition.
+ */
+public class TypeCondition implements InclusionCondition {
+
+    /* Cached to save space: it is used as a marker for all non-conditional elements */
+    public static final TypeCondition JAVA_LANG_OBJECT_REACHED = new TypeCondition(Object.class, true);
+>>>>>>>> 675ac0bf8ee (Introduced public API for registration conditions.):sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/TypeCondition.java
     private final Class<?> type;
 
     public final boolean runtimeChecked;
@@ -65,6 +79,7 @@ public class TypeReachabilityCondition implements RegistrationCondition {
      * @param runtimeChecked makes this a type-reachable condition when false
      * @return instance of the condition
      */
+<<<<<<<< HEAD:sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/TypeReachabilityCondition.java
     public static TypeReachabilityCondition create(Class<?> type, boolean runtimeChecked) {
         Objects.requireNonNull(type);
         if (TypeReachabilityCondition.JAVA_LANG_OBJECT_REACHED.getKey().equals(type)) {
@@ -78,6 +93,21 @@ public boolean isAlwaysTrue() {
     }
 
     public TypeReachabilityCondition(Class<?> type, boolean runtimeChecked) {
+========
+    public static TypeCondition create(Class<?> type, boolean runtimeChecked) {
+        Objects.requireNonNull(type);
+        if (TypeCondition.JAVA_LANG_OBJECT_REACHED.getKey().equals(type)) {
+            return TypeCondition.JAVA_LANG_OBJECT_REACHED;
+        }
+        return new TypeCondition(type, runtimeChecked);
+    }
+
+    public boolean isAlwaysTrue() {
+        return InclusionCondition.alwaysInclude().equals(this);
+    }
+
+    public TypeCondition(Class<?> type, boolean runtimeChecked) {
+>>>>>>>> 675ac0bf8ee (Introduced public API for registration conditions.):sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/TypeCondition.java
         this.runtimeChecked = runtimeChecked;
         this.type = type;
     }
@@ -94,7 +124,11 @@ public boolean equals(Object o) {
         if (o == null || getClass() != o.getClass()) {
             return false;
         }
+<<<<<<<< HEAD:sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/TypeReachabilityCondition.java
         TypeReachabilityCondition that = (TypeReachabilityCondition) o;
+========
+        TypeCondition that = (TypeCondition) o;
+>>>>>>>> 675ac0bf8ee (Introduced public API for registration conditions.):sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/TypeCondition.java
         return runtimeChecked == that.runtimeChecked && Objects.equals(type, that.type);
     }
 
@@ -105,7 +139,11 @@ public int hashCode() {
 
     @Override
     public String toString() {
+<<<<<<<< HEAD:sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/TypeReachabilityCondition.java
         return "TypeReachabilityCondition(" +
+========
+        return "TypeCondition(" +
+>>>>>>>> 675ac0bf8ee (Introduced public API for registration conditions.):sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/TypeCondition.java
                         "type=" + type +
                         ", runtimeChecked=" + runtimeChecked +
                         ')';