Merge branch '3.5.x' into 4.0.x

Closes gh-48840

core/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java

@@ -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();