ListableBeanFactory::getBeansOfType should honor bean order

Fix spring-projectsGH-34688

Signed-off-by: Yanming Zhou <[email protected]>

Author: quaff

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

@@ -119,6 +119,7 @@
  * @author Phillip Webb
  * @author Stephane Nicoll
  * @author Sebastien Deleuze
+ * @author Yanming Zhou
  * @since 16 April 2001
  * @see #registerBeanDefinition
  * @see #addBeanPostProcessor
@@ -742,6 +743,16 @@ public <T> Map<String, T> getBeansOfType(
 				throw ex;
 			}
 		}
+		return sort(result);
+	}
+
+	private <T> Map<String, T> sort(Map<String, T> matchingBeans) {
+		List<Map.Entry<String, T>> list = new ArrayList<>(matchingBeans.entrySet());
+		list.sort(Map.Entry.comparingByValue(adaptOrderComparator(matchingBeans)));
+		Map<String, T> result = CollectionUtils.newLinkedHashMap(list.size());
+		for(Map.Entry<String, T> entry : list) {
+			result.put(entry.getKey(), entry.getValue());
+		}
 		return result;
 	}
 

spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java

@@ -1549,6 +1549,31 @@ void orderFromAttributeOverridesAnnotation() {
 				.containsExactly("fromLowestPrecedenceTestBeanFactoryBean");
 	}
 
+	@Test
+	void orderIsHonoredByMapOfBeans() {
+		RootBeanDefinition bd1 = new RootBeanDefinition();
+		bd1.setBeanClass(TestBean.class);
+		bd1.setPropertyValues(new MutablePropertyValues(List.of(new PropertyValue("name", "bean1"))));
+		bd1.setAttribute(AbstractBeanDefinition.ORDER_ATTRIBUTE, Ordered.LOWEST_PRECEDENCE);
+		lbf.registerBeanDefinition("bean1", bd1);
+		RootBeanDefinition bd2 = new RootBeanDefinition();
+		bd2.setBeanClass(DerivedTestBean.class);
+		bd2.setPropertyValues(new MutablePropertyValues(List.of(new PropertyValue("name", "bean2"))));
+		bd2.setAttribute(AbstractBeanDefinition.ORDER_ATTRIBUTE, Ordered.HIGHEST_PRECEDENCE);
+		lbf.registerBeanDefinition("bean2", bd2);
+		RootBeanDefinition bd3 = new RootBeanDefinition();
+		bd3.setBeanClass(TestBean.class);
+		bd3.setPropertyValues(new MutablePropertyValues(List.of(new PropertyValue("name", "bean3"))));
+		bd3.setAttribute(AbstractBeanDefinition.ORDER_ATTRIBUTE, Ordered.HIGHEST_PRECEDENCE + 1);
+		lbf.registerBeanDefinition("bean3", bd3);
+		RootBeanDefinition bd4 = new RootBeanDefinition();
+		bd4.setBeanClass(TestBean.class);
+		bd4.setPropertyValues(new MutablePropertyValues(List.of(new PropertyValue("name", "bean4"))));
+		bd4.setAttribute(AbstractBeanDefinition.ORDER_ATTRIBUTE, Ordered.LOWEST_PRECEDENCE - 1);
+		lbf.registerBeanDefinition("bean4", bd4);
+		assertThat(lbf.getBeansOfType(TestBean.class).keySet()).containsExactly("bean2", "bean3", "bean4", "bean1");
+	}
+
 	@Test
 	void invalidOrderAttribute() {
 		GenericBeanDefinition bd1 = new GenericBeanDefinition();