Make additional health web paths back off without web endpoint infra

Author: wilkinsona

spring-boot-project/spring-boot-webflux/src/main/java/org/springframework/boot/webflux/autoconfigure/actuate/endpoint/web/WebFluxHealthEndpointExtensionAutoConfiguration.java

@@ -28,6 +28,7 @@
 import org.springframework.boot.actuate.health.HealthEndpointGroups;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
@@ -43,6 +44,7 @@
  */
 @AutoConfiguration
 @ConditionalOnWebApplication(type = Type.REACTIVE)
+@ConditionalOnBean({ WebEndpointsSupplier.class, HealthEndpointGroups.class })
 @ConditionalOnClass(HealthEndpoint.class)
 @ConditionalOnAvailableEndpoint(endpoint = HealthEndpoint.class, exposure = EndpointExposure.WEB)
 public class WebFluxHealthEndpointExtensionAutoConfiguration {

spring-boot-project/spring-boot-webflux/src/test/java/org/springframework/boot/webflux/autoconfigure/actuate/endpoint/web/WebFluxHealthEndpointExtensionAutoConfigurationTests.java

@@ -67,6 +67,16 @@ void additionalReactiveHealthEndpointsPathsTolerateHealthEndpointThatIsNotWebExp
 			});
 	}
 
+	@Test
+	@WithTestEndpointOutcomeExposureContributor
+	void backsOffWithoutWebEndpointInfrastructure() {
+		this.contextRunner.withConfiguration(AutoConfigurations.of(EndpointAutoConfiguration.class))
+			.withPropertyValues("management.endpoints.web.exposure.exclude=*",
+					"management.endpoints.test.exposure.include=*")
+			.run((context) -> assertThat(context)
+				.doesNotHaveBean(AdditionalHealthEndpointPathsWebFluxHandlerMapping.class));
+	}
+
 	@Configuration(proxyBeanMethods = false)
 	static class HealthIndicatorsConfiguration {
 

spring-boot-project/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/autoconfigure/actuate/endpoint/web/WebMvcHealthEndpointExtensionAutoConfiguration.java

@@ -44,7 +44,7 @@
 @AutoConfiguration
 @ConditionalOnWebApplication(type = Type.SERVLET)
 @ConditionalOnClass(HealthEndpoint.class)
-@ConditionalOnBean(HealthEndpoint.class)
+@ConditionalOnBean({ HealthEndpoint.class, WebEndpointsSupplier.class, HealthEndpointGroups.class })
 @ConditionalOnAvailableEndpoint(endpoint = HealthEndpoint.class, exposure = EndpointExposure.WEB)
 public class WebMvcHealthEndpointExtensionAutoConfiguration {
 

spring-boot-project/spring-boot-webmvc/src/test/java/org/springframework/boot/webmvc/actuate/autoconfigure/health/WebMvcHealthEndpointExtensionAutoConfigurationTests.java

@@ -67,6 +67,17 @@ void additionalHealthEndpointsPathsTolerateHealthEndpointThatIsNotWebExposed() {
 			});
 	}
 
+	@Test
+	@WithTestEndpointOutcomeExposureContributor
+	void backsOffWithoutWebEndpointInfrastructure() {
+		this.contextRunner.withConfiguration(AutoConfigurations.of(EndpointAutoConfiguration.class))
+			.withBean(DispatcherServlet.class)
+			.withPropertyValues("management.endpoints.web.exposure.exclude=*",
+					"management.endpoints.test.exposure.include=*")
+			.run((context) -> assertThat(context)
+				.doesNotHaveBean(AdditionalHealthEndpointPathsWebMvcHandlerMapping.class));
+	}
+
 	@Configuration(proxyBeanMethods = false)
 	static class HealthIndicatorsConfiguration {