spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-26 08:59:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '6.2.x'

Browse Source 
# Conflicts:
#	spring-context/src/main/java/org/springframework/context/aot/BeanFactoryInitializationAotContributions.java
#	spring-context/src/test/java/org/springframework/context/aot/ApplicationContextAotGeneratorTests.java
#	spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateQueryException.java
This commit is contained in:
Juergen Hoeller
2025-06-24 22:01:58 +02:00
parent 04f3975e0f b6aa6899a8
commit 90c875144a
14 changed files with 334 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-context/src/main/java/org/springframework/context/aot/BeanFactoryInitializationAotContributions.java
+9 -11
View File
@@ -32,9 +32,8 @@ import org.springframework.beans.factory.aot.BeanFactoryInitializationCode;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
/**
* A collection of {@link BeanFactoryInitializationAotContribution AOT
* contributions} obtained from {@link BeanFactoryInitializationAotProcessor AOT
* processors}.
* A collection of {@link BeanFactoryInitializationAotContribution AOT contributions}
* obtained from {@link BeanFactoryInitializationAotProcessor AOT processors}.
*
* @author Phillip Webb
* @since 6.0
@@ -48,14 +47,12 @@ class BeanFactoryInitializationAotContributions {
this(beanFactory, AotServices.factoriesAndBeans(beanFactory));
}
BeanFactoryInitializationAotContributions(DefaultListableBeanFactory beanFactory,
AotServices.Loader loader) {
BeanFactoryInitializationAotContributions(DefaultListableBeanFactory beanFactory, AotServices.Loader loader) {
this.contributions = getContributions(beanFactory, getProcessors(loader));
}
private static List<BeanFactoryInitializationAotProcessor> getProcessors(
AotServices.Loader loader) {
private static List<BeanFactoryInitializationAotProcessor> getProcessors(AotServices.Loader loader) {
List<BeanFactoryInitializationAotProcessor> processors = new ArrayList<>(
loader.load(BeanFactoryInitializationAotProcessor.class).asList());
processors.add(new RuntimeHintsBeanFactoryInitializationAotProcessor());
@@ -63,8 +60,8 @@ class BeanFactoryInitializationAotContributions {
}
private List<BeanFactoryInitializationAotContribution> getContributions(
DefaultListableBeanFactory beanFactory,
List<BeanFactoryInitializationAotProcessor> processors) {
DefaultListableBeanFactory beanFactory, List<BeanFactoryInitializationAotProcessor> processors) {
List<BeanFactoryInitializationAotContribution> contributions = new ArrayList<>();
for (BeanFactoryInitializationAotProcessor processor : processors) {
BeanFactoryInitializationAotContribution contribution = processAheadOfTime(processor, beanFactory);
@@ -75,8 +72,8 @@ class BeanFactoryInitializationAotContributions {
return Collections.unmodifiableList(contributions);
}
private @Nullable BeanFactoryInitializationAotContribution processAheadOfTime(BeanFactoryInitializationAotProcessor processor,
DefaultListableBeanFactory beanFactory) {
private @Nullable BeanFactoryInitializationAotContribution processAheadOfTime(
BeanFactoryInitializationAotProcessor processor, DefaultListableBeanFactory beanFactory) {
try {
return processor.processAheadOfTime(beanFactory);
@@ -92,6 +89,7 @@ class BeanFactoryInitializationAotContributions {
void applyTo(GenerationContext generationContext,
BeanFactoryInitializationCode beanFactoryInitializationCode) {
for (BeanFactoryInitializationAotContribution contribution : this.contributions) {
contribution.applyTo(generationContext, beanFactoryInitializationCode);
}