Allow child context to override parent's configuration properties

wilkinsona · wilkinsona · commit 09fdb9d36c7a · 2024-07-24T18:47:19.000+01:00
Closes gh-41487
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanRegistrar.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanRegistrar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 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.
@@ -17,7 +17,6 @@
 package org.springframework.boot.context.properties;
 
 import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.HierarchicalBeanFactory;
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
@@ -68,18 +67,8 @@ private String getName(Class<?> type, MergedAnnotation<ConfigurationProperties>
 	}
 
 	private boolean containsBeanDefinition(String name) {
-		return containsBeanDefinition(this.beanFactory, name);
-	}
-
-	private boolean containsBeanDefinition(BeanFactory beanFactory, String name) {
-		if (beanFactory instanceof ListableBeanFactory listableBeanFactory
-				&& listableBeanFactory.containsBeanDefinition(name)) {
-			return true;
-		}
-		if (beanFactory instanceof HierarchicalBeanFactory hierarchicalBeanFactory) {
-			return containsBeanDefinition(hierarchicalBeanFactory.getParentBeanFactory(), name);
-		}
-		return false;
+		return (this.beanFactory instanceof ListableBeanFactory listableBeanFactory
+				&& listableBeanFactory.containsBeanDefinition(name));
 	}
 
 	private void registerBeanDefinition(String beanName, Class<?> type,
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java
@@ -289,7 +289,7 @@ void loadWhenBindingWithParentContextShouldBind() {
 		load(new Class<?>[] { BasicConfiguration.class, BasicPropertiesConsumer.class }, "name=child");
 		assertThat(this.context.getBean(BasicProperties.class)).isNotNull();
 		assertThat(parent.getBean(BasicProperties.class)).isNotNull();
-		assertThat(this.context.getBean(BasicPropertiesConsumer.class).getName()).isEqualTo("parent");
+		assertThat(this.context.getBean(BasicPropertiesConsumer.class).getName()).isEqualTo("child");
 		parent.close();
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ void loadWhenBindingWithParentContextShouldBind() {`
`289`	`289`	`load(new Class<?>[] { BasicConfiguration.class, BasicPropertiesConsumer.class }, "name=child");`
`290`	`290`	`assertThat(this.context.getBean(BasicProperties.class)).isNotNull();`
`291`	`291`	`assertThat(parent.getBean(BasicProperties.class)).isNotNull();`
`292`		`- assertThat(this.context.getBean(BasicPropertiesConsumer.class).getName()).isEqualTo("parent");`
	`292`	`+ assertThat(this.context.getBean(BasicPropertiesConsumer.class).getName()).isEqualTo("child");`
`293`	`293`	`parent.close();`
`294`	`294`	`}`
`295`	`295`