Skip to content

Commit e68551a

Browse files
author
mihailo
committed
Diverged ConfigurationCondition into MetadataCondition(Interface) and TypeReachedCondition(Implementation)
1 parent cc8e914 commit e68551a

File tree

48 files changed

+466
-402
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+466
-402
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -46,7 +46,7 @@
4646
import org.graalvm.nativeimage.ImageSingletons;
4747
import org.graalvm.nativeimage.Platform;
4848
import org.graalvm.nativeimage.Platforms;
49-
import org.graalvm.nativeimage.impl.ConfigurationCondition;
49+
import org.graalvm.nativeimage.impl.MetadataCondition;
5050
import org.graalvm.nativeimage.impl.RuntimeForeignAccessSupport;
5151

5252
@Platforms(Platform.HOSTED_ONLY.class)
@@ -68,7 +68,7 @@ public final class RuntimeForeignAccess {
6868
* @since 23.1
6969
*/
7070
public static void registerForDowncall(Object desc, Object... options) {
71-
ImageSingletons.lookup(RuntimeForeignAccessSupport.class).registerForDowncall(ConfigurationCondition.alwaysTrue(), desc, options);
71+
ImageSingletons.lookup(RuntimeForeignAccessSupport.class).registerForDowncall(MetadataCondition.alwaysTrue(), desc, options);
7272
}
7373

7474
/**
@@ -86,7 +86,7 @@ public static void registerForDowncall(Object desc, Object... options) {
8686
* @since 24.1
8787
*/
8888
public static void registerForUpcall(Object desc, Object... options) {
89-
ImageSingletons.lookup(RuntimeForeignAccessSupport.class).registerForUpcall(ConfigurationCondition.alwaysTrue(), desc, options);
89+
ImageSingletons.lookup(RuntimeForeignAccessSupport.class).registerForUpcall(MetadataCondition.alwaysTrue(), desc, options);
9090
}
9191

9292
/**
@@ -114,7 +114,7 @@ public static void registerForUpcall(Object desc, Object... options) {
114114
* @since 24.2
115115
*/
116116
public static void registerForDirectUpcall(MethodHandle target, Object desc, Object... options) {
117-
ImageSingletons.lookup(RuntimeForeignAccessSupport.class).registerForDirectUpcall(ConfigurationCondition.alwaysTrue(), target, desc, options);
117+
ImageSingletons.lookup(RuntimeForeignAccessSupport.class).registerForDirectUpcall(MetadataCondition.alwaysTrue(), target, desc, options);
118118
}
119119

120120
private RuntimeForeignAccess() {

‎sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeJNIAccess.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -46,7 +46,7 @@
4646
import org.graalvm.nativeimage.ImageSingletons;
4747
import org.graalvm.nativeimage.Platform;
4848
import org.graalvm.nativeimage.Platforms;
49-
import org.graalvm.nativeimage.impl.ConfigurationCondition;
49+
import org.graalvm.nativeimage.impl.MetadataCondition;
5050
import org.graalvm.nativeimage.impl.RuntimeJNIAccessSupport;
5151

5252
/**
@@ -66,7 +66,7 @@ public final class RuntimeJNIAccess {
6666
* @since 22.3
6767
*/
6868
public static void register(Class<?>... classes) {
69-
ImageSingletons.lookup(RuntimeJNIAccessSupport.class).register(ConfigurationCondition.alwaysTrue(), classes);
69+
ImageSingletons.lookup(RuntimeJNIAccessSupport.class).register(MetadataCondition.alwaysTrue(), classes);
7070
}
7171

7272
/**
@@ -79,7 +79,7 @@ public static void register(Class<?>... classes) {
7979
* @since 22.3
8080
*/
8181
public static void register(Executable... methods) {
82-
ImageSingletons.lookup(RuntimeJNIAccessSupport.class).register(ConfigurationCondition.alwaysTrue(), false, methods);
82+
ImageSingletons.lookup(RuntimeJNIAccessSupport.class).register(MetadataCondition.alwaysTrue(), false, methods);
8383
}
8484

8585
/**
@@ -92,7 +92,7 @@ public static void register(Executable... methods) {
9292
* @since 22.3
9393
*/
9494
public static void register(Field... fields) {
95-
ImageSingletons.lookup(RuntimeJNIAccessSupport.class).register(ConfigurationCondition.alwaysTrue(), false, fields);
95+
ImageSingletons.lookup(RuntimeJNIAccessSupport.class).register(MetadataCondition.alwaysTrue(), false, fields);
9696
}
9797

9898
private RuntimeJNIAccess() {

‎sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeProxyCreation.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -43,7 +43,7 @@
4343
import org.graalvm.nativeimage.ImageSingletons;
4444
import org.graalvm.nativeimage.Platform;
4545
import org.graalvm.nativeimage.Platforms;
46-
import org.graalvm.nativeimage.impl.ConfigurationCondition;
46+
import org.graalvm.nativeimage.impl.MetadataCondition;
4747
import org.graalvm.nativeimage.impl.RuntimeProxyCreationSupport;
4848

4949
/**
@@ -62,7 +62,7 @@ public final class RuntimeProxyCreation {
6262
* @since 22.3
6363
*/
6464
public static void register(Class<?>... interfaces) {
65-
ImageSingletons.lookup(RuntimeProxyCreationSupport.class).addProxyClass(ConfigurationCondition.alwaysTrue(), interfaces);
65+
ImageSingletons.lookup(RuntimeProxyCreationSupport.class).addProxyClass(MetadataCondition.alwaysTrue(), interfaces);
6666
}
6767

6868
private RuntimeProxyCreation() {

‎sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeReflection.java

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
import org.graalvm.nativeimage.ImageSingletons;
4949
import org.graalvm.nativeimage.Platform;
5050
import org.graalvm.nativeimage.Platforms;
51-
import org.graalvm.nativeimage.impl.ConfigurationCondition;
51+
import org.graalvm.nativeimage.impl.MetadataCondition;
5252
import org.graalvm.nativeimage.impl.RuntimeReflectionSupport;
5353

5454
//Checkstyle: allow reflection
@@ -69,7 +69,7 @@ public final class RuntimeReflection {
6969
* @since 19.0
7070
*/
7171
public static void register(Class<?>... classes) {
72-
ImageSingletons.lookup(RuntimeReflectionSupport.class).register(ConfigurationCondition.alwaysTrue(), classes);
72+
ImageSingletons.lookup(RuntimeReflectionSupport.class).register(MetadataCondition.alwaysTrue(), classes);
7373
}
7474

7575
/**
@@ -80,7 +80,7 @@ public static void register(Class<?>... classes) {
8080
* @since 23.0
8181
*/
8282
public static void registerClassLookup(String className) {
83-
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerClassLookup(ConfigurationCondition.alwaysTrue(), className);
83+
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerClassLookup(MetadataCondition.alwaysTrue(), className);
8484
}
8585

8686
/**
@@ -91,7 +91,7 @@ public static void registerClassLookup(String className) {
9191
* @since 19.0
9292
*/
9393
public static void register(Executable... methods) {
94-
ImageSingletons.lookup(RuntimeReflectionSupport.class).register(ConfigurationCondition.alwaysTrue(), false, methods);
94+
ImageSingletons.lookup(RuntimeReflectionSupport.class).register(MetadataCondition.alwaysTrue(), false, methods);
9595
}
9696

9797
/**
@@ -103,7 +103,7 @@ public static void register(Executable... methods) {
103103
* @since 21.3
104104
*/
105105
public static void registerAsQueried(Executable... methods) {
106-
ImageSingletons.lookup(RuntimeReflectionSupport.class).register(ConfigurationCondition.alwaysTrue(), true, methods);
106+
ImageSingletons.lookup(RuntimeReflectionSupport.class).register(MetadataCondition.alwaysTrue(), true, methods);
107107
}
108108

109109
/**
@@ -116,7 +116,7 @@ public static void registerAsQueried(Executable... methods) {
116116
* @since 23.0
117117
*/
118118
public static void registerMethodLookup(Class<?> declaringClass, String methodName, Class<?>... parameterTypes) {
119-
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerMethodLookup(ConfigurationCondition.alwaysTrue(), declaringClass, methodName, parameterTypes);
119+
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerMethodLookup(MetadataCondition.alwaysTrue(), declaringClass, methodName, parameterTypes);
120120
}
121121

122122
/**
@@ -130,7 +130,7 @@ public static void registerMethodLookup(Class<?> declaringClass, String methodNa
130130
* @since 23.0
131131
*/
132132
public static void registerConstructorLookup(Class<?> declaringClass, Class<?>... parameterTypes) {
133-
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerConstructorLookup(ConfigurationCondition.alwaysTrue(), declaringClass, parameterTypes);
133+
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerConstructorLookup(MetadataCondition.alwaysTrue(), declaringClass, parameterTypes);
134134
}
135135

136136
/**
@@ -141,7 +141,7 @@ public static void registerConstructorLookup(Class<?> declaringClass, Class<?>..
141141
* @since 19.0
142142
*/
143143
public static void register(Field... fields) {
144-
ImageSingletons.lookup(RuntimeReflectionSupport.class).register(ConfigurationCondition.alwaysTrue(), false, fields);
144+
ImageSingletons.lookup(RuntimeReflectionSupport.class).register(MetadataCondition.alwaysTrue(), false, fields);
145145
}
146146

147147
/**
@@ -153,7 +153,7 @@ public static void register(Field... fields) {
153153
* @since 19.0
154154
*/
155155
public static void registerFieldLookup(Class<?> declaringClass, String fieldName) {
156-
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerFieldLookup(ConfigurationCondition.alwaysTrue(), declaringClass, fieldName);
156+
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerFieldLookup(MetadataCondition.alwaysTrue(), declaringClass, fieldName);
157157
}
158158

159159
/**
@@ -162,7 +162,7 @@ public static void registerFieldLookup(Class<?> declaringClass, String fieldName
162162
* @since 23.0
163163
*/
164164
public static void registerAllClasses(Class<?> declaringClass) {
165-
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllClassesQuery(ConfigurationCondition.alwaysTrue(), declaringClass);
165+
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllClassesQuery(MetadataCondition.alwaysTrue(), declaringClass);
166166
}
167167

168168
/**
@@ -171,7 +171,7 @@ public static void registerAllClasses(Class<?> declaringClass) {
171171
* @since 23.0
172172
*/
173173
public static void registerAllDeclaredClasses(Class<?> declaringClass) {
174-
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllDeclaredClassesQuery(ConfigurationCondition.alwaysTrue(), declaringClass);
174+
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllDeclaredClassesQuery(MetadataCondition.alwaysTrue(), declaringClass);
175175
}
176176

177177
/**
@@ -181,7 +181,7 @@ public static void registerAllDeclaredClasses(Class<?> declaringClass) {
181181
* @since 23.0
182182
*/
183183
public static void registerAllMethods(Class<?> declaringClass) {
184-
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllMethodsQuery(ConfigurationCondition.alwaysTrue(), true, declaringClass);
184+
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllMethodsQuery(MetadataCondition.alwaysTrue(), true, declaringClass);
185185
}
186186

187187
/**
@@ -191,7 +191,7 @@ public static void registerAllMethods(Class<?> declaringClass) {
191191
* @since 23.0
192192
*/
193193
public static void registerAllDeclaredMethods(Class<?> declaringClass) {
194-
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllDeclaredMethodsQuery(ConfigurationCondition.alwaysTrue(), true, declaringClass);
194+
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllDeclaredMethodsQuery(MetadataCondition.alwaysTrue(), true, declaringClass);
195195
}
196196

197197
/**
@@ -201,7 +201,7 @@ public static void registerAllDeclaredMethods(Class<?> declaringClass) {
201201
* @since 23.0
202202
*/
203203
public static void registerAllConstructors(Class<?> declaringClass) {
204-
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllConstructorsQuery(ConfigurationCondition.alwaysTrue(), true, declaringClass);
204+
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllConstructorsQuery(MetadataCondition.alwaysTrue(), true, declaringClass);
205205
}
206206

207207
/**
@@ -211,7 +211,7 @@ public static void registerAllConstructors(Class<?> declaringClass) {
211211
* @since 23.0
212212
*/
213213
public static void registerAllDeclaredConstructors(Class<?> declaringClass) {
214-
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllDeclaredConstructorsQuery(ConfigurationCondition.alwaysTrue(), true, declaringClass);
214+
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllDeclaredConstructorsQuery(MetadataCondition.alwaysTrue(), true, declaringClass);
215215
}
216216

217217
/**
@@ -221,7 +221,7 @@ public static void registerAllDeclaredConstructors(Class<?> declaringClass) {
221221
* @since 23.0
222222
*/
223223
public static void registerAllFields(Class<?> declaringClass) {
224-
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllFields(ConfigurationCondition.alwaysTrue(), declaringClass);
224+
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllFields(MetadataCondition.alwaysTrue(), declaringClass);
225225
}
226226

227227
/**
@@ -231,7 +231,7 @@ public static void registerAllFields(Class<?> declaringClass) {
231231
* @since 23.0
232232
*/
233233
public static void registerAllDeclaredFields(Class<?> declaringClass) {
234-
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllDeclaredFields(ConfigurationCondition.alwaysTrue(), declaringClass);
234+
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllDeclaredFields(MetadataCondition.alwaysTrue(), declaringClass);
235235
}
236236

237237
/**
@@ -240,7 +240,7 @@ public static void registerAllDeclaredFields(Class<?> declaringClass) {
240240
* @since 23.0
241241
*/
242242
public static void registerAllNestMembers(Class<?> declaringClass) {
243-
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllNestMembersQuery(ConfigurationCondition.alwaysTrue(), declaringClass);
243+
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllNestMembersQuery(MetadataCondition.alwaysTrue(), declaringClass);
244244
}
245245

246246
/**
@@ -249,7 +249,7 @@ public static void registerAllNestMembers(Class<?> declaringClass) {
249249
* @since 23.0
250250
*/
251251
public static void registerAllPermittedSubclasses(Class<?> declaringClass) {
252-
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllPermittedSubclassesQuery(ConfigurationCondition.alwaysTrue(), declaringClass);
252+
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllPermittedSubclassesQuery(MetadataCondition.alwaysTrue(), declaringClass);
253253
}
254254

255255
/**
@@ -258,7 +258,7 @@ public static void registerAllPermittedSubclasses(Class<?> declaringClass) {
258258
* @since 23.0
259259
*/
260260
public static void registerAllRecordComponents(Class<?> declaringClass) {
261-
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllRecordComponentsQuery(ConfigurationCondition.alwaysTrue(), declaringClass);
261+
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllRecordComponentsQuery(MetadataCondition.alwaysTrue(), declaringClass);
262262
}
263263

264264
/**
@@ -267,7 +267,7 @@ public static void registerAllRecordComponents(Class<?> declaringClass) {
267267
* @since 23.0
268268
*/
269269
public static void registerAllSigners(Class<?> declaringClass) {
270-
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllSignersQuery(ConfigurationCondition.alwaysTrue(), declaringClass);
270+
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllSignersQuery(MetadataCondition.alwaysTrue(), declaringClass);
271271
}
272272

273273
/**

‎sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeResourceAccess.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -47,7 +47,7 @@
4747
import org.graalvm.nativeimage.ImageSingletons;
4848
import org.graalvm.nativeimage.Platform;
4949
import org.graalvm.nativeimage.Platforms;
50-
import org.graalvm.nativeimage.impl.ConfigurationCondition;
50+
import org.graalvm.nativeimage.impl.MetadataCondition;
5151
import org.graalvm.nativeimage.impl.RuntimeResourceSupport;
5252

5353
/**
@@ -84,7 +84,7 @@ public static void addResource(Module module, String resourcePath, byte[] resour
8484
Objects.requireNonNull(resourcePath);
8585
Objects.requireNonNull(resourceContent);
8686
ImageSingletons.lookup(RuntimeResourceSupport.class).injectResource(module, resourcePath, resourceContent, "Manually added via RuntimeResourceAccess");
87-
ImageSingletons.lookup(RuntimeResourceSupport.class).addCondition(ConfigurationCondition.alwaysTrue(), module, resourcePath);
87+
ImageSingletons.lookup(RuntimeResourceSupport.class).addCondition(MetadataCondition.alwaysTrue(), module, resourcePath);
8888
}
8989

9090
/**
@@ -96,7 +96,7 @@ public static void addResource(Module module, String resourcePath, byte[] resour
9696
*/
9797
public static void addResourceBundle(Module module, String baseBundleName, Locale[] locales) {
9898
Objects.requireNonNull(locales);
99-
RuntimeResourceSupport.singleton().addResourceBundles(ConfigurationCondition.alwaysTrue(),
99+
RuntimeResourceSupport.singleton().addResourceBundles(MetadataCondition.alwaysTrue(),
100100
withModuleName(module, baseBundleName), Arrays.asList(locales));
101101
}
102102

@@ -108,7 +108,7 @@ public static void addResourceBundle(Module module, String baseBundleName, Local
108108
* @since 22.3
109109
*/
110110
public static void addResourceBundle(Module module, String bundleName) {
111-
RuntimeResourceSupport.singleton().addResourceBundles(ConfigurationCondition.alwaysTrue(),
111+
RuntimeResourceSupport.singleton().addResourceBundles(MetadataCondition.alwaysTrue(),
112112
withModuleName(module, bundleName));
113113
}
114114

0 commit comments

Comments
 (0)