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

Polish

Browse Source 
See gh-29391
This commit is contained in:
Stephane Nicoll
2022-11-15 11:39:39 +01:00
parent 9235e3996f
commit 711a63adca
4 changed files with 39 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanRegistrationsAotContribution.java
View File

@@ -30,7 +30,6 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.javapoet.ClassName;
import org.springframework.javapoet.CodeBlock;
import org.springframework.javapoet.MethodSpec;
import org.springframework.util.MultiValueMap;
/**
* AOT contribution from a {@link BeanRegistrationsAotProcessor} used to
@@ -38,6 +37,7 @@ import org.springframework.util.MultiValueMap;
*
* @author Phillip Webb
* @author Sebastien Deleuze
* @author Stephane Nicoll
* @since 6.0
* @see BeanRegistrationsAotProcessor
*/
@@ -46,16 +46,10 @@ class BeanRegistrationsAotContribution
private static final String BEAN_FACTORY_PARAMETER_NAME = "beanFactory";
private final Map<String, BeanDefinitionMethodGenerator> registrations;
private final MultiValueMap<String, String> aliases;
BeanRegistrationsAotContribution(
Map<String, BeanDefinitionMethodGenerator> registrations, MultiValueMap<String, String> aliases) {
private final Map<String, Registration> registrations;
BeanRegistrationsAotContribution(Map<String, Registration> registrations) {
this.registrations = registrations;
this.aliases = aliases;
}
@@ -86,8 +80,8 @@ class BeanRegistrationsAotContribution
method.addParameter(DefaultListableBeanFactory.class,
BEAN_FACTORY_PARAMETER_NAME);
CodeBlock.Builder code = CodeBlock.builder();
this.registrations.forEach((beanName, beanDefinitionMethodGenerator) -> {
MethodReference beanDefinitionMethod = beanDefinitionMethodGenerator
this.registrations.forEach((beanName, registration) -> {
MethodReference beanDefinitionMethod = registration.methodGenerator
.generateBeanDefinitionMethod(generationContext,
beanRegistrationsCode);
CodeBlock methodInvocation = beanDefinitionMethod.toInvokeCodeBlock(
@@ -105,12 +99,22 @@ class BeanRegistrationsAotContribution
method.addParameter(DefaultListableBeanFactory.class,
BEAN_FACTORY_PARAMETER_NAME);
CodeBlock.Builder code = CodeBlock.builder();
this.aliases.forEach((beanName, beanAliases) ->
beanAliases.forEach(alias -> code.addStatement("$L.registerAlias($S, $S)", BEAN_FACTORY_PARAMETER_NAME,
beanName, alias)));
this.registrations.forEach((beanName, registration) -> {
for (String alias : registration.aliases) {
code.addStatement("$L.registerAlias($S, $S)",
BEAN_FACTORY_PARAMETER_NAME, beanName, alias);
}
});
method.addCode(code.build());
}
/**
* Gather the necessary information to register a particular bean.
* @param methodGenerator the {@link BeanDefinitionMethodGenerator} to use
* @param aliases the bean aliases, if any
*/
record Registration(BeanDefinitionMethodGenerator methodGenerator, String[] aliases) {}
/**
* {@link BeanRegistrationsCode} with generation support.

15
spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanRegistrationsAotProcessor.java
View File

@@ -19,10 +19,9 @@ package org.springframework.beans.factory.aot;
import java.util.LinkedHashMap;
import java.util.Map;
import org.springframework.beans.factory.aot.BeanRegistrationsAotContribution.Registration;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.support.RegisteredBean;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
/**
* {@link BeanFactoryInitializationAotProcessor} that contributes code to
@@ -30,6 +29,7 @@ import org.springframework.util.MultiValueMap;
*
* @author Phillip Webb
* @author Sebastien Deleuze
* @author Stephane Nicoll
* @since 6.0
*/
class BeanRegistrationsAotProcessor implements BeanFactoryInitializationAotProcessor {
@@ -38,23 +38,20 @@ class BeanRegistrationsAotProcessor implements BeanFactoryInitializationAotProce
public BeanRegistrationsAotContribution processAheadOfTime(ConfigurableListableBeanFactory beanFactory) {
BeanDefinitionMethodGeneratorFactory beanDefinitionMethodGeneratorFactory =
new BeanDefinitionMethodGeneratorFactory(beanFactory);
Map<String, BeanDefinitionMethodGenerator> registrations = new LinkedHashMap<>();
MultiValueMap<String, String> aliases = new LinkedMultiValueMap<>();
Map<String, Registration> registrations = new LinkedHashMap<>();
for (String beanName : beanFactory.getBeanDefinitionNames()) {
RegisteredBean registeredBean = RegisteredBean.of(beanFactory, beanName);
BeanDefinitionMethodGenerator beanDefinitionMethodGenerator = beanDefinitionMethodGeneratorFactory
.getBeanDefinitionMethodGenerator(registeredBean);
if (beanDefinitionMethodGenerator != null) {
registrations.put(beanName, beanDefinitionMethodGenerator);
}
for (String alias : beanFactory.getAliases(beanName)) {
aliases.add(beanName, alias);
registrations.put(beanName, new Registration(beanDefinitionMethodGenerator,
beanFactory.getAliases(beanName)));
}
}
if (registrations.isEmpty()) {
return null;
}
return new BeanRegistrationsAotContribution(registrations, aliases);
return new BeanRegistrationsAotContribution(registrations);
}
}