Reduce dependencies of spring-boot-actuator

Author: wilkinsona

settings.gradle

@@ -45,6 +45,7 @@ include "spring-boot-project:spring-boot-actuator"
 include "spring-boot-project:spring-boot-actuator-autoconfigure"
 include "spring-boot-project:spring-boot-actuator-autoconfigure-all"
 include "spring-boot-project:spring-boot-actuator-docs"
+include "spring-boot-project:spring-boot-actuator-integration-tests"
 include "spring-boot-project:spring-boot-amqp"
 include "spring-boot-project:spring-boot-artemis"
 include "spring-boot-project:spring-boot-autoconfigure"

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfiguration.java

@@ -20,7 +20,6 @@
 import io.micrometer.core.instrument.binder.tomcat.TomcatMetrics;
 import org.apache.catalina.Manager;
 
-import org.springframework.boot.actuate.metrics.web.tomcat.TomcatMetricsBinder;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -29,6 +28,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration;
 import org.springframework.boot.tomcat.TomcatWebServer;
+import org.springframework.boot.tomcat.actuate.metrics.TomcatMetricsBinder;
 import org.springframework.context.annotation.Bean;
 
 /**

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/web/mappings/MappingsEndpointAutoConfiguration.java

@@ -20,8 +20,6 @@
 import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint;
 import org.springframework.boot.actuate.web.mappings.MappingDescriptionProvider;
 import org.springframework.boot.actuate.web.mappings.MappingsEndpoint;
-import org.springframework.boot.actuate.web.mappings.reactive.DispatcherHandlersMappingDescriptionProvider;
-import org.springframework.boot.actuate.web.mappings.servlet.DispatcherServletsMappingDescriptionProvider;
 import org.springframework.boot.actuate.web.mappings.servlet.FiltersMappingDescriptionProvider;
 import org.springframework.boot.actuate.web.mappings.servlet.ServletsMappingDescriptionProvider;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -30,6 +28,8 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
+import org.springframework.boot.webflux.actuate.mappings.DispatcherHandlersMappingDescriptionProvider;
+import org.springframework.boot.webmvc.actuate.mappings.DispatcherServletsMappingDescriptionProvider;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfigurationTests.java

@@ -26,12 +26,12 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.actuate.metrics.web.tomcat.TomcatMetricsBinder;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.context.event.ApplicationStartedEvent;
 import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
 import org.springframework.boot.tomcat.TomcatWebServer;
+import org.springframework.boot.tomcat.actuate.metrics.TomcatMetricsBinder;
 import org.springframework.boot.tomcat.autoconfigure.reactive.TomcatReactiveWebServerAutoConfiguration;
 import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
 import org.springframework.boot.tomcat.reactive.TomcatReactiveWebServerFactory;

spring-boot-project/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/web/mappings/MappingsEndpointReactiveDocumentationTests.java

@@ -28,11 +28,11 @@
 import org.springframework.boot.actuate.docs.AbstractEndpointDocumentationTests;
 import org.springframework.boot.actuate.web.mappings.MappingDescriptionProvider;
 import org.springframework.boot.actuate.web.mappings.MappingsEndpoint;
-import org.springframework.boot.actuate.web.mappings.reactive.DispatcherHandlersMappingDescriptionProvider;
 import org.springframework.boot.reactor.netty.NettyReactiveWebServerFactory;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.web.server.test.LocalServerPort;
+import org.springframework.boot.webflux.actuate.mappings.DispatcherHandlersMappingDescriptionProvider;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

spring-boot-project/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/web/mappings/MappingsEndpointServletDocumentationTests.java

@@ -28,13 +28,13 @@
 import org.springframework.boot.actuate.docs.AbstractEndpointDocumentationTests;
 import org.springframework.boot.actuate.web.mappings.MappingDescriptionProvider;
 import org.springframework.boot.actuate.web.mappings.MappingsEndpoint;
-import org.springframework.boot.actuate.web.mappings.servlet.DispatcherServletsMappingDescriptionProvider;
 import org.springframework.boot.actuate.web.mappings.servlet.FiltersMappingDescriptionProvider;
 import org.springframework.boot.actuate.web.mappings.servlet.ServletsMappingDescriptionProvider;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.tomcat.servlet.TomcatServletWebServerFactory;
 import org.springframework.boot.web.server.test.LocalServerPort;
+import org.springframework.boot.webmvc.actuate.mappings.DispatcherServletsMappingDescriptionProvider;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

spring-boot-project/spring-boot-actuator-integration-tests/build.gradle

@@ -0,0 +1,39 @@
+plugins {
+	id "java-library"
+	id "java-test-fixtures"
+}
+
+description = "Spring Boot Actuator Integration Tests"
+
+
+dependencies {
+	testFixturesImplementation(project(":spring-boot-project:spring-boot-actuator"))
+	testFixturesImplementation(project(":spring-boot-project:spring-boot-autoconfigure"))
+	testFixturesImplementation(project(":spring-boot-project:spring-boot-http-converter"))
+	testFixturesImplementation(project(":spring-boot-project:spring-boot-jackson"))
+	testFixturesImplementation(project(":spring-boot-project:spring-boot-jersey"))
+	testFixturesImplementation(project(":spring-boot-project:spring-boot-reactor-netty"))
+	testFixturesImplementation(project(":spring-boot-project:spring-boot-test"))
+	testFixturesImplementation(project(":spring-boot-project:spring-boot-tomcat"))
+	testFixturesImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
+	testFixturesImplementation(project(":spring-boot-project:spring-boot-webflux"))
+	testFixturesImplementation(project(":spring-boot-project:spring-boot-webmvc"))
+	testFixturesImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
+	testImplementation(project(":spring-boot-project:spring-boot-actuator"))
+	testImplementation(project(":spring-boot-project:spring-boot-autoconfigure"))
+	testImplementation(project(":spring-boot-project:spring-boot-http-converter"))
+	testImplementation(project(":spring-boot-project:spring-boot-jackson"))
+	testImplementation(project(":spring-boot-project:spring-boot-jersey"))
+	testImplementation(project(":spring-boot-project:spring-boot-reactor-netty"))
+	testImplementation(project(":spring-boot-project:spring-boot-test"))
+	testImplementation(project(":spring-boot-project:spring-boot-tomcat"))
+	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
+	testImplementation(project(":spring-boot-project:spring-boot-web-server"))
+	testImplementation(project(":spring-boot-project:spring-boot-webflux"))
+	testImplementation(project(":spring-boot-project:spring-boot-webmvc"))
+	testImplementation("io.micrometer:micrometer-registry-prometheus")
+	testImplementation("io.prometheus:prometheus-metrics-exposition-formats")
+	testImplementation("net.minidev:json-smart")
+	testImplementation("org.springframework.security:spring-security-web")
+	testRuntimeOnly("ch.qos.logback:logback-classic")
+}

spring-boot-project/spring-boot-actuator-integration-tests/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -0,0 +1,4 @@
+{
+  "groups": [],
+  "properties": []
+}

spring-boot-project/spring-boot-actuator-integration-tests/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,80 @@
+/*
+ * Copyright 2012-2025 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.actuate.endpoint.web.annotation;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.actuate.endpoint.invoke.ParameterValueMapper;
+import org.springframework.boot.actuate.endpoint.invoke.convert.ConversionServiceParameterValueMapper;
+import org.springframework.boot.actuate.endpoint.web.EndpointMediaTypes;
+import org.springframework.boot.actuate.endpoint.web.PathMapper;
+import org.springframework.boot.tomcat.TomcatEmbeddedWebappClassLoader;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
+import org.springframework.core.convert.support.DefaultConversionService;
+
+import static org.mockito.Mockito.mock;
+
+/**
+ * Base configuration shared by tests.
+ *
+ * @author Andy Wilkinson
+ */
+@Configuration(proxyBeanMethods = false)
+class BaseConfiguration {
+
+	@Bean
+	AbstractWebEndpointIntegrationTests.EndpointDelegate endpointDelegate() {
+		ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+		if (classLoader instanceof TomcatEmbeddedWebappClassLoader) {
+			Thread.currentThread().setContextClassLoader(classLoader.getParent());
+		}
+		try {
+			return mock(AbstractWebEndpointIntegrationTests.EndpointDelegate.class);
+		}
+		finally {
+			Thread.currentThread().setContextClassLoader(classLoader);
+		}
+	}
+
+	@Bean
+	EndpointMediaTypes endpointMediaTypes() {
+		List<String> mediaTypes = Arrays.asList("application/vnd.test+json", "application/json");
+		return new EndpointMediaTypes(mediaTypes, mediaTypes);
+	}
+
+	@Bean
+	WebEndpointDiscoverer webEndpointDiscoverer(EndpointMediaTypes endpointMediaTypes,
+			ApplicationContext applicationContext, ObjectProvider<PathMapper> pathMappers) {
+		ParameterValueMapper parameterMapper = new ConversionServiceParameterValueMapper(
+				DefaultConversionService.getSharedInstance());
+		return new WebEndpointDiscoverer(applicationContext, parameterMapper, endpointMediaTypes,
+				pathMappers.orderedStream().toList(), Collections.emptyList(), Collections.emptyList(),
+				Collections.emptyList(), Collections.emptyList());
+	}
+
+	@Bean
+	static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
+		return new PropertySourcesPlaceholderConfigurer();
+	}
+
+}

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/AuditEventsEndpointWebIntegrationTests.java renamed to spring-boot-project/spring-boot-actuator-integration-tests/src/test/java/org/springframework/boot/actuate/audit/AuditEventsEndpointWebIntegrationTests.java

