Merge branch '6.2.x'

# Conflicts:
#	spring-beans/src/main/java/org/springframework/beans/factory/support/StaticListableBeanFactory.java
#	spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java

Author: jhoeller

spring-beans/src/main/java/org/springframework/beans/factory/support/StaticListableBeanFactory.java

@@ -208,7 +208,6 @@ public boolean containsBean(String name) {
 	public boolean isSingleton(String name) throws NoSuchBeanDefinitionException {
 		String beanName = BeanFactoryUtils.transformedBeanName(name);
 		Object bean = obtainBean(beanName);
-		// In case of FactoryBean, return singleton status of created object.
 		if (bean instanceof FactoryBean<?> factoryBean && !BeanFactoryUtils.isFactoryDereference(name)) {
 			return factoryBean.isSingleton();
 		}
@@ -219,7 +218,6 @@ public boolean isSingleton(String name) throws NoSuchBeanDefinitionException {
 	public boolean isPrototype(String name) throws NoSuchBeanDefinitionException {
 		String beanName = BeanFactoryUtils.transformedBeanName(name);
 		Object bean = obtainBean(beanName);
-		// In case of FactoryBean, return prototype status of created object.
 		return (!BeanFactoryUtils.isFactoryDereference(name) &&
 				((bean instanceof SmartFactoryBean<?> smartFactoryBean && smartFactoryBean.isPrototype()) ||
 				(bean instanceof FactoryBean<?> factoryBean && !factoryBean.isSingleton())));
@@ -263,7 +261,6 @@ private boolean isTypeMatch(FactoryBean<?> factoryBean, Class<?> typeToMatch) th
 		String beanName = BeanFactoryUtils.transformedBeanName(name);
 		Object bean = obtainBean(beanName);
 		if (bean instanceof FactoryBean<?> factoryBean && !BeanFactoryUtils.isFactoryDereference(name)) {
-			// If it's a FactoryBean, we want to look at what it creates, not the factory class.
 			return factoryBean.getObjectType();
 		}
 		return bean.getClass();
@@ -417,18 +414,14 @@ public <T> Map<String, T> getBeansOfType(@Nullable Class<T> type, boolean includ
 		for (Map.Entry<String, Object> entry : this.beans.entrySet()) {
 			String beanName = entry.getKey();
 			Object beanInstance = entry.getValue();
-			// Is bean a FactoryBean?
 			if (beanInstance instanceof FactoryBean<?> factoryBean && !isFactoryType) {
-				// Match object created by FactoryBean.
 				if ((includeNonSingletons || factoryBean.isSingleton()) &&
 						(type == null || isTypeMatch(factoryBean, type))) {
 					matches.put(beanName, getBean(beanName, type));
 				}
 			}
 			else {
 				if (type == null || type.isInstance(beanInstance)) {
-					// If type to match is FactoryBean, return FactoryBean itself.
-					// Else, return bean instance.
 					if (isFactoryType) {
 						beanName = FACTORY_BEAN_PREFIX + beanName;
 					}