Skip to content
This repository was archived by the owner on Feb 23, 2023. It is now read-only.

Commit 42738de

Browse files
committed
Fix class init configuration at main class level
Closes gh-1660
1 parent 51bc8d0 commit 42738de

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

spring-aot/src/main/java/org/springframework/aot/nativex/ConfigurationContributor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public void contribute(BuildContext context, AotOptions aotOptions) {
7777
context.describeProxies(proxies -> proxies.merge(configurationCollector.getProxyDescriptors()));
7878
context.describeSerialization(serial -> serial.merge(configurationCollector.getSerializationDescriptor()));
7979
context.describeJNIReflection(jniReflect -> jniReflect.merge(configurationCollector.getJNIReflectionDescriptor()));
80-
context.describeInitialization(init -> init.merge(configurationCollector.getInitializationDescriptor()));
80+
context.describeInitialization(init -> init.mergeTo(configurationCollector.getInitializationDescriptor()));
8181
context.getOptions().forEach(configurationCollector::addOption);
8282
String mainClass = getMainClass(context);
8383
if (mainClass != null) {

spring-aot/src/main/java/org/springframework/nativex/domain/init/InitializationDescriptor.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,4 +127,11 @@ public void merge(InitializationDescriptor initializationDescriptor) {
127127
this.runtimePackages.addAll(initializationDescriptor.getRuntimePackages());
128128
}
129129

130+
public void mergeTo(InitializationDescriptor initializationDescriptor) {
131+
initializationDescriptor.getBuildtimeClasses().addAll(this.buildtimeClasses);
132+
initializationDescriptor.getBuildtimePackages().addAll(this.buildtimePackages);
133+
initializationDescriptor.getRuntimeClasses().addAll(this.runtimeClasses);
134+
initializationDescriptor.getRuntimePackages().addAll(this.runtimePackages);
135+
}
136+
130137
}

0 commit comments

Comments
 (0)