spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.0.x'

Browse Source 
Closes gh-48841
This commit is contained in:
Andy Wilkinson
2026-01-15 11:11:05 +00:00
parent d1e4d72fa5 8b3ef3b28b
commit 2d1df02866
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java
+3
View File
@@ -328,6 +328,9 @@ class OnBeanCondition extends FilteringSpringBootCondition implements Configurat
private @Nullable Map<String, @Nullable BeanDefinition> collectBeanDefinitionsForType(
ListableBeanFactory beanFactory, boolean considerHierarchy, BeanType type,
Set<BeanType> parameterizedContainers, @Nullable Map<String, @Nullable BeanDefinition> result) {
if (ResolvableType.NONE.equals(type.resolvableType())) {
return result;
}
result = putAll(result, beanFactory.getBeanNamesForType(type.resolvableType(), true, false), beanFactory);
for (BeanType parameterizedContainer : parameterizedContainers) {
Class<?> resolved = parameterizedContainer.resolvableType().resolve();