Merge branch 'main' into 4.0.x

Author: wilkinsona

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/ServletManagementChildContextConfiguration.java

@@ -39,7 +39,6 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
 import org.springframework.boot.autoconfigure.condition.SearchStrategy;
 import org.springframework.boot.autoconfigure.web.ServerProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.embedded.jetty.JettyServletWebServerFactory;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
 import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory;
@@ -67,7 +66,6 @@
  */
 @ManagementContextConfiguration(value = ManagementContextType.CHILD, proxyBeanMethods = false)
 @ConditionalOnWebApplication(type = Type.SERVLET)
-@EnableConfigurationProperties(ManagementServerProperties.class)
 class ServletManagementChildContextConfiguration {
 
 	@Bean

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/reactive/ReactiveManagementChildContextConfigurationTests.java

@@ -19,6 +19,8 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.actuate.autoconfigure.web.reactive.ReactiveManagementChildContextConfiguration.AccessLogCustomizer;
+import org.springframework.boot.actuate.autoconfigure.web.server.ManagementServerProperties;
+import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -46,4 +48,24 @@ void accessLogCustomizerWithNullPrefix() {
 		assertThat(customizer.customizePrefix("existing")).isEqualTo("existing");
 	}
 
+	@Test
+	// gh-45857
+	void failsWithoutManagementServerPropertiesBeanFromParent() {
+		new ReactiveWebApplicationContextRunner().run((parent) -> {
+			new ReactiveWebApplicationContextRunner().withParent(parent)
+				.withUserConfiguration(ReactiveManagementChildContextConfiguration.class)
+				.run((context) -> assertThat(context).hasFailed());
+		});
+	}
+
+	@Test
+	// gh-45857
+	void succeedsWithManagementServerPropertiesBeanFromParent() {
+		new ReactiveWebApplicationContextRunner().withBean(ManagementServerProperties.class).run((parent) -> {
+			new ReactiveWebApplicationContextRunner().withParent(parent)
+				.withUserConfiguration(ReactiveManagementChildContextConfiguration.class)
+				.run((context) -> assertThat(context).hasNotFailed());
+		});
+	}
+
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/ServletManagementChildContextConfigurationTests.java

@@ -18,7 +18,9 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.actuate.autoconfigure.web.server.ManagementServerProperties;
 import org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementChildContextConfiguration.AccessLogCustomizer;
+import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -46,4 +48,24 @@ void accessLogCustomizerWithNullPrefix() {
 		assertThat(customizer.customizePrefix("existing")).isEqualTo("existing");
 	}
 
+	@Test
+	// gh-45857
+	void failsWithoutManagementServerPropertiesBeanFromParent() {
+		new WebApplicationContextRunner().run((parent) -> {
+			new WebApplicationContextRunner().withParent(parent)
+				.withUserConfiguration(ServletManagementChildContextConfiguration.class)
+				.run((context) -> assertThat(context).hasFailed());
+		});
+	}
+
+	@Test
+	// gh-45857
+	void succeedsWithManagementServerPropertiesBeanFromParent() {
+		new WebApplicationContextRunner().withBean(ManagementServerProperties.class).run((parent) -> {
+			new WebApplicationContextRunner().withParent(parent)
+				.withUserConfiguration(ServletManagementChildContextConfiguration.class)
+				.run((context) -> assertThat(context).hasNotFailed());
+		});
+	}
+
 }