From e30391ca7a35a58174769e72b8f95b507449cc33 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 8 Jun 2022 14:51:05 +0200 Subject: [PATCH] Use Application as target for generated code Closes gh-31274 --- .../main/java/org/springframework/boot/AotProcessor.java | 3 ++- .../java/org/springframework/boot/AotProcessorTests.java | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/AotProcessor.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/AotProcessor.java index f240919901..37d1d69e90 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/AotProcessor.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/AotProcessor.java @@ -147,7 +147,8 @@ public class AotProcessor { ApplicationContextAotGenerator generator = new ApplicationContextAotGenerator(); ClassName generatedInitializerClassName = generationContext.getClassNameGenerator() .generateClassName(this.application, "ApplicationContextInitializer"); - generator.generateApplicationContext(applicationContext, generationContext, generatedInitializerClassName); + generator.generateApplicationContext(applicationContext, this.application, "", generationContext, + generatedInitializerClassName); registerEntryPointHint(generationContext, generatedInitializerClassName); generationContext.writeGeneratedContent(); writeHints(generationContext.getRuntimeHints()); diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/AotProcessorTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/AotProcessorTests.java index cec676da1a..4c3e10ea87 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/AotProcessorTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/AotProcessorTests.java @@ -109,6 +109,12 @@ class AotProcessorTests { assertThat(directory.resolve( "source/org/springframework/boot/AotProcessorTests_SampleApplication__ApplicationContextInitializer.java")) .exists().isRegularFile(); + assertThat(directory.resolve( + "source/org/springframework/boot/AotProcessorTests_SampleApplication__BeanDefinitions.java")) + .exists().isRegularFile(); + assertThat(directory.resolve( + "source/org/springframework/boot/AotProcessorTests_SampleApplication__BeanFactoryRegistrations.java")) + .exists().isRegularFile(); assertThat(directory.resolve("resource/META-INF/native-image/com.example/example/reflect-config.json")) .exists().isRegularFile(); Path nativeImagePropertiesFile = directory