Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.2.x'

Browse Source 
# Conflicts:
#	spring-context/src/test/java/org/springframework/context/aot/ContextAotProcessorTests.java
This commit is contained in:
Juergen Hoeller
2025-04-29 11:51:24 +02:00
parent bb513de224 03620fc530
commit 4d15c136b1
4 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-context/src/main/java/org/springframework/context/aot/ApplicationContextAotGenerator.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2023 the original author or authors. * Copyright 2002-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -50,6 +50,7 @@ public class ApplicationContextAotGenerator {
*/ */
public ClassName processAheadOfTime(GenericApplicationContext applicationContext, public ClassName processAheadOfTime(GenericApplicationContext applicationContext,
GenerationContext generationContext) { GenerationContext generationContext) {
return withCglibClassHandler(new CglibClassHandler(generationContext), () -> { return withCglibClassHandler(new CglibClassHandler(generationContext), () -> {
applicationContext.refreshForAotProcessing(generationContext.getRuntimeHints()); applicationContext.refreshForAotProcessing(generationContext.getRuntimeHints());
ApplicationContextInitializationCodeGenerator codeGenerator = ApplicationContextInitializationCodeGenerator codeGenerator =

7
spring-context/src/main/java/org/springframework/context/aot/ContextAotProcessor.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2022 the original author or authors. * Copyright 2002-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -80,8 +80,9 @@ public abstract class ContextAotProcessor extends AbstractAotProcessor<ClassName
@Override @Override
protected ClassName doProcess() { protected ClassName doProcess() {
deleteExistingOutput(); deleteExistingOutput();
GenericApplicationContext applicationContext = prepareApplicationContext(getApplicationClass()); try (GenericApplicationContext applicationContext = prepareApplicationContext(getApplicationClass())) {
return performAotProcessing(applicationContext); return performAotProcessing(applicationContext);
}
} }
/** /**

5
spring-context/src/main/java/org/springframework/context/aot/ReflectiveProcessorAotContributionBuilder.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2024 the original author or authors. * Copyright 2002-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -100,6 +100,7 @@ public class ReflectiveProcessorAotContributionBuilder {
return (!this.classes.isEmpty() ? new AotContribution(this.classes) : null); return (!this.classes.isEmpty() ? new AotContribution(this.classes) : null);
} }
private static class AotContribution implements BeanFactoryInitializationAotContribution { private static class AotContribution implements BeanFactoryInitializationAotContribution {
private final Class<?>[] classes; private final Class<?>[] classes;
@@ -113,9 +114,9 @@ public class ReflectiveProcessorAotContributionBuilder {
RuntimeHints runtimeHints = generationContext.getRuntimeHints(); RuntimeHints runtimeHints = generationContext.getRuntimeHints();
registrar.registerRuntimeHints(runtimeHints, this.classes); registrar.registerRuntimeHints(runtimeHints, this.classes);
} }
} }
private static class ReflectiveClassPathScanner extends ClassPathScanningCandidateComponentProvider { private static class ReflectiveClassPathScanner extends ClassPathScanningCandidateComponentProvider {
private final @Nullable ClassLoader classLoader; private final @Nullable ClassLoader classLoader;

17
spring-context/src/test/java/org/springframework/context/aot/ContextAotProcessorTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2024 the original author or authors. * Copyright 2002-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -45,8 +45,9 @@ class ContextAotProcessorTests {
void processGeneratesAssets(@TempDir Path directory) { void processGeneratesAssets(@TempDir Path directory) {
GenericApplicationContext context = new AnnotationConfigApplicationContext(); GenericApplicationContext context = new AnnotationConfigApplicationContext();
context.registerBean(SampleApplication.class); context.registerBean(SampleApplication.class);
ContextAotProcessor processor = new DemoContextAotProcessor(SampleApplication.class, directory); DemoContextAotProcessor processor = new DemoContextAotProcessor(SampleApplication.class, directory);
ClassName className = processor.process(); ClassName className = processor.process();
assertThat(processor.context.isClosed()).isTrue();
assertThat(className).isEqualTo(ClassName.get(SampleApplication.class.getPackageName(), assertThat(className).isEqualTo(ClassName.get(SampleApplication.class.getPackageName(),
"ContextAotProcessorTests_SampleApplication__ApplicationContextInitializer")); "ContextAotProcessorTests_SampleApplication__ApplicationContextInitializer"));
assertThat(directory).satisfies(hasGeneratedAssetsForSampleApplication()); assertThat(directory).satisfies(hasGeneratedAssetsForSampleApplication());
@@ -61,9 +62,10 @@ class ContextAotProcessorTests {
Path existingSourceOutput = createExisting(sourceOutput); Path existingSourceOutput = createExisting(sourceOutput);
Path existingResourceOutput = createExisting(resourceOutput); Path existingResourceOutput = createExisting(resourceOutput);
Path existingClassOutput = createExisting(classOutput); Path existingClassOutput = createExisting(classOutput);
ContextAotProcessor processor = new DemoContextAotProcessor(SampleApplication.class, DemoContextAotProcessor processor = new DemoContextAotProcessor(SampleApplication.class,
sourceOutput, resourceOutput, classOutput); sourceOutput, resourceOutput, classOutput);
processor.process(); processor.process();
assertThat(processor.context.isClosed()).isTrue();
assertThat(existingSourceOutput).doesNotExist(); assertThat(existingSourceOutput).doesNotExist();
assertThat(existingResourceOutput).doesNotExist(); assertThat(existingResourceOutput).doesNotExist();
assertThat(existingClassOutput).doesNotExist(); assertThat(existingClassOutput).doesNotExist();
@@ -73,13 +75,14 @@ class ContextAotProcessorTests {
void processWithEmptyNativeImageArgumentsDoesNotCreateNativeImageProperties(@TempDir Path directory) { void processWithEmptyNativeImageArgumentsDoesNotCreateNativeImageProperties(@TempDir Path directory) {
GenericApplicationContext context = new AnnotationConfigApplicationContext(); GenericApplicationContext context = new AnnotationConfigApplicationContext();
context.registerBean(SampleApplication.class); context.registerBean(SampleApplication.class);
ContextAotProcessor processor = new DemoContextAotProcessor(SampleApplication.class, directory) { DemoContextAotProcessor processor = new DemoContextAotProcessor(SampleApplication.class, directory) {
@Override @Override
protected List<String> getDefaultNativeImageArguments(String application) { protected List<String> getDefaultNativeImageArguments(String application) {
return Collections.emptyList(); return Collections.emptyList();
} }
}; };
processor.process(); processor.process();
assertThat(processor.context.isClosed()).isTrue();
assertThat(directory.resolve("resource/META-INF/native-image/com.example/example/native-image.properties")) assertThat(directory.resolve("resource/META-INF/native-image/com.example/example/native-image.properties"))
.doesNotExist(); .doesNotExist();
context.close(); context.close();
@@ -118,6 +121,8 @@ class ContextAotProcessorTests {
private static class DemoContextAotProcessor extends ContextAotProcessor { private static class DemoContextAotProcessor extends ContextAotProcessor {
AnnotationConfigApplicationContext context;
DemoContextAotProcessor(Class<?> application, Path rootPath) { DemoContextAotProcessor(Class<?> application, Path rootPath) {
this(application, rootPath.resolve("source"), rootPath.resolve("resource"), rootPath.resolve("class")); this(application, rootPath.resolve("source"), rootPath.resolve("resource"), rootPath.resolve("class"));
} }
@@ -141,11 +146,12 @@ class ContextAotProcessorTests {
protected GenericApplicationContext prepareApplicationContext(Class<?> application) { protected GenericApplicationContext prepareApplicationContext(Class<?> application) {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
context.register(application); context.register(application);
this.context = context;
return context; return context;
} }
} }
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
static class SampleApplication { static class SampleApplication {
@@ -153,7 +159,6 @@ class ContextAotProcessorTests {
public String testBean() { public String testBean() {
return "Hello"; return "Hello";
} }
} }
} }