Skip to content

Commit ca8f524

Browse files
committed
Switch RuntimeSerialization.{registerLambdaCapturingClass,registerProxyClass} to java.lang.Class<?> arguments
1 parent 58c31d8 commit ca8f524

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,8 +1006,8 @@ CLSS public final org.graalvm.nativeimage.hosted.RuntimeSerialization
10061006
meth public !varargs static void register(java.lang.Class<?>[])
10071007
meth public static void registerIncludingAssociatedClasses(java.lang.Class<?>)
10081008
meth public static void registerWithTargetConstructorClass(java.lang.Class<?>,java.lang.Class<?>)
1009-
meth public static void registerLambdaCapturingClass(java.lang.String)
1010-
meth public static void registerProxyClass(java.lang.String[])
1009+
meth public static void registerLambdaCapturingClass(java.lang.Class<?>)
1010+
meth public !varargs static void registerProxyClass(java.lang.Class<?>[])
10111011
supr java.lang.Object
10121012

10131013
CLSS public final org.graalvm.nativeimage.hosted.RuntimeProxyCreation

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@
4040
*/
4141
package org.graalvm.nativeimage.hosted;
4242

43-
import java.util.Arrays;
44-
4543
import org.graalvm.nativeimage.ImageSingletons;
4644
import org.graalvm.nativeimage.Platform;
4745
import org.graalvm.nativeimage.Platforms;
@@ -108,8 +106,8 @@ public static void registerWithTargetConstructorClass(Class<?> clazz, Class<?> c
108106
*
109107
* @since 22.3
110108
*/
111-
public static void registerLambdaCapturingClass(String lambdaCapturingClassName) {
112-
ImageSingletons.lookup(RuntimeSerializationSupport.class).registerLambdaCapturingClass(ConfigurationCondition.alwaysTrue(), lambdaCapturingClassName);
109+
public static void registerLambdaCapturingClass(Class<?> lambdaCapturingClass) {
110+
ImageSingletons.lookup(RuntimeSerializationSupport.class).registerLambdaCapturingClass(ConfigurationCondition.alwaysTrue(), lambdaCapturingClass);
113111
}
114112

115113
/**
@@ -119,8 +117,8 @@ public static void registerLambdaCapturingClass(String lambdaCapturingClassName)
119117
*
120118
* @since 22.3
121119
*/
122-
public static void registerProxyClass(String... implementedInterfaces) {
123-
ImageSingletons.lookup(RuntimeSerializationSupport.class).registerProxyClass(ConfigurationCondition.alwaysTrue(), Arrays.asList(implementedInterfaces));
120+
public static void registerProxyClass(Class<?>... implementedInterfaces) {
121+
ImageSingletons.lookup(RuntimeSerializationSupport.class).registerProxyClass(ConfigurationCondition.alwaysTrue(), implementedInterfaces);
124122
}
125123

126124
private RuntimeSerialization() {

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@
4040
*/
4141
package org.graalvm.nativeimage.impl;
4242

43+
import java.util.Arrays;
4344
import java.util.List;
45+
import java.util.stream.Collectors;
4446

4547
public interface RuntimeSerializationSupport {
4648

@@ -54,6 +56,13 @@ public interface RuntimeSerializationSupport {
5456

5557
void registerLambdaCapturingClass(ConfigurationCondition condition, String lambdaCapturingClassName);
5658

59+
default void registerLambdaCapturingClass(ConfigurationCondition condition, Class<?> lambdaCapturingClass) {
60+
registerLambdaCapturingClass(condition, lambdaCapturingClass.getName());
61+
}
62+
5763
void registerProxyClass(ConfigurationCondition condition, List<String> implementedInterfaces);
5864

65+
default void registerProxyClass(ConfigurationCondition condition, Class<?>... implementedInterfaces) {
66+
registerProxyClass(condition, Arrays.stream(implementedInterfaces).map(Class::getName).collect(Collectors.toList()));
67+
}
5968
}

0 commit comments

Comments
 (0)