Skip to content

Commit 2b3fb97

Browse files
author
Mihailo Markovic
committed
Refactoring Condition API, MetadataCondition renamed to InclusionCondition.
1 parent 0cfc271 commit 2b3fb97

File tree

43 files changed

+283
-278
lines changed

Some content is hidden

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

43 files changed

+283
-278
lines changed

‎sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/MetadataCondition.java renamed to ‎sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/InclusionCondition.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,19 @@
3838
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3939
* SOFTWARE.
4040
*/
41-
package org.graalvm.nativeimage.impl;
41+
package org.graalvm.nativeimage.hosted;
4242

43-
public interface MetadataCondition {
43+
import org.graalvm.nativeimage.impl.TypeCondition;
44+
45+
public interface InclusionCondition {
4446

4547
/**
4648
* Creates the type-reached condition that is always satisfied. Any element that is predicated
4749
* with this condition will always be included.
4850
*
4951
* @return instance of the condition
5052
*/
51-
static MetadataCondition alwaysTrue() {
53+
static InclusionCondition alwaysTrue() {
5254
return TypeCondition.JAVA_LANG_OBJECT_REACHED;
5355
}
5456

@@ -59,8 +61,7 @@ static MetadataCondition alwaysTrue() {
5961
* @param type that has to be reached for this condition to be satisfied
6062
* @return instance of the condition
6163
*/
62-
static MetadataCondition typeReached(Class<?> type) {
64+
static InclusionCondition typeReached(Class<?> type) {
6365
return TypeCondition.create(type, true);
6466
}
65-
6667
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
import org.graalvm.nativeimage.ImageSingletons;
4747
import org.graalvm.nativeimage.Platform;
4848
import org.graalvm.nativeimage.Platforms;
49-
import org.graalvm.nativeimage.impl.MetadataCondition;
5049
import org.graalvm.nativeimage.impl.RuntimeForeignAccessSupport;
5150

5251
@Platforms(Platform.HOSTED_ONLY.class)
@@ -68,7 +67,7 @@ public final class RuntimeForeignAccess {
6867
* @since 23.1
6968
*/
7069
public static void registerForDowncall(Object desc, Object... options) {
71-
ImageSingletons.lookup(RuntimeForeignAccessSupport.class).registerForDowncall(MetadataCondition.alwaysTrue(), desc, options);
70+
ImageSingletons.lookup(RuntimeForeignAccessSupport.class).registerForDowncall(InclusionCondition.alwaysTrue(), desc, options);
7271
}
7372

7473
/**
@@ -86,7 +85,7 @@ public static void registerForDowncall(Object desc, Object... options) {
8685
* @since 24.1
8786
*/
8887
public static void registerForUpcall(Object desc, Object... options) {
89-
ImageSingletons.lookup(RuntimeForeignAccessSupport.class).registerForUpcall(MetadataCondition.alwaysTrue(), desc, options);
88+
ImageSingletons.lookup(RuntimeForeignAccessSupport.class).registerForUpcall(InclusionCondition.alwaysTrue(), desc, options);
9089
}
9190

9291
/**
@@ -114,7 +113,7 @@ public static void registerForUpcall(Object desc, Object... options) {
114113
* @since 24.2
115114
*/
116115
public static void registerForDirectUpcall(MethodHandle target, Object desc, Object... options) {
117-
ImageSingletons.lookup(RuntimeForeignAccessSupport.class).registerForDirectUpcall(MetadataCondition.alwaysTrue(), target, desc, options);
116+
ImageSingletons.lookup(RuntimeForeignAccessSupport.class).registerForDirectUpcall(InclusionCondition.alwaysTrue(), target, desc, options);
118117
}
119118

120119
private RuntimeForeignAccess() {

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
import org.graalvm.nativeimage.ImageSingletons;
4747
import org.graalvm.nativeimage.Platform;
4848
import org.graalvm.nativeimage.Platforms;
49-
import org.graalvm.nativeimage.impl.MetadataCondition;
5049
import org.graalvm.nativeimage.impl.RuntimeJNIAccessSupport;
5150

5251
/**
@@ -66,7 +65,7 @@ public final class RuntimeJNIAccess {
6665
* @since 22.3
6766
*/
6867
public static void register(Class<?>... classes) {
69-
ImageSingletons.lookup(RuntimeJNIAccessSupport.class).register(MetadataCondition.alwaysTrue(), classes);
68+
ImageSingletons.lookup(RuntimeJNIAccessSupport.class).register(InclusionCondition.alwaysTrue(), classes);
7069
}
7170

7271
/**
@@ -79,7 +78,7 @@ public static void register(Class<?>... classes) {
7978
* @since 22.3
8079
*/
8180
public static void register(Executable... methods) {
82-
ImageSingletons.lookup(RuntimeJNIAccessSupport.class).register(MetadataCondition.alwaysTrue(), false, methods);
81+
ImageSingletons.lookup(RuntimeJNIAccessSupport.class).register(InclusionCondition.alwaysTrue(), false, methods);
8382
}
8483

8584
/**
@@ -92,7 +91,7 @@ public static void register(Executable... methods) {
9291
* @since 22.3
9392
*/
9493
public static void register(Field... fields) {
95-
ImageSingletons.lookup(RuntimeJNIAccessSupport.class).register(MetadataCondition.alwaysTrue(), false, fields);
94+
ImageSingletons.lookup(RuntimeJNIAccessSupport.class).register(InclusionCondition.alwaysTrue(), false, fields);
9695
}
9796

9897
private RuntimeJNIAccess() {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import org.graalvm.nativeimage.ImageSingletons;
4444
import org.graalvm.nativeimage.Platform;
4545
import org.graalvm.nativeimage.Platforms;
46-
import org.graalvm.nativeimage.impl.MetadataCondition;
4746
import org.graalvm.nativeimage.impl.RuntimeProxyCreationSupport;
4847

4948
/**
@@ -62,7 +61,7 @@ public final class RuntimeProxyCreation {
6261
* @since 22.3
6362
*/
6463
public static void register(Class<?>... interfaces) {
65-
ImageSingletons.lookup(RuntimeProxyCreationSupport.class).addProxyClass(MetadataCondition.alwaysTrue(), interfaces);
64+
ImageSingletons.lookup(RuntimeProxyCreationSupport.class).addProxyClass(InclusionCondition.alwaysTrue(), interfaces);
6665
}
6766

6867
private RuntimeProxyCreation() {

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

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
import org.graalvm.nativeimage.ImageSingletons;
4949
import org.graalvm.nativeimage.Platform;
5050
import org.graalvm.nativeimage.Platforms;
51-
import org.graalvm.nativeimage.impl.MetadataCondition;
5251
import org.graalvm.nativeimage.impl.RuntimeReflectionSupport;
5352

5453
//Checkstyle: allow reflection
@@ -69,7 +68,7 @@ public final class RuntimeReflection {
6968
* @since 19.0
7069
*/
7170
public static void register(Class<?>... classes) {
72-
ImageSingletons.lookup(RuntimeReflectionSupport.class).register(MetadataCondition.alwaysTrue(), classes);
71+
ImageSingletons.lookup(RuntimeReflectionSupport.class).register(InclusionCondition.alwaysTrue(), classes);
7372
}
7473

7574
/**
@@ -80,7 +79,7 @@ public static void register(Class<?>... classes) {
8079
* @since 23.0
8180
*/
8281
public static void registerClassLookup(String className) {
83-
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerClassLookup(MetadataCondition.alwaysTrue(), className);
82+
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerClassLookup(InclusionCondition.alwaysTrue(), className);
8483
}
8584

8685
/**
@@ -91,7 +90,7 @@ public static void registerClassLookup(String className) {
9190
* @since 19.0
9291
*/
9392
public static void register(Executable... methods) {
94-
ImageSingletons.lookup(RuntimeReflectionSupport.class).register(MetadataCondition.alwaysTrue(), false, methods);
93+
ImageSingletons.lookup(RuntimeReflectionSupport.class).register(InclusionCondition.alwaysTrue(), false, methods);
9594
}
9695

9796
/**
@@ -103,7 +102,7 @@ public static void register(Executable... methods) {
103102
* @since 21.3
104103
*/
105104
public static void registerAsQueried(Executable... methods) {
106-
ImageSingletons.lookup(RuntimeReflectionSupport.class).register(MetadataCondition.alwaysTrue(), true, methods);
105+
ImageSingletons.lookup(RuntimeReflectionSupport.class).register(InclusionCondition.alwaysTrue(), true, methods);
107106
}
108107

109108
/**
@@ -116,7 +115,7 @@ public static void registerAsQueried(Executable... methods) {
116115
* @since 23.0
117116
*/
118117
public static void registerMethodLookup(Class<?> declaringClass, String methodName, Class<?>... parameterTypes) {
119-
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerMethodLookup(MetadataCondition.alwaysTrue(), declaringClass, methodName, parameterTypes);
118+
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerMethodLookup(InclusionCondition.alwaysTrue(), declaringClass, methodName, parameterTypes);
120119
}
121120

122121
/**
@@ -130,7 +129,7 @@ public static void registerMethodLookup(Class<?> declaringClass, String methodNa
130129
* @since 23.0
131130
*/
132131
public static void registerConstructorLookup(Class<?> declaringClass, Class<?>... parameterTypes) {
133-
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerConstructorLookup(MetadataCondition.alwaysTrue(), declaringClass, parameterTypes);
132+
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerConstructorLookup(InclusionCondition.alwaysTrue(), declaringClass, parameterTypes);
134133
}
135134

136135
/**
@@ -141,7 +140,7 @@ public static void registerConstructorLookup(Class<?> declaringClass, Class<?>..
141140
* @since 19.0
142141
*/
143142
public static void register(Field... fields) {
144-
ImageSingletons.lookup(RuntimeReflectionSupport.class).register(MetadataCondition.alwaysTrue(), false, fields);
143+
ImageSingletons.lookup(RuntimeReflectionSupport.class).register(InclusionCondition.alwaysTrue(), false, fields);
145144
}
146145

147146
/**
@@ -153,7 +152,7 @@ public static void register(Field... fields) {
153152
* @since 19.0
154153
*/
155154
public static void registerFieldLookup(Class<?> declaringClass, String fieldName) {
156-
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerFieldLookup(MetadataCondition.alwaysTrue(), declaringClass, fieldName);
155+
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerFieldLookup(InclusionCondition.alwaysTrue(), declaringClass, fieldName);
157156
}
158157

159158
/**
@@ -162,7 +161,7 @@ public static void registerFieldLookup(Class<?> declaringClass, String fieldName
162161
* @since 23.0
163162
*/
164163
public static void registerAllClasses(Class<?> declaringClass) {
165-
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllClassesQuery(MetadataCondition.alwaysTrue(), declaringClass);
164+
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllClassesQuery(InclusionCondition.alwaysTrue(), declaringClass);
166165
}
167166

168167
/**
@@ -171,7 +170,7 @@ public static void registerAllClasses(Class<?> declaringClass) {
171170
* @since 23.0
172171
*/
173172
public static void registerAllDeclaredClasses(Class<?> declaringClass) {
174-
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllDeclaredClassesQuery(MetadataCondition.alwaysTrue(), declaringClass);
173+
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllDeclaredClassesQuery(InclusionCondition.alwaysTrue(), declaringClass);
175174
}
176175

177176
/**
@@ -181,7 +180,7 @@ public static void registerAllDeclaredClasses(Class<?> declaringClass) {
181180
* @since 23.0
182181
*/
183182
public static void registerAllMethods(Class<?> declaringClass) {
184-
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllMethodsQuery(MetadataCondition.alwaysTrue(), true, declaringClass);
183+
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllMethodsQuery(InclusionCondition.alwaysTrue(), true, declaringClass);
185184
}
186185

187186
/**
@@ -191,7 +190,7 @@ public static void registerAllMethods(Class<?> declaringClass) {
191190
* @since 23.0
192191
*/
193192
public static void registerAllDeclaredMethods(Class<?> declaringClass) {
194-
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllDeclaredMethodsQuery(MetadataCondition.alwaysTrue(), true, declaringClass);
193+
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllDeclaredMethodsQuery(InclusionCondition.alwaysTrue(), true, declaringClass);
195194
}
196195

197196
/**
@@ -201,7 +200,7 @@ public static void registerAllDeclaredMethods(Class<?> declaringClass) {
201200
* @since 23.0
202201
*/
203202
public static void registerAllConstructors(Class<?> declaringClass) {
204-
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllConstructorsQuery(MetadataCondition.alwaysTrue(), true, declaringClass);
203+
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllConstructorsQuery(InclusionCondition.alwaysTrue(), true, declaringClass);
205204
}
206205

207206
/**
@@ -211,7 +210,7 @@ public static void registerAllConstructors(Class<?> declaringClass) {
211210
* @since 23.0
212211
*/
213212
public static void registerAllDeclaredConstructors(Class<?> declaringClass) {
214-
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllDeclaredConstructorsQuery(MetadataCondition.alwaysTrue(), true, declaringClass);
213+
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllDeclaredConstructorsQuery(InclusionCondition.alwaysTrue(), true, declaringClass);
215214
}
216215

217216
/**
@@ -231,7 +230,7 @@ public static void registerAllFields(Class<?> declaringClass) {
231230
* @since 23.0
232231
*/
233232
public static void registerAllDeclaredFields(Class<?> declaringClass) {
234-
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllDeclaredFields(MetadataCondition.alwaysTrue(), declaringClass);
233+
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllDeclaredFields(InclusionCondition.alwaysTrue(), declaringClass);
235234
}
236235

237236
/**
@@ -240,7 +239,7 @@ public static void registerAllDeclaredFields(Class<?> declaringClass) {
240239
* @since 23.0
241240
*/
242241
public static void registerAllNestMembers(Class<?> declaringClass) {
243-
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllNestMembersQuery(MetadataCondition.alwaysTrue(), declaringClass);
242+
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllNestMembersQuery(InclusionCondition.alwaysTrue(), declaringClass);
244243
}
245244

246245
/**
@@ -249,7 +248,7 @@ public static void registerAllNestMembers(Class<?> declaringClass) {
249248
* @since 23.0
250249
*/
251250
public static void registerAllPermittedSubclasses(Class<?> declaringClass) {
252-
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllPermittedSubclassesQuery(MetadataCondition.alwaysTrue(), declaringClass);
251+
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllPermittedSubclassesQuery(InclusionCondition.alwaysTrue(), declaringClass);
253252
}
254253

255254
/**
@@ -258,7 +257,7 @@ public static void registerAllPermittedSubclasses(Class<?> declaringClass) {
258257
* @since 23.0
259258
*/
260259
public static void registerAllRecordComponents(Class<?> declaringClass) {
261-
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllRecordComponentsQuery(MetadataCondition.alwaysTrue(), declaringClass);
260+
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllRecordComponentsQuery(InclusionCondition.alwaysTrue(), declaringClass);
262261
}
263262

264263
/**
@@ -267,7 +266,7 @@ public static void registerAllRecordComponents(Class<?> declaringClass) {
267266
* @since 23.0
268267
*/
269268
public static void registerAllSigners(Class<?> declaringClass) {
270-
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllSignersQuery(MetadataCondition.alwaysTrue(), declaringClass);
269+
ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllSignersQuery(InclusionCondition.alwaysTrue(), declaringClass);
271270
}
272271

273272
/**

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
import org.graalvm.nativeimage.ImageSingletons;
4848
import org.graalvm.nativeimage.Platform;
4949
import org.graalvm.nativeimage.Platforms;
50-
import org.graalvm.nativeimage.impl.MetadataCondition;
5150
import org.graalvm.nativeimage.impl.RuntimeResourceSupport;
5251

5352
/**
@@ -84,7 +83,7 @@ public static void addResource(Module module, String resourcePath, byte[] resour
8483
Objects.requireNonNull(resourcePath);
8584
Objects.requireNonNull(resourceContent);
8685
ImageSingletons.lookup(RuntimeResourceSupport.class).injectResource(module, resourcePath, resourceContent, "Manually added via RuntimeResourceAccess");
87-
ImageSingletons.lookup(RuntimeResourceSupport.class).addCondition(MetadataCondition.alwaysTrue(), module, resourcePath);
86+
ImageSingletons.lookup(RuntimeResourceSupport.class).addCondition(InclusionCondition.alwaysTrue(), module, resourcePath);
8887
}
8988

9089
/**
@@ -96,7 +95,7 @@ public static void addResource(Module module, String resourcePath, byte[] resour
9695
*/
9796
public static void addResourceBundle(Module module, String baseBundleName, Locale[] locales) {
9897
Objects.requireNonNull(locales);
99-
RuntimeResourceSupport.singleton().addResourceBundles(MetadataCondition.alwaysTrue(),
98+
RuntimeResourceSupport.singleton().addResourceBundles(InclusionCondition.alwaysTrue(),
10099
withModuleName(module, baseBundleName), Arrays.asList(locales));
101100
}
102101

@@ -108,7 +107,7 @@ public static void addResourceBundle(Module module, String baseBundleName, Local
108107
* @since 22.3
109108
*/
110109
public static void addResourceBundle(Module module, String bundleName) {
111-
RuntimeResourceSupport.singleton().addResourceBundles(MetadataCondition.alwaysTrue(),
110+
RuntimeResourceSupport.singleton().addResourceBundles(InclusionCondition.alwaysTrue(),
112111
withModuleName(module, bundleName));
113112
}
114113

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242

4343
import org.graalvm.nativeimage.Platform;
4444
import org.graalvm.nativeimage.Platforms;
45-
import org.graalvm.nativeimage.impl.MetadataCondition;
4645
import org.graalvm.nativeimage.impl.RuntimeSerializationSupport;
4746

4847
/**
@@ -72,7 +71,7 @@ public final class RuntimeSerialization {
7271
* @since 21.3
7372
*/
7473
public static void registerIncludingAssociatedClasses(Class<?> clazz) {
75-
RuntimeSerializationSupport.singleton().registerIncludingAssociatedClasses(MetadataCondition.alwaysTrue(), clazz);
74+
RuntimeSerializationSupport.singleton().registerIncludingAssociatedClasses(InclusionCondition.alwaysTrue(), clazz);
7675
}
7776

7877
/**
@@ -82,7 +81,7 @@ public static void registerIncludingAssociatedClasses(Class<?> clazz) {
8281
*/
8382
public static void register(Class<?>... classes) {
8483
for (Class<?> clazz : classes) {
85-
RuntimeSerializationSupport.singleton().register(MetadataCondition.alwaysTrue(), clazz);
84+
RuntimeSerializationSupport.singleton().register(InclusionCondition.alwaysTrue(), clazz);
8685
}
8786
}
8887

@@ -103,7 +102,7 @@ public static void register(Class<?>... classes) {
103102
@Deprecated(since = "24.2")
104103
@SuppressWarnings("unused")
105104
public static void registerWithTargetConstructorClass(Class<?> clazz, Class<?> customTargetConstructorClazz) {
106-
RuntimeSerializationSupport.singleton().register(MetadataCondition.alwaysTrue(), clazz);
105+
RuntimeSerializationSupport.singleton().register(InclusionCondition.alwaysTrue(), clazz);
107106
}
108107

109108
/**
@@ -114,7 +113,7 @@ public static void registerWithTargetConstructorClass(Class<?> clazz, Class<?> c
114113
* @since 22.3
115114
*/
116115
public static void registerLambdaCapturingClass(Class<?> lambdaCapturingClass) {
117-
RuntimeSerializationSupport.singleton().registerLambdaCapturingClass(MetadataCondition.alwaysTrue(), lambdaCapturingClass);
116+
RuntimeSerializationSupport.singleton().registerLambdaCapturingClass(InclusionCondition.alwaysTrue(), lambdaCapturingClass);
118117
}
119118

120119
/**
@@ -125,7 +124,7 @@ public static void registerLambdaCapturingClass(Class<?> lambdaCapturingClass) {
125124
* @since 22.3
126125
*/
127126
public static void registerProxyClass(Class<?>... implementedInterfaces) {
128-
RuntimeSerializationSupport.singleton().registerProxyClass(MetadataCondition.alwaysTrue(), implementedInterfaces);
127+
RuntimeSerializationSupport.singleton().registerProxyClass(InclusionCondition.alwaysTrue(), implementedInterfaces);
129128
}
130129

131130
private RuntimeSerialization() {

0 commit comments

Comments
 (0)