@@ -0,0 +1,92 @@
+/*
+ * Copyright 2012-2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.actuate.health;
+
+import java.util.function.Predicate;
+
+import org.springframework.boot.actuate.endpoint.SecurityContext;
+
+/**
+ * Test implementation of {@link HealthEndpointGroups}.
+ *
+ * @author Phillip Webb
+ */
+class TestHealthEndpointGroup implements HealthEndpointGroup {
+
+	private final StatusAggregator statusAggregator = new SimpleStatusAggregator();
+
+	private final HttpCodeStatusMapper httpCodeStatusMapper = new SimpleHttpCodeStatusMapper();
+
+	private final Predicate<String> memberPredicate;
+
+	private Boolean showComponents;
+
+	private boolean showDetails = true;
+
+	private AdditionalHealthEndpointPath additionalPath;
+
+	TestHealthEndpointGroup() {
+		this((name) -> true);
+	}
+
+	TestHealthEndpointGroup(Predicate<String> memberPredicate) {
+		this.memberPredicate = memberPredicate;
+	}
+
+	@Override
+	public boolean isMember(String name) {
+		return this.memberPredicate.test(name);
+	}
+
+	@Override
+	public boolean showComponents(SecurityContext securityContext) {
+		return (this.showComponents != null) ? this.showComponents : this.showDetails;
+	}
+
+	void setShowComponents(Boolean showComponents) {
+		this.showComponents = showComponents;
+	}
+
+	@Override
+	public boolean showDetails(SecurityContext securityContext) {
+		return this.showDetails;
+	}
+
+	void setShowDetails(boolean includeDetails) {
+		this.showDetails = includeDetails;
+	}
+
+	@Override
+	public StatusAggregator getStatusAggregator() {
+		return this.statusAggregator;
+	}
+
+	@Override
+	public HttpCodeStatusMapper getHttpCodeStatusMapper() {
+		return this.httpCodeStatusMapper;
+	}
+
+	@Override
+	public AdditionalHealthEndpointPath getAdditionalPath() {
+		return this.additionalPath;
+	}
+
+	void setAdditionalPath(AdditionalHealthEndpointPath additionalPath) {
+		this.additionalPath = additionalPath;
+	}
+
+}

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointWebIntegrationTests.java renamed to spring-boot-project/spring-boot-actuator-integration-tests/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointWebIntegrationTests.java

