Merge branch '2.6.x' into 2.7.x

Closes gh-30582

spring-boot-project/spring-boot/src/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 final class ConfigurationPropertiesBean {
 			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,8 +162,10 @@ public final class ConfigurationPropertiesBean {
 				try {
 					Object bean = beanFactory.getBean(beanName);
 					ConfigurationPropertiesBean propertiesBean = get(applicationContext, bean, beanName);
+					if (propertiesBean != null) {
 						propertiesBeans.put(beanName, propertiesBean);
 					}
+				}
 				catch (Exception ex) {
 				}
 			}

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanTests.java

@@ -78,6 +78,15 @@ class ConfigurationPropertiesBeanTests {
 		}
 	}
 
+	@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 @@ class ConfigurationPropertiesBeanTests {
 
 	}
 
+	@Configuration(proxyBeanMethods = false)
+	@ConfigurationProperties
+	static class StaticBeanMethodConfiguration {
+
+		@Bean
+		static String stringBean() {
+			return "example";
+		}
+
+	}
+
 }