Merge branch '2.5.x' into 2.6.x

Closes gh-30581
spring-projects · Apr 7, 2022 · a2c08f9 · a2c08f9
2 parents fa77e1c + d9b0efb
commit a2c08f9
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 4 deletions.
diff --git a/...rc/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBean.java b/...rc/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -143,8 +143,12 @@ public static Map<String, ConfigurationPropertiesBean> getAll(ApplicationContext
 			return getAll((ConfigurableApplicationContext) applicationContext);
 		}
 		Map<String, ConfigurationPropertiesBean> propertiesBeans = new LinkedHashMap<>();
-		applicationContext.getBeansWithAnnotation(ConfigurationProperties.class)
-				.forEach((beanName, bean) -> propertiesBeans.put(beanName, get(applicationContext, bean, beanName)));
+		applicationContext.getBeansWithAnnotation(ConfigurationProperties.class).forEach((beanName, bean) -> {
+			ConfigurationPropertiesBean propertiesBean = get(applicationContext, bean, beanName);
+			if (propertiesBean != null) {
+				propertiesBeans.put(beanName, propertiesBean);
+			}
+		});
 		return propertiesBeans;
 	}
 
@@ -158,7 +162,9 @@ private static Map<String, ConfigurationPropertiesBean> getAll(ConfigurableAppli
 				try {
 					Object bean = beanFactory.getBean(beanName);
 					ConfigurationPropertiesBean propertiesBean = get(applicationContext, bean, beanName);
-					propertiesBeans.put(beanName, propertiesBean);
+					if (propertiesBean != null) {
+						propertiesBeans.put(beanName, propertiesBean);
+					}
 				}
 				catch (Exception ex) {
 				}

diff --git a/...st/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanTests.java b/...st/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanTests.java
@@ -78,6 +78,15 @@ void getAllReturnsAll() {
 		}
 	}
 
+	@Test
+	void getAllDoesNotFindABeanDeclaredInAStaticBeanMethodOnAConfigurationAndConfigurationPropertiesAnnotatedClass() {
+		try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
+				StaticBeanMethodConfiguration.class)) {
+			Map<String, ConfigurationPropertiesBean> all = ConfigurationPropertiesBean.getAll(context);
+			assertThat(all).containsOnlyKeys("configurationPropertiesBeanTests.StaticBeanMethodConfiguration");
+		}
+	}
+
 	@Test
 	void getAllWhenHasBadBeanDoesNotFail() {
 		try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
@@ -546,4 +555,15 @@ public String[] selectImports(AnnotationMetadata importingClassMetadata) {
 
 	}
 
+	@Configuration(proxyBeanMethods = false)
+	@ConfigurationProperties
+	static class StaticBeanMethodConfiguration {
+
+		@Bean
+		static String stringBean() {
+			return "example";
+		}
+
+	}
+
 }