@@ -30,10 +30,6 @@
 
 import org.springframework.boot.actuate.web.mappings.MappingsEndpoint.ApplicationMappingsDescriptor;
 import org.springframework.boot.actuate.web.mappings.MappingsEndpoint.ContextMappingsDescriptor;
-import org.springframework.boot.actuate.web.mappings.reactive.DispatcherHandlerMappingDescription;
-import org.springframework.boot.actuate.web.mappings.reactive.DispatcherHandlersMappingDescriptionProvider;
-import org.springframework.boot.actuate.web.mappings.servlet.DispatcherServletMappingDescription;
-import org.springframework.boot.actuate.web.mappings.servlet.DispatcherServletsMappingDescriptionProvider;
 import org.springframework.boot.actuate.web.mappings.servlet.FilterRegistrationMappingDescription;
 import org.springframework.boot.actuate.web.mappings.servlet.FiltersMappingDescriptionProvider;
 import org.springframework.boot.actuate.web.mappings.servlet.ServletRegistrationMappingDescription;
@@ -42,6 +38,10 @@
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
 import org.springframework.boot.web.context.servlet.AnnotationConfigServletWebApplicationContext;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
+import org.springframework.boot.webflux.actuate.mappings.DispatcherHandlerMappingDescription;
+import org.springframework.boot.webflux.actuate.mappings.DispatcherHandlersMappingDescriptionProvider;
+import org.springframework.boot.webmvc.actuate.mappings.DispatcherServletMappingDescription;
+import org.springframework.boot.webmvc.actuate.mappings.DispatcherServletsMappingDescriptionProvider;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -69,13 +69,13 @@
 import static org.springframework.web.reactive.function.server.RouterFunctions.route;
 
 /**
- * Tests for {@link MappingsEndpoint}.
+ * Integration tests for {@link MappingsEndpoint}.
  *
  * @author Andy Wilkinson
  * @author Stephane Nicoll
  * @author Xiong Tang
  */
-class MappingsEndpointTests {
+class MappingsEndpointIntegrationTests {
 
 	@Test
 	void servletWebMappings() {