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

Redesign BeanOverrideRegistry internals

Browse Source
This commit is contained in:
Sam Brannen
2025-04-07 13:42:11 +02:00
parent 470bf3b0bb
commit 0c7bc232d6
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideRegistry.java
View File

@@ -27,9 +27,9 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.util.ReflectionUtils;
import org.springframework.util.StringUtils;
/**
* An internal class used to track {@link BeanOverrideHandler}-related state after
@@ -110,14 +110,13 @@ class BeanOverrideRegistry {
void inject(Object target, BeanOverrideHandler handler) {
Field field = handler.getField();
Assert.notNull(field, () -> "BeanOverrideHandler must have a non-null field: " + handler);
String beanName = this.handlerToBeanNameMap.get(handler);
Assert.state(StringUtils.hasLength(beanName), () -> "No bean found for BeanOverrideHandler: " + handler);
inject(field, target, beanName);
Object bean = getBeanForHandler(handler, field.getType());
Assert.state(bean != null, () -> "No bean found for BeanOverrideHandler: " + handler);
inject(field, target, bean);
}
private void inject(Field field, Object target, String beanName) {
private void inject(Field field, Object target, Object bean) {
try {
Object bean = this.beanFactory.getBean(beanName, field.getType());
ReflectionUtils.makeAccessible(field);
ReflectionUtils.setField(field, target, bean);
}
@@ -126,4 +125,13 @@ class BeanOverrideRegistry {
}
}
@Nullable
private Object getBeanForHandler(BeanOverrideHandler handler, Class<?> requiredType) {
String beanName = this.handlerToBeanNameMap.get(handler);
if (beanName != null) {
return this.beanFactory.getBean(beanName, requiredType);
}
return null;
}